Commit e43ec608 authored by Natanael Copa's avatar Natanael Copa

state: use db in own struc when committing

The db parameter to apk_state_commit is not needed so we remove it.
parent 0f6475b8
......@@ -142,7 +142,7 @@ static int add_main(void *ctx, struct apk_database *db, int argc, char **argv)
apk_state_print_errors(state);
r = -1;
} else {
r = apk_state_commit(state, db);
r = apk_state_commit(state);
}
if (state != NULL)
apk_state_unref(state);
......
......@@ -37,7 +37,7 @@ struct apk_state *apk_state_dup(struct apk_state *state);
void apk_state_unref(struct apk_state *state);
void apk_state_print_errors(struct apk_state *state);
int apk_state_commit(struct apk_state *state, struct apk_database *db);
int apk_state_commit(struct apk_state *state);
int apk_state_lock_dependency(struct apk_state *state,
struct apk_dependency *dep);
int apk_state_lock_name(struct apk_state *state,
......
......@@ -58,7 +58,7 @@ static int del_main(void *ctx, struct apk_database *db, int argc, char **argv)
r |= apk_state_lock_dependency(state, &dep);
}
if (r == 0)
r = apk_state_commit(state, db);
r = apk_state_commit(state);
else
apk_state_print_errors(state);
err:
......
......@@ -89,7 +89,7 @@ static int fix_main(void *pctx, struct apk_database *db, int argc, char **argv)
r |= apk_state_lock_dependency(state, &deps[i]);
if (r == 0 || (apk_flags & APK_FORCE))
r = apk_state_commit(state, db);
r = apk_state_commit(state);
else
apk_state_print_errors(state);
err:
......
......@@ -937,11 +937,11 @@ void apk_state_print_errors(struct apk_state *state)
printf("\n");
}
int apk_state_commit(struct apk_state *state,
struct apk_database *db)
int apk_state_commit(struct apk_state *state)
{
struct progress prog;
struct apk_change *change;
struct apk_database *db = state->db;
int n = 0, r = 0, size_diff = 0, toplevel = FALSE, deleteonly = TRUE;
/* Count what needs to be done */
......
......@@ -48,7 +48,7 @@ int apk_do_self_upgrade(struct apk_database *db, struct apk_state *state)
apk_message("Uprading first to new apk-tools:");
state->print_ok = 0;
r = apk_state_commit(state, db);
r = apk_state_commit(state);
apk_state_unref(state);
apk_db_close(db);
......@@ -101,7 +101,7 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg
if (i != 0)
printf("\n");
r = apk_state_commit(state, db);
r = apk_state_commit(state);
} else
apk_state_print_errors(state);
err:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment