From: Michael Tremer Date: Fri, 27 Jun 2025 15:11:29 +0000 (+0000) Subject: transaction: Create its own type X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afe7ff29d4eca07f0f7732a52db98a4630e67fdc;p=pakfire.git transaction: Create its own type Signed-off-by: Michael Tremer --- diff --git a/src/cli/lib/install.c b/src/cli/lib/install.c index eabe6355..285c515d 100644 --- a/src/cli/lib/install.c +++ b/src/cli/lib/install.c @@ -91,7 +91,7 @@ static error_t parse(int key, char* arg, struct argp_state* state, void* data) { return 0; } -static int __cli_install(struct pakfire_transaction* transaction, int argc, char* argv[], void* data) { +static int __cli_install(pakfire_transaction* transaction, int argc, char* argv[], void* data) { struct cli_local_args* args = data; int r; diff --git a/src/cli/lib/remove.c b/src/cli/lib/remove.c index a175cf53..8a3bef33 100644 --- a/src/cli/lib/remove.c +++ b/src/cli/lib/remove.c @@ -72,7 +72,7 @@ static error_t parse(int key, char* arg, struct argp_state* state, void* data) { return 0; } -static int __cli_remove(struct pakfire_transaction* transaction, int argc, char* argv[], void* data) { +static int __cli_remove(pakfire_transaction* transaction, int argc, char* argv[], void* data) { struct cli_local_args* args = data; int r; diff --git a/src/cli/lib/sync.c b/src/cli/lib/sync.c index b0dd77e8..3703dc56 100644 --- a/src/cli/lib/sync.c +++ b/src/cli/lib/sync.c @@ -59,7 +59,7 @@ static error_t parse(int key, char* arg, struct argp_state* state, void* data) { return 0; } -static int __cli_sync(struct pakfire_transaction* transaction, int argc, char* argv[], void* data) { +static int __cli_sync(pakfire_transaction* transaction, int argc, char* argv[], void* data) { struct cli_local_args* args = data; int r; diff --git a/src/cli/lib/terminal.c b/src/cli/lib/terminal.c index c1626b50..d9bfd0b2 100644 --- a/src/cli/lib/terminal.c +++ b/src/cli/lib/terminal.c @@ -257,7 +257,7 @@ static pakfire_solution* cli_term_find_solution( } int cli_term_pick_solution(pakfire_ctx* ctx, struct pakfire* pakfire, void* data, - struct pakfire_transaction* transaction) { + pakfire_transaction* transaction) { pakfire_problem** problems = NULL; pakfire_solution* solution = NULL; unsigned int num_solutions = 0; diff --git a/src/cli/lib/terminal.h b/src/cli/lib/terminal.h index a34c7d9b..56ce1dc5 100644 --- a/src/cli/lib/terminal.h +++ b/src/cli/lib/terminal.h @@ -35,6 +35,6 @@ int cli_term_confirm_yes(pakfire_ctx* ctx, struct pakfire* pakfire, void* data, const char* message, const char* question); int cli_term_pick_solution(pakfire_ctx* ctx, struct pakfire* pakfire, - void* data, struct pakfire_transaction* transaction); + void* data, pakfire_transaction* transaction); #endif /* PAKFIRE_CLI_TERMINAL_H */ diff --git a/src/cli/lib/transaction.c b/src/cli/lib/transaction.c index 414f8926..ab5fa7be 100644 --- a/src/cli/lib/transaction.c +++ b/src/cli/lib/transaction.c @@ -34,7 +34,7 @@ */ int cli_transaction(struct pakfire* pakfire, int argc, char* argv[], int flags, cli_transaction_callback callback, void* data) { - struct pakfire_transaction* transaction = NULL; + pakfire_transaction* transaction = NULL; char* problems = NULL; int r; diff --git a/src/cli/lib/transaction.h b/src/cli/lib/transaction.h index 03dca41e..6e57b9d6 100644 --- a/src/cli/lib/transaction.h +++ b/src/cli/lib/transaction.h @@ -25,7 +25,7 @@ #include typedef int (*cli_transaction_callback) - (struct pakfire_transaction* transaction, int argc, char* argv[], void* data); + (pakfire_transaction* transaction, int argc, char* argv[], void* data); int cli_transaction(struct pakfire* pakfire, int argc, char* argv[], int flags, cli_transaction_callback callback, void* data); diff --git a/src/cli/lib/update.c b/src/cli/lib/update.c index 074c3f97..2b23565e 100644 --- a/src/cli/lib/update.c +++ b/src/cli/lib/update.c @@ -91,7 +91,7 @@ static error_t parse(int key, char* arg, struct argp_state* state, void* data) { return 0; } -static int __cli_update(struct pakfire_transaction* transaction, int argc, char* argv[], void* data) { +static int __cli_update(pakfire_transaction* transaction, int argc, char* argv[], void* data) { struct cli_local_args* args = data; int r; diff --git a/src/pakfire/build.c b/src/pakfire/build.c index 7222340e..6477b924 100644 --- a/src/pakfire/build.c +++ b/src/pakfire/build.c @@ -2336,14 +2336,14 @@ ERROR: static int pakfire_build_install_package(pakfire_ctx* ctx, pakfire_package* pkg, void* p) { - struct pakfire_transaction* transaction = (struct pakfire_transaction*)p; + pakfire_transaction* transaction = (pakfire_transaction*)p; return pakfire_transaction_request_package(transaction, PAKFIRE_JOB_INSTALL, pkg, PAKFIRE_JOB_ESSENTIAL); } static int pakfire_build_install_test(pakfire_build* build) { - struct pakfire_transaction* transaction = NULL; + pakfire_transaction* transaction = NULL; char* problems = NULL; int r; @@ -2403,7 +2403,7 @@ static int pakfire_build_post_check(pakfire_build* build) { static int pakfire_build_init(pakfire_build* build, pakfire_package* package, const char** packages) { - struct pakfire_transaction* transaction = NULL; + pakfire_transaction* transaction = NULL; char* problems = NULL; int r; @@ -2618,7 +2618,7 @@ ERROR: static int pakfire_build_mkimage_install_deps(pakfire_build* build, const char* type) { - struct pakfire_transaction* transaction = NULL; + pakfire_transaction* transaction = NULL; char requires[NAME_MAX]; char* problems = NULL; int r; @@ -2665,7 +2665,7 @@ ERROR: } static int pakfire_build_collect_packages(pakfire_build* build, const char* path) { - struct pakfire_transaction* transaction = NULL; + pakfire_transaction* transaction = NULL; char* problems = NULL; char* p = NULL; int r; diff --git a/src/pakfire/ctx.c b/src/pakfire/ctx.c index 2180b7be..e6681d1c 100644 --- a/src/pakfire/ctx.c +++ b/src/pakfire/ctx.c @@ -378,7 +378,7 @@ void pakfire_ctx_set_pick_solution_callback(pakfire_ctx* self, } int pakfire_ctx_pick_solution(pakfire_ctx* self, struct pakfire* pakfire, - struct pakfire_transaction* transaction) { + pakfire_transaction* transaction) { if (!self->pick_solution.callback) return 1; diff --git a/src/pakfire/ctx.h b/src/pakfire/ctx.h index 9a846af6..e4c9b710 100644 --- a/src/pakfire/ctx.h +++ b/src/pakfire/ctx.h @@ -81,7 +81,7 @@ void pakfire_ctx_set_progress_callback(pakfire_ctx* self, // Pick Solution typedef int (*pakfire_pick_solution_callback)(pakfire_ctx* self, - struct pakfire* pakfire, void* data, struct pakfire_transaction* transaction); + struct pakfire* pakfire, void* data, pakfire_transaction* transaction); void pakfire_ctx_set_pick_solution_callback(pakfire_ctx* self, pakfire_pick_solution_callback callback, void* data); @@ -106,7 +106,7 @@ int pakfire_ctx_setup_progress(pakfire_ctx* self, pakfire_progress* progress); // Pick Solution int pakfire_ctx_pick_solution(pakfire_ctx* self, struct pakfire* pakfire, - struct pakfire_transaction* transaction); + pakfire_transaction* transaction); // Event Loop diff --git a/src/pakfire/package.c b/src/pakfire/package.c index 3f6e6044..6dde9852 100644 --- a/src/pakfire/package.c +++ b/src/pakfire/package.c @@ -2808,7 +2808,7 @@ ERROR: int pakfire_package_installcheck(pakfire_package* pkg, char** problem, int flags) { - struct pakfire_transaction* transaction = NULL; + pakfire_transaction* transaction = NULL; char* p = NULL; int r; diff --git a/src/pakfire/pakfire.c b/src/pakfire/pakfire.c index a64e094c..275f9088 100644 --- a/src/pakfire/pakfire.c +++ b/src/pakfire/pakfire.c @@ -1931,7 +1931,7 @@ ERROR: * Convenience function to install a couple of packages. Simple. */ int pakfire_install(struct pakfire* self, const char** packages) { - struct pakfire_transaction* transaction = NULL; + pakfire_transaction* transaction = NULL; char* problems = NULL; int r; diff --git a/src/pakfire/pakfire.h b/src/pakfire/pakfire.h index 7e04b9a3..e5c00aee 100644 --- a/src/pakfire/pakfire.h +++ b/src/pakfire/pakfire.h @@ -112,7 +112,7 @@ const struct pakfire_subid* pakfire_subgid(struct pakfire* pakfire); pakfire_config* pakfire_get_config(struct pakfire* pakfire); int pakfire_confirm(struct pakfire* pakfire, const char* message, const char* question); -int pakfire_pick_solution(struct pakfire* pakfire, struct pakfire_transaction* transaction); +int pakfire_pick_solution(struct pakfire* pakfire, pakfire_transaction* transaction); int pakfire_setup_progress(struct pakfire* pakfire, pakfire_progress* progress); const char* pakfire_get_distro_name(struct pakfire* pakfire); diff --git a/src/pakfire/problem.c b/src/pakfire/problem.c index c17b923a..fad1cec6 100644 --- a/src/pakfire/problem.c +++ b/src/pakfire/problem.c @@ -37,7 +37,7 @@ struct pakfire_problem { struct pakfire* pakfire; int nrefs; - struct pakfire_transaction* transaction; + pakfire_transaction* transaction; Id id; char* string; @@ -191,7 +191,7 @@ static char* pakfire_problem_make_string(pakfire_problem* problem) { } int pakfire_problem_create(pakfire_problem** problem, - struct pakfire* pakfire, struct pakfire_transaction* transaction, Id id) { + struct pakfire* pakfire, pakfire_transaction* transaction, Id id) { pakfire_problem* p = NULL; // Allocate some memory @@ -260,7 +260,7 @@ Id pakfire_problem_get_id(pakfire_problem* problem) { return problem->id; } -struct pakfire_transaction* pakfire_problem_get_transaction(pakfire_problem* problem) { +pakfire_transaction* pakfire_problem_get_transaction(pakfire_problem* problem) { return pakfire_transaction_ref(problem->transaction); } diff --git a/src/pakfire/problem.h b/src/pakfire/problem.h index 4a3c65ec..ba3cc24e 100644 --- a/src/pakfire/problem.h +++ b/src/pakfire/problem.h @@ -38,9 +38,9 @@ pakfire_solution** pakfire_problem_get_solutions( pakfire_problem* problem); int pakfire_problem_create(pakfire_problem** problem, struct pakfire* pakfire, - struct pakfire_transaction* transaction, Id id); + pakfire_transaction* transaction, Id id); -struct pakfire_transaction* pakfire_problem_get_transaction(pakfire_problem* problem); +pakfire_transaction* pakfire_problem_get_transaction(pakfire_problem* problem); Id pakfire_problem_get_id(pakfire_problem* problem); diff --git a/src/pakfire/snapshot.c b/src/pakfire/snapshot.c index be6d756a..bb525202 100644 --- a/src/pakfire/snapshot.c +++ b/src/pakfire/snapshot.c @@ -472,7 +472,7 @@ static int pakfire_snapshot_destroy(pakfire_snapshot* self) { } static int pakfire_snapshot_install_packages(struct pakfire* pakfire, const char** packages) { - struct pakfire_transaction* transaction = NULL; + pakfire_transaction* transaction = NULL; int r; // Create a new transaction diff --git a/src/pakfire/solution.c b/src/pakfire/solution.c index aa1f3098..83d7beba 100644 --- a/src/pakfire/solution.c +++ b/src/pakfire/solution.c @@ -100,7 +100,7 @@ Id pakfire_solution_get_id(pakfire_solution* solution) { } static char* pakfire_solution_make_string(pakfire_solution* solution) { - struct pakfire_transaction* transaction = pakfire_problem_get_transaction(solution->problem); + pakfire_transaction* transaction = pakfire_problem_get_transaction(solution->problem); Solver* solver = pakfire_transaction_get_solver(transaction); Pool* pool = solver->pool; diff --git a/src/pakfire/transaction.c b/src/pakfire/transaction.c index 1b251ef1..8b891d5f 100644 --- a/src/pakfire/transaction.c +++ b/src/pakfire/transaction.c @@ -95,7 +95,7 @@ enum pakfire_steps { }; static enum pakfire_steps pakfire_transaction_get_step_type( - struct pakfire_transaction* transaction, pakfire_package* pkg) { + pakfire_transaction* transaction, pakfire_package* pkg) { const Id id = pakfire_package_id(pkg); const int flags = SOLVER_TRANSACTION_CHANGE_IS_REINSTALL; @@ -142,7 +142,7 @@ static enum pakfire_steps pakfire_transaction_get_step_type( } static void pakfire_transaction_free_archives_and_packages( - struct pakfire_transaction* transaction) { + pakfire_transaction* transaction) { if (transaction->archives) { for (unsigned int i = 0; i < transaction->num; i++) if (transaction->archives[i]) @@ -162,7 +162,7 @@ static void pakfire_transaction_free_archives_and_packages( } } -static int pakfire_transaction_import_transaction(struct pakfire_transaction* transaction) { +static int pakfire_transaction_import_transaction(pakfire_transaction* transaction) { pakfire_package* pkg = NULL; int new_pkgs; Queue pkgs; @@ -247,7 +247,7 @@ ERROR: return r; } -static int pakfire_transaction_import_userinstalled(struct pakfire_transaction* transaction) { +static int pakfire_transaction_import_userinstalled(pakfire_transaction* transaction) { Queue userinstalled; const char* package = NULL; int r = 0; @@ -303,7 +303,7 @@ OUT: return r; } -static int pakfire_transaction_setup_solver(struct pakfire_transaction* transaction) { +static int pakfire_transaction_setup_solver(pakfire_transaction* transaction) { Pool* pool = pakfire_get_solv_pool(transaction->pakfire); // Allocate a new solver @@ -343,7 +343,7 @@ static int pakfire_transaction_setup_solver(struct pakfire_transaction* transact return 0; } -static void pakfire_transaction_free(struct pakfire_transaction* transaction) { +static void pakfire_transaction_free(pakfire_transaction* transaction) { pakfire_transaction_free_archives_and_packages(transaction); if (transaction->installed_packages) @@ -366,12 +366,12 @@ static void pakfire_transaction_free(struct pakfire_transaction* transaction) { free(transaction); } -int pakfire_transaction_create(struct pakfire_transaction** transaction, +int pakfire_transaction_create(pakfire_transaction** transaction, struct pakfire* pakfire, int flags) { int r; // Allocate the transaction - struct pakfire_transaction* t = calloc(1, sizeof(*t)); + pakfire_transaction* t = calloc(1, sizeof(*t)); if (!t) return -errno; @@ -419,15 +419,15 @@ ERROR: return r; } -struct pakfire_transaction* pakfire_transaction_ref( - struct pakfire_transaction* transaction) { +pakfire_transaction* pakfire_transaction_ref( + pakfire_transaction* transaction) { transaction->nrefs++; return transaction; } -struct pakfire_transaction* pakfire_transaction_unref( - struct pakfire_transaction* transaction) { +pakfire_transaction* pakfire_transaction_unref( + pakfire_transaction* transaction) { if (--transaction->nrefs > 0) return transaction; @@ -436,7 +436,7 @@ struct pakfire_transaction* pakfire_transaction_unref( } pakfire_problem** pakfire_transaction_get_problems( - struct pakfire_transaction* transaction) { + pakfire_transaction* transaction) { pakfire_problem** problems = NULL; pakfire_problem* problem = NULL; unsigned int count = 0; @@ -487,7 +487,7 @@ ERROR: } static int pakfire_transaction_append_solutions( - struct pakfire_transaction* transaction, char** buffer, pakfire_solution** solutions) { + pakfire_transaction* transaction, char** buffer, pakfire_solution** solutions) { const char* s = NULL; int r; @@ -506,7 +506,7 @@ static int pakfire_transaction_append_solutions( } static int pakfire_transaction_append_problems( - struct pakfire_transaction* transaction, char** buffer, pakfire_problem** problems, int flags) { + pakfire_transaction* transaction, char** buffer, pakfire_problem** problems, int flags) { pakfire_solution** solutions = NULL; const char* s = NULL; int r; @@ -544,7 +544,7 @@ static int pakfire_transaction_append_problems( } static char* pakfire_transaction_get_problem_string( - struct pakfire_transaction* transaction, int flags) { + pakfire_transaction* transaction, int flags) { pakfire_problem** problems = NULL; char* buffer = NULL; int r; @@ -575,11 +575,11 @@ static char* pakfire_transaction_get_problem_string( return buffer; } -Solver* pakfire_transaction_get_solver(struct pakfire_transaction* transaction) { +Solver* pakfire_transaction_get_solver(pakfire_transaction* transaction) { return transaction->solver; } -int pakfire_transaction_solve(struct pakfire_transaction* transaction, +int pakfire_transaction_solve(pakfire_transaction* transaction, int flags, char** problems) { clock_t solving_start; clock_t solving_end; @@ -684,7 +684,7 @@ static int pakfire_transaction_is_file(const char* what) { return pakfire_string_endswith(what, ".pfm"); } -static int __pakfire_transaction_add(struct pakfire_transaction* transaction, +static int __pakfire_transaction_add(pakfire_transaction* transaction, const enum pakfire_job_action action, const Id type, const Id id, int flags) { Id job = ID_NULL; @@ -754,7 +754,7 @@ static int __pakfire_transaction_add(struct pakfire_transaction* transaction, return 0; } -static int pakfire_transaction_add_job(struct pakfire_transaction* transaction, +static int pakfire_transaction_add_job(pakfire_transaction* transaction, const enum pakfire_job_action action, const char* what, int extra_flags) { Queue jobs; int r; @@ -818,7 +818,7 @@ ERROR: return r; } -int pakfire_transaction_request(struct pakfire_transaction* transaction, +int pakfire_transaction_request(pakfire_transaction* transaction, const enum pakfire_job_action action, const char* what, int flags) { pakfire_package* package = NULL; int r; @@ -860,7 +860,7 @@ ERROR: return r; } -int pakfire_transaction_request_package(struct pakfire_transaction* transaction, +int pakfire_transaction_request_package(pakfire_transaction* transaction, const enum pakfire_job_action action, pakfire_package* package, int flags) { // Get the solvable ID Id id = pakfire_package_id(package); @@ -869,7 +869,7 @@ int pakfire_transaction_request_package(struct pakfire_transaction* transaction, return __pakfire_transaction_add(transaction, action, SOLVER_SOLVABLE, id, flags); } -int pakfire_transaction_take_solution(struct pakfire_transaction* transaction, +int pakfire_transaction_take_solution(pakfire_transaction* transaction, pakfire_solution* solution) { pakfire_problem* problem = pakfire_solution_get_problem(solution); @@ -884,18 +884,18 @@ int pakfire_transaction_take_solution(struct pakfire_transaction* transaction, return 0; } -size_t pakfire_transaction_count(struct pakfire_transaction* transaction) { +size_t pakfire_transaction_count(pakfire_transaction* transaction) { return transaction->num; } -static ssize_t pakfire_transaction_installsizechange(struct pakfire_transaction* transaction) { +static ssize_t pakfire_transaction_installsizechange(pakfire_transaction* transaction) { ssize_t sizechange = transaction_calc_installsizechange(transaction->transaction); // Convert from kbytes to bytes return sizechange * 1024; } -static ssize_t pakfire_transaction_downloadsize(struct pakfire_transaction* transaction) { +static ssize_t pakfire_transaction_downloadsize(pakfire_transaction* transaction) { ssize_t size = 0; for (unsigned int i = 0; i < transaction->num; i++) @@ -1003,7 +1003,7 @@ static int pakfire_transaction_add_usage_line(char** s, size_t width, return pakfire_transaction_append_line(s, "%s%-21s: %s\n", *s, headline, buffer); } -char* pakfire_transaction_dump(struct pakfire_transaction* transaction, size_t width) { +char* pakfire_transaction_dump(pakfire_transaction* transaction, size_t width) { char headline[1024]; char* s = NULL; int r; @@ -1242,7 +1242,7 @@ ERROR: } static int pakfire_transaction_check_fileconflicts( - struct pakfire_transaction* transaction) { + pakfire_transaction* transaction) { /* XXX TODO @@ -1252,7 +1252,7 @@ static int pakfire_transaction_check_fileconflicts( return 0; } -static int pakfire_transaction_check(struct pakfire_transaction* transaction) { +static int pakfire_transaction_check(pakfire_transaction* transaction) { int r; // Check for any file conflicts @@ -1263,7 +1263,7 @@ static int pakfire_transaction_check(struct pakfire_transaction* transaction) { return 0; } -static int pakfire_transaction_verify(struct pakfire_transaction* transaction, +static int pakfire_transaction_verify(pakfire_transaction* transaction, pakfire_package* pkg, pakfire_archive* archive) { enum pakfire_hash_type hash = PAKFIRE_HASH_UNDEFINED; const unsigned char* checksum = NULL; @@ -1299,7 +1299,7 @@ static int pakfire_transaction_verify(struct pakfire_transaction* transaction, return 0; } -static int pakfire_transaction_run_script(struct pakfire_transaction* transaction, +static int pakfire_transaction_run_script(pakfire_transaction* transaction, pakfire_db* db, const char* type, pakfire_package* pkg, pakfire_archive* archive) { pakfire_scriptlet* scriptlet = NULL; @@ -1321,7 +1321,7 @@ static int pakfire_transaction_run_script(struct pakfire_transaction* transactio return 0; } -static int pakfire_transaction_extract(struct pakfire_transaction* transaction, +static int pakfire_transaction_extract(pakfire_transaction* transaction, pakfire_package* pkg, pakfire_archive* archive) { pakfire_filelist* filelist = NULL; int r; @@ -1360,7 +1360,7 @@ ERROR: return 0; } -static int pakfire_transaction_erase(struct pakfire_transaction* transaction, +static int pakfire_transaction_erase(pakfire_transaction* transaction, pakfire_db* db, pakfire_package* pkg) { pakfire_filelist* filelist = NULL; int r; @@ -1450,7 +1450,7 @@ static const char* pakfire_step_type_string(enum pakfire_steps type) { } static int pakfire_transaction_package_is_userinstalled( - struct pakfire_transaction* transaction, pakfire_package* pkg) { + pakfire_transaction* transaction, pakfire_package* pkg) { // No packages on the list if (!transaction->userinstalled) return 0; @@ -1467,7 +1467,7 @@ static int pakfire_transaction_package_is_userinstalled( return 0; } -static int pakfire_transaction_apply_systemd_sysusers(struct pakfire_transaction* transaction, +static int pakfire_transaction_apply_systemd_sysusers(pakfire_transaction* transaction, pakfire_package* pkg, pakfire_archive* archive) { // Walk through the archive and find all sysuser files if (pakfire_package_matches_dep(pkg, PAKFIRE_PKG_REQUIRES, "pakfire(systemd-sysusers)")) @@ -1477,7 +1477,7 @@ static int pakfire_transaction_apply_systemd_sysusers(struct pakfire_transaction } static int pakfire_transaction_apply_systemd_tmpfiles( - struct pakfire_transaction* transaction, pakfire_package* pkg) { + pakfire_transaction* transaction, pakfire_package* pkg) { // Apply any tmpfiles (ignore any errors) if (pakfire_package_matches_dep(pkg, PAKFIRE_PKG_REQUIRES, "pakfire(systemd-tmpfiles)")) pakfire_jail_run_systemd_tmpfiles(transaction->pakfire); @@ -1485,7 +1485,7 @@ static int pakfire_transaction_apply_systemd_tmpfiles( return 0; } -static int pakfire_transaction_run_step(struct pakfire_transaction* transaction, +static int pakfire_transaction_run_step(pakfire_transaction* transaction, pakfire_db* db, const enum pakfire_actions action, pakfire_package* pkg, pakfire_archive* archive) { if (!pkg) { errno = EINVAL; @@ -1682,7 +1682,7 @@ static int pakfire_transaction_run_step(struct pakfire_transaction* transaction, return r; } -static int pakfire_transaction_run_steps(struct pakfire_transaction* transaction, +static int pakfire_transaction_run_steps(pakfire_transaction* transaction, pakfire_db* db, enum pakfire_actions action) { int r = 0; @@ -1738,7 +1738,7 @@ static int pakfire_transaction_run_steps(struct pakfire_transaction* transaction } static int pakfire_transaction_open_archives( - struct pakfire_transaction* transaction, size_t* total_size) { + pakfire_transaction* transaction, size_t* total_size) { pakfire_archive* archive = NULL; int r; @@ -1844,7 +1844,7 @@ static int pakfire_usrmove(pakfire_ctx* ctx, struct pakfire* pakfire) { return r; } -static int pakfire_transaction_perform(struct pakfire_transaction* transaction) { +static int pakfire_transaction_perform(pakfire_transaction* transaction) { pakfire_repo* repo = NULL; pakfire_db* db; size_t total_size = 0; @@ -1922,7 +1922,7 @@ ERROR: return r; } -static int pakfire_transaction_download_package(struct pakfire_transaction* transaction, +static int pakfire_transaction_download_package(pakfire_transaction* transaction, pakfire_httpclient* httpclient, pakfire_package* pkg) { pakfire_repo* repo = NULL; struct pakfire_xfer* xfer = NULL; @@ -1955,7 +1955,7 @@ ERROR: } static int pakfire_transaction_package_needs_download( - struct pakfire_transaction* transaction, pakfire_package* pkg) { + pakfire_transaction* transaction, pakfire_package* pkg) { int r; enum pakfire_steps type = pakfire_transaction_get_step_type(transaction, pkg); @@ -1994,7 +1994,7 @@ static int pakfire_transaction_package_needs_download( } } -int pakfire_transaction_download(struct pakfire_transaction* transaction) { +int pakfire_transaction_download(pakfire_transaction* transaction) { pakfire_httpclient* httpclient = NULL; int r; @@ -2031,7 +2031,7 @@ ERROR: return r; } -int pakfire_transaction_run(struct pakfire_transaction* transaction) { +int pakfire_transaction_run(pakfire_transaction* transaction) { char* dump = NULL; int r; @@ -2081,7 +2081,7 @@ ERROR: return r; } -int pakfire_transaction_compose_repo(struct pakfire_transaction* transaction, +int pakfire_transaction_compose_repo(pakfire_transaction* transaction, pakfire_key* key, const char* path) { pakfire_archive* archive = NULL; int r; diff --git a/src/pakfire/transaction.h b/src/pakfire/transaction.h index 8af9a6ab..d861eabe 100644 --- a/src/pakfire/transaction.h +++ b/src/pakfire/transaction.h @@ -24,7 +24,7 @@ // libsolv #include -struct pakfire_transaction; +typedef struct pakfire_transaction pakfire_transaction; #include #include @@ -59,33 +59,33 @@ enum pakfire_job_flags { PAKFIRE_JOB_BEST = 1 << 3, }; -int pakfire_transaction_create(struct pakfire_transaction** transaction, +int pakfire_transaction_create(pakfire_transaction** transaction, struct pakfire* pakfire, int flags); -struct pakfire_transaction* pakfire_transaction_ref(struct pakfire_transaction* transaction); -struct pakfire_transaction* pakfire_transaction_unref(struct pakfire_transaction* transaction); +pakfire_transaction* pakfire_transaction_ref(pakfire_transaction* transaction); +pakfire_transaction* pakfire_transaction_unref(pakfire_transaction* transaction); -int pakfire_transaction_solve(struct pakfire_transaction* transaction, int flags, char** problems); +int pakfire_transaction_solve(pakfire_transaction* transaction, int flags, char** problems); -int pakfire_transaction_request(struct pakfire_transaction* transaction, +int pakfire_transaction_request(pakfire_transaction* transaction, const enum pakfire_job_action action, const char* what, int flags); -int pakfire_transaction_request_package(struct pakfire_transaction* transaction, +int pakfire_transaction_request_package(pakfire_transaction* transaction, const enum pakfire_job_action action, pakfire_package* package, int flags); -pakfire_problem** pakfire_transaction_get_problems(struct pakfire_transaction* transaction); +pakfire_problem** pakfire_transaction_get_problems(pakfire_transaction* transaction); int pakfire_transaction_take_solution( - struct pakfire_transaction* transaction, pakfire_solution* solution); + pakfire_transaction* transaction, pakfire_solution* solution); -size_t pakfire_transaction_count(struct pakfire_transaction* transaction); -char* pakfire_transaction_dump(struct pakfire_transaction* transaction, size_t width); +size_t pakfire_transaction_count(pakfire_transaction* transaction); +char* pakfire_transaction_dump(pakfire_transaction* transaction, size_t width); -int pakfire_transaction_run(struct pakfire_transaction* transaction); +int pakfire_transaction_run(pakfire_transaction* transaction); -int pakfire_transaction_download(struct pakfire_transaction* transaction); +int pakfire_transaction_download(pakfire_transaction* transaction); -Solver* pakfire_transaction_get_solver(struct pakfire_transaction* transaction); +Solver* pakfire_transaction_get_solver(pakfire_transaction* transaction); -int pakfire_transaction_compose_repo(struct pakfire_transaction* transaction, +int pakfire_transaction_compose_repo(pakfire_transaction* transaction, pakfire_key* key, const char* path); #endif /* PAKFIRE_TRANSACTION_H */ diff --git a/src/python/transaction.h b/src/python/transaction.h index 88d8e098..9b8b6981 100644 --- a/src/python/transaction.h +++ b/src/python/transaction.h @@ -27,7 +27,7 @@ typedef struct { PyObject_HEAD - struct pakfire_transaction* transaction; + pakfire_transaction* transaction; } TransactionObject; extern PyTypeObject TransactionType;