From: Michael Tremer Date: Fri, 27 Jun 2025 14:29:50 +0000 (+0000) Subject: package: Create its own type X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4d26cd6a2323783c13bd121f002cb66c3516ae2;p=pakfire.git package: Create its own type Signed-off-by: Michael Tremer --- diff --git a/src/cli/lib/build.c b/src/cli/lib/build.c index cdc3153e..78bffaca 100644 --- a/src/cli/lib/build.c +++ b/src/cli/lib/build.c @@ -165,7 +165,7 @@ static void log_callback(void* data, int priority, const char* file, int line, static int result_callback(pakfire_ctx* ctx, struct pakfire* pakfire, pakfire_build* build, pakfire_archive* archive, void* data) { const struct cli_local_args* local_args = data; - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; struct pakfire_repo* local = NULL; char path[PATH_MAX]; int r; diff --git a/src/cli/lib/dump.c b/src/cli/lib/dump.c index ac6153cb..85262840 100644 --- a/src/cli/lib/dump.c +++ b/src/cli/lib/dump.c @@ -33,7 +33,7 @@ #include "dump.h" -int cli_dump_package(struct pakfire_package* package, int flags) { +int cli_dump_package(pakfire_package* package, int flags) { char* p = NULL; // Dump the package information @@ -48,7 +48,7 @@ int cli_dump_package(struct pakfire_package* package, int flags) { return 0; } -static int __cli_dump_package(pakfire_ctx* ctx, struct pakfire_package* package, void* p) { +static int __cli_dump_package(pakfire_ctx* ctx, pakfire_package* package, void* p) { int flags = *(int*)p; #if 0 diff --git a/src/cli/lib/dump.h b/src/cli/lib/dump.h index da9d1bd0..9b553256 100644 --- a/src/cli/lib/dump.h +++ b/src/cli/lib/dump.h @@ -28,7 +28,7 @@ #include #include -int cli_dump_package(struct pakfire_package* package, int flags); +int cli_dump_package(pakfire_package* package, int flags); int cli_dump_packagelist(pakfire_packagelist* list, int flags); int cli_dump_repolist(struct pakfire_repolist* list, int flags); diff --git a/src/cli/lib/lint.c b/src/cli/lib/lint.c index 94f30f05..e2ed50e2 100644 --- a/src/cli/lib/lint.c +++ b/src/cli/lib/lint.c @@ -61,7 +61,7 @@ static error_t parse(int key, char* arg, struct argp_state* state, void* data) { } static int cli_linter_result(pakfire_ctx* ctx, pakfire_archive* archive, - struct pakfire_package* package, pakfire_file* file, int priority, + pakfire_package* package, pakfire_file* file, int priority, const char* result, void* data) { const char* nevra = pakfire_package_get_string(package, PAKFIRE_PKG_NEVRA); diff --git a/src/pakfire/archive.c b/src/pakfire/archive.c index 98ec3ea5..5e820330 100644 --- a/src/pakfire/archive.c +++ b/src/pakfire/archive.c @@ -74,7 +74,7 @@ struct pakfire_archive { FILE* f; struct stat stat; - struct pakfire_package* package; + pakfire_package* package; // metadata unsigned int format; @@ -449,7 +449,7 @@ pakfire_archive* pakfire_archive_unref(pakfire_archive* archive) { return NULL; } -static struct pakfire_package* pakfire_archive_get_package(pakfire_archive* archive) { +static pakfire_package* pakfire_archive_get_package(pakfire_archive* archive) { if (!archive->package) { int r = pakfire_archive_make_package(archive, NULL, &archive->package); if (r) @@ -1311,7 +1311,7 @@ ERROR: static int __pakfire_archive_extract(pakfire_archive* archive, const char* path, int flags, struct pakfire_progress* parent) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; char prefix[PATH_MAX] = "/"; struct archive* writer = NULL; struct archive* a = NULL; @@ -1415,7 +1415,7 @@ const char* pakfire_archive_get_path(pakfire_archive* archive) { } const char* pakfire_archive_get_filename(pakfire_archive* self) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; const char* filename = NULL; // Fetch the package @@ -1543,7 +1543,7 @@ int pakfire_archive_verify_checksum(pakfire_archive* archive, } static int pakfire_archive_import_filelist_from_json( - pakfire_archive* archive, struct pakfire_package* package) { + pakfire_archive* archive, pakfire_package* package) { struct json_object* array = NULL; int r; @@ -1582,8 +1582,8 @@ static int pakfire_archive_import_filelist_from_json( } static int pakfire_archive_make_package_from_json(pakfire_archive* archive, - struct pakfire_repo* repo, struct pakfire_package** package) { - struct pakfire_package* pkg = NULL; + struct pakfire_repo* repo, pakfire_package** package) { + pakfire_package* pkg = NULL; char path[PATH_MAX]; int r; @@ -1869,7 +1869,7 @@ ERROR: Copy all metadata from this archive to the package object */ int pakfire_archive_make_package(pakfire_archive* archive, - struct pakfire_repo* repo, struct pakfire_package** package) { + struct pakfire_repo* repo, pakfire_package** package) { struct pakfire_repo* dummy = NULL; int r; diff --git a/src/pakfire/archive.h b/src/pakfire/archive.h index f75a7ccd..cad637f2 100644 --- a/src/pakfire/archive.h +++ b/src/pakfire/archive.h @@ -63,7 +63,7 @@ int pakfire_archive_verify_checksum(pakfire_archive* archive, const enum pakfire_hash_type type, const unsigned char* checksum, const size_t length); int pakfire_archive_make_package(pakfire_archive* archive, - struct pakfire_repo* repo, struct pakfire_package** package); + struct pakfire_repo* repo, pakfire_package** package); int pakfire_archive_lint(pakfire_archive* archive, pakfire_linter_result_callback callback, void* data); diff --git a/src/pakfire/build.c b/src/pakfire/build.c index 37bc5bd8..a4040fc7 100644 --- a/src/pakfire/build.c +++ b/src/pakfire/build.c @@ -311,11 +311,11 @@ ERROR: struct pakfire_find_deps_ctx { pakfire_build* build; - struct pakfire_package* pkg; + pakfire_package* pkg; pakfire_filelist* filelist; }; -static int pakfire_build_process_pkgconfig_dep(struct pakfire_package* pkg, +static int pakfire_build_process_pkgconfig_dep(pakfire_package* pkg, const enum pakfire_package_key key, const char* line, const size_t length) { char buffer[PATH_MAX]; int r; @@ -754,7 +754,7 @@ static int pakfire_build_find_perl_files( return 0; } -static int pakfire_build_add_perl_dep(pakfire_ctx* ctx, struct pakfire_package* pkg, +static int pakfire_build_add_perl_dep(pakfire_ctx* ctx, pakfire_package* pkg, const enum pakfire_package_key key, const char* line, size_t length) { // Add the dependency return pakfire_package_add_dep(pkg, key, "%.*s", (int)length, line); @@ -762,7 +762,7 @@ static int pakfire_build_add_perl_dep(pakfire_ctx* ctx, struct pakfire_package* static int pakfire_build_add_perl_provides(pakfire_ctx* ctx, void* data, const enum pakfire_jail_output_stream stream, const char* line, size_t length) { - struct pakfire_package* pkg = data; + pakfire_package* pkg = data; switch (stream) { // Process output @@ -780,7 +780,7 @@ static int pakfire_build_add_perl_provides(pakfire_ctx* ctx, void* data, static int pakfire_build_add_perl_requires(pakfire_ctx* ctx, void* data, const enum pakfire_jail_output_stream stream, const char* line, size_t length) { - struct pakfire_package* pkg = data; + pakfire_package* pkg = data; switch (stream) { // Process output @@ -797,7 +797,7 @@ static int pakfire_build_add_perl_requires(pakfire_ctx* ctx, void* data, } static int pakfire_build_find_perl_deps(pakfire_build* build, - struct pakfire_package* pkg, pakfire_filelist* filelist) { + pakfire_package* pkg, pakfire_filelist* filelist) { pakfire_filelist* perlfiles = NULL; const char* args[] = { build->buildroot, @@ -844,7 +844,7 @@ ERROR: static int pakfire_build_find_dependencies(pakfire_build* build, struct pakfire_parser* makefile, const char* namespace, - struct pakfire_package* pkg, pakfire_filelist* filelist) { + pakfire_package* pkg, pakfire_filelist* filelist) { char* filter_provides = NULL; char* filter_requires = NULL; int r; @@ -955,7 +955,7 @@ ERROR: static int pakfire_build_package_add_files(pakfire_build* build, struct pakfire_parser* makefile, const char* buildroot, const char* namespace, - struct pakfire_package* pkg, pakfire_packager* packager) { + pakfire_package* pkg, pakfire_packager* packager) { pakfire_filelist* filelist = NULL; char** includes = NULL; char** excludes = NULL; @@ -1111,7 +1111,7 @@ static int pakfire_build_process_scriptlet_dep(pakfire_ctx* ctx, void* data, } static int pakfire_build_add_scriptlet_requires(pakfire_build* build, - struct pakfire_package* pkg, struct pakfire_scriptlet* scriptlet) { + pakfire_package* pkg, struct pakfire_scriptlet* scriptlet) { struct pakfire_input_buffer buffer = {}; int r; @@ -1140,7 +1140,7 @@ static int pakfire_build_add_scriptlet_requires(pakfire_build* build, } static int pakfire_build_package_add_scriptlet(pakfire_build* build, - struct pakfire_package* pkg, pakfire_packager* packager, + pakfire_package* pkg, pakfire_packager* packager, const char* type, const char* data) { struct pakfire_scriptlet* scriptlet = NULL; char* shell = NULL; @@ -1184,7 +1184,7 @@ ERROR: static int pakfire_build_package_add_scriptlets(pakfire_build* build, struct pakfire_parser* makefile, const char* namespace, - struct pakfire_package* pkg, pakfire_packager* packager) { + pakfire_package* pkg, pakfire_packager* packager) { char name[NAME_MAX]; int r; @@ -1214,7 +1214,7 @@ static int pakfire_build_package_add_scriptlets(pakfire_build* build, static int pakfire_build_package(pakfire_build* build, struct pakfire_parser* makefile, const char* buildroot, const char* namespace) { pakfire_archive* archive = NULL; - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; pakfire_packager* packager = NULL; int r = 1; @@ -1321,7 +1321,7 @@ ERROR: } static int pakfire_build_package_dump(pakfire_ctx* ctx, - struct pakfire_package* pkg, void* p) { + pakfire_package* pkg, void* p) { pakfire_build* build = p; char* dump = pakfire_package_dump(pkg, PAKFIRE_PKG_DUMP_LONG); @@ -2190,7 +2190,7 @@ int pakfire_build_set_ccache_path( } static int pakfire_build_read_makefile(pakfire_build* build, - struct pakfire_parser** parser, struct pakfire_package* package) { + struct pakfire_parser** parser, pakfire_package* package) { char path[PATH_MAX]; int r; @@ -2335,7 +2335,7 @@ ERROR: } static int pakfire_build_install_package(pakfire_ctx* ctx, - struct pakfire_package* pkg, void* p) { + pakfire_package* pkg, void* p) { struct pakfire_transaction* transaction = (struct pakfire_transaction*)p; return pakfire_transaction_request_package(transaction, @@ -2402,7 +2402,7 @@ static int pakfire_build_post_check(pakfire_build* build) { } static int pakfire_build_init(pakfire_build* build, - struct pakfire_package* package, const char** packages) { + pakfire_package* package, const char** packages) { struct pakfire_transaction* transaction = NULL; char* problems = NULL; int r; @@ -2468,7 +2468,7 @@ ERROR: } static int pakfire_build_lint_archive( - pakfire_ctx* ctx, struct pakfire_package* pkg, pakfire_archive* archive, void* data) { + pakfire_ctx* ctx, pakfire_package* pkg, pakfire_archive* archive, void* data) { return pakfire_archive_lint(archive, NULL, NULL); } @@ -2493,7 +2493,7 @@ typedef struct pakfire_build_result { void* data; } pakfire_build_result; -static int __pakfire_build_result(pakfire_ctx* ctx, struct pakfire_package* pkg, +static int __pakfire_build_result(pakfire_ctx* ctx, pakfire_package* pkg, pakfire_archive* archive, void* data) { const pakfire_build_result* result = data; pakfire_build* build = result->build; @@ -2511,7 +2511,7 @@ static int __pakfire_build_result(pakfire_ctx* ctx, struct pakfire_package* pkg, int pakfire_build_exec(pakfire_build* build, const char* path, pakfire_build_result_callback result_callback, void* data) { - struct pakfire_package* package = NULL; + pakfire_package* package = NULL; struct pakfire_parser* makefile = NULL; char* problems = NULL; char duration[TIME_STRING_MAX]; diff --git a/src/pakfire/db.c b/src/pakfire/db.c index 7e357402..98258ea5 100644 --- a/src/pakfire/db.c +++ b/src/pakfire/db.c @@ -917,7 +917,7 @@ static void pakfire_db_add_userinstalled(struct pakfire* pakfire, const char* na queue_push2(&pool->pooljobs, SOLVER_USERINSTALLED|SOLVER_SOLVABLE_NAME, id); } -static int pakfire_db_add_dependencies(pakfire_db* db, unsigned long id, struct pakfire_package* pkg) { +static int pakfire_db_add_dependencies(pakfire_db* db, unsigned long id, pakfire_package* pkg) { sqlite3_stmt* stmt = NULL; char** list = NULL; int r = 1; @@ -1350,7 +1350,7 @@ END: } int pakfire_db_add_package(pakfire_db* db, - struct pakfire_package* pkg, pakfire_archive* archive, int userinstalled) { + pakfire_package* pkg, pakfire_archive* archive, int userinstalled) { enum pakfire_hash_type hash_type = PAKFIRE_HASH_UNDEFINED; const unsigned char* checksum = NULL; size_t checksum_length = 0; @@ -1704,7 +1704,7 @@ ERROR: return r; } -int pakfire_db_remove_package(pakfire_db* db, struct pakfire_package* pkg) { +int pakfire_db_remove_package(pakfire_db* db, pakfire_package* pkg) { sqlite3_stmt* stmt = NULL; int r = 1; @@ -1765,7 +1765,7 @@ ERROR: } struct pakfire_scriptlet* pakfire_db_get_scriptlet(pakfire_db* db, - struct pakfire_package* pkg, const char* type) { + pakfire_package* pkg, const char* type) { struct pakfire_scriptlet* scriptlet = NULL; sqlite3_stmt* stmt = NULL; int r = 1; @@ -1827,7 +1827,7 @@ ERROR: } static int pakfire_db_load_package(pakfire_db* db, struct pakfire_repo* repo, sqlite3_stmt* stmt) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; int r = 1; // Name @@ -2421,7 +2421,7 @@ ERROR: } int pakfire_db_package_filelist(pakfire_db* db, pakfire_filelist** filelist, - struct pakfire_package* pkg) { + pakfire_package* pkg) { pakfire_filelist* fl = NULL; sqlite3_stmt* stmt = NULL; int r = 1; diff --git a/src/pakfire/db.h b/src/pakfire/db.h index d7aa5077..70a601db 100644 --- a/src/pakfire/db.h +++ b/src/pakfire/db.h @@ -45,17 +45,17 @@ int pakfire_db_check(pakfire_db* db); ssize_t pakfire_db_packages(pakfire_db* db); -int pakfire_db_add_package(pakfire_db* db, struct pakfire_package* pkg, +int pakfire_db_add_package(pakfire_db* db, pakfire_package* pkg, pakfire_archive* archive, int userinstalled); -int pakfire_db_remove_package(pakfire_db* db, struct pakfire_package* pkg); +int pakfire_db_remove_package(pakfire_db* db, pakfire_package* pkg); int pakfire_db_load(pakfire_db* db, struct pakfire_repo* repo); struct pakfire_scriptlet* pakfire_db_get_scriptlet( - pakfire_db* db, struct pakfire_package* pkg, const char* type); + pakfire_db* db, pakfire_package* pkg, const char* type); int pakfire_db_filelist(pakfire_db* db, pakfire_filelist** filelist); int pakfire_db_package_filelist(pakfire_db* db, pakfire_filelist** filelist, - struct pakfire_package* pkg); + pakfire_package* pkg); #endif /* PAKFIRE_DB_H */ diff --git a/src/pakfire/deps.c b/src/pakfire/deps.c index 6a8dc920..40667794 100644 --- a/src/pakfire/deps.c +++ b/src/pakfire/deps.c @@ -348,7 +348,7 @@ Id pakfire_str2dep(struct pakfire* pakfire, const char* dep) { return id; } -int pakfire_str2deps(struct pakfire* pakfire, struct pakfire_package* pkg, +int pakfire_str2deps(struct pakfire* pakfire, pakfire_package* pkg, const enum pakfire_package_key key, const char* deps) { char* p = NULL; int r = 0; diff --git a/src/pakfire/deps.h b/src/pakfire/deps.h index f6802c78..d52b244b 100644 --- a/src/pakfire/deps.h +++ b/src/pakfire/deps.h @@ -34,7 +34,7 @@ int pakfire_static_version_compare(const char* evr1, const char* evr2); const char* pakfire_dep2str(struct pakfire* pakfire, Id id); Id pakfire_str2dep(struct pakfire* pakfire, const char* s); -int pakfire_str2deps(struct pakfire* pakfire, struct pakfire_package* pkg, +int pakfire_str2deps(struct pakfire* pakfire, pakfire_package* pkg, const enum pakfire_package_key key, const char* deps); #endif /* PAKFIRE_DEPENDENCIES_H */ diff --git a/src/pakfire/dist.c b/src/pakfire/dist.c index 59b6b4f0..2eef1456 100644 --- a/src/pakfire/dist.c +++ b/src/pakfire/dist.c @@ -325,7 +325,7 @@ ERROR: } static int pakfire_dist_add_source(struct pakfire* pakfire, pakfire_packager* packager, - struct pakfire_package* pkg, pakfire_ctx* ctx, + pakfire_package* pkg, pakfire_ctx* ctx, pakfire_mirrorlist* mirrorlist, const char* filename) { char archive_path[PATH_MAX]; char cache_path[PATH_MAX]; @@ -352,7 +352,7 @@ static int pakfire_dist_add_source(struct pakfire* pakfire, pakfire_packager* pa } static int pakfire_dist_add_sources(pakfire_ctx* ctx, struct pakfire* pakfire, - pakfire_packager* packager, struct pakfire_package* pkg, struct pakfire_parser* makefile) { + pakfire_packager* packager, pakfire_package* pkg, struct pakfire_parser* makefile) { pakfire_mirrorlist* mirrorlist = NULL; char* sources = NULL; char* p = NULL; @@ -453,7 +453,7 @@ ERROR: int pakfire_dist(struct pakfire* pakfire, const char* path, pakfire_archive** archive) { pakfire_packager* packager = NULL; - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; struct pakfire_parser* makefile = NULL; struct pakfire_parser_error* error = NULL; pakfire_archive* a = NULL; diff --git a/src/pakfire/job.c b/src/pakfire/job.c index 72cdef9d..9c5f9a43 100644 --- a/src/pakfire/job.c +++ b/src/pakfire/job.c @@ -409,7 +409,7 @@ static int pakfire_job_logfile_uploaded(pakfire_client* client, static int pakfire_job_result(pakfire_ctx* ctx, struct pakfire* pakfire, pakfire_build* build, pakfire_archive* archive, void* data) { pakfire_job* self = data; - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; const char* filename = NULL; const char* nevra = NULL; char path[PATH_MAX]; diff --git a/src/pakfire/linter.c b/src/pakfire/linter.c index d4366338..8fde6d45 100644 --- a/src/pakfire/linter.c +++ b/src/pakfire/linter.c @@ -63,7 +63,7 @@ struct pakfire_linter { pakfire_archive* archive; // Package - struct pakfire_package* pkg; + pakfire_package* pkg; // Filelist pakfire_filelist* filelist; diff --git a/src/pakfire/linter.h b/src/pakfire/linter.h index 577ee331..e1f85a98 100644 --- a/src/pakfire/linter.h +++ b/src/pakfire/linter.h @@ -33,7 +33,7 @@ enum pakfire_linter_priority { }; typedef int (*pakfire_linter_result_callback)(pakfire_ctx* ctx, - pakfire_archive* archive, struct pakfire_package* package, + pakfire_archive* archive, pakfire_package* package, pakfire_file* file, int priority, const char* message, void* data); typedef struct pakfire_linter pakfire_linter; diff --git a/src/pakfire/package.c b/src/pakfire/package.c index d0cb1209..7d9b2071 100644 --- a/src/pakfire/package.c +++ b/src/pakfire/package.c @@ -78,7 +78,7 @@ struct pakfire_package { } filters; }; -static Solvable* get_solvable(struct pakfire_package* pkg) { +static Solvable* get_solvable(pakfire_package* pkg) { Pool* pool = pakfire_get_solv_pool(pkg->pakfire); return pool_id2solvable(pool, pkg->id); @@ -135,7 +135,7 @@ static int pakfire_package_dep2id(const enum pakfire_package_key key, return 0; } -static int pakfire_package_add_depid(struct pakfire_package* pkg, +static int pakfire_package_add_depid(pakfire_package* pkg, const enum pakfire_package_key key, Id dep) { Solvable* s = get_solvable(pkg); int r; @@ -154,7 +154,7 @@ static int pakfire_package_add_depid(struct pakfire_package* pkg, return 0; } -static int pakfire_package_add_self_provides(struct pakfire_package* pkg) { +static int pakfire_package_add_self_provides(pakfire_package* pkg) { // Fetch the solvable Solvable* s = get_solvable(pkg); if (!s) @@ -167,9 +167,9 @@ static int pakfire_package_add_self_provides(struct pakfire_package* pkg) { return pakfire_package_add_depid(pkg, PAKFIRE_PKG_PROVIDES, dep); } -int pakfire_package_create_from_solvable(struct pakfire_package** package, +int pakfire_package_create_from_solvable(pakfire_package** package, struct pakfire* pakfire, struct pakfire_repo* repo, Id id) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; // Allocate some memory pkg = calloc(1, sizeof(*pkg)); @@ -198,7 +198,7 @@ int pakfire_package_create_from_solvable(struct pakfire_package** package, return 0; } -int pakfire_package_create(struct pakfire_package** package, +int pakfire_package_create(pakfire_package** package, struct pakfire* pakfire, struct pakfire_repo* repo, const char* name, const char* evr, const char* arch) { struct pakfire_repo* dummy = NULL; @@ -274,7 +274,7 @@ ERROR: return r; } -static void pakfire_package_free(struct pakfire_package* pkg) { +static void pakfire_package_free(pakfire_package* pkg) { if (pkg->filters.requires) pcre2_code_free(pkg->filters.requires); if (pkg->filters.provides) @@ -288,13 +288,13 @@ static void pakfire_package_free(struct pakfire_package* pkg) { free(pkg); } -struct pakfire_package* pakfire_package_ref(struct pakfire_package* pkg) { +pakfire_package* pakfire_package_ref(pakfire_package* pkg) { pkg->nrefs++; return pkg; } -struct pakfire_package* pakfire_package_unref(struct pakfire_package* pkg) { +pakfire_package* pakfire_package_unref(pakfire_package* pkg) { if (--pkg->nrefs > 0) return pkg; @@ -305,7 +305,7 @@ struct pakfire_package* pakfire_package_unref(struct pakfire_package* pkg) { /* Destroys the package (i.e. removes its membership from any repository) */ -int pakfire_package_destroy(struct pakfire_package* self) { +int pakfire_package_destroy(pakfire_package* self) { Solvable* s = get_solvable(self); // Remove the reference to the repository @@ -323,15 +323,15 @@ int pakfire_package_destroy(struct pakfire_package* self) { return 0; } -struct pakfire* pakfire_package_get_pakfire(struct pakfire_package* pkg) { +struct pakfire* pakfire_package_get_pakfire(pakfire_package* pkg) { return pakfire_ref(pkg->pakfire); } -int pakfire_package_eq(struct pakfire_package* pkg1, struct pakfire_package* pkg2) { +int pakfire_package_eq(pakfire_package* pkg1, pakfire_package* pkg2) { return pkg1->id == pkg2->id; } -int pakfire_package_cmp(struct pakfire_package* pkg1, struct pakfire_package* pkg2) { +int pakfire_package_cmp(pakfire_package* pkg1, pakfire_package* pkg2) { Pool* pool = pakfire_get_solv_pool(pkg1->pakfire); Solvable* s1 = get_solvable(pkg1); @@ -371,7 +371,7 @@ int pakfire_package_cmp(struct pakfire_package* pkg1, struct pakfire_package* pk return strcmp(str1, str2); } -int pakfire_package_evr_cmp(struct pakfire_package* pkg1, struct pakfire_package* pkg2) { +int pakfire_package_evr_cmp(pakfire_package* pkg1, pakfire_package* pkg2) { Pool* pool = pakfire_get_solv_pool(pkg1->pakfire); Solvable* s1 = get_solvable(pkg1); @@ -380,7 +380,7 @@ int pakfire_package_evr_cmp(struct pakfire_package* pkg1, struct pakfire_package return pool_evrcmp(pool, s1->evr, s2->evr, EVRCMP_COMPARE); } -unsigned int pakfire_package_id(struct pakfire_package* pkg) { +unsigned int pakfire_package_id(pakfire_package* pkg) { return pkg->id; } @@ -411,7 +411,7 @@ char* pakfire_package_join_evr(const char* e, const char* v, const char* r) { return buffer; } -int pakfire_package_is_source(struct pakfire_package* pkg) { +int pakfire_package_is_source(pakfire_package* pkg) { const char* arch = pakfire_package_get_string(pkg, PAKFIRE_PKG_ARCH); if (!arch) return 1; @@ -419,7 +419,7 @@ int pakfire_package_is_source(struct pakfire_package* pkg) { return (strcmp(arch, "src") == 0); } -static void pakfire_package_internalize_repo(struct pakfire_package* pkg) { +static void pakfire_package_internalize_repo(pakfire_package* pkg) { struct pakfire_repo* repo = pakfire_package_get_repo(pkg); if (repo) { pakfire_repo_internalize(repo, 0); @@ -427,7 +427,7 @@ static void pakfire_package_internalize_repo(struct pakfire_package* pkg) { } } -static void pakfire_package_has_changed(struct pakfire_package* pkg) { +static void pakfire_package_has_changed(pakfire_package* pkg) { struct pakfire_repo* repo = pakfire_package_get_repo(pkg); if (repo) { pakfire_repo_has_changed(repo); @@ -449,7 +449,7 @@ static const char* evr2vr(const char* evr) { return evr; } -const char* pakfire_package_get_filename(struct pakfire_package* pkg) { +const char* pakfire_package_get_filename(pakfire_package* pkg) { int r; if (!*pkg->filename) { @@ -472,7 +472,7 @@ const char* pakfire_package_get_filename(struct pakfire_package* pkg) { return pkg->filename; } -static int pakfire_package_make_path_internal(struct pakfire_package* self) { +static int pakfire_package_make_path_internal(pakfire_package* self) { const char* path = NULL; // Fetch the path @@ -483,7 +483,7 @@ static int pakfire_package_make_path_internal(struct pakfire_package* self) { return pakfire_string_set(self->local_path, path); } -static int pakfire_package_make_path_local(struct pakfire_package* self, struct pakfire_repo* repo) { +static int pakfire_package_make_path_local(pakfire_package* self, struct pakfire_repo* repo) { const char* path = NULL; // Fetch the path @@ -495,7 +495,7 @@ static int pakfire_package_make_path_local(struct pakfire_package* self, struct return pakfire_repo_path(repo, self->local_path, "%s", path); } -static int pakfire_package_make_path_cache(struct pakfire_package* self) { +static int pakfire_package_make_path_cache(pakfire_package* self) { const char* path = NULL; // Fetch the cache path @@ -509,7 +509,7 @@ static int pakfire_package_make_path_cache(struct pakfire_package* self) { /* Returns the path this package is or should be stored. */ -const char* pakfire_package_get_path(struct pakfire_package* self) { +const char* pakfire_package_get_path(pakfire_package* self) { struct pakfire_repo* repo = NULL; int r; @@ -547,7 +547,7 @@ ERROR: return (r == 0) ? self->local_path : NULL; } -static int pakfire_package_make_cache_path(struct pakfire_package* pkg) { +static int pakfire_package_make_cache_path(pakfire_package* pkg) { const char* nevra = pakfire_package_get_string(pkg, PAKFIRE_PKG_NEVRA); // Fetch the filename @@ -567,7 +567,7 @@ static int pakfire_package_make_cache_path(struct pakfire_package* pkg) { return pakfire_cache_path(pkg->pakfire, pkg->cache_path, "%s/%s", uuid, filename); } -void pakfire_package_unset(struct pakfire_package* pkg, +void pakfire_package_unset(pakfire_package* pkg, const enum pakfire_package_key key) { Id id = ID_NULL; @@ -707,7 +707,7 @@ void pakfire_package_unset(struct pakfire_package* pkg, } char** pakfire_package_get_strings( - struct pakfire_package* pkg, const enum pakfire_package_key key) { + pakfire_package* pkg, const enum pakfire_package_key key) { char** ret = NULL; const char* str = NULL; Queue strings; @@ -762,7 +762,7 @@ ERROR: return ret; } -int pakfire_package_set_strings(struct pakfire_package* pkg, +int pakfire_package_set_strings(pakfire_package* pkg, const enum pakfire_package_key key, const char** values) { int r; @@ -783,7 +783,7 @@ int pakfire_package_set_strings(struct pakfire_package* pkg, return 0; } -int pakfire_package_set_strings_from_string(struct pakfire_package* pkg, +int pakfire_package_set_strings_from_string(pakfire_package* pkg, const enum pakfire_package_key key, const char* value) { char* buffer = NULL; char* p = NULL; @@ -824,7 +824,7 @@ ERROR: } const char* pakfire_package_get_string( - struct pakfire_package* pkg, const enum pakfire_package_key key) { + pakfire_package* pkg, const enum pakfire_package_key key) { const char* ret = NULL; int r; @@ -976,7 +976,7 @@ const char* pakfire_package_get_string( } int pakfire_package_set_string( - struct pakfire_package* pkg, const enum pakfire_package_key key, const char* value) { + pakfire_package* pkg, const enum pakfire_package_key key, const char* value) { char basename[PATH_MAX]; char dirname[PATH_MAX]; Id id = ID_NULL; @@ -1146,7 +1146,7 @@ int pakfire_package_set_string( return 0; } -int pakfire_package_add_string(struct pakfire_package* pkg, +int pakfire_package_add_string(pakfire_package* pkg, const enum pakfire_package_key key, const char* value) { Id key_id = ID_NULL; Id value_id = ID_NULL; @@ -1180,7 +1180,7 @@ int pakfire_package_add_string(struct pakfire_package* pkg, return 0; } -int pakfire_package_get_uuid(struct pakfire_package* pkg, +int pakfire_package_get_uuid(pakfire_package* pkg, const enum pakfire_package_key key, uuid_t uuid) { const char* buffer = NULL; int r; @@ -1209,7 +1209,7 @@ int pakfire_package_get_uuid(struct pakfire_package* pkg, } } -int pakfire_package_set_uuid(struct pakfire_package* pkg, +int pakfire_package_set_uuid(pakfire_package* pkg, const enum pakfire_package_key key, const uuid_t uuid) { char buffer[UUID_STR_LEN]; @@ -1228,7 +1228,7 @@ int pakfire_package_set_uuid(struct pakfire_package* pkg, } } -unsigned long long pakfire_package_get_num(struct pakfire_package* pkg, +unsigned long long pakfire_package_get_num(pakfire_package* pkg, const enum pakfire_package_key key, unsigned long long notfound) { Id id = ID_NULL; @@ -1266,7 +1266,7 @@ unsigned long long pakfire_package_get_num(struct pakfire_package* pkg, return solvable_lookup_num(s, id, notfound); } -int pakfire_package_set_num(struct pakfire_package* pkg, +int pakfire_package_set_num(pakfire_package* pkg, const enum pakfire_package_key key, unsigned long long num) { Id id = ID_NULL; @@ -1308,7 +1308,7 @@ int pakfire_package_set_num(struct pakfire_package* pkg, return 0; } -int pakfire_package_get_checksum(struct pakfire_package* pkg, +int pakfire_package_get_checksum(pakfire_package* pkg, enum pakfire_hash_type* hash, const unsigned char** checksum, size_t* length) { Solvable* s = get_solvable(pkg); Id id = 0; @@ -1337,7 +1337,7 @@ int pakfire_package_get_checksum(struct pakfire_package* pkg, return 0; } -int pakfire_package_set_checksum(struct pakfire_package* pkg, +int pakfire_package_set_checksum(pakfire_package* pkg, const enum pakfire_hash_type hash, const unsigned char* digest, const size_t length) { struct pakfire_repo* repo = NULL; Id id = ID_NULL; @@ -1385,7 +1385,7 @@ ERROR: /* This function checks if the archive is available. */ -int pakfire_package_is_available(struct pakfire_package* self) { +int pakfire_package_is_available(pakfire_package* self) { const char* path = NULL; struct stat st = {}; int r; @@ -1430,14 +1430,14 @@ int pakfire_package_is_available(struct pakfire_package* self) { return 1; } -int pakfire_package_is_installed(struct pakfire_package* pkg) { +int pakfire_package_is_installed(pakfire_package* pkg) { Pool* pool = pakfire_get_solv_pool(pkg->pakfire); Solvable* s = get_solvable(pkg); return pool->installed == s->repo; } -size_t pakfire_package_get_size(struct pakfire_package* pkg) { +size_t pakfire_package_get_size(pakfire_package* pkg) { if (pakfire_package_is_installed(pkg)) return pakfire_package_get_num(pkg, PAKFIRE_PKG_INSTALLSIZE, 0); @@ -1446,7 +1446,7 @@ size_t pakfire_package_get_size(struct pakfire_package* pkg) { // Build -int pakfire_package_supports_build_arch(struct pakfire_package* pkg, const char* arch) { +int pakfire_package_supports_build_arch(pakfire_package* pkg, const char* arch) { int supported = 0; // Fetch all supported arches for this package @@ -1477,7 +1477,7 @@ int pakfire_package_supports_build_arch(struct pakfire_package* pkg, const char* // Dependencies -char** pakfire_package_get_deps(struct pakfire_package* pkg, +char** pakfire_package_get_deps(pakfire_package* pkg, const enum pakfire_package_key key) { Solvable* s = get_solvable(pkg); char** ret = NULL; @@ -1528,7 +1528,7 @@ SUCCESS: return ret; } -int pakfire_package_add_dep_filter(struct pakfire_package* pkg, +int pakfire_package_add_dep_filter(pakfire_package* pkg, const enum pakfire_package_key key, const char* pattern) { pcre2_code* filter = NULL; int r; @@ -1567,7 +1567,7 @@ int pakfire_package_add_dep_filter(struct pakfire_package* pkg, return 0; } -static int pakfire_package_filter_dep(struct pakfire_package* pkg, +static int pakfire_package_filter_dep(pakfire_package* pkg, const pcre2_code* filter, const char* dep) { pcre2_match_data* match = NULL; char error[120]; @@ -1616,7 +1616,7 @@ ERROR: return r; } -int pakfire_package_add_dep(struct pakfire_package* pkg, +int pakfire_package_add_dep(pakfire_package* pkg, const enum pakfire_package_key key, const char* format, ...) { char buffer[PATH_MAX]; va_list args; @@ -1682,7 +1682,7 @@ int pakfire_package_add_dep(struct pakfire_package* pkg, return pakfire_package_add_depid(pkg, key, id); } -int pakfire_package_get_reverse_requires(struct pakfire_package* pkg, +int pakfire_package_get_reverse_requires(pakfire_package* pkg, pakfire_packagelist** ret) { pakfire_packagelist* list = NULL; Queue matches; @@ -1721,7 +1721,7 @@ ERROR: } static int pakfire_package_has_rich_deps_in_deparray( - struct pakfire_package* pkg, Id type) { + pakfire_package* pkg, Id type) { int r = 0; Solvable* s = get_solvable(pkg); @@ -1752,7 +1752,7 @@ ERROR: return r; } -int pakfire_package_has_rich_deps(struct pakfire_package* pkg) { +int pakfire_package_has_rich_deps(pakfire_package* pkg) { const Id types[] = { // Requires (includes pre-requires) SOLVABLE_REQUIRES, @@ -1776,7 +1776,7 @@ int pakfire_package_has_rich_deps(struct pakfire_package* pkg) { return 0; } -static int pakfire_package_matches_depid(struct pakfire_package* pkg, +static int pakfire_package_matches_depid(pakfire_package* pkg, const enum pakfire_package_key key, const Id dep) { int r; @@ -1795,7 +1795,7 @@ static int pakfire_package_matches_depid(struct pakfire_package* pkg, return solvable_matchesdep(s, id, dep, marker); } -int pakfire_package_matches_dep(struct pakfire_package* pkg, +int pakfire_package_matches_dep(pakfire_package* pkg, const enum pakfire_package_key key, const char* dep) { // Get the dependency Id id = pakfire_str2dep(pkg->pakfire, dep); @@ -1805,7 +1805,7 @@ int pakfire_package_matches_dep(struct pakfire_package* pkg, return pakfire_package_matches_depid(pkg, key, id); } -struct pakfire_repo* pakfire_package_get_repo(struct pakfire_package* pkg) { +struct pakfire_repo* pakfire_package_get_repo(pakfire_package* pkg) { int r; // Open the repository if not done, yet @@ -1895,7 +1895,7 @@ static int pakfire_sort_dependencies(const void* p1, const void* p2) { return strcmp(dep1, dep2); } -char* pakfire_package_dump(struct pakfire_package* pkg, int flags) { +char* pakfire_package_dump(pakfire_package* pkg, int flags) { enum pakfire_hash_type hash = PAKFIRE_HASH_UNDEFINED; const unsigned char* checksum = NULL; size_t checksum_length = 0; @@ -2143,7 +2143,7 @@ ERROR: return NULL; } -int pakfire_package_get_archive(struct pakfire_package* pkg, pakfire_archive** archive) { +int pakfire_package_get_archive(pakfire_package* pkg, pakfire_archive** archive) { const char* path = NULL; int r; @@ -2163,15 +2163,15 @@ int pakfire_package_get_archive(struct pakfire_package* pkg, pakfire_archive** a return 0; } -struct pakfire_package_filelist_search { +typedef struct pakfire_package_filelist_search { struct pakfire* pakfire; pakfire_filelist* filelist; int r; -}; +} pakfire_package_filelist_search; static int __pakfire_package_fetch_filelist(void* data, Solvable* s, Repodata* repodata, Repokey* key, struct s_KeyValue* kv) { - struct pakfire_package_filelist_search* search = (struct pakfire_package_filelist_search*)data; + pakfire_package_filelist_search* search = (pakfire_package_filelist_search*)data; pakfire_file* file = NULL; int r; @@ -2207,8 +2207,8 @@ ERROR: return r; } -static int pakfire_package_fetch_filelist(struct pakfire_package* pkg, pakfire_filelist* filelist) { - struct pakfire_package_filelist_search search = { +static int pakfire_package_fetch_filelist(pakfire_package* pkg, pakfire_filelist* filelist) { + pakfire_package_filelist_search search = { .pakfire = pkg->pakfire, .filelist = filelist, .r = 0, @@ -2231,7 +2231,7 @@ static int pakfire_package_fetch_filelist(struct pakfire_package* pkg, pakfire_f return search.r; } -pakfire_filelist* pakfire_package_get_filelist(struct pakfire_package* pkg) { +pakfire_filelist* pakfire_package_get_filelist(pakfire_package* pkg) { pakfire_filelist* filelist = NULL; // Create a new filelist @@ -2253,7 +2253,7 @@ ERROR: return NULL; } -int pakfire_package_append_file(struct pakfire_package* pkg, const char* path) { +int pakfire_package_append_file(pakfire_package* pkg, const char* path) { char basename[PATH_MAX]; char dirname[PATH_MAX]; int r; @@ -2297,7 +2297,7 @@ int pakfire_package_append_file(struct pakfire_package* pkg, const char* path) { static int __pakfire_package_set_filelist( pakfire_ctx* ctx, pakfire_file* file, void* data) { - struct pakfire_package* pkg = data; + pakfire_package* pkg = data; // Fetch the path const char* path = pakfire_file_get_path(file); @@ -2306,11 +2306,11 @@ static int __pakfire_package_set_filelist( } int pakfire_package_set_filelist( - struct pakfire_package* pkg, pakfire_filelist* filelist) { + pakfire_package* pkg, pakfire_filelist* filelist) { return pakfire_filelist_walk(filelist, __pakfire_package_set_filelist, pkg, 0, NULL); } -int pakfire_package_set_filelist_from_string(struct pakfire_package* pkg, const char* files) { +int pakfire_package_set_filelist_from_string(pakfire_package* pkg, const char* files) { char* p = NULL; int r = 0; @@ -2337,7 +2337,7 @@ ERROR: } static int _pakfire_package_add_json_dependencies( - struct pakfire_package* pkg, + pakfire_package* pkg, struct json_object* json, const char* name, const enum pakfire_package_key key) { @@ -2361,7 +2361,7 @@ ERROR: } static int pakfire_package_add_json_dependencies( - struct pakfire_package* pkg, struct json_object* md) { + pakfire_package* pkg, struct json_object* md) { int r = 0; // Create new dependencies object @@ -2466,7 +2466,7 @@ ERROR: } static int pakfire_package_add_json_filelist( - struct pakfire_package* pkg, struct json_object* md) { + pakfire_package* pkg, struct json_object* md) { pakfire_filelist* filelist = NULL; struct json_object* object = NULL; int r; @@ -2509,7 +2509,7 @@ ERROR: } static int __pakfire_package_add_build_packages(pakfire_ctx* ctx, - struct pakfire_package* pkg, void* p) { + pakfire_package* pkg, void* p) { struct json_object* object = (struct json_object*)p; int r; @@ -2531,7 +2531,7 @@ static int __pakfire_package_add_build_packages(pakfire_ctx* ctx, return 0; } -static int pakfire_package_add_build_packages(struct pakfire_package* pkg, +static int pakfire_package_add_build_packages(pakfire_package* pkg, struct json_object* md) { struct pakfire_repo* repo = NULL; struct json_object* object = NULL; @@ -2572,7 +2572,7 @@ ERROR: return r; } -static int pakfire_package_add_build_metadata(struct pakfire_package* pkg, +static int pakfire_package_add_build_metadata(pakfire_package* pkg, struct json_object* md) { int r; @@ -2665,7 +2665,7 @@ ERROR: return r; } -int pakfire_package_to_json(struct pakfire_package* pkg, struct json_object** json) { +int pakfire_package_to_json(pakfire_package* pkg, struct json_object** json) { struct json_object* md = NULL; int r = 0; @@ -2810,7 +2810,7 @@ ERROR: return r; } -int pakfire_package_installcheck(struct pakfire_package* pkg, +int pakfire_package_installcheck(pakfire_package* pkg, char** problem, int flags) { struct pakfire_transaction* transaction = NULL; char* p = NULL; diff --git a/src/pakfire/package.h b/src/pakfire/package.h index 2d02b834..540ee6b5 100644 --- a/src/pakfire/package.h +++ b/src/pakfire/package.h @@ -30,7 +30,7 @@ #include -struct pakfire_package; +typedef struct pakfire_package pakfire_package; #include #include @@ -80,76 +80,76 @@ enum pakfire_package_key { PAKFIRE_PKG_ENHANCES, }; -int pakfire_package_create(struct pakfire_package** package, struct pakfire* pakfire, +int pakfire_package_create(pakfire_package** package, struct pakfire* pakfire, struct pakfire_repo* repo, const char* name, const char* evr, const char* arch); -struct pakfire_package* pakfire_package_ref(struct pakfire_package* pkg); -struct pakfire_package* pakfire_package_unref(struct pakfire_package* pkg); +pakfire_package* pakfire_package_ref(pakfire_package* pkg); +pakfire_package* pakfire_package_unref(pakfire_package* pkg); // Destroy -int pakfire_package_destroy(struct pakfire_package* self); +int pakfire_package_destroy(pakfire_package* self); -struct pakfire* pakfire_package_get_pakfire(struct pakfire_package* pkg); +struct pakfire* pakfire_package_get_pakfire(pakfire_package* pkg); -int pakfire_package_eq(struct pakfire_package* pkg1, struct pakfire_package* pkg2); -int pakfire_package_cmp(struct pakfire_package* pkg1, struct pakfire_package* pkg2); -int pakfire_package_evr_cmp(struct pakfire_package* pkg1, struct pakfire_package* pkg2); +int pakfire_package_eq(pakfire_package* pkg1, pakfire_package* pkg2); +int pakfire_package_cmp(pakfire_package* pkg1, pakfire_package* pkg2); +int pakfire_package_evr_cmp(pakfire_package* pkg1, pakfire_package* pkg2); -unsigned int pakfire_package_id(struct pakfire_package* pkg); +unsigned int pakfire_package_id(pakfire_package* pkg); -void pakfire_package_unset(struct pakfire_package* pkg, +void pakfire_package_unset(pakfire_package* pkg, const enum pakfire_package_key key); // String -const char* pakfire_package_get_string(struct pakfire_package* pkg, +const char* pakfire_package_get_string(pakfire_package* pkg, const enum pakfire_package_key key); -int pakfire_package_set_string(struct pakfire_package* pkg, +int pakfire_package_set_string(pakfire_package* pkg, const enum pakfire_package_key key, const char* value); // String Arrays -char** pakfire_package_get_strings(struct pakfire_package* pkg, +char** pakfire_package_get_strings(pakfire_package* pkg, const enum pakfire_package_key key); -int pakfire_package_set_strings(struct pakfire_package* pkg, +int pakfire_package_set_strings(pakfire_package* pkg, const enum pakfire_package_key key, const char** values); -int pakfire_package_add_string(struct pakfire_package* pkg, +int pakfire_package_add_string(pakfire_package* pkg, const enum pakfire_package_key key, const char* value); // UUID -int pakfire_package_get_uuid(struct pakfire_package* pkg, +int pakfire_package_get_uuid(pakfire_package* pkg, const enum pakfire_package_key key, uuid_t uuid); -int pakfire_package_set_uuid(struct pakfire_package* pkg, +int pakfire_package_set_uuid(pakfire_package* pkg, const enum pakfire_package_key key, const uuid_t uuid); // Numeric -unsigned long long pakfire_package_get_num(struct pakfire_package* pkg, +unsigned long long pakfire_package_get_num(pakfire_package* pkg, const enum pakfire_package_key key, unsigned long long notfound); -int pakfire_package_set_num(struct pakfire_package* pkg, +int pakfire_package_set_num(pakfire_package* pkg, const enum pakfire_package_key key, unsigned long long num); // Dependencies -char** pakfire_package_get_deps(struct pakfire_package* pkg, +char** pakfire_package_get_deps(pakfire_package* pkg, const enum pakfire_package_key key); // Checksum -int pakfire_package_get_checksum(struct pakfire_package* pkg, +int pakfire_package_get_checksum(pakfire_package* pkg, enum pakfire_hash_type* hash, const unsigned char** checksum, size_t* length); -int pakfire_package_set_checksum(struct pakfire_package* pkg, +int pakfire_package_set_checksum(pakfire_package* pkg, const enum pakfire_hash_type hash, const unsigned char* digest, const size_t length); -size_t pakfire_package_get_size(struct pakfire_package* pkg); +size_t pakfire_package_get_size(pakfire_package* pkg); -int pakfire_package_get_reverse_requires(struct pakfire_package* pkg, +int pakfire_package_get_reverse_requires(pakfire_package* pkg, pakfire_packagelist** list); -struct pakfire_repo* pakfire_package_get_repo(struct pakfire_package* pkg); +struct pakfire_repo* pakfire_package_get_repo(pakfire_package* pkg); -char* pakfire_package_dump(struct pakfire_package* pkg, int flags); +char* pakfire_package_dump(pakfire_package* pkg, int flags); -int pakfire_package_get_archive(struct pakfire_package* pkg, pakfire_archive** archive); +int pakfire_package_get_archive(pakfire_package* pkg, pakfire_archive** archive); -pakfire_filelist* pakfire_package_get_filelist(struct pakfire_package* pkg); -int pakfire_package_set_filelist(struct pakfire_package* pkg, pakfire_filelist* filelist); -int pakfire_package_set_filelist_from_string(struct pakfire_package* pkg, const char* files); +pakfire_filelist* pakfire_package_get_filelist(pakfire_package* pkg); +int pakfire_package_set_filelist(pakfire_package* pkg, pakfire_filelist* filelist); +int pakfire_package_set_filelist_from_string(pakfire_package* pkg, const char* files); enum pakfire_package_dump_flags { PAKFIRE_PKG_DUMP_FILELIST = 1 << 0, @@ -157,40 +157,40 @@ enum pakfire_package_dump_flags { }; // Installcheck -int pakfire_package_installcheck(struct pakfire_package* pkg, char** problem, int flags); +int pakfire_package_installcheck(pakfire_package* pkg, char** problem, int flags); -int pakfire_package_create_from_solvable(struct pakfire_package** package, +int pakfire_package_create_from_solvable(pakfire_package** package, struct pakfire* pakfire, struct pakfire_repo* repo, Id id); -int pakfire_package_set_strings_from_string(struct pakfire_package* pkg, +int pakfire_package_set_strings_from_string(pakfire_package* pkg, const enum pakfire_package_key key, const char* value); -const char* pakfire_package_get_filename(struct pakfire_package* pkg); -const char* pakfire_package_get_path(struct pakfire_package* self); +const char* pakfire_package_get_filename(pakfire_package* pkg); +const char* pakfire_package_get_path(pakfire_package* self); -int pakfire_package_is_source(struct pakfire_package* pkg); -int pakfire_package_supports_build_arch(struct pakfire_package* pkg, const char* arch); +int pakfire_package_is_source(pakfire_package* pkg); +int pakfire_package_supports_build_arch(pakfire_package* pkg, const char* arch); char* pakfire_package_join_evr(const char* e, const char* v, const char* r); -int pakfire_package_is_available(struct pakfire_package* self); -int pakfire_package_is_installed(struct pakfire_package* pkg); +int pakfire_package_is_available(pakfire_package* self); +int pakfire_package_is_installed(pakfire_package* pkg); // Filelist -int pakfire_package_append_file(struct pakfire_package* pkg, const char* path); +int pakfire_package_append_file(pakfire_package* pkg, const char* path); // Dependencies -int pakfire_package_add_dep_filter(struct pakfire_package* pkg, +int pakfire_package_add_dep_filter(pakfire_package* pkg, const enum pakfire_package_key key, const char* pattern); -int pakfire_package_add_dep(struct pakfire_package* pkg, +int pakfire_package_add_dep(pakfire_package* pkg, const enum pakfire_package_key key, const char* format, ...) __attribute__((format(printf, 3, 4))); -int pakfire_package_has_rich_deps(struct pakfire_package* pkg); -int pakfire_package_matches_dep(struct pakfire_package* pkg, +int pakfire_package_has_rich_deps(pakfire_package* pkg); +int pakfire_package_matches_dep(pakfire_package* pkg, const enum pakfire_package_key key, const char* dep); -int pakfire_package_to_json(struct pakfire_package* pkg, struct json_object** json); +int pakfire_package_to_json(pakfire_package* pkg, struct json_object** json); #endif /* PAKFIRE_PACKAGE_H */ diff --git a/src/pakfire/packagelist.c b/src/pakfire/packagelist.c index d29b43f7..c435ebd7 100644 --- a/src/pakfire/packagelist.c +++ b/src/pakfire/packagelist.c @@ -35,7 +35,7 @@ struct pakfire_packagelist { pakfire_ctx* ctx; int nrefs; - struct pakfire_package** packages; + pakfire_package** packages; unsigned int num_packages; }; @@ -99,7 +99,7 @@ size_t pakfire_packagelist_length(pakfire_packagelist* self) { return self->num_packages; } -struct pakfire_package* pakfire_packagelist_get(pakfire_packagelist* self, unsigned int index) { +pakfire_package* pakfire_packagelist_get(pakfire_packagelist* self, unsigned int index) { // Check that index is in range if (index >= self->num_packages) { errno = ERANGE; @@ -109,7 +109,7 @@ struct pakfire_package* pakfire_packagelist_get(pakfire_packagelist* self, unsig return pakfire_package_ref(self->packages[index]); } -static int pakfire_packagelist_search(pakfire_packagelist* self, struct pakfire_package* pkg) { +static int pakfire_packagelist_search(pakfire_packagelist* self, pakfire_package* pkg) { int i; int r; @@ -136,7 +136,7 @@ static int pakfire_packagelist_search(pakfire_packagelist* self, struct pakfire_ return lo; } -int pakfire_packagelist_add(pakfire_packagelist* self, struct pakfire_package* pkg) { +int pakfire_packagelist_add(pakfire_packagelist* self, pakfire_package* pkg) { // Find the index where the package should go int pos = pakfire_packagelist_search(self, pkg); @@ -204,7 +204,7 @@ int pakfire_packagelist_walk(pakfire_packagelist* self, int pakfire_packagelist_import_solvables(pakfire_packagelist* self, struct pakfire* pakfire, Queue* q) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; int r; // Walk through all elements on the queue @@ -223,7 +223,7 @@ int pakfire_packagelist_import_solvables(pakfire_packagelist* self, } static int __pakfire_packagelist_has_path( - pakfire_ctx* ctx, struct pakfire_package* pkg, void* data) { + pakfire_ctx* ctx, pakfire_package* pkg, void* data) { const char* path = data; // Fetch the path where we would expect this package to be diff --git a/src/pakfire/packagelist.h b/src/pakfire/packagelist.h index ccfb939c..f86dd327 100644 --- a/src/pakfire/packagelist.h +++ b/src/pakfire/packagelist.h @@ -34,13 +34,13 @@ pakfire_packagelist* pakfire_packagelist_ref(pakfire_packagelist* list); pakfire_packagelist* pakfire_packagelist_unref(pakfire_packagelist* list); size_t pakfire_packagelist_length(pakfire_packagelist* list); -struct pakfire_package* pakfire_packagelist_get(pakfire_packagelist* list, unsigned int index); +pakfire_package* pakfire_packagelist_get(pakfire_packagelist* list, unsigned int index); -int pakfire_packagelist_add(pakfire_packagelist* list, struct pakfire_package* pkg); +int pakfire_packagelist_add(pakfire_packagelist* list, pakfire_package* pkg); int pakfire_packagelist_add_list(pakfire_packagelist* self, pakfire_packagelist* other); typedef int (*pakfire_packagelist_walk_callback) - (pakfire_ctx* ctx, struct pakfire_package* pkg, void* p); + (pakfire_ctx* ctx, pakfire_package* pkg, void* p); enum pakfire_packagelist_walk_flags { PAKFIRE_PACKAGELIST_KEEPGOING = (1 << 0), diff --git a/src/pakfire/packager.c b/src/pakfire/packager.c index 125a3311..f7765872 100644 --- a/src/pakfire/packager.c +++ b/src/pakfire/packager.c @@ -52,7 +52,7 @@ struct pakfire_packager { time_t time_created; - struct pakfire_package* pkg; + pakfire_package* pkg; char filename[PATH_MAX]; // Reader @@ -92,7 +92,7 @@ static void pakfire_packager_free(pakfire_packager* packager) { } int pakfire_packager_create(pakfire_packager** packager, - struct pakfire* pakfire, struct pakfire_package* pkg) { + struct pakfire* pakfire, pakfire_package* pkg) { pakfire_packager* p = NULL; char hostname[HOST_NAME_MAX]; int r = 1; diff --git a/src/pakfire/packager.h b/src/pakfire/packager.h index f064055d..83d4b7ba 100644 --- a/src/pakfire/packager.h +++ b/src/pakfire/packager.h @@ -32,7 +32,7 @@ typedef struct pakfire_packager pakfire_packager; int pakfire_packager_create(pakfire_packager** packager, - struct pakfire* pakfire, struct pakfire_package* pkg); + struct pakfire* pakfire, pakfire_package* pkg); pakfire_packager* pakfire_packager_ref(pakfire_packager* packager); pakfire_packager* pakfire_packager_unref(pakfire_packager* packager); diff --git a/src/pakfire/pakfire.c b/src/pakfire/pakfire.c index 5c50fdf1..14c4f656 100644 --- a/src/pakfire/pakfire.c +++ b/src/pakfire/pakfire.c @@ -1445,7 +1445,7 @@ struct pakfire_repo* pakfire_get_installed_repo(struct pakfire* pakfire) { Convenience function to dist() a package on the fly */ static int pakfire_commandline_dist(struct pakfire* pakfire, struct pakfire_repo* repo, - const char* path, struct pakfire_package** pkg) { + const char* path, pakfire_package** pkg) { pakfire_archive* archive = NULL; int r; @@ -1470,7 +1470,7 @@ ERROR: Convenience function to add a package to the @commandline repository */ int pakfire_commandline_add(struct pakfire* pakfire, const char* path, - struct pakfire_package** package) { + pakfire_package** package) { struct pakfire_repo* repo = NULL; int r; @@ -1601,7 +1601,7 @@ int pakfire_whatprovides(struct pakfire* pakfire, const char* what, int flags, return 0; } -static int __pakfire_whatrequires(pakfire_ctx* ctx, struct pakfire_package* pkg, void* data) { +static int __pakfire_whatrequires(pakfire_ctx* ctx, pakfire_package* pkg, void* data) { pakfire_packagelist* reverse = NULL; pakfire_packagelist* list = data; int r; diff --git a/src/pakfire/pakfire.h b/src/pakfire/pakfire.h index 53a06e5b..115af879 100644 --- a/src/pakfire/pakfire.h +++ b/src/pakfire/pakfire.h @@ -144,7 +144,7 @@ Pool* pakfire_get_solv_pool(struct pakfire* pakfire); struct pakfire_repo* pakfire_get_installed_repo(struct pakfire* pakfire); int pakfire_commandline_add(struct pakfire* pakfire, const char* path, - struct pakfire_package** package); + pakfire_package** package); typedef int (*pakfire_repo_walk_callback) (struct pakfire* pakfire, struct pakfire_repo* repo, void* p); diff --git a/src/pakfire/parser.c b/src/pakfire/parser.c index 8a6bfb40..34e5c14a 100644 --- a/src/pakfire/parser.c +++ b/src/pakfire/parser.c @@ -1038,7 +1038,7 @@ int pakfire_parser_set_env(struct pakfire_parser* parser, pakfire_env* env) { } int pakfire_parser_create_package(struct pakfire_parser* parser, - struct pakfire_package** pkg, struct pakfire_repo* repo, const char* namespace, const char* default_arch) { + pakfire_package** pkg, struct pakfire_repo* repo, const char* namespace, const char* default_arch) { int r = 1; char* name = NULL; diff --git a/src/pakfire/parser.h b/src/pakfire/parser.h index 37dd96d8..e8dc1c6f 100644 --- a/src/pakfire/parser.h +++ b/src/pakfire/parser.h @@ -70,7 +70,7 @@ const char* pakfire_parser_get_namespace(struct pakfire_parser* parser); int pakfire_parser_set_namespace(struct pakfire_parser* parser, const char* namespace); int pakfire_parser_create_package(struct pakfire_parser* parser, - struct pakfire_package** pkg, struct pakfire_repo* repo, const char* namespace, const char* default_arch); + pakfire_package** pkg, struct pakfire_repo* repo, const char* namespace, const char* default_arch); // Errors int pakfire_parser_error_create(struct pakfire_parser_error** error, diff --git a/src/pakfire/repo.c b/src/pakfire/repo.c index a152846f..3a784582 100644 --- a/src/pakfire/repo.c +++ b/src/pakfire/repo.c @@ -444,7 +444,7 @@ int pakfire_repo_import(struct pakfire* pakfire, pakfire_config* config) { static int pakfire_repo_to_packagelist( struct pakfire_repo* self, pakfire_packagelist** list) { pakfire_packagelist* l = NULL; - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; Solvable* s = NULL; Id id; int i; @@ -498,7 +498,7 @@ Id pakfire_repo_add_solvable(struct pakfire_repo* repo) { } int __pakfire_repo_make_path(struct pakfire_repo* self, char* path, size_t length, - pakfire_archive* archive, struct pakfire_package* pkg) { + pakfire_archive* archive, pakfire_package* pkg) { const char* uuid = NULL; // Fetch NEVRA @@ -535,8 +535,8 @@ int __pakfire_repo_make_path(struct pakfire_repo* self, char* path, size_t lengt } int pakfire_repo_import_archive(struct pakfire_repo* self, - pakfire_archive* archive, struct pakfire_package** package) { - struct pakfire_package* pkg = NULL; + pakfire_archive* archive, pakfire_package** package) { + pakfire_package* pkg = NULL; char path[PATH_MAX]; int r; @@ -671,7 +671,7 @@ static int __pakfire_repo_scan_count(struct pakfire_repo* repo, static int __pakfire_repo_scan_archive(struct pakfire_repo* repo, struct pakfire_repo_scan_ctx* scan_ctx, FTSENT* entry) { pakfire_archive* archive = NULL; - struct pakfire_package* package = NULL; + pakfire_package* package = NULL; int r = 0; // Skip this package if it already exists @@ -777,7 +777,7 @@ ERROR: return r; } -static int pakfire_repo_sync_remove(pakfire_ctx* ctx, struct pakfire_package* pkg, void* data) { +static int pakfire_repo_sync_remove(pakfire_ctx* ctx, pakfire_package* pkg, void* data) { int r; // Check if the package is available @@ -1852,7 +1852,7 @@ int pakfire_repo_is_installed_repo(struct pakfire_repo* self) { } int pakfire_repo_download_package(struct pakfire_xfer** xfer, - struct pakfire_repo* repo, struct pakfire_package* pkg) { + struct pakfire_repo* repo, pakfire_package* pkg) { enum pakfire_hash_type hash = PAKFIRE_HASH_UNDEFINED; const unsigned char* checksum = NULL; size_t checksum_length = 0; @@ -1943,7 +1943,7 @@ ERROR: } static int pakfire_repo_download(struct pakfire_repo* repo, const char* url, - struct pakfire_package** package) { + pakfire_package** package) { struct pakfire_xfer* xfer = NULL; FILE* f = NULL; int r; @@ -1990,7 +1990,7 @@ ERROR: } int pakfire_repo_add(struct pakfire_repo* repo, const char* path, - struct pakfire_package** package) { + pakfire_package** package) { pakfire_archive* archive = NULL; int r; @@ -2118,7 +2118,7 @@ ERROR: static int pakfire_repo_delete_all_packages( struct pakfire_repo* repo, const char* prefix) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; Solvable* s = NULL; int i = 0; int r; @@ -2665,7 +2665,7 @@ ERROR: } int pakfire_repo_walk_packages(struct pakfire_repo* self, - int (*callback)(pakfire_ctx* ctx, struct pakfire_package* pkg, void* data), void* data, int flags) { + int (*callback)(pakfire_ctx* ctx, pakfire_package* pkg, void* data), void* data, int flags) { pakfire_packagelist* list = NULL; int r; @@ -2692,7 +2692,7 @@ struct pakfire_repo_walk_archives_state { }; static int __pakfire_repo_walk_archives( - pakfire_ctx* ctx, struct pakfire_package* pkg, void* data) { + pakfire_ctx* ctx, pakfire_package* pkg, void* data) { const struct pakfire_repo_walk_archives_state* state = data; pakfire_archive* archive = NULL; int r; diff --git a/src/pakfire/repo.h b/src/pakfire/repo.h index 572b8230..6a012ea6 100644 --- a/src/pakfire/repo.h +++ b/src/pakfire/repo.h @@ -131,16 +131,16 @@ Id pakfire_repo_add_solvable(struct pakfire_repo* repo); #define pakfire_repo_make_path(repo, path, archive, pkg) \ __pakfire_repo_make_path(repo, path, sizeof(path), archive, pkg) int __pakfire_repo_make_path(struct pakfire_repo* self, - char* path, size_t length, pakfire_archive* archive, struct pakfire_package* pkg); + char* path, size_t length, pakfire_archive* archive, pakfire_package* pkg); int pakfire_repo_import_archive(struct pakfire_repo* self, - pakfire_archive* archive, struct pakfire_package** package); + pakfire_archive* archive, pakfire_package** package); int pakfire_repo_download_package(struct pakfire_xfer** xfer, - struct pakfire_repo* repo, struct pakfire_package* pkg); + struct pakfire_repo* repo, pakfire_package* pkg); int pakfire_repo_add(struct pakfire_repo* repo, const char* path, - struct pakfire_package** package); + pakfire_package** package); void pakfire_repo_free_all(struct pakfire* pakfire); @@ -150,10 +150,10 @@ Repodata* pakfire_repo_get_repodata(struct pakfire_repo* repo); pakfire_mirrorlist* pakfire_repo_get_mirrorlist(struct pakfire_repo* repo); int pakfire_repo_walk_packages(struct pakfire_repo* self, - int (*callback)(pakfire_ctx* ctx, struct pakfire_package* pkg, void* data), void* data, int flags); + int (*callback)(pakfire_ctx* ctx, pakfire_package* pkg, void* data), void* data, int flags); typedef int (*pakfire_repo_walk_archives_callback) - (pakfire_ctx* ctx, struct pakfire_package* pkg, pakfire_archive* archive, void* data); + (pakfire_ctx* ctx, pakfire_package* pkg, pakfire_archive* archive, void* data); int pakfire_repo_walk_archives(struct pakfire_repo* self, pakfire_repo_walk_archives_callback callback, void* data, int flags); diff --git a/src/pakfire/transaction.c b/src/pakfire/transaction.c index 9dea15f4..e687df28 100644 --- a/src/pakfire/transaction.c +++ b/src/pakfire/transaction.c @@ -63,7 +63,7 @@ struct pakfire_transaction { char** userinstalled; pakfire_archive** archives; - struct pakfire_package** packages; + pakfire_package** packages; size_t num; // Progress @@ -95,7 +95,7 @@ enum pakfire_steps { }; static enum pakfire_steps pakfire_transaction_get_step_type( - struct pakfire_transaction* transaction, struct pakfire_package* pkg) { + struct pakfire_transaction* transaction, pakfire_package* pkg) { const Id id = pakfire_package_id(pkg); const int flags = SOLVER_TRANSACTION_CHANGE_IS_REINSTALL; @@ -163,7 +163,7 @@ static void pakfire_transaction_free_archives_and_packages( } static int pakfire_transaction_import_transaction(struct pakfire_transaction* transaction) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; int new_pkgs; Queue pkgs; int r = 0; @@ -820,7 +820,7 @@ ERROR: int pakfire_transaction_request(struct pakfire_transaction* transaction, const enum pakfire_job_action action, const char* what, int flags) { - struct pakfire_package* package = NULL; + pakfire_package* package = NULL; int r; // Remove leading whitespace @@ -861,7 +861,7 @@ ERROR: } int pakfire_transaction_request_package(struct pakfire_transaction* transaction, - const enum pakfire_job_action action, struct pakfire_package* package, int flags) { + const enum pakfire_job_action action, pakfire_package* package, int flags) { // Get the solvable ID Id id = pakfire_package_id(package); @@ -932,7 +932,7 @@ static int pakfire_transaction_add_line(char** s, size_t width, const char* name return asprintf(s, "%s %-21s %-8s %-21s %-18s %6s \n", *s, name, arch, version, repo, size); } -static int pakfire_transaction_add_package(char** s, size_t width, struct pakfire_package* pkg) { +static int pakfire_transaction_add_package(char** s, size_t width, pakfire_package* pkg) { char size[128]; int r; @@ -957,7 +957,7 @@ static int pakfire_transaction_add_package(char** s, size_t width, struct pakfir } static int pakfire_transaction_add_package_change(char** s, size_t width, - struct pakfire_package* old_pkg, struct pakfire_package* new_pkg) { + pakfire_package* old_pkg, pakfire_package* new_pkg) { int r; // Print the new package first @@ -1157,8 +1157,8 @@ char* pakfire_transaction_dump(struct pakfire_transaction* transaction, size_t w // List all packages for (int j = 0; j < pkgs.count; j++) { - struct pakfire_package* old_pkg = NULL; - struct pakfire_package* new_pkg = NULL; + pakfire_package* old_pkg = NULL; + pakfire_package* new_pkg = NULL; r = pakfire_package_create_from_solvable(&old_pkg, transaction->pakfire, NULL, pkgs.elements[j]); @@ -1264,7 +1264,7 @@ static int pakfire_transaction_check(struct pakfire_transaction* transaction) { } static int pakfire_transaction_verify(struct pakfire_transaction* transaction, - struct pakfire_package* pkg, pakfire_archive* archive) { + pakfire_package* pkg, pakfire_archive* archive) { enum pakfire_hash_type hash = PAKFIRE_HASH_UNDEFINED; const unsigned char* checksum = NULL; size_t checksum_length = 0; @@ -1300,7 +1300,7 @@ static int pakfire_transaction_verify(struct pakfire_transaction* transaction, } static int pakfire_transaction_run_script(struct pakfire_transaction* transaction, - pakfire_db* db, const char* type, struct pakfire_package* pkg, pakfire_archive* archive) { + pakfire_db* db, const char* type, pakfire_package* pkg, pakfire_archive* archive) { struct pakfire_scriptlet* scriptlet = NULL; // Fetch scriptlet from archive if possible @@ -1322,7 +1322,7 @@ static int pakfire_transaction_run_script(struct pakfire_transaction* transactio } static int pakfire_transaction_extract(struct pakfire_transaction* transaction, - struct pakfire_package* pkg, pakfire_archive* archive) { + pakfire_package* pkg, pakfire_archive* archive) { pakfire_filelist* filelist = NULL; int r; @@ -1361,7 +1361,7 @@ ERROR: } static int pakfire_transaction_erase(struct pakfire_transaction* transaction, - pakfire_db* db, struct pakfire_package* pkg) { + 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, struct pakfire_package* pkg) { + struct pakfire_transaction* transaction, pakfire_package* pkg) { // No packages on the list if (!transaction->userinstalled) return 0; @@ -1468,7 +1468,7 @@ static int pakfire_transaction_package_is_userinstalled( } static int pakfire_transaction_apply_systemd_sysusers(struct pakfire_transaction* transaction, - struct pakfire_package* pkg, pakfire_archive* archive) { + 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)")) return pakfire_archive_apply_systemd_sysusers(archive); @@ -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, struct pakfire_package* pkg) { + struct 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); @@ -1486,7 +1486,7 @@ static int pakfire_transaction_apply_systemd_tmpfiles( } static int pakfire_transaction_run_step(struct pakfire_transaction* transaction, - pakfire_db* db, const enum pakfire_actions action, struct pakfire_package* pkg, pakfire_archive* archive) { + pakfire_db* db, const enum pakfire_actions action, pakfire_package* pkg, pakfire_archive* archive) { if (!pkg) { errno = EINVAL; return 1; @@ -1743,7 +1743,7 @@ static int pakfire_transaction_open_archives( int r; for (unsigned int i = 0; i < transaction->num; i++) { - struct pakfire_package* pkg = transaction->packages[i]; + pakfire_package* pkg = transaction->packages[i]; // Fetch the type enum pakfire_steps type = pakfire_transaction_get_step_type(transaction, pkg); @@ -1923,7 +1923,7 @@ ERROR: } static int pakfire_transaction_download_package(struct pakfire_transaction* transaction, - pakfire_httpclient* httpclient, struct pakfire_package* pkg) { + pakfire_httpclient* httpclient, pakfire_package* pkg) { struct pakfire_repo* repo = NULL; struct pakfire_xfer* xfer = NULL; int r; @@ -1955,7 +1955,7 @@ ERROR: } static int pakfire_transaction_package_needs_download( - struct pakfire_transaction* transaction, struct pakfire_package* pkg) { + struct pakfire_transaction* transaction, pakfire_package* pkg) { int r; enum pakfire_steps type = pakfire_transaction_get_step_type(transaction, pkg); @@ -2007,7 +2007,7 @@ int pakfire_transaction_download(struct pakfire_transaction* transaction) { // Add all packages that need to be downloaded for (unsigned int i = 0; i < transaction->num; i++) { - struct pakfire_package* pkg = transaction->packages[i]; + pakfire_package* pkg = transaction->packages[i]; if (!pakfire_transaction_package_needs_download(transaction, pkg)) continue; diff --git a/src/pakfire/transaction.h b/src/pakfire/transaction.h index bd5a2196..ae608334 100644 --- a/src/pakfire/transaction.h +++ b/src/pakfire/transaction.h @@ -70,7 +70,7 @@ int pakfire_transaction_solve(struct pakfire_transaction* transaction, int flags int pakfire_transaction_request(struct pakfire_transaction* transaction, const enum pakfire_job_action action, const char* what, int flags); int pakfire_transaction_request_package(struct pakfire_transaction* transaction, - const enum pakfire_job_action action, struct pakfire_package* package, int flags); + const enum pakfire_job_action action, pakfire_package* package, int flags); struct pakfire_problem** pakfire_transaction_get_problems(struct pakfire_transaction* transaction); int pakfire_transaction_take_solution( diff --git a/src/python/archive.c b/src/python/archive.c index 6d7d43d9..ba951b1f 100644 --- a/src/python/archive.c +++ b/src/python/archive.c @@ -155,7 +155,7 @@ static PyObject* Archive_extract(ArchiveObject* self, PyObject* args, PyObject* } static PyObject* Archive_get_package(ArchiveObject* self, PyObject* args) { - struct pakfire_package* package = NULL; + pakfire_package* package = NULL; RepoObject* repo = NULL; if (!PyArg_ParseTuple(args, "|O!", &RepoType, &repo)) diff --git a/src/python/package.c b/src/python/package.c index c9fd029b..e566b1d2 100644 --- a/src/python/package.c +++ b/src/python/package.c @@ -35,7 +35,7 @@ #include "repo.h" #include "util.h" -PyObject* new_package(PyTypeObject* type, struct pakfire_package* pkg) { +PyObject* new_package(PyTypeObject* type, pakfire_package* pkg) { PackageObject* self = (PackageObject *)type->tp_alloc(type, 0); if (self) { self->package = pakfire_package_ref(pkg); diff --git a/src/python/package.h b/src/python/package.h index 98c34e14..2926e23e 100644 --- a/src/python/package.h +++ b/src/python/package.h @@ -30,11 +30,11 @@ typedef struct { PyObject_HEAD - struct pakfire_package* package; + pakfire_package* package; } PackageObject; extern PyTypeObject PackageType; -PyObject* new_package(PyTypeObject* type, struct pakfire_package* pkg); +PyObject* new_package(PyTypeObject* type, pakfire_package* pkg); #endif /* PYTHON_PAKFIRE_PACKAGE_H */ diff --git a/src/python/util.c b/src/python/util.c index 853af273..ec0803aa 100644 --- a/src/python/util.c +++ b/src/python/util.c @@ -63,7 +63,7 @@ ERROR: } PyObject* PyList_FromPackageList(pakfire_packagelist* packagelist) { - struct pakfire_package* package = NULL; + pakfire_package* package = NULL; PyObject* item = NULL; // Determine the length of the list diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c index 058f48ee..e2604eae 100644 --- a/tests/libpakfire/archive.c +++ b/tests/libpakfire/archive.c @@ -32,7 +32,7 @@ static int test_open(const struct test* t) { pakfire_archive* archive = NULL; - struct pakfire_package* package = NULL; + pakfire_package* package = NULL; int r = EXIT_FAILURE; // Open the archive @@ -217,7 +217,7 @@ static int test_import(const struct test* t) { pakfire_archive* archive = NULL; struct pakfire_repo* repo = NULL; - struct pakfire_package* package = NULL; + pakfire_package* package = NULL; // Open archive ASSERT_SUCCESS(pakfire_archive_open(&archive, t->pakfire, path)); diff --git a/tests/libpakfire/db.c b/tests/libpakfire/db.c index 8e622a3a..c5d996d8 100644 --- a/tests/libpakfire/db.c +++ b/tests/libpakfire/db.c @@ -78,7 +78,7 @@ FAIL: } static int test_add_package(const struct test* t) { - struct pakfire_package* package = NULL; + pakfire_package* package = NULL; pakfire_db* db = NULL; struct pakfire_repo* repo = NULL; pakfire_archive* archive = NULL; diff --git a/tests/libpakfire/deps.c b/tests/libpakfire/deps.c index 11de51c3..582a98de 100644 --- a/tests/libpakfire/deps.c +++ b/tests/libpakfire/deps.c @@ -174,7 +174,7 @@ FAIL: } static int test_dep_match(const struct test* t) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; int r = EXIT_FAILURE; ASSERT_SUCCESS(pakfire_package_create(&pkg, t->pakfire, NULL, diff --git a/tests/libpakfire/makefile.c b/tests/libpakfire/makefile.c index ed8b1a3b..7d04e797 100644 --- a/tests/libpakfire/makefile.c +++ b/tests/libpakfire/makefile.c @@ -113,7 +113,7 @@ FAIL: static int test_packages(const struct test* t) { struct pakfire_parser* parser = NULL; - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; struct pakfire_repo* repo = NULL; char* s = NULL; int r = EXIT_FAILURE; @@ -173,7 +173,7 @@ static int test_dist_dummy(const struct test* t) { int r = EXIT_FAILURE; pakfire_archive* archive = NULL; - struct pakfire_package* package = NULL; + pakfire_package* package = NULL; pakfire_filelist* filelist = NULL; // Create a directory to write packages to diff --git a/tests/libpakfire/package.c b/tests/libpakfire/package.c index 626ee663..d1a990a2 100644 --- a/tests/libpakfire/package.c +++ b/tests/libpakfire/package.c @@ -32,7 +32,7 @@ This tests creates a new package and sets various attributes and reads them back again. */ static int test_create(const struct test* t) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; char** groups = NULL; int r = EXIT_FAILURE; @@ -151,7 +151,7 @@ FAIL: } static int test_invalid_inputs(const struct test* t) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; int r = EXIT_FAILURE; // Try to create a package with some values missing @@ -179,7 +179,7 @@ FAIL: } static int test_uuid(const struct test* t) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; int r = EXIT_FAILURE; uuid_t uuid; @@ -220,7 +220,7 @@ FAIL: } static int test_deps(const struct test* t) { - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; char** deps = NULL; int r = EXIT_FAILURE; @@ -252,7 +252,7 @@ FAIL: static int test_filelist(const struct test* t) { pakfire_filelist* filelist = NULL; pakfire_file* file = NULL; - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; int r = EXIT_FAILURE; // Create a filelist diff --git a/tests/libpakfire/packager.c b/tests/libpakfire/packager.c index 5e6ad34c..0ffeb85e 100644 --- a/tests/libpakfire/packager.c +++ b/tests/libpakfire/packager.c @@ -29,7 +29,7 @@ static int test_create(const struct test* t) { pakfire_packager* packager = NULL; - struct pakfire_package* pkg = NULL; + pakfire_package* pkg = NULL; struct pakfire_repo* repo = NULL; int r = EXIT_FAILURE; @@ -66,8 +66,8 @@ FAIL: static int test_compare_metadata(const struct test* t) { pakfire_archive* archive = NULL; - struct pakfire_package* pkg1 = NULL; - struct pakfire_package* pkg2 = NULL; + pakfire_package* pkg1 = NULL; + pakfire_package* pkg2 = NULL; pakfire_packager* packager = NULL; char* path = NULL; const char* s = NULL;