From: Michael Tremer Date: Fri, 27 Jun 2025 10:33:05 +0000 (+0000) Subject: archive: Create a new type for the archive X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0b04b57f973e77dacf30af34782d643d415e26b;p=pakfire.git archive: Create a new type for the archive Signed-off-by: Michael Tremer --- diff --git a/src/cli/lib/build.c b/src/cli/lib/build.c index d1f88b46..001ac74f 100644 --- a/src/cli/lib/build.c +++ b/src/cli/lib/build.c @@ -163,7 +163,7 @@ static void log_callback(void* data, int priority, const char* file, int line, } static int result_callback(pakfire_ctx* ctx, struct pakfire* pakfire, - struct pakfire_build* build, struct pakfire_archive* archive, void* data) { + struct pakfire_build* build, pakfire_archive* archive, void* data) { const struct cli_local_args* local_args = data; struct pakfire_package* pkg = NULL; struct pakfire_repo* local = NULL; diff --git a/src/cli/lib/dist.c b/src/cli/lib/dist.c index 4e09fdde..9d95e9dd 100644 --- a/src/cli/lib/dist.c +++ b/src/cli/lib/dist.c @@ -61,7 +61,7 @@ static error_t parse(int key, char* arg, struct argp_state* state, void* data) { } static int do_dist(struct pakfire* pakfire, const char* makefile, const char* resultdir) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; const char* filename = NULL; char path[PATH_MAX]; int r; diff --git a/src/cli/lib/lint.c b/src/cli/lib/lint.c index c20bcf4d..75cf469a 100644 --- a/src/cli/lib/lint.c +++ b/src/cli/lib/lint.c @@ -60,7 +60,7 @@ static error_t parse(int key, char* arg, struct argp_state* state, void* data) { return 0; } -static int cli_linter_result(pakfire_ctx* ctx, struct pakfire_archive* archive, +static int cli_linter_result(pakfire_ctx* ctx, pakfire_archive* archive, struct pakfire_package* package, struct pakfire_file* file, int priority, const char* result, void* data) { const char* nevra = pakfire_package_get_string(package, PAKFIRE_PKG_NEVRA); @@ -86,7 +86,7 @@ static int cli_linter_result(pakfire_ctx* ctx, struct pakfire_archive* archive, } static int do_lint(struct pakfire* pakfire, const char* path) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; int r; // Open the archive diff --git a/src/pakfire/archive.c b/src/pakfire/archive.c index 9cc499e0..baf7c4e4 100644 --- a/src/pakfire/archive.c +++ b/src/pakfire/archive.c @@ -96,7 +96,7 @@ struct pakfire_archive { int verify; }; -struct pakfire_archive_file { +typedef struct pakfire_archive_file { FILE* f; // Buffer to store a block of data @@ -105,10 +105,10 @@ struct pakfire_archive_file { enum { PAKFIRE_ARCHIVE_FILE_CANT_SEEK = (1 << 0), } flags; -}; +} pakfire_archive_file; static ssize_t archive_file_read(struct archive* a, void* data, const void** buffer) { - struct pakfire_archive_file* file = data; + pakfire_archive_file* file = data; // Read a block of data into the buffer size_t bytes_read = fread(file->buffer, 1, sizeof(file->buffer), file->f); @@ -124,7 +124,7 @@ static ssize_t archive_file_read(struct archive* a, void* data, const void** buf } static int64_t archive_file_skip(struct archive* a, void* data, off_t skip) { - struct pakfire_archive_file* file = data; + pakfire_archive_file* file = data; int r; // Skip if we don't support seek @@ -146,7 +146,7 @@ static int64_t archive_file_skip(struct archive* a, void* data, off_t skip) { } static int archive_file_close(struct archive* a, void* data) { - struct pakfire_archive_file* file = data; + pakfire_archive_file* file = data; // Close the file if (file->f) @@ -164,7 +164,7 @@ static int archive_file_close(struct archive* a, void* data) { file descriptor for multiple operations. */ static int archive_read_file_open(struct archive* a, FILE* f) { - struct pakfire_archive_file* file = NULL; + pakfire_archive_file* file = NULL; int fd = -EBADF; int r; @@ -237,7 +237,7 @@ ERROR: /* A helper function that opens the archive for reading */ -static int pakfire_archive_open_archive(struct pakfire_archive* archive, +static int pakfire_archive_open_archive(pakfire_archive* archive, struct archive** __archive) { struct archive* a = NULL; int r; @@ -282,7 +282,7 @@ ERROR: return r; } -static int pakfire_archive_compute_hashes(struct pakfire_archive* archive) { +static int pakfire_archive_compute_hashes(pakfire_archive* archive) { int r; // Start reading at the beginning @@ -307,7 +307,7 @@ static int pakfire_archive_compute_hashes(struct pakfire_archive* archive) { Helper function to conditionally walk through an archive and perform actions based on the callback. */ -static int pakfire_archive_walk(struct pakfire_archive* archive, struct archive* a, +static int pakfire_archive_walk(pakfire_archive* archive, struct archive* a, pakfire_archive_walk_callback walk_callback, pakfire_archive_walk_filter_callback filter_callback, void* p) { struct archive_entry* entry = NULL; @@ -390,7 +390,7 @@ static int pakfire_archive_walk(struct pakfire_archive* archive, struct archive* return 0; } -static int pakfire_archive_open_and_walk(struct pakfire_archive* archive, +static int pakfire_archive_open_and_walk(pakfire_archive* archive, pakfire_archive_walk_callback walk_callback, pakfire_archive_walk_filter_callback filter_callback, void* data) { struct archive* a = NULL; @@ -411,7 +411,7 @@ ERROR: return r; } -static void pakfire_archive_free(struct pakfire_archive* archive) { +static void pakfire_archive_free(pakfire_archive* archive) { // Close the file if (archive->f) fclose(archive->f); @@ -435,13 +435,13 @@ static void pakfire_archive_free(struct pakfire_archive* archive) { free(archive); } -struct pakfire_archive* pakfire_archive_ref(struct pakfire_archive* archive) { +pakfire_archive* pakfire_archive_ref(pakfire_archive* archive) { ++archive->nrefs; return archive; } -struct pakfire_archive* pakfire_archive_unref(struct pakfire_archive* archive) { +pakfire_archive* pakfire_archive_unref(pakfire_archive* archive) { if (--archive->nrefs > 0) return archive; @@ -449,7 +449,7 @@ struct pakfire_archive* pakfire_archive_unref(struct pakfire_archive* archive) { return NULL; } -static struct pakfire_package* pakfire_archive_get_package(struct pakfire_archive* archive) { +static struct pakfire_package* pakfire_archive_get_package(pakfire_archive* archive) { if (!archive->package) { int r = pakfire_archive_make_package(archive, NULL, &archive->package); if (r) @@ -461,7 +461,7 @@ static struct pakfire_package* pakfire_archive_get_package(struct pakfire_archiv // Metadata -static int pakfire_archive_parse_json_metadata(struct pakfire_archive* archive, +static int pakfire_archive_parse_json_metadata(pakfire_archive* archive, const char* data, const size_t length) { int r = 1; @@ -495,7 +495,7 @@ ERROR: return r; } -static int pakfire_archive_parse_format(struct pakfire_archive* archive, +static int pakfire_archive_parse_format(pakfire_archive* archive, const char* data, const size_t length) { // Check if format has already been set if (archive->format) { @@ -521,7 +521,7 @@ static int pakfire_archive_parse_format(struct pakfire_archive* archive, return 0; } -static int pakfire_archive_parse_scriptlet(struct pakfire_archive* archive, +static int pakfire_archive_parse_scriptlet(pakfire_archive* archive, const char* path, const char* data, const size_t length) { struct pakfire_scriptlet* scriptlet = NULL; const char* type = NULL; @@ -551,7 +551,7 @@ static int pakfire_archive_parse_scriptlet(struct pakfire_archive* archive, return 0; } -static int pakfire_archive_copy_data_to_buffer(struct pakfire_archive* archive, +static int pakfire_archive_copy_data_to_buffer(pakfire_archive* archive, struct archive* a, struct archive_entry* entry, char** data, size_t* length) { size_t bytes_read = 0; char* buffer = NULL; @@ -588,7 +588,7 @@ ERROR: return r; } -static int __pakfire_archive_read_metadata(struct pakfire_archive* archive, +static int __pakfire_archive_read_metadata(pakfire_archive* archive, struct archive* a, struct archive_entry* entry, void* p) { char* data = NULL; size_t length = 0; @@ -640,7 +640,7 @@ ERROR: return r; } -static int __pakfire_archive_filter_metadata(struct pakfire_archive* archive, +static int __pakfire_archive_filter_metadata(pakfire_archive* archive, struct archive_entry* entry, void* p) { const char* path = archive_entry_pathname(entry); @@ -662,7 +662,7 @@ static int __pakfire_archive_filter_metadata(struct pakfire_archive* archive, return PAKFIRE_WALK_ERROR; } -static int pakfire_archive_read_metadata(struct pakfire_archive* archive) { +static int pakfire_archive_read_metadata(pakfire_archive* archive) { int r; DEBUG(archive->ctx, "Reading archive metadata...\n"); @@ -694,9 +694,9 @@ static int pakfire_archive_read_metadata(struct pakfire_archive* archive) { return 0; } -int pakfire_archive_open(struct pakfire_archive** archive, +int pakfire_archive_open(pakfire_archive** archive, struct pakfire* pakfire, const char* path) { - struct pakfire_archive* a = NULL; + pakfire_archive* a = NULL; int r; // Allocate a new object @@ -766,7 +766,7 @@ ERROR: } static struct json_object* pakfire_archive_metadata_get_object( - struct pakfire_archive* archive, const char* key1, const char* key2) { + pakfire_archive* archive, const char* key1, const char* key2) { struct json_object* object = archive->metadata; int r; @@ -790,7 +790,7 @@ static struct json_object* pakfire_archive_metadata_get_object( } static const char* pakfire_archive_metadata_get( - struct pakfire_archive* archive, const char* key1, const char* key2) { + pakfire_archive* archive, const char* key1, const char* key2) { // Try finding an object struct json_object* object = pakfire_archive_metadata_get_object(archive, key1, key2); if (!object) @@ -801,7 +801,7 @@ static const char* pakfire_archive_metadata_get( } static int64_t pakfire_archive_metadata_get_int64( - struct pakfire_archive* archive, const char* key1, const char* key2) { + pakfire_archive* archive, const char* key1, const char* key2) { // Try finding an object struct json_object* object = pakfire_archive_metadata_get_object(archive, key1, key2); if (!object) @@ -811,7 +811,7 @@ static int64_t pakfire_archive_metadata_get_int64( return json_object_get_int64(object); } -static int pakfire_archive_filter_payload(struct pakfire_archive* archive, +static int pakfire_archive_filter_payload(pakfire_archive* archive, struct archive_entry* entry, void* p) { const char* path = archive_entry_pathname(entry); if (!path) @@ -834,7 +834,7 @@ static int pakfire_archive_filter_payload(struct pakfire_archive* archive, return PAKFIRE_WALK_DONE; } -int pakfire_archive_walk_payload(struct pakfire_archive* archive, +int pakfire_archive_walk_payload(pakfire_archive* archive, pakfire_archive_walk_callback callback, void* data) { return pakfire_archive_open_and_walk( archive, callback, pakfire_archive_filter_payload, data); @@ -843,9 +843,9 @@ int pakfire_archive_walk_payload(struct pakfire_archive* archive, /* Read files from the archive */ -struct pakfire_archive_read_cookie { +typedef struct pakfire_archive_read_cookie { // A reference to the archive - struct pakfire_archive* archive; + pakfire_archive* archive; // The path we are reading char path[PATH_MAX]; @@ -861,17 +861,17 @@ struct pakfire_archive_read_cookie { // Count how many symlinks we have followed unsigned int followed_symlinks; -}; +} pakfire_archive_read_cookie; static ssize_t pakfire_archive_cookie_read(void* c, char* buffer, size_t size) { - struct pakfire_archive_read_cookie* cookie = (struct pakfire_archive_read_cookie*)c; + pakfire_archive_read_cookie* cookie = (pakfire_archive_read_cookie*)c; // Read the data directly from the archive return archive_read_data(cookie->a, buffer, size); } static int pakfire_archive_cookie_close(void* c) { - struct pakfire_archive_read_cookie* cookie = (struct pakfire_archive_read_cookie*)c; + pakfire_archive_read_cookie* cookie = (pakfire_archive_read_cookie*)c; if (cookie->archive) pakfire_archive_unref(cookie->archive); @@ -890,9 +890,9 @@ static cookie_io_functions_t pakfire_archive_read_functions = { }; // Tries to find a matching file in the archive -static int pakfire_archive_read_filter(struct pakfire_archive* archive, +static int pakfire_archive_read_filter(pakfire_archive* archive, struct archive_entry* e, void* data) { - struct pakfire_archive_read_cookie* cookie = data; + pakfire_archive_read_cookie* cookie = data; const char* symlink = NULL; int r; @@ -939,9 +939,9 @@ static int pakfire_archive_read_filter(struct pakfire_archive* archive, } // Reads a matching file into memory -static int __pakfire_archive_read(struct pakfire_archive* archive, +static int __pakfire_archive_read(pakfire_archive* archive, struct archive* a, struct archive_entry* e, void* data) { - struct pakfire_archive_read_cookie* cookie = data; + pakfire_archive_read_cookie* cookie = data; // Create a file descriptor cookie->f = fopencookie(cookie, "r", pakfire_archive_read_functions); @@ -953,8 +953,8 @@ static int __pakfire_archive_read(struct pakfire_archive* archive, return PAKFIRE_WALK_DONE; } -FILE* pakfire_archive_read(struct pakfire_archive* archive, const char* path, int flags) { - struct pakfire_archive_read_cookie* cookie = NULL; +FILE* pakfire_archive_read(pakfire_archive* archive, const char* path, int flags) { + pakfire_archive_read_cookie* cookie = NULL; int r; // Check if path is absolute @@ -1033,7 +1033,7 @@ ERROR: We will keep the archive open so it can still be used. */ -int pakfire_archive_unlink(struct pakfire_archive* archive) { +int pakfire_archive_unlink(pakfire_archive* archive) { int r; // We cannot do this if we don't have a path @@ -1058,7 +1058,7 @@ int pakfire_archive_unlink(struct pakfire_archive* archive) { return 0; } -int pakfire_archive_copy(struct pakfire_archive* archive, const char* path) { +int pakfire_archive_copy(pakfire_archive* archive, const char* path) { FILE* f = NULL; int r; @@ -1113,7 +1113,7 @@ ERROR: return r; } -static int pakfire_archive_link(struct pakfire_archive* archive, const char* path) { +static int pakfire_archive_link(pakfire_archive* archive, const char* path) { int r; // Check if path is set @@ -1135,7 +1135,7 @@ static int pakfire_archive_link(struct pakfire_archive* archive, const char* pat return 0; } -int pakfire_archive_link_or_copy(struct pakfire_archive* archive, const char* path) { +int pakfire_archive_link_or_copy(pakfire_archive* archive, const char* path) { int r; // Make sure the parent directory exists @@ -1162,7 +1162,7 @@ int pakfire_archive_link_or_copy(struct pakfire_archive* archive, const char* pa */ struct pakfire_extract_state { - struct pakfire_archive* archive; + pakfire_archive* archive; // Archive struct archive* a; @@ -1184,7 +1184,7 @@ static void pakfire_extract_progress(void* data) { pakfire_progress_update(state->archive->progress, position); } -static int pakfire_archive_extract_one(struct pakfire_archive* archive, +static int pakfire_archive_extract_one(pakfire_archive* archive, struct archive* a, struct archive_entry* entry, void* data) { struct pakfire_file* file = NULL; struct vfs_cap_data cap_data = {}; @@ -1309,7 +1309,7 @@ ERROR: return r; } -static int __pakfire_archive_extract(struct pakfire_archive* archive, +static int __pakfire_archive_extract(pakfire_archive* archive, const char* path, int flags, struct pakfire_progress* parent) { struct pakfire_package* pkg = NULL; char prefix[PATH_MAX] = "/"; @@ -1405,16 +1405,16 @@ ERROR: return r; } -int pakfire_archive_extract(struct pakfire_archive* archive, +int pakfire_archive_extract(pakfire_archive* archive, const char* path, const int flags, struct pakfire_progress* parent) { return __pakfire_archive_extract(archive, path, flags, parent); } -const char* pakfire_archive_get_path(struct pakfire_archive* archive) { +const char* pakfire_archive_get_path(pakfire_archive* archive) { return archive->path; } -const char* pakfire_archive_get_filename(struct pakfire_archive* self) { +const char* pakfire_archive_get_filename(pakfire_archive* self) { struct pakfire_package* pkg = NULL; const char* filename = NULL; @@ -1435,11 +1435,11 @@ ERROR: return filename; } -unsigned int pakfire_archive_get_format(struct pakfire_archive* archive) { +unsigned int pakfire_archive_get_format(pakfire_archive* archive) { return archive->format; } -static int __pakfire_archive_load_filelist(struct pakfire_archive* archive, +static int __pakfire_archive_load_filelist(pakfire_archive* archive, struct archive* a, struct archive_entry* entry, void* data) { struct pakfire_filelist* filelist = data; struct pakfire_file* file = NULL; @@ -1462,7 +1462,7 @@ ERROR: return r; } -static int pakfire_archive_load_filelist(struct pakfire_archive* self) { +static int pakfire_archive_load_filelist(pakfire_archive* self) { struct pakfire_filelist* filelist = NULL; int r; @@ -1491,7 +1491,7 @@ ERROR: return r; } -int pakfire_archive_get_filelist(struct pakfire_archive* self, struct pakfire_filelist** filelist) { +int pakfire_archive_get_filelist(pakfire_archive* self, struct pakfire_filelist** filelist) { int r; // Load the filelist if we don't have one, yet @@ -1505,16 +1505,16 @@ int pakfire_archive_get_filelist(struct pakfire_archive* self, struct pakfire_fi return 0; } -int pakfire_archive_verify(struct pakfire_archive* archive, int* status) { +int pakfire_archive_verify(pakfire_archive* archive, int* status) { // XXX currently not implemented return 0; } -ssize_t pakfire_archive_get_size(struct pakfire_archive* archive) { +ssize_t pakfire_archive_get_size(pakfire_archive* archive) { return archive->stat.st_size; } -int pakfire_archive_verify_checksum(struct pakfire_archive* archive, +int pakfire_archive_verify_checksum(pakfire_archive* archive, const enum pakfire_hash_type type, const unsigned char* checksum, const size_t length) { struct pakfire_hashes expected_hashes = {}; int r; @@ -1543,7 +1543,7 @@ int pakfire_archive_verify_checksum(struct pakfire_archive* archive, } static int pakfire_archive_import_filelist_from_json( - struct pakfire_archive* archive, struct pakfire_package* package) { + pakfire_archive* archive, struct pakfire_package* package) { struct json_object* array = NULL; int r; @@ -1581,7 +1581,7 @@ static int pakfire_archive_import_filelist_from_json( return 0; } -static int pakfire_archive_make_package_from_json(struct pakfire_archive* archive, +static int pakfire_archive_make_package_from_json(pakfire_archive* archive, struct pakfire_repo* repo, struct pakfire_package** package) { struct pakfire_package* pkg = NULL; char path[PATH_MAX]; @@ -1868,7 +1868,7 @@ ERROR: /* Copy all metadata from this archive to the package object */ -int pakfire_archive_make_package(struct pakfire_archive* archive, +int pakfire_archive_make_package(pakfire_archive* archive, struct pakfire_repo* repo, struct pakfire_package** package) { struct pakfire_repo* dummy = NULL; int r; @@ -1893,7 +1893,7 @@ int pakfire_archive_make_package(struct pakfire_archive* archive, } struct pakfire_scriptlet* pakfire_archive_get_scriptlet( - struct pakfire_archive* archive, const char* type) { + pakfire_archive* archive, const char* type) { struct pakfire_scriptlet* scriptlet = NULL; for (unsigned int i = 0; i < archive->num_scriptlets; i++) { @@ -1913,7 +1913,7 @@ struct pakfire_scriptlet* pakfire_archive_get_scriptlet( /* systemd sysusers */ -static int pakfire_archive_filter_systemd_sysusers(struct pakfire_archive* archive, +static int pakfire_archive_filter_systemd_sysusers(pakfire_archive* archive, struct archive_entry* e, void* data) { const char* path = archive_entry_pathname(e); @@ -1936,7 +1936,7 @@ static ssize_t pakfire_archive_stream_payload( return bytes_read; } -static int pakfire_archive_handle_systemd_sysusers(struct pakfire_archive* archive, +static int pakfire_archive_handle_systemd_sysusers(pakfire_archive* archive, struct archive* a, struct archive_entry* e, void* data) { struct pakfire_jail* jail = NULL; char replace[PATH_MAX]; @@ -1974,14 +1974,14 @@ ERROR: return r; } -int pakfire_archive_apply_systemd_sysusers(struct pakfire_archive* archive) { +int pakfire_archive_apply_systemd_sysusers(pakfire_archive* archive) { pakfire_archive_open_and_walk(archive, pakfire_archive_handle_systemd_sysusers, pakfire_archive_filter_systemd_sysusers, NULL); return 0; } -int pakfire_archive_lint(struct pakfire_archive* archive, +int pakfire_archive_lint(pakfire_archive* archive, pakfire_linter_result_callback callback, void* data) { struct pakfire_linter* linter = NULL; int r; diff --git a/src/pakfire/archive.h b/src/pakfire/archive.h index 30e578d7..ec8c0d33 100644 --- a/src/pakfire/archive.h +++ b/src/pakfire/archive.h @@ -25,7 +25,7 @@ #include -struct pakfire_archive; +typedef struct pakfire_archive pakfire_archive; #include #include @@ -36,43 +36,43 @@ struct pakfire_archive; #include #include -int pakfire_archive_open(struct pakfire_archive** archive, struct pakfire* pakfire, const char* path); -struct pakfire_archive* pakfire_archive_ref(struct pakfire_archive* archive); -struct pakfire_archive* pakfire_archive_unref(struct pakfire_archive* archive); +int pakfire_archive_open(pakfire_archive** archive, struct pakfire* pakfire, const char* path); +pakfire_archive* pakfire_archive_ref(pakfire_archive* archive); +pakfire_archive* pakfire_archive_unref(pakfire_archive* archive); enum pakfire_archive_read_flags { PAKFIRE_ARCHIVE_READ_FOLLOW_SYMLINKS = (1 << 0), }; -FILE* pakfire_archive_read(struct pakfire_archive* archive, const char* filename, int flags); -int pakfire_archive_extract(struct pakfire_archive* archive, +FILE* pakfire_archive_read(pakfire_archive* archive, const char* filename, int flags); +int pakfire_archive_extract(pakfire_archive* archive, const char* path, const int flags, struct pakfire_progress* parent); -const char* pakfire_archive_get_path(struct pakfire_archive* archive); -const char* pakfire_archive_get_filename(struct pakfire_archive* self); +const char* pakfire_archive_get_path(pakfire_archive* archive); +const char* pakfire_archive_get_filename(pakfire_archive* self); -unsigned int pakfire_archive_get_format(struct pakfire_archive* archive); +unsigned int pakfire_archive_get_format(pakfire_archive* archive); -int pakfire_archive_get_filelist(struct pakfire_archive* self, struct pakfire_filelist** filelist); +int pakfire_archive_get_filelist(pakfire_archive* self, struct pakfire_filelist** filelist); -int pakfire_archive_verify(struct pakfire_archive* archive, int* status); +int pakfire_archive_verify(pakfire_archive* archive, int* status); -ssize_t pakfire_archive_get_size(struct pakfire_archive* archive); +ssize_t pakfire_archive_get_size(pakfire_archive* archive); -int pakfire_archive_verify_checksum(struct pakfire_archive* archive, +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(struct pakfire_archive* archive, +int pakfire_archive_make_package(pakfire_archive* archive, struct pakfire_repo* repo, struct pakfire_package** package); -int pakfire_archive_lint(struct pakfire_archive* archive, +int pakfire_archive_lint(pakfire_archive* archive, pakfire_linter_result_callback callback, void* data); // Walk -typedef int (*pakfire_archive_walk_callback)(struct pakfire_archive* archive, +typedef int (*pakfire_archive_walk_callback)(pakfire_archive* archive, struct archive* a, struct archive_entry* e, void* p); -typedef int (*pakfire_archive_walk_filter_callback)(struct pakfire_archive* archive, +typedef int (*pakfire_archive_walk_filter_callback)(pakfire_archive* archive, struct archive_entry* e, void* p); enum pakfire_archive_walk_codes { @@ -92,16 +92,16 @@ enum pakfire_archive_walk_codes { PAKFIRE_WALK_AGAIN = -40, }; -int pakfire_archive_walk_payload(struct pakfire_archive* archive, +int pakfire_archive_walk_payload(pakfire_archive* archive, pakfire_archive_walk_callback callback, void* data); -int pakfire_archive_unlink(struct pakfire_archive* archive); -int pakfire_archive_copy(struct pakfire_archive* archive, const char* path); -int pakfire_archive_link_or_copy(struct pakfire_archive* archive, const char* path); +int pakfire_archive_unlink(pakfire_archive* archive); +int pakfire_archive_copy(pakfire_archive* archive, const char* path); +int pakfire_archive_link_or_copy(pakfire_archive* archive, const char* path); struct pakfire_scriptlet* pakfire_archive_get_scriptlet( - struct pakfire_archive* archive, const char* type); + pakfire_archive* archive, const char* type); -int pakfire_archive_apply_systemd_sysusers(struct pakfire_archive* archive); +int pakfire_archive_apply_systemd_sysusers(pakfire_archive* archive); #endif /* PAKFIRE_ARCHIVE_H */ diff --git a/src/pakfire/build.c b/src/pakfire/build.c index edbd8ab4..5ef8560f 100644 --- a/src/pakfire/build.c +++ b/src/pakfire/build.c @@ -1213,7 +1213,7 @@ static int pakfire_build_package_add_scriptlets(struct pakfire_build* build, static int pakfire_build_package(struct pakfire_build* build, struct pakfire_parser* makefile, const char* buildroot, const char* namespace) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; struct pakfire_package* pkg = NULL; struct pakfire_packager* packager = NULL; @@ -2468,7 +2468,7 @@ ERROR: } static int pakfire_build_lint_archive( - pakfire_ctx* ctx, struct pakfire_package* pkg, struct pakfire_archive* archive, void* data) { + pakfire_ctx* ctx, struct pakfire_package* pkg, pakfire_archive* archive, void* data) { return pakfire_archive_lint(archive, NULL, NULL); } @@ -2494,7 +2494,7 @@ struct pakfire_build_result { }; static int pakfire_build_result(pakfire_ctx* ctx, struct pakfire_package* pkg, - struct pakfire_archive* archive, void* data) { + pakfire_archive* archive, void* data) { const struct pakfire_build_result* result = data; struct pakfire_build* build = result->build; int r; diff --git a/src/pakfire/build.h b/src/pakfire/build.h index 8d77801e..c472e7f9 100644 --- a/src/pakfire/build.h +++ b/src/pakfire/build.h @@ -36,7 +36,7 @@ enum pakfire_build_flags { }; typedef int (*pakfire_build_result_callback)(pakfire_ctx* ctx, struct pakfire* pakfire, - struct pakfire_build* build, struct pakfire_archive* archive, void* data); + struct pakfire_build* build, pakfire_archive* archive, void* data); int pakfire_build_create(struct pakfire_build** build, pakfire_ctx* ctx, struct pakfire_config* config, const char* arch, const char* id, int flags); diff --git a/src/pakfire/db.c b/src/pakfire/db.c index a5bf43be..822823b0 100644 --- a/src/pakfire/db.c +++ b/src/pakfire/db.c @@ -1011,7 +1011,7 @@ static int pakfire_db_bind_checksum(struct pakfire_db* db, sqlite3_stmt* stmt, return sqlite3_bind_blob(stmt, field, checksum, checksum_length, NULL); } -static int pakfire_db_add_files(struct pakfire_db* db, unsigned long id, struct pakfire_archive* archive) { +static int pakfire_db_add_files(struct pakfire_db* db, unsigned long id, pakfire_archive* archive) { struct pakfire_filelist* filelist = NULL; sqlite3_stmt* stmt = NULL; int r; @@ -1273,7 +1273,7 @@ END: return r; } -static int pakfire_db_add_scriptlets(struct pakfire_db* db, unsigned long id, struct pakfire_archive* archive) { +static int pakfire_db_add_scriptlets(struct pakfire_db* db, unsigned long id, pakfire_archive* archive) { sqlite3_stmt* stmt = NULL; size_t size; int r = 1; @@ -1350,7 +1350,7 @@ END: } int pakfire_db_add_package(struct pakfire_db* db, - struct pakfire_package* pkg, struct pakfire_archive* archive, int userinstalled) { + struct 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; diff --git a/src/pakfire/db.h b/src/pakfire/db.h index 36a68cc5..cc85fd2b 100644 --- a/src/pakfire/db.h +++ b/src/pakfire/db.h @@ -46,7 +46,7 @@ int pakfire_db_check(struct pakfire_db* db); ssize_t pakfire_db_packages(struct pakfire_db* db); int pakfire_db_add_package(struct pakfire_db* db, struct pakfire_package* pkg, - struct pakfire_archive* archive, int userinstalled); + pakfire_archive* archive, int userinstalled); int pakfire_db_remove_package(struct pakfire_db* db, struct pakfire_package* pkg); int pakfire_db_load(struct pakfire_db* db, struct pakfire_repo* repo); diff --git a/src/pakfire/dist.c b/src/pakfire/dist.c index df96ea35..7ba97291 100644 --- a/src/pakfire/dist.c +++ b/src/pakfire/dist.c @@ -451,12 +451,12 @@ ERROR: } int pakfire_dist(struct pakfire* pakfire, - const char* path, struct pakfire_archive** archive) { + const char* path, pakfire_archive** archive) { struct pakfire_packager* packager = NULL; struct pakfire_package* pkg = NULL; struct pakfire_parser* makefile = NULL; struct pakfire_parser_error* error = NULL; - struct pakfire_archive* a = NULL; + pakfire_archive* a = NULL; int r; // Fetch context diff --git a/src/pakfire/dist.h b/src/pakfire/dist.h index e0961ecb..7301325e 100644 --- a/src/pakfire/dist.h +++ b/src/pakfire/dist.h @@ -26,7 +26,7 @@ #include int pakfire_dist(struct pakfire* pakfire, - const char* path, struct pakfire_archive** archive); + const char* path, pakfire_archive** archive); int pakfire_read_makefile(struct pakfire_parser** parser, struct pakfire* pakfire, const char* path, struct pakfire_parser_error** error); diff --git a/src/pakfire/job.c b/src/pakfire/job.c index ad1842b6..1ac16706 100644 --- a/src/pakfire/job.c +++ b/src/pakfire/job.c @@ -407,7 +407,7 @@ static int pakfire_job_logfile_uploaded(pakfire_client* client, } static int pakfire_job_result(pakfire_ctx* ctx, struct pakfire* pakfire, - struct pakfire_build* build, struct pakfire_archive* archive, void* data) { + struct pakfire_build* build, pakfire_archive* archive, void* data) { struct pakfire_job* self = data; struct pakfire_package* pkg = NULL; const char* filename = NULL; diff --git a/src/pakfire/linter.c b/src/pakfire/linter.c index 60551137..6516c7db 100644 --- a/src/pakfire/linter.c +++ b/src/pakfire/linter.c @@ -60,7 +60,7 @@ struct pakfire_linter { struct pakfire* pakfire; // Archive - struct pakfire_archive* archive; + pakfire_archive* archive; // Package struct pakfire_package* pkg; @@ -169,7 +169,7 @@ ERROR: } int pakfire_linter_create(struct pakfire_linter** linter, - struct pakfire* pakfire, struct pakfire_archive* archive) { + struct pakfire* pakfire, pakfire_archive* archive) { struct pakfire_linter* l = NULL; int r; @@ -478,7 +478,7 @@ static int pakfire_linter_lint_fhs( return 0; } -static int pakfire_linter_file(struct pakfire_archive* archive, +static int pakfire_linter_file(pakfire_archive* archive, struct archive* a, struct archive_entry* e, void* data) { struct pakfire_linter* linter = data; struct pakfire_file* file = NULL; diff --git a/src/pakfire/linter.h b/src/pakfire/linter.h index 6c1c5d04..c01468b1 100644 --- a/src/pakfire/linter.h +++ b/src/pakfire/linter.h @@ -33,13 +33,13 @@ enum pakfire_linter_priority { }; typedef int (*pakfire_linter_result_callback)(pakfire_ctx* ctx, - struct pakfire_archive* archive, struct pakfire_package* package, + pakfire_archive* archive, struct pakfire_package* package, struct pakfire_file* file, int priority, const char* message, void* data); struct pakfire_linter; int pakfire_linter_create(struct pakfire_linter** linter, - struct pakfire* pakfire, struct pakfire_archive* archive); + struct pakfire* pakfire, pakfire_archive* archive); struct pakfire_linter* pakfire_linter_ref(struct pakfire_linter* linter); struct pakfire_linter* pakfire_linter_unref(struct pakfire_linter* linter); diff --git a/src/pakfire/package.c b/src/pakfire/package.c index 2f17e269..9c8d32dd 100644 --- a/src/pakfire/package.c +++ b/src/pakfire/package.c @@ -2143,7 +2143,7 @@ ERROR: return NULL; } -int pakfire_package_get_archive(struct pakfire_package* pkg, struct pakfire_archive** archive) { +int pakfire_package_get_archive(struct pakfire_package* pkg, pakfire_archive** archive) { const char* path = NULL; int r; diff --git a/src/pakfire/package.h b/src/pakfire/package.h index 1c67d2e9..a7dfd8f2 100644 --- a/src/pakfire/package.h +++ b/src/pakfire/package.h @@ -145,7 +145,7 @@ struct pakfire_repo* pakfire_package_get_repo(struct pakfire_package* pkg); char* pakfire_package_dump(struct pakfire_package* pkg, int flags); -int pakfire_package_get_archive(struct pakfire_package* pkg, struct pakfire_archive** archive); +int pakfire_package_get_archive(struct pakfire_package* pkg, pakfire_archive** archive); struct pakfire_filelist* pakfire_package_get_filelist(struct pakfire_package* pkg); int pakfire_package_set_filelist(struct pakfire_package* pkg, struct pakfire_filelist* filelist); diff --git a/src/pakfire/packager.c b/src/pakfire/packager.c index d26a5335..afbedf07 100644 --- a/src/pakfire/packager.c +++ b/src/pakfire/packager.c @@ -376,7 +376,7 @@ ERROR: } int pakfire_packager_write_archive(struct pakfire_packager* self, - struct pakfire_archive** archive) { + pakfire_archive** archive) { FILE* f = NULL; char path[PATH_MAX]; int r; diff --git a/src/pakfire/packager.h b/src/pakfire/packager.h index 39d7a078..522a7b3c 100644 --- a/src/pakfire/packager.h +++ b/src/pakfire/packager.h @@ -38,7 +38,7 @@ struct pakfire_packager* pakfire_packager_ref(struct pakfire_packager* packager) struct pakfire_packager* pakfire_packager_unref(struct pakfire_packager* packager); int pakfire_packager_write_archive(struct pakfire_packager* self, - struct pakfire_archive** archive); + pakfire_archive** archive); int pakfire_packager_finish(struct pakfire_packager* packager, FILE* f); diff --git a/src/pakfire/pakfire.c b/src/pakfire/pakfire.c index 57f32cdf..2a8da5c9 100644 --- a/src/pakfire/pakfire.c +++ b/src/pakfire/pakfire.c @@ -1446,7 +1446,7 @@ struct pakfire_repo* pakfire_get_installed_repo(struct pakfire* pakfire) { */ static int pakfire_commandline_dist(struct pakfire* pakfire, struct pakfire_repo* repo, const char* path, struct pakfire_package** pkg) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; int r; // Run dist() diff --git a/src/pakfire/repo.c b/src/pakfire/repo.c index 955d37d0..076e4f4c 100644 --- a/src/pakfire/repo.c +++ b/src/pakfire/repo.c @@ -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, - struct pakfire_archive* archive, struct pakfire_package* pkg) { + pakfire_archive* archive, struct pakfire_package* pkg) { const char* uuid = NULL; // Fetch NEVRA @@ -535,7 +535,7 @@ int __pakfire_repo_make_path(struct pakfire_repo* self, char* path, size_t lengt } int pakfire_repo_import_archive(struct pakfire_repo* self, - struct pakfire_archive* archive, struct pakfire_package** package) { + pakfire_archive* archive, struct pakfire_package** package) { struct pakfire_package* pkg = NULL; char path[PATH_MAX]; int r; @@ -670,7 +670,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) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; struct pakfire_package* package = NULL; int r = 0; @@ -1991,7 +1991,7 @@ ERROR: int pakfire_repo_add(struct pakfire_repo* repo, const char* path, struct pakfire_package** package) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; int r; // This operation is only supported for the command line repository @@ -2554,7 +2554,7 @@ ERROR: int pakfire_repo_compose(struct pakfire* pakfire, const char* path, struct pakfire_key* key, const char** files) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; struct pakfire_repo* repo = NULL; char realpath[PATH_MAX]; char baseurl[PATH_MAX]; @@ -2694,7 +2694,7 @@ struct pakfire_repo_walk_archives_state { static int __pakfire_repo_walk_archives( pakfire_ctx* ctx, struct pakfire_package* pkg, void* data) { const struct pakfire_repo_walk_archives_state* state = data; - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; int r; // Check if we actually have a callback diff --git a/src/pakfire/repo.h b/src/pakfire/repo.h index d6eb5cfd..bc617ab9 100644 --- a/src/pakfire/repo.h +++ b/src/pakfire/repo.h @@ -130,10 +130,10 @@ 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, struct pakfire_archive* archive, struct pakfire_package* pkg); + char* path, size_t length, pakfire_archive* archive, struct pakfire_package* pkg); int pakfire_repo_import_archive(struct pakfire_repo* self, - struct pakfire_archive* archive, struct pakfire_package** package); + pakfire_archive* archive, struct pakfire_package** package); int pakfire_repo_download_package(struct pakfire_xfer** xfer, struct pakfire_repo* repo, struct pakfire_package* pkg); @@ -152,7 +152,7 @@ int pakfire_repo_walk_packages(struct pakfire_repo* self, int (*callback)(pakfire_ctx* ctx, struct pakfire_package* pkg, void* data), void* data, int flags); typedef int (*pakfire_repo_walk_archives_callback) - (pakfire_ctx* ctx, struct pakfire_package* pkg, struct pakfire_archive* archive, void* data); + (pakfire_ctx* ctx, struct 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 ac0d5b3f..479c9771 100644 --- a/src/pakfire/transaction.c +++ b/src/pakfire/transaction.c @@ -62,7 +62,7 @@ struct pakfire_transaction { Transaction* transaction; char** userinstalled; - struct pakfire_archive** archives; + pakfire_archive** archives; struct pakfire_package** packages; size_t num; @@ -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, struct pakfire_archive* archive) { + struct 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, - struct pakfire_db* db, const char* type, struct pakfire_package* pkg, struct pakfire_archive* archive) { + struct pakfire_db* db, const char* type, struct 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, struct pakfire_archive* archive) { + struct pakfire_package* pkg, pakfire_archive* archive) { struct pakfire_filelist* filelist = NULL; int r; @@ -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, struct pakfire_archive* archive) { + struct 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); @@ -1486,7 +1486,7 @@ static int pakfire_transaction_apply_systemd_tmpfiles( } static int pakfire_transaction_run_step(struct pakfire_transaction* transaction, - struct pakfire_db* db, const enum pakfire_actions action, struct pakfire_package* pkg, struct pakfire_archive* archive) { + struct pakfire_db* db, const enum pakfire_actions action, struct pakfire_package* pkg, pakfire_archive* archive) { if (!pkg) { errno = EINVAL; return 1; @@ -1739,7 +1739,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) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; int r; for (unsigned int i = 0; i < transaction->num; i++) { @@ -2083,7 +2083,7 @@ ERROR: int pakfire_transaction_compose_repo(struct pakfire_transaction* transaction, struct pakfire_key* key, const char* path) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; int r; // Allocate an array for all files diff --git a/src/python/archive.c b/src/python/archive.c index 9c60aa79..1da49ce7 100644 --- a/src/python/archive.c +++ b/src/python/archive.c @@ -35,7 +35,7 @@ #include "repo.h" #include "util.h" -PyObject* new_archive(PyTypeObject* type, struct pakfire_archive* archive) { +PyObject* new_archive(PyTypeObject* type, pakfire_archive* archive) { ArchiveObject* self = (ArchiveObject *)type->tp_alloc(type, 0); if (self) { self->archive = pakfire_archive_ref(archive); diff --git a/src/python/archive.h b/src/python/archive.h index 53e065eb..ed0ebc00 100644 --- a/src/python/archive.h +++ b/src/python/archive.h @@ -27,11 +27,11 @@ typedef struct { PyObject_HEAD - struct pakfire_archive* archive; + pakfire_archive* archive; } ArchiveObject; extern PyTypeObject ArchiveType; -PyObject* new_archive(PyTypeObject* type, struct pakfire_archive* archive); +PyObject* new_archive(PyTypeObject* type, pakfire_archive* archive); #endif /* PYTHON_PAKFIRE_ARCHIVE_H */ diff --git a/src/python/pakfire.c b/src/python/pakfire.c index 8e1b606d..8bbaff56 100644 --- a/src/python/pakfire.c +++ b/src/python/pakfire.c @@ -358,7 +358,7 @@ static PyObject* Pakfire_version_compare(PakfireObject* self, PyObject* args) { } static PyObject* Pakfire_dist(PakfireObject* self, PyObject* args) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; const char* path = NULL; PyObject* ret = NULL; int r; @@ -435,7 +435,7 @@ static PyObject* Pakfire_clean(PakfireObject* self) { } static PyObject* Pakfire_open(PakfireObject* self, PyObject* args) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; const char* path = NULL; if (!PyArg_ParseTuple(args, "s", &path)) diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c index 2cb954ba..a2fa6afe 100644 --- a/tests/libpakfire/archive.c +++ b/tests/libpakfire/archive.c @@ -31,7 +31,7 @@ #define TEST_PKG1_PATH "data/beep-1.3-2.ip3.x86_64.pfm" static int test_open(const struct test* t) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; struct pakfire_package* package = NULL; int r = EXIT_FAILURE; @@ -69,7 +69,7 @@ FAIL: } static int test_open_directory(const struct test* t) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; int r = EXIT_FAILURE; // Open the archive @@ -87,7 +87,7 @@ FAIL: } static int test_read(const struct test* t) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; FILE* f = NULL; char data[20000]; size_t length = 0; @@ -132,7 +132,7 @@ FAIL: } static int test_copy(const struct test* t) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; char* path = NULL; int r = EXIT_FAILURE; @@ -163,7 +163,7 @@ FAIL: } static int test_filelist(const struct test* t) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; struct pakfire_filelist* list = NULL; int r = EXIT_FAILURE; @@ -189,7 +189,7 @@ FAIL: } static int test_extract(const struct test* t) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; char path[PATH_MAX]; int r = EXIT_FAILURE; @@ -215,7 +215,7 @@ static int test_import(const struct test* t) { const char* path = TEST_SRC_PATH TEST_PKG1_PATH; int r = EXIT_FAILURE; - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; struct pakfire_repo* repo = NULL; struct pakfire_package* package = NULL; diff --git a/tests/libpakfire/db.c b/tests/libpakfire/db.c index 795790b8..a056f7c9 100644 --- a/tests/libpakfire/db.c +++ b/tests/libpakfire/db.c @@ -81,7 +81,7 @@ static int test_add_package(const struct test* t) { struct pakfire_package* package = NULL; struct pakfire_db* db = NULL; struct pakfire_repo* repo = NULL; - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; int r = EXIT_FAILURE; ASSERT(repo = pakfire_get_repo(t->pakfire, PAKFIRE_REPO_DUMMY)); diff --git a/tests/libpakfire/makefile.c b/tests/libpakfire/makefile.c index 18b46d96..825ed49b 100644 --- a/tests/libpakfire/makefile.c +++ b/tests/libpakfire/makefile.c @@ -172,7 +172,7 @@ FAIL: static int test_dist_dummy(const struct test* t) { int r = EXIT_FAILURE; - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; struct pakfire_package* package = NULL; struct pakfire_filelist* filelist = NULL; diff --git a/tests/libpakfire/packager.c b/tests/libpakfire/packager.c index bd63130d..b712bf99 100644 --- a/tests/libpakfire/packager.c +++ b/tests/libpakfire/packager.c @@ -65,7 +65,7 @@ FAIL: } static int test_compare_metadata(const struct test* t) { - struct pakfire_archive* archive = NULL; + pakfire_archive* archive = NULL; struct pakfire_package* pkg1 = NULL; struct pakfire_package* pkg2 = NULL; struct pakfire_packager* packager = NULL;