From: Michael Tremer Date: Fri, 9 Jul 2021 14:26:11 +0000 (+0000) Subject: filelist: Change type from PakfireFilelist to struct pakfire_filelist X-Git-Tag: 0.9.28~1061 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bbbfb9ea3930aa4acfc99a983725ef40a113d94;p=pakfire.git filelist: Change type from PakfireFilelist to struct pakfire_filelist Signed-off-by: Michael Tremer --- diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c index abf75f3ab..b5a729d52 100644 --- a/src/_pakfire/package.c +++ b/src/_pakfire/package.c @@ -528,7 +528,7 @@ static PyObject* Package_get_filelist(PackageObject* self, PyObject* args) { if (list == NULL) return NULL; - PakfireFilelist filelist = pakfire_package_get_filelist(self->package); + struct pakfire_filelist* filelist = pakfire_package_get_filelist(self->package); for (unsigned int i = 0; i < pakfire_filelist_size(filelist); i++) { struct pakfire_file* file = pakfire_filelist_get(filelist, i); const char* path = pakfire_file_get_path(file); @@ -561,7 +561,7 @@ static int Package_set_filelist(PackageObject* self, PyObject* value) { Pakfire pakfire = pakfire_package_get_pakfire(self->package); // Create a new filelist - PakfireFilelist filelist; + struct pakfire_filelist* filelist; int r = pakfire_filelist_create(&filelist, pakfire); if (r) { diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c index 864b166d6..66b48fc7a 100644 --- a/src/libpakfire/archive.c +++ b/src/libpakfire/archive.c @@ -72,7 +72,7 @@ struct pakfire_archive { unsigned int format; struct pakfire_parser* parser; - PakfireFilelist filelist; + struct pakfire_filelist* filelist; // Checksums STAILQ_HEAD(chksums, pakfire_archive_chksum) chksums; @@ -1089,7 +1089,7 @@ static int pakfire_archive_load_filelist(struct pakfire_archive* archive) { return pakfire_archive_load_filelist_legacy(archive); } -PAKFIRE_EXPORT PakfireFilelist pakfire_archive_get_filelist(struct pakfire_archive* archive) { +PAKFIRE_EXPORT struct pakfire_filelist* pakfire_archive_get_filelist(struct pakfire_archive* archive) { if (!archive->filelist) { int r = pakfire_archive_load_filelist(archive); if (r) @@ -1573,7 +1573,7 @@ PAKFIRE_EXPORT struct pakfire_package* pakfire_archive_make_package(struct pakfi } // Import filelist - PakfireFilelist filelist = pakfire_archive_get_filelist(archive); + struct pakfire_filelist* filelist = pakfire_archive_get_filelist(archive); if (filelist) { pakfire_package_set_filelist(pkg, filelist); pakfire_filelist_unref(filelist); diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c index e853a676b..7e99f4dc2 100644 --- a/src/libpakfire/build.c +++ b/src/libpakfire/build.c @@ -243,7 +243,7 @@ static int find_dependency(char** haystack, const char* needle) { } static int pakfire_build_find_dependencies(Pakfire pakfire, - struct pakfire_package* pkg, PakfireFilelist filelist, const char* buildroot) { + struct pakfire_package* pkg, struct pakfire_filelist* filelist, const char* buildroot) { char** provides = NULL; char** requires = NULL; char path[PATH_MAX]; @@ -352,7 +352,7 @@ static int append_to_array(const char*** array, const char* s) { static int pakfire_build_package_add_files(Pakfire pakfire, struct pakfire_parser* makefile, const char* buildroot, const char* namespace, struct pakfire_package* pkg, struct pakfire_packager* packager) { - PakfireFilelist filelist = NULL; + struct pakfire_filelist* filelist = NULL; char path[PATH_MAX]; int r = 1; diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c index d6a267d1b..344e93e78 100644 --- a/src/libpakfire/db.c +++ b/src/libpakfire/db.c @@ -755,7 +755,7 @@ static int pakfire_db_add_files(struct pakfire_db* db, unsigned long id, struct int r = 1; // Get the filelist from the archive - PakfireFilelist filelist = pakfire_archive_get_filelist(archive); + struct pakfire_filelist* filelist = pakfire_archive_get_filelist(archive); if (!filelist) { ERROR(db->pakfire, "Could not fetch filelist from archive\n"); return 1; @@ -1634,7 +1634,7 @@ ERROR: return r; } -static int pakfire_db_load_file(struct pakfire_db* db, PakfireFilelist filelist, +static int pakfire_db_load_file(struct pakfire_db* db, struct pakfire_filelist* filelist, sqlite3_stmt* stmt) { struct pakfire_file* file = NULL; char abspath[PATH_MAX]; @@ -1697,9 +1697,9 @@ ERROR: return r; } -int pakfire_db_package_filelist(struct pakfire_db* db, PakfireFilelist* filelist, +int pakfire_db_package_filelist(struct pakfire_db* db, struct pakfire_filelist** filelist, struct pakfire_package* pkg) { - PakfireFilelist fl = NULL; + struct pakfire_filelist* fl = NULL; sqlite3_stmt* stmt = NULL; int r = 1; diff --git a/src/libpakfire/filelist.c b/src/libpakfire/filelist.c index e9d1a6b50..ffec79906 100644 --- a/src/libpakfire/filelist.c +++ b/src/libpakfire/filelist.c @@ -33,7 +33,7 @@ #include #include -struct _PakfireFilelist { +struct pakfire_filelist { Pakfire pakfire; int nrefs; @@ -43,7 +43,7 @@ struct _PakfireFilelist { size_t size; }; -static int pakfire_filelist_grow(PakfireFilelist list, size_t size) { +static int pakfire_filelist_grow(struct pakfire_filelist* list, size_t size) { struct pakfire_file** elements = reallocarray(list->elements, list->elements_size + size, sizeof(*list->elements)); if (!elements) @@ -55,8 +55,8 @@ static int pakfire_filelist_grow(PakfireFilelist list, size_t size) { return 0; } -PAKFIRE_EXPORT int pakfire_filelist_create(PakfireFilelist* list, Pakfire pakfire) { - PakfireFilelist l = calloc(1, sizeof(*l)); +PAKFIRE_EXPORT int pakfire_filelist_create(struct pakfire_filelist** list, Pakfire pakfire) { + struct pakfire_filelist* l = calloc(1, sizeof(*l)); if (!l) return -ENOMEM; @@ -67,19 +67,19 @@ PAKFIRE_EXPORT int pakfire_filelist_create(PakfireFilelist* list, Pakfire pakfir return 0; } -static void pakfire_filelist_free(PakfireFilelist list) { +static void pakfire_filelist_free(struct pakfire_filelist* list) { pakfire_filelist_clear(list); pakfire_unref(list->pakfire); free(list); } -PAKFIRE_EXPORT PakfireFilelist pakfire_filelist_ref(PakfireFilelist list) { +PAKFIRE_EXPORT struct pakfire_filelist* pakfire_filelist_ref(struct pakfire_filelist* list) { list->nrefs++; return list; } -PAKFIRE_EXPORT PakfireFilelist pakfire_filelist_unref(PakfireFilelist list) { +PAKFIRE_EXPORT struct pakfire_filelist* pakfire_filelist_unref(struct pakfire_filelist* list) { if (--list->nrefs > 0) return list; @@ -87,15 +87,15 @@ PAKFIRE_EXPORT PakfireFilelist pakfire_filelist_unref(PakfireFilelist list) { return NULL; } -PAKFIRE_EXPORT size_t pakfire_filelist_size(PakfireFilelist list) { +PAKFIRE_EXPORT size_t pakfire_filelist_size(struct pakfire_filelist* list) { return list->size; } -PAKFIRE_EXPORT int pakfire_filelist_is_empty(PakfireFilelist list) { +PAKFIRE_EXPORT int pakfire_filelist_is_empty(struct pakfire_filelist* list) { return list->size == 0; } -PAKFIRE_EXPORT void pakfire_filelist_clear(PakfireFilelist list) { +PAKFIRE_EXPORT void pakfire_filelist_clear(struct pakfire_filelist* list) { if (!list->elements) return; @@ -109,14 +109,14 @@ PAKFIRE_EXPORT void pakfire_filelist_clear(PakfireFilelist list) { list->size = 0; } -PAKFIRE_EXPORT struct pakfire_file* pakfire_filelist_get(PakfireFilelist list, size_t index) { +PAKFIRE_EXPORT struct pakfire_file* pakfire_filelist_get(struct pakfire_filelist* list, size_t index) { if (index >= list->size) return NULL; return pakfire_file_ref(list->elements[index]); } -PAKFIRE_EXPORT int pakfire_filelist_append(PakfireFilelist list, struct pakfire_file* file) { +PAKFIRE_EXPORT int pakfire_filelist_append(struct pakfire_filelist* list, struct pakfire_file* file) { if (!file) return EINVAL; @@ -139,7 +139,7 @@ static int __sort(const void* ptr1, const void* ptr2) { return pakfire_file_cmp(file1, file2); } -PAKFIRE_EXPORT void pakfire_filelist_sort(PakfireFilelist list) { +PAKFIRE_EXPORT void pakfire_filelist_sort(struct pakfire_filelist* list) { // Nothing to do on empty list if (pakfire_filelist_is_empty(list)) return; @@ -264,7 +264,7 @@ static int pakfire_filelist_parse_line(struct pakfire_file** file, Pakfire pakfi return 0; } -int pakfire_filelist_create_from_file(PakfireFilelist* list, Pakfire pakfire, +int pakfire_filelist_create_from_file(struct pakfire_filelist** list, Pakfire pakfire, char* data, unsigned int format) { int r = pakfire_filelist_create(list, pakfire); if (r) @@ -366,7 +366,7 @@ static int pakfire_filelist_is_excluded(const char* path, const char** excludes) return 0; } -int pakfire_filelist_scan(PakfireFilelist list, const char* root, +int pakfire_filelist_scan(struct pakfire_filelist* list, const char* root, const char** includes, const char** excludes) { DEBUG(list->pakfire, "Scanning %s...\n", root); @@ -480,7 +480,7 @@ ERROR: return r; } -int pakfire_filelist_contains(PakfireFilelist list, const char* pattern) { +int pakfire_filelist_contains(struct pakfire_filelist* list, const char* pattern) { if (!pattern) { errno = EINVAL; return -1; @@ -501,7 +501,7 @@ int pakfire_filelist_contains(PakfireFilelist list, const char* pattern) { return 0; } -int pakfire_filelist_export(PakfireFilelist list, FILE* f) { +int pakfire_filelist_export(struct pakfire_filelist* list, FILE* f) { for (unsigned int i = 0; i < list->size; i++) { struct pakfire_file* file = list->elements[i]; diff --git a/src/libpakfire/include/pakfire/archive.h b/src/libpakfire/include/pakfire/archive.h index 448fd2611..1cf2e2abc 100644 --- a/src/libpakfire/include/pakfire/archive.h +++ b/src/libpakfire/include/pakfire/archive.h @@ -25,6 +25,7 @@ struct pakfire_archive; +#include #include #include #include @@ -56,7 +57,7 @@ const char* pakfire_archive_get_path(struct pakfire_archive* archive); unsigned int pakfire_archive_get_format(struct pakfire_archive* archive); -PakfireFilelist pakfire_archive_get_filelist(struct pakfire_archive* archive); +struct pakfire_filelist* pakfire_archive_get_filelist(struct pakfire_archive* archive); pakfire_archive_verify_status_t pakfire_archive_verify(struct pakfire_archive* archive); const char* pakfire_archive_verify_strerror(pakfire_archive_verify_status_t status); diff --git a/src/libpakfire/include/pakfire/db.h b/src/libpakfire/include/pakfire/db.h index 3e2376ce5..898d044d0 100644 --- a/src/libpakfire/include/pakfire/db.h +++ b/src/libpakfire/include/pakfire/db.h @@ -56,7 +56,7 @@ int pakfire_db_load(struct pakfire_db* db, struct pakfire_repo* repo); struct pakfire_scriptlet* pakfire_db_get_scriptlet( struct pakfire_db* db, struct pakfire_package* pkg, const char* type); -int pakfire_db_package_filelist(struct pakfire_db* db, PakfireFilelist* filelist, +int pakfire_db_package_filelist(struct pakfire_db* db, struct pakfire_filelist** filelist, struct pakfire_package* pkg); #endif diff --git a/src/libpakfire/include/pakfire/filelist.h b/src/libpakfire/include/pakfire/filelist.h index a32ff93fa..22817eb48 100644 --- a/src/libpakfire/include/pakfire/filelist.h +++ b/src/libpakfire/include/pakfire/filelist.h @@ -21,35 +21,37 @@ #ifndef PAKFIRE_FILELIST_H #define PAKFIRE_FILELIST_H +struct pakfire_filelist; + #include #include -int pakfire_filelist_create(PakfireFilelist* list, Pakfire pakfire); +int pakfire_filelist_create(struct pakfire_filelist** list, Pakfire pakfire); -PakfireFilelist pakfire_filelist_ref(PakfireFilelist list); -PakfireFilelist pakfire_filelist_unref(PakfireFilelist list); +struct pakfire_filelist* pakfire_filelist_ref(struct pakfire_filelist* list); +struct pakfire_filelist* pakfire_filelist_unref(struct pakfire_filelist* list); -size_t pakfire_filelist_size(PakfireFilelist list); -int pakfire_filelist_is_empty(PakfireFilelist list); -void pakfire_filelist_clear(PakfireFilelist list); +size_t pakfire_filelist_size(struct pakfire_filelist* list); +int pakfire_filelist_is_empty(struct pakfire_filelist* list); +void pakfire_filelist_clear(struct pakfire_filelist* list); -struct pakfire_file* pakfire_filelist_get(PakfireFilelist list, size_t index); -int pakfire_filelist_append(PakfireFilelist list, struct pakfire_file* file); +struct pakfire_file* pakfire_filelist_get(struct pakfire_filelist* list, size_t index); +int pakfire_filelist_append(struct pakfire_filelist* list, struct pakfire_file* file); -void pakfire_filelist_sort(PakfireFilelist list); +void pakfire_filelist_sort(struct pakfire_filelist* list); #ifdef PAKFIRE_PRIVATE #include -int pakfire_filelist_create_from_file(PakfireFilelist* list, Pakfire pakfire, +int pakfire_filelist_create_from_file(struct pakfire_filelist** list, Pakfire pakfire, char* data, unsigned int format); -int pakfire_filelist_scan(PakfireFilelist list, const char* root, +int pakfire_filelist_scan(struct pakfire_filelist* list, const char* root, const char** includes, const char** excludes); -int pakfire_filelist_contains(PakfireFilelist list, const char* pattern); -int pakfire_filelist_export(PakfireFilelist list, FILE* f); +int pakfire_filelist_contains(struct pakfire_filelist* list, const char* pattern); +int pakfire_filelist_export(struct pakfire_filelist* list, FILE* f); #endif diff --git a/src/libpakfire/include/pakfire/package.h b/src/libpakfire/include/pakfire/package.h index b6ef1ef65..e88553b51 100644 --- a/src/libpakfire/include/pakfire/package.h +++ b/src/libpakfire/include/pakfire/package.h @@ -105,8 +105,8 @@ char* pakfire_package_dump(struct pakfire_package* pkg, int flags); struct pakfire_archive* pakfire_package_get_archive(struct pakfire_package* pkg); -PakfireFilelist pakfire_package_get_filelist(struct pakfire_package* pkg); -int pakfire_package_set_filelist(struct pakfire_package* pkg, PakfireFilelist filelist); +struct pakfire_filelist* pakfire_package_get_filelist(struct pakfire_package* pkg); +int pakfire_package_set_filelist(struct pakfire_package* pkg, struct pakfire_filelist* filelist); int pakfire_package_set_filelist_from_string(struct pakfire_package* pkg, const char* files); enum pakfire_package_dump_flags { diff --git a/src/libpakfire/include/pakfire/types.h b/src/libpakfire/include/pakfire/types.h index 5fa5c1ee4..b73cd8569 100644 --- a/src/libpakfire/include/pakfire/types.h +++ b/src/libpakfire/include/pakfire/types.h @@ -22,6 +22,5 @@ #define PAKFIRE_TYPES_H typedef struct _Pakfire* Pakfire; -typedef struct _PakfireFilelist* PakfireFilelist; #endif /* PAKFIRE_TYPES_H */ diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c index e7b5db810..9d3719e09 100644 --- a/src/libpakfire/package.c +++ b/src/libpakfire/package.c @@ -956,7 +956,7 @@ PAKFIRE_EXPORT char* pakfire_package_dump(struct pakfire_package* pkg, int flags } if (flags & PAKFIRE_PKG_DUMP_FILELIST) { - PakfireFilelist filelist = pakfire_package_get_filelist(pkg); + struct pakfire_filelist* filelist = pakfire_package_get_filelist(pkg); const char* prefix = _("Filelist"); @@ -995,7 +995,7 @@ PAKFIRE_EXPORT struct pakfire_archive* pakfire_package_get_archive(struct pakfir return NULL; } -static int pakfire_package_fetch_legacy_filelist(struct pakfire_package* pkg, PakfireFilelist filelist) { +static int pakfire_package_fetch_legacy_filelist(struct pakfire_package* pkg, struct pakfire_filelist* filelist) { pakfire_package_internalize_repo(pkg); struct pakfire_repo* repo = pakfire_package_get_repo(pkg); @@ -1036,7 +1036,7 @@ static int pakfire_package_fetch_legacy_filelist(struct pakfire_package* pkg, Pa return 0; } -static int pakfire_package_fetch_filelist(struct pakfire_package* pkg, PakfireFilelist filelist) { +static int pakfire_package_fetch_filelist(struct pakfire_package* pkg, struct pakfire_filelist* filelist) { int r; pakfire_package_internalize_repo(pkg); @@ -1076,8 +1076,8 @@ static int pakfire_package_fetch_filelist(struct pakfire_package* pkg, PakfireFi return 0; } -PAKFIRE_EXPORT PakfireFilelist pakfire_package_get_filelist(struct pakfire_package* pkg) { - PakfireFilelist filelist; +PAKFIRE_EXPORT struct pakfire_filelist* pakfire_package_get_filelist(struct pakfire_package* pkg) { + struct pakfire_filelist* filelist; int r = pakfire_filelist_create(&filelist, pkg->pakfire); if (r) @@ -1116,7 +1116,7 @@ static int pakfire_package_append_file(struct pakfire_package* pkg, const char* return 0; } -PAKFIRE_EXPORT int pakfire_package_set_filelist(struct pakfire_package* pkg, PakfireFilelist filelist) { +PAKFIRE_EXPORT int pakfire_package_set_filelist(struct pakfire_package* pkg, struct pakfire_filelist* filelist) { int r; for (unsigned int i = 0; i < pakfire_filelist_size(filelist); i++) { diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c index 5e065e750..36beae2e9 100644 --- a/src/libpakfire/repo.c +++ b/src/libpakfire/repo.c @@ -856,7 +856,7 @@ PAKFIRE_EXPORT int pakfire_repo_scan(struct pakfire_repo* repo, int flags) { return 1; } - PakfireFilelist filelist; + struct pakfire_filelist* filelist; int r = pakfire_filelist_create(&filelist, repo->pakfire); if (r) return r; diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c index 25bb59552..36e1c6155 100644 --- a/src/libpakfire/transaction.c +++ b/src/libpakfire/transaction.c @@ -624,7 +624,7 @@ static int pakfire_transaction_extract(struct pakfire_transaction* transaction, } // Is it necessary to call ldconfig? - PakfireFilelist filelist = pakfire_archive_get_filelist(archive); + struct pakfire_filelist* filelist = pakfire_archive_get_filelist(archive); if (filelist) { int need_ldconfig = pakfire_filelist_contains(filelist, "*/lib*.so.?"); @@ -640,7 +640,7 @@ static int pakfire_transaction_extract(struct pakfire_transaction* transaction, static int pakfire_transaction_erase(struct pakfire_transaction* transaction, struct pakfire_db* db, struct pakfire_package* pkg) { - PakfireFilelist filelist = NULL; + struct pakfire_filelist* filelist = NULL; int r; // Fetch filelist diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c index 41c53166d..8c3e76ff9 100644 --- a/tests/libpakfire/archive.c +++ b/tests/libpakfire/archive.c @@ -56,7 +56,7 @@ static int test_filelist(const struct test* t) { ASSERT_SUCCESS(pakfire_archive_open(&archive, t->pakfire, path)); // Fetch the filelist - PakfireFilelist list = pakfire_archive_get_filelist(archive); + struct pakfire_filelist* list = pakfire_archive_get_filelist(archive); ASSERT(list); // This packages has 7 files