filelist: Create its own type

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/pakfire/archive.c b/src/pakfire/archive.c
index baf7c4e485317619ba45111267dfdd670cbf755f..6966d3ea61e3784eef5a686bf0d70b681fb4fcfd 100644 (file)
--- a/src/pakfire/archive.c
+++ b/src/pakfire/archive.c
@@ -80,7 +80,7 @@ struct pakfire_archive {
        unsigned int format;
        struct json_object* metadata;
 
-       struct pakfire_filelist* filelist;
+       pakfire_filelist* filelist;
 
        // Scriptlets
        struct pakfire_scriptlet* scriptlets[MAX_SCRIPTLETS];
@@ -1441,7 +1441,7 @@ unsigned int pakfire_archive_get_format(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;
+       pakfire_filelist* filelist = data;
        struct pakfire_file* file = NULL;
        int r;
 
@@ -1463,7 +1463,7 @@ ERROR:
 }
 
 static int pakfire_archive_load_filelist(pakfire_archive* self) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        int r;
 
        // Create a new filelist
@@ -1491,7 +1491,7 @@ ERROR:
        return r;
 }
 
-int pakfire_archive_get_filelist(pakfire_archive* self, struct pakfire_filelist** filelist) {
+int pakfire_archive_get_filelist(pakfire_archive* self, pakfire_filelist** filelist) {
        int r;
 
        // Load the filelist if we don't have one, yet

diff --git a/src/pakfire/archive.h b/src/pakfire/archive.h
index ec8c0d335d256e5a2b3e31ab089861d486cbf40f..f75a7ccd3e2d5e0e787d1c3a27d65690e75753ab 100644 (file)
--- a/src/pakfire/archive.h
+++ b/src/pakfire/archive.h
@@ -53,7 +53,7 @@ const char* pakfire_archive_get_filename(pakfire_archive* self);
 
 unsigned int pakfire_archive_get_format(pakfire_archive* archive);
 
-int pakfire_archive_get_filelist(pakfire_archive* self, struct pakfire_filelist** filelist);
+int pakfire_archive_get_filelist(pakfire_archive* self, pakfire_filelist** filelist);
 
 int pakfire_archive_verify(pakfire_archive* archive, int* status);
 

diff --git a/src/pakfire/archive_writer.c b/src/pakfire/archive_writer.c
index 5fffc6111df3b8fecd2397be9512acc099604f34..4cf4353d30310bc7d50c803f81badc38a0fc2078 100644 (file)
--- a/src/pakfire/archive_writer.c
+++ b/src/pakfire/archive_writer.c
@@ -519,7 +519,7 @@ ERROR:
 }
 
 int pakfire_archive_writer_write_files(
-               pakfire_archive_writer* self, struct pakfire_filelist* files) {
+               pakfire_archive_writer* self, pakfire_filelist* files) {
        int r;
 
        // Fetch the total amount of data we are going to write
@@ -552,7 +552,7 @@ ERROR:
 
 int pakfire_archive_writer_write_everything(
                pakfire_archive_writer* self, const char* root) {
-       struct pakfire_filelist* files = NULL;
+       pakfire_filelist* files = NULL;
        int r;
 
        // Create a new filelist

diff --git a/src/pakfire/archive_writer.h b/src/pakfire/archive_writer.h
index 7c13a769999a675e289b104783c12bea1f990486..362689686fd9e923f910ef27670979f2ed2e5b29 100644 (file)
--- a/src/pakfire/archive_writer.h
+++ b/src/pakfire/archive_writer.h
@@ -50,7 +50,7 @@ int pakfire_archive_writer_set_title(pakfire_archive_writer* self,
        const char* format, ...) __attribute__((format(printf, 2, 3)));
 
 int pakfire_archive_writer_write_files(
-       pakfire_archive_writer* self, struct pakfire_filelist* files);
+       pakfire_archive_writer* self, pakfire_filelist* files);
 
 int pakfire_archive_writer_write_everything(
        pakfire_archive_writer* self, const char* root);

diff --git a/src/pakfire/build.c b/src/pakfire/build.c
index e2825396f6a1cfb68cc5894a3bca2d31e3d86050..1fe6efc11ac416a743bcb724f84c9b9e4e715cdf 100644 (file)
--- a/src/pakfire/build.c
+++ b/src/pakfire/build.c
@@ -312,7 +312,7 @@ ERROR:
 struct pakfire_find_deps_ctx {
        pakfire_build* build;
        struct pakfire_package* pkg;
-       struct pakfire_filelist* filelist;
+       pakfire_filelist* filelist;
 };
 
 static int pakfire_build_process_pkgconfig_dep(struct pakfire_package* pkg,
@@ -745,7 +745,7 @@ static int pakfire_build_find_requires(
 
 static int pakfire_build_find_perl_files(
                pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
-       struct pakfire_filelist* perlfiles = data;
+       pakfire_filelist* perlfiles = data;
 
        // Add all perl files
        if (pakfire_file_matches_class(file, PAKFIRE_FILE_PERL))
@@ -797,8 +797,8 @@ 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, struct pakfire_filelist* filelist) {
-       struct pakfire_filelist* perlfiles = NULL;
+               struct pakfire_package* pkg, pakfire_filelist* filelist) {
+       pakfire_filelist* perlfiles = NULL;
        const char* args[] = {
                build->buildroot,
                NULL,
@@ -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, struct pakfire_filelist* filelist) {
+               struct pakfire_package* pkg, pakfire_filelist* filelist) {
        char* filter_provides = NULL;
        char* filter_requires = NULL;
        int r;
@@ -928,7 +928,7 @@ static int __pakfire_build_package_mark_config_files(
 }
 
 static int pakfire_build_package_mark_config_files(pakfire_build* build,
-               struct pakfire_filelist* filelist, struct pakfire_parser* makefile, const char* namespace) {
+               pakfire_filelist* filelist, struct pakfire_parser* makefile, const char* namespace) {
        char** configfiles = NULL;
        int r;
 
@@ -956,7 +956,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, struct pakfire_packager* packager) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        char** includes = NULL;
        char** excludes = NULL;
        int r;
@@ -1444,7 +1444,7 @@ typedef struct pakfire_build_post_process_state {
        pakfire_build* build;
 
        // Filelist with files to remove
-       struct pakfire_filelist* removees;
+       pakfire_filelist* removees;
 } pakfire_build_post_process_state;
 
 /*
@@ -1452,9 +1452,9 @@ typedef struct pakfire_build_post_process_state {
        to the given filelist which will optionally be all removed after.
 */
 static int pakfire_build_post_process_files(pakfire_build* build,
-               struct pakfire_filelist* filelist, const char* description,
+               pakfire_filelist* filelist, const char* description,
                pakfire_filelist_walk_callback callback, int flags) {
-       struct pakfire_filelist* removees = NULL;
+       pakfire_filelist* removees = NULL;
        int r;
 
        // Create a filelist with objects that need to be removed
@@ -1531,7 +1531,7 @@ static int __pakfire_build_remove_static_libraries(
 }
 
 static int pakfire_build_post_remove_static_libraries(
-               pakfire_build* build, struct pakfire_filelist* filelist) {
+               pakfire_build* build, pakfire_filelist* filelist) {
        return pakfire_build_post_process_files(build, filelist,
                "Removing static libaries...",
                __pakfire_build_remove_static_libraries,
@@ -1550,7 +1550,7 @@ static int __pakfire_build_remove_libtool_archives(
 }
 
 static int pakfire_build_post_remove_libtool_archives(
-               pakfire_build* build, struct pakfire_filelist* filelist) {
+               pakfire_build* build, pakfire_filelist* filelist) {
        return pakfire_build_post_process_files(build, filelist,
                "Removing libtool archives...",
                __pakfire_build_remove_libtool_archives,
@@ -1582,7 +1582,7 @@ static int __pakfire_build_check_broken_symlinks(
 }
 
 static int pakfire_build_post_check_broken_symlinks(
-               pakfire_build* build, struct pakfire_filelist* filelist) {
+               pakfire_build* build, pakfire_filelist* filelist) {
        return pakfire_build_post_process_files(build, filelist,
                "Broken symlinks have been found:",
                __pakfire_build_check_broken_symlinks,
@@ -1647,7 +1647,7 @@ static int pakfire_build_check_buildroot(
 */
 
 static int pakfire_build_run_post_build_checks(pakfire_build* build) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        int r;
 
        // Create a filelist of all files in the build
@@ -2303,7 +2303,7 @@ static int __pakfire_build_unpackaged_file(
 }
 
 static int pakfire_build_check_unpackaged_files(pakfire_build* build) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        int r;
 
        // Create a new filelist

diff --git a/src/pakfire/db.c b/src/pakfire/db.c
index 74d4984751709e56184c238103869e3135d87146..da758e872b99d32260ba86b64b46a480f2e04051 100644 (file)
--- a/src/pakfire/db.c
+++ b/src/pakfire/db.c
@@ -1012,7 +1012,7 @@ static int pakfire_db_bind_checksum(pakfire_db* db, sqlite3_stmt* stmt,
 }
 
 static int pakfire_db_add_files(pakfire_db* db, unsigned long id, pakfire_archive* archive) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        sqlite3_stmt* stmt = NULL;
        int r;
 
@@ -2215,7 +2215,7 @@ static int pakfire_db_load_file_checksum(pakfire_db* db, struct pakfire_file* fi
        return pakfire_file_set_checksum(file, type, checksum, checksum_length);
 }
 
-static int pakfire_db_load_file(pakfire_db* db, struct pakfire_filelist* filelist,
+static int pakfire_db_load_file(pakfire_db* db, pakfire_filelist* filelist,
                sqlite3_stmt* stmt) {
        struct pakfire_file* file = NULL;
        int r;
@@ -2338,8 +2338,8 @@ ERROR:
        return r;
 }
 
-int pakfire_db_filelist(pakfire_db* db, struct pakfire_filelist** filelist) {
-       struct pakfire_filelist* list = NULL;
+int pakfire_db_filelist(pakfire_db* db, pakfire_filelist** filelist) {
+       pakfire_filelist* list = NULL;
        sqlite3_stmt* stmt = NULL;
        int r;
 
@@ -2420,9 +2420,9 @@ ERROR:
        return r;
 }
 
-int pakfire_db_package_filelist(pakfire_db* db, struct pakfire_filelist** filelist,
+int pakfire_db_package_filelist(pakfire_db* db, pakfire_filelist** filelist,
                struct pakfire_package* pkg) {
-       struct pakfire_filelist* fl = NULL;
+       pakfire_filelist* fl = NULL;
        sqlite3_stmt* stmt = NULL;
        int r = 1;
 

diff --git a/src/pakfire/db.h b/src/pakfire/db.h
index 2ab6c61a59474dff1081d1a2c0248261c082dc80..d7aa5077e5bc26d35c280e1f5904c220276549c2 100644 (file)
--- a/src/pakfire/db.h
+++ b/src/pakfire/db.h
@@ -54,8 +54,8 @@ 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);
 
-int pakfire_db_filelist(pakfire_db* db, struct pakfire_filelist** filelist);
-int pakfire_db_package_filelist(pakfire_db* db, struct pakfire_filelist** filelist,
+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);
 
 #endif /* PAKFIRE_DB_H */

diff --git a/src/pakfire/dist.c b/src/pakfire/dist.c
index 7ba9729102282532a623790a8fbcebc872bb5026..c1f1ba21b31cfc2e16a5c9323da52bb05ad4e7f1 100644 (file)
--- a/src/pakfire/dist.c
+++ b/src/pakfire/dist.c
@@ -414,7 +414,7 @@ static int __pakfire_dist_find_root(char* root, const size_t length, const char*
 
 static int pakfire_dist_add_files(pakfire_ctx* ctx, struct pakfire* pakfire,
                struct pakfire_packager* packager, const char* file) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        char root[PATH_MAX];
        int r;
 

diff --git a/src/pakfire/filelist.c b/src/pakfire/filelist.c
index 6b785dff0febcfc9a13772e4364aa367f5558068..44f707d9e974ecde8fffef461e1da69d67849d06 100644 (file)
--- a/src/pakfire/filelist.c
+++ b/src/pakfire/filelist.c
@@ -44,8 +44,8 @@ struct pakfire_filelist {
        unsigned int num_files;
 };
 
-int pakfire_filelist_create(struct pakfire_filelist** list, struct pakfire* pakfire) {
-       struct pakfire_filelist* l = NULL;
+int pakfire_filelist_create(pakfire_filelist** list, struct pakfire* pakfire) {
+       pakfire_filelist* l = NULL;
 
        // Allocate a new object
        l = calloc(1, sizeof(*l));
@@ -67,7 +67,7 @@ int pakfire_filelist_create(struct pakfire_filelist** list, struct pakfire* pakf
        return 0;
 }
 
-static void pakfire_filelist_free(struct pakfire_filelist* list) {
+static void pakfire_filelist_free(pakfire_filelist* list) {
        pakfire_filelist_clear(list);
        if (list->pakfire)
                pakfire_unref(list->pakfire);
@@ -76,13 +76,13 @@ static void pakfire_filelist_free(struct pakfire_filelist* list) {
        free(list);
 }
 
-struct pakfire_filelist* pakfire_filelist_ref(struct pakfire_filelist* list) {
+pakfire_filelist* pakfire_filelist_ref(pakfire_filelist* list) {
        list->nrefs++;
 
        return list;
 }
 
-struct pakfire_filelist* pakfire_filelist_unref(struct pakfire_filelist* list) {
+pakfire_filelist* pakfire_filelist_unref(pakfire_filelist* list) {
        if (--list->nrefs > 0)
                return list;
 
@@ -90,11 +90,11 @@ struct pakfire_filelist* pakfire_filelist_unref(struct pakfire_filelist* list) {
        return NULL;
 }
 
-size_t pakfire_filelist_length(struct pakfire_filelist* list) {
+size_t pakfire_filelist_length(pakfire_filelist* list) {
        return list->num_files;
 }
 
-size_t pakfire_filelist_total_size(struct pakfire_filelist* list) {
+size_t pakfire_filelist_total_size(pakfire_filelist* list) {
        size_t size = 0;
 
        for (unsigned int i = 0; i < list->num_files; i++)
@@ -103,11 +103,11 @@ size_t pakfire_filelist_total_size(struct pakfire_filelist* list) {
        return size;
 }
 
-int pakfire_filelist_is_empty(struct pakfire_filelist* list) {
+int pakfire_filelist_is_empty(pakfire_filelist* list) {
        return list->num_files == 0;
 }
 
-void pakfire_filelist_clear(struct pakfire_filelist* list) {
+void pakfire_filelist_clear(pakfire_filelist* list) {
        if (list->files) {
                for (unsigned int i = 0; i < list->num_files; i++)
                        pakfire_file_unref(list->files[i]);
@@ -121,7 +121,7 @@ void pakfire_filelist_clear(struct pakfire_filelist* list) {
        }
 }
 
-struct pakfire_file* pakfire_filelist_get(struct pakfire_filelist* list, size_t index) {
+struct pakfire_file* pakfire_filelist_get(pakfire_filelist* list, size_t index) {
        // Check that index is in range
        if (index >= list->num_files) {
                errno = ERANGE;
@@ -134,7 +134,7 @@ struct pakfire_file* pakfire_filelist_get(struct pakfire_filelist* list, size_t
 /*
        Checks if the file is already on the list
 */
-static int pakfire_filelist_has_file(struct pakfire_filelist* list, struct pakfire_file* file) {
+static int pakfire_filelist_has_file(pakfire_filelist* list, struct pakfire_file* file) {
        for (unsigned int i = 0; i < list->num_files; i++) {
                if (list->files[i] == file)
                        return i;
@@ -144,7 +144,7 @@ static int pakfire_filelist_has_file(struct pakfire_filelist* list, struct pakfi
        return -1;
 }
 
-static int pakfire_filelist_search(struct pakfire_filelist* list, struct pakfire_file* file) {
+static int pakfire_filelist_search(pakfire_filelist* list, struct pakfire_file* file) {
        int i;
        int r;
 
@@ -171,7 +171,7 @@ static int pakfire_filelist_search(struct pakfire_filelist* list, struct pakfire
        return lo;
 }
 
-int pakfire_filelist_add(struct pakfire_filelist* list, struct pakfire_file* file) {
+int pakfire_filelist_add(pakfire_filelist* list, struct pakfire_file* file) {
        // Do not do anything if the file is already on the list
        if (pakfire_filelist_has_file(list, file) >= 0)
                return 0;
@@ -199,7 +199,7 @@ int pakfire_filelist_add(struct pakfire_filelist* list, struct pakfire_file* fil
        return 0;
 }
 
-static int pakfire_filelist_remove(struct pakfire_filelist* list, struct pakfire_file* file) {
+static int pakfire_filelist_remove(pakfire_filelist* list, struct pakfire_file* file) {
        // Check if the file is on the list
        int pos = pakfire_filelist_has_file(list, file);
 
@@ -229,14 +229,14 @@ static int pakfire_filelist_remove(struct pakfire_filelist* list, struct pakfire
 
 static int __pakfire_filelist_remove_one(
                pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
-       struct pakfire_filelist* list = data;
+       pakfire_filelist* list = data;
 
        // Remove the file from the given filelist
        return pakfire_filelist_remove(list, file);
 }
 
 int pakfire_filelist_remove_all(
-               struct pakfire_filelist* list, struct pakfire_filelist* removees) {
+               pakfire_filelist* list, pakfire_filelist* removees) {
        return pakfire_filelist_walk(removees, __pakfire_filelist_remove_one, list, 0, NULL);
 }
 
@@ -274,16 +274,16 @@ static int pakfire_filelist_match_patterns(const char* path,
        return 0;
 }
 
-struct pakfire_filelist_matches {
+typedef struct pakfire_filelist_matches {
        const char* root;
        const char** includes;
        const char** excludes;
        const int flags;
-};
+} pakfire_filelist_matches;
 
 static int pakfire_filelist_scan_filter(struct archive* archive, void* p,
                struct archive_entry* entry) {
-       const struct pakfire_filelist_matches* matches = p;
+       const pakfire_filelist_matches* matches = p;
 
        // Descend if possible
        if (archive_read_disk_can_descend(archive))
@@ -323,12 +323,12 @@ static int pakfire_filelist_scan_filter(struct archive* archive, void* p,
        return 1;
 }
 
-int pakfire_filelist_scan(struct pakfire_filelist* list, const char* root,
+int pakfire_filelist_scan(pakfire_filelist* list, const char* root,
                const char** includes, const char** excludes, int flags) {
        struct archive* reader = NULL;
        struct pakfire_file* file = NULL;
        struct archive_entry* entry = NULL;
-       struct pakfire_filelist_matches matches = {
+       pakfire_filelist_matches matches = {
                .root     = root,
                .includes = includes,
                .excludes = excludes,
@@ -432,7 +432,7 @@ ERROR:
 }
 
 static int pakfire_filelist_contains_path(
-               struct pakfire_filelist* list, const char* path) {
+               pakfire_filelist* list, const char* path) {
        const char* p = NULL;
        int i;
        int r;
@@ -471,7 +471,7 @@ static int pakfire_filelist_contains_path(
 }
 
 static int pakfire_filelist_contains_pattern(
-               struct pakfire_filelist* list, const char* pattern) {
+               pakfire_filelist* list, const char* pattern) {
        for (unsigned int i = 0; i < list->num_files; i++) {
                const char* path = pakfire_file_get_path(list->files[i]);
                if (!path)
@@ -484,7 +484,7 @@ static int pakfire_filelist_contains_pattern(
        return 0;
 }
 
-int pakfire_filelist_contains(struct pakfire_filelist* list, const char* pattern) {
+int pakfire_filelist_contains(pakfire_filelist* list, const char* pattern) {
        if (!pattern)
                return -EINVAL;
 
@@ -496,7 +496,7 @@ int pakfire_filelist_contains(struct pakfire_filelist* list, const char* pattern
        return pakfire_filelist_contains_path(list, pattern);
 }
 
-int pakfire_filelist_walk(struct pakfire_filelist* list,
+int pakfire_filelist_walk(pakfire_filelist* list,
                pakfire_filelist_walk_callback callback, void* data, int flags, const char* title) {
        struct pakfire_progress* progress = NULL;
        int r = 0;
@@ -565,14 +565,14 @@ static int __pakfire_filelist_dump(
        return 0;
 }
 
-int pakfire_filelist_dump(struct pakfire_filelist* list, int flags) {
+int pakfire_filelist_dump(pakfire_filelist* list, int flags) {
        return pakfire_filelist_walk(list, __pakfire_filelist_dump, &flags, 0, NULL);
 }
 
 /*
        Verifies all files on the filelist
 */
-int pakfire_filelist_verify(struct pakfire_filelist* list, struct pakfire_filelist* errors) {
+int pakfire_filelist_verify(pakfire_filelist* list, pakfire_filelist* errors) {
        struct pakfire_progress* progress = NULL;
        int status;
        int r;
@@ -630,7 +630,7 @@ ERROR:
        return r;
 }
 
-int pakfire_filelist_cleanup(struct pakfire_filelist* list, int flags) {
+int pakfire_filelist_cleanup(pakfire_filelist* list, int flags) {
        int r;
 
        // Nothing to do if the filelist is empty
@@ -657,6 +657,6 @@ static int __pakfire_filelist_matches_class(
 /*
        Returns true if any file on the list matches class
 */
-int pakfire_filelist_matches_class(struct pakfire_filelist* list, int class) {
+int pakfire_filelist_matches_class(pakfire_filelist* list, int class) {
        return pakfire_filelist_walk(list, __pakfire_filelist_matches_class, &class, 0, NULL);
 }

diff --git a/src/pakfire/filelist.h b/src/pakfire/filelist.h
index eb87174c0a918967726a7af7ee84d57ae4cabbb6..61f6b3df0d4e2df7d7d36ba2309052760ebbc5f7 100644 (file)
--- a/src/pakfire/filelist.h
+++ b/src/pakfire/filelist.h
@@ -23,39 +23,39 @@
 
 #include <stdio.h>
 
-struct pakfire_filelist;
+typedef struct pakfire_filelist pakfire_filelist;
 
 #include <pakfire/ctx.h>
 #include <pakfire/file.h>
 #include <pakfire/pakfire.h>
 
-int pakfire_filelist_create(struct pakfire_filelist** list, struct pakfire* pakfire);
+int pakfire_filelist_create(pakfire_filelist** list, struct pakfire* pakfire);
 
-struct pakfire_filelist* pakfire_filelist_ref(struct pakfire_filelist* list);
-struct pakfire_filelist* pakfire_filelist_unref(struct pakfire_filelist* list);
+pakfire_filelist* pakfire_filelist_ref(pakfire_filelist* list);
+pakfire_filelist* pakfire_filelist_unref(pakfire_filelist* list);
 
-size_t pakfire_filelist_length(struct pakfire_filelist* list);
-int pakfire_filelist_is_empty(struct pakfire_filelist* list);
-void pakfire_filelist_clear(struct pakfire_filelist* list);
+size_t pakfire_filelist_length(pakfire_filelist* list);
+int pakfire_filelist_is_empty(pakfire_filelist* list);
+void pakfire_filelist_clear(pakfire_filelist* list);
 
-struct pakfire_file* pakfire_filelist_get(struct pakfire_filelist* list, size_t index);
+struct pakfire_file* pakfire_filelist_get(pakfire_filelist* list, size_t index);
 
-int pakfire_filelist_add(struct pakfire_filelist* list, struct pakfire_file* file);
+int pakfire_filelist_add(pakfire_filelist* list, struct pakfire_file* file);
 
-size_t pakfire_filelist_total_size(struct pakfire_filelist* list);
+size_t pakfire_filelist_total_size(pakfire_filelist* list);
 
-int pakfire_filelist_remove_all(struct pakfire_filelist* list,
-       struct pakfire_filelist* removees);
+int pakfire_filelist_remove_all(pakfire_filelist* list,
+       pakfire_filelist* removees);
 
 enum pakfire_filelist_scan_flags {
        PAKFIRE_FILELIST_EXTENDED_MATCHING = (1 << 0),
        PAKFIRE_FILELIST_NO_DIRECTORIES    = (1 << 1),
 };
 
-int pakfire_filelist_scan(struct pakfire_filelist* list, const char* root,
+int pakfire_filelist_scan(pakfire_filelist* list, const char* root,
                const char** includes, const char** excludes, int flags);
 
-int pakfire_filelist_contains(struct pakfire_filelist* list, const char* pattern);
+int pakfire_filelist_contains(pakfire_filelist* list, const char* pattern);
 
 typedef int (*pakfire_filelist_walk_callback)
        (pakfire_ctx* ctx, struct pakfire_file* file, void* data);
@@ -64,14 +64,14 @@ enum pakfire_filelist_walk_flags {
        PAKFIRE_FILELIST_SHOW_PROGRESS = (1 << 0),
 };
 
-int pakfire_filelist_walk(struct pakfire_filelist* list,
+int pakfire_filelist_walk(pakfire_filelist* list,
        pakfire_filelist_walk_callback callback, void* data, int flags, const char* title);
-int pakfire_filelist_dump(struct pakfire_filelist* list, int flags);
+int pakfire_filelist_dump(pakfire_filelist* list, int flags);
 
-int pakfire_filelist_verify(struct pakfire_filelist* list, struct pakfire_filelist* errors);
+int pakfire_filelist_verify(pakfire_filelist* list, pakfire_filelist* errors);
 
-int pakfire_filelist_cleanup(struct pakfire_filelist* list, int flags);
+int pakfire_filelist_cleanup(pakfire_filelist* list, int flags);
 
-int pakfire_filelist_matches_class(struct pakfire_filelist* list, int class);
+int pakfire_filelist_matches_class(pakfire_filelist* list, int class);
 
 #endif /* PAKFIRE_FILELIST_H */

diff --git a/src/pakfire/jail.h b/src/pakfire/jail.h
index 7cd4bd6d6ef90bc83b2c7202727c5119e869a9b5..fea9c3c42a70605462c59de63643b1d362b6aeec 100644 (file)
--- a/src/pakfire/jail.h
+++ b/src/pakfire/jail.h
@@ -108,7 +108,7 @@ ssize_t pakfire_jail_send_buffer(pakfire_ctx* ctx,
 // Stream a filelist
 
 struct pakfire_jail_filelist {
-       struct pakfire_filelist* filelist;
+       pakfire_filelist* filelist;
        size_t i;
 
        // Buffer for the path

diff --git a/src/pakfire/linter.c b/src/pakfire/linter.c
index 6516c7db7d232c67d8082b86ec84fa5800f0a032..3172a59b74c818d5305ce554d1ad20ba70a6e7e5 100644 (file)
--- a/src/pakfire/linter.c
+++ b/src/pakfire/linter.c
@@ -66,7 +66,7 @@ struct pakfire_linter {
        struct pakfire_package* pkg;
 
        // Filelist
-       struct pakfire_filelist* filelist;
+       pakfire_filelist* filelist;
 
        // Results
        TAILQ_HEAD(results, pakfire_linter_result) results;

diff --git a/src/pakfire/package.c b/src/pakfire/package.c
index 9c8d32dd31055297d30bd4fdf0629a3ce5c1fb44..f1482e0f422b28be9af426c7cc73d7d81dab690d 100644 (file)
--- a/src/pakfire/package.c
+++ b/src/pakfire/package.c
@@ -2115,7 +2115,7 @@ char* pakfire_package_dump(struct pakfire_package* pkg, int flags) {
        }
 
        if (flags & PAKFIRE_PKG_DUMP_FILELIST) {
-               struct pakfire_filelist* filelist = pakfire_package_get_filelist(pkg);
+               pakfire_filelist* filelist = pakfire_package_get_filelist(pkg);
 
                const char* prefix = _("Filelist");
 
@@ -2165,7 +2165,7 @@ int pakfire_package_get_archive(struct pakfire_package* pkg, pakfire_archive** a
 
 struct pakfire_package_filelist_search {
        struct pakfire* pakfire;
-       struct pakfire_filelist* filelist;
+       pakfire_filelist* filelist;
        int r;
 };
 
@@ -2207,7 +2207,7 @@ ERROR:
        return r;
 }
 
-static int pakfire_package_fetch_filelist(struct pakfire_package* pkg, struct pakfire_filelist* filelist) {
+static int pakfire_package_fetch_filelist(struct pakfire_package* pkg, pakfire_filelist* filelist) {
        struct pakfire_package_filelist_search search = {
                .pakfire  = pkg->pakfire,
                .filelist = filelist,
@@ -2231,8 +2231,8 @@ static int pakfire_package_fetch_filelist(struct pakfire_package* pkg, struct pa
        return search.r;
 }
 
-struct pakfire_filelist* pakfire_package_get_filelist(struct pakfire_package* pkg) {
-       struct pakfire_filelist* filelist = NULL;
+pakfire_filelist* pakfire_package_get_filelist(struct pakfire_package* pkg) {
+       pakfire_filelist* filelist = NULL;
 
        // Create a new filelist
        int r = pakfire_filelist_create(&filelist, pkg->pakfire);
@@ -2306,7 +2306,7 @@ static int __pakfire_package_set_filelist(
 }
 
 int pakfire_package_set_filelist(
-               struct pakfire_package* pkg, struct pakfire_filelist* filelist) {
+               struct pakfire_package* pkg, pakfire_filelist* filelist) {
        return pakfire_filelist_walk(filelist, __pakfire_package_set_filelist, pkg, 0, NULL);
 }
 
@@ -2467,7 +2467,7 @@ ERROR:
 
 static int pakfire_package_add_json_filelist(
                struct pakfire_package* pkg, struct json_object* md) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        struct json_object* object = NULL;
        int r;
 

diff --git a/src/pakfire/package.h b/src/pakfire/package.h
index a7dfd8f2b0d0846b0a6694cf0084afb3a717aa6f..b70a947090814772281e55f6c124aa3607b1d838 100644 (file)
--- a/src/pakfire/package.h
+++ b/src/pakfire/package.h
@@ -147,8 +147,8 @@ char* pakfire_package_dump(struct pakfire_package* pkg, int flags);
 
 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);
+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);
 
 enum pakfire_package_dump_flags {

diff --git a/src/pakfire/packager.c b/src/pakfire/packager.c
index afbedf0794325bfc6c7c84bc459efc86d6df9a4c..baa24311c634e096133c6d4ec55edfbdf565f0c8 100644 (file)
--- a/src/pakfire/packager.c
+++ b/src/pakfire/packager.c
@@ -59,7 +59,7 @@ struct pakfire_packager {
        struct archive* reader;
 
        // Payload
-       struct pakfire_filelist* filelist;
+       pakfire_filelist* filelist;
 
        // Scriptlets
        struct pakfire_scriptlet** scriptlets;
@@ -544,7 +544,7 @@ static int __pakfire_packager_add_files(
 }
 
 int pakfire_packager_add_files(
-               struct pakfire_packager* packager, struct pakfire_filelist* filelist) {
+               struct pakfire_packager* packager, pakfire_filelist* filelist) {
        // Add all files on the filelist
        return pakfire_filelist_walk(filelist, __pakfire_packager_add_files, packager, 0, NULL);
 }

diff --git a/src/pakfire/packager.h b/src/pakfire/packager.h
index 522a7b3c1f6cb55976822a2bd26495842478a23e..aad38dec7fce4f1b1b50f7862a19bcaf1ce7ee10 100644 (file)
--- a/src/pakfire/packager.h
+++ b/src/pakfire/packager.h
@@ -45,7 +45,7 @@ int pakfire_packager_finish(struct pakfire_packager* packager, FILE* f);
 int pakfire_packager_add_file(
        struct pakfire_packager* packager, struct pakfire_file* file);
 int pakfire_packager_add_files(struct pakfire_packager* packager,
-       struct pakfire_filelist* filelist);
+       pakfire_filelist* filelist);
 int pakfire_packager_add(struct pakfire_packager* packager,
        const char* sourcepath, const char* path);
 

diff --git a/src/pakfire/pakfire.c b/src/pakfire/pakfire.c
index 500d690509e407993244586f82be31657b3bcba0..eef33ed9b9fcf27faa3814d0fb81d965c7a83cef 100644 (file)
--- a/src/pakfire/pakfire.c
+++ b/src/pakfire/pakfire.c
@@ -1861,8 +1861,8 @@ static int pakfire_verify(struct pakfire* pakfire, int *changed) {
 }
 
 static int pakfire_check_files(struct pakfire* pakfire,
-               pakfire_db* db, struct pakfire_filelist* errors) {
-       struct pakfire_filelist* filelist = NULL;
+               pakfire_db* db, pakfire_filelist* errors) {
+       pakfire_filelist* filelist = NULL;
        int r;
 
        // Fetch the filelist
@@ -1880,7 +1880,7 @@ ERROR:
        return r;
 }
 
-int pakfire_check(struct pakfire* pakfire, struct pakfire_filelist* errors) {
+int pakfire_check(struct pakfire* pakfire, pakfire_filelist* errors) {
        pakfire_db* db = NULL;
        int r;
 

diff --git a/src/pakfire/pakfire.h b/src/pakfire/pakfire.h
index e9ec9e9fdfde4e1f0490fe95a7edef05021fa0c1..f27b6b4a4847cfc7c5737c765bd642a4ae0825c3 100644 (file)
--- a/src/pakfire/pakfire.h
+++ b/src/pakfire/pakfire.h
@@ -92,7 +92,7 @@ int pakfire_search(struct pakfire* pakfire, const char* what, int flags,
 
 // Check
 
-int pakfire_check(struct pakfire* pakfire, struct pakfire_filelist* errors);
+int pakfire_check(struct pakfire* pakfire, pakfire_filelist* errors);
 
 // Snapshots
 int pakfire_update_snapshot(struct pakfire* pakfire);

diff --git a/src/pakfire/stripper.c b/src/pakfire/stripper.c
index ca01b63b5717a9013a390011a965f53d93cf0fa9..c916da8c4a5923072fa03188efb304f6d23ce3a7 100644 (file)
--- a/src/pakfire/stripper.c
+++ b/src/pakfire/stripper.c
@@ -50,10 +50,10 @@ struct pakfire_stripper {
        char path[PATH_MAX];
 
        // Filelist
-       struct pakfire_filelist* filelist;
+       pakfire_filelist* filelist;
 
        // Sources
-       struct pakfire_filelist* sources;
+       pakfire_filelist* sources;
 
        // Source Directory
        int sourcesfd;
@@ -184,7 +184,7 @@ static int pakfire_stripper_find_elf(
        Scan all files in path and identify ELF files
 */
 static int pakfire_stripper_scan(struct pakfire_stripper* self) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        int r;
 
        // Create a new filelist

diff --git a/src/pakfire/transaction.c b/src/pakfire/transaction.c
index 2f949e63331f89e1d4eec93fee006c6321c00505..78632aad2497bee5f6399df6e596d3753a433433 100644 (file)
--- a/src/pakfire/transaction.c
+++ b/src/pakfire/transaction.c
@@ -1323,7 +1323,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) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        int r;
 
        // Fetch NEVRA
@@ -1362,7 +1362,7 @@ ERROR:
 
 static int pakfire_transaction_erase(struct pakfire_transaction* transaction,
                pakfire_db* db, struct pakfire_package* pkg) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        int r;
 
        // Fetch NEVRA

diff --git a/src/python/archive.c b/src/python/archive.c
index 1da49ce76a8faf4d1f05a657fbae66d92aa86527..6d7d43d95a9119d7d7bbae2436ee9888c50e06e0 100644 (file)
--- a/src/python/archive.c
+++ b/src/python/archive.c
@@ -199,7 +199,7 @@ static PyObject* Archive_get_filename(ArchiveObject* self) {
 }
 
 static PyObject* Archive_get_filelist(ArchiveObject* self) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        int r;
 
        Py_BEGIN_ALLOW_THREADS

diff --git a/src/python/package.c b/src/python/package.c
index 949b7824d6366e271c262bb9017fdccd947dd29c..b684c6d8b8148815dc0ec8f043d85c96270b4206 100644 (file)
--- a/src/python/package.c
+++ b/src/python/package.c
@@ -425,7 +425,7 @@ static PyObject* Package_get_filelist(PackageObject* self, PyObject* args) {
        if (list == NULL)
                return NULL;
 
-       struct pakfire_filelist* filelist = pakfire_package_get_filelist(self->package);
+       pakfire_filelist* filelist = pakfire_package_get_filelist(self->package);
        for (unsigned int i = 0; i < pakfire_filelist_length(filelist); i++) {
                struct pakfire_file* file = pakfire_filelist_get(filelist, i);
                const char* path = pakfire_file_get_path(file);

diff --git a/src/python/util.c b/src/python/util.c
index 7f3be84d2e05980886b0b5e6cda8264fd1a7f37a..1ff6eed5af66ec1b7b10861933e74cfd74ec60ea 100644 (file)
--- a/src/python/util.c
+++ b/src/python/util.c
@@ -94,7 +94,7 @@ ERROR:
        return NULL;
 }
 
-PyObject* PyList_FromFileList(struct pakfire_filelist* filelist) {
+PyObject* PyList_FromFileList(pakfire_filelist* filelist) {
        struct pakfire_file* file = NULL;
        PyObject* f = NULL;
        int r;

diff --git a/src/python/util.h b/src/python/util.h
index 79cc72ebfbe651f733c4d540a8cebb6f8c96531e..545080e87112e6c2306f0f79d683e71331c5bb64 100644 (file)
--- a/src/python/util.h
+++ b/src/python/util.h
@@ -29,7 +29,7 @@
 PyObject* PyUnicodeList_FromStringArray(const char** l);
 
 PyObject* PyList_FromPackageList(struct pakfire_packagelist* packagelist);
-PyObject* PyList_FromFileList(struct pakfire_filelist* filelist);
+PyObject* PyList_FromFileList(pakfire_filelist* filelist);
 
 PyObject* PyDateTime_FromTime_t(const time_t* t);
 

diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c
index a2fa6afe2caf35d2bad90e61eea2a303b060cad4..058f48eebff212a333b4733ffcbd7302f5fe74c2 100644 (file)
--- a/tests/libpakfire/archive.c
+++ b/tests/libpakfire/archive.c
@@ -164,7 +164,7 @@ FAIL:
 
 static int test_filelist(const struct test* t) {
        pakfire_archive* archive = NULL;
-       struct pakfire_filelist* list = NULL;
+       pakfire_filelist* list = NULL;
        int r = EXIT_FAILURE;
 
        // Open the archive

diff --git a/tests/libpakfire/file.c b/tests/libpakfire/file.c
index 87ea5c35e178a81ada0e8e77927daebc465a7b99..b11a155c5ce439d7e1a1f9baab744ce3c98c438b 100644 (file)
--- a/tests/libpakfire/file.c
+++ b/tests/libpakfire/file.c
@@ -61,7 +61,7 @@ FAIL:
 }
 
 static int test_create_filelist(const struct test* t) {
-       struct pakfire_filelist* list = NULL;
+       pakfire_filelist* list = NULL;
        struct pakfire_file* file1 = NULL;
        struct pakfire_file* file2 = NULL;
        struct pakfire_file* file3 = NULL;

diff --git a/tests/libpakfire/makefile.c b/tests/libpakfire/makefile.c
index 825ed49bdf3631b957045f55803c88df9e34249f..ed8b1a3b41042041c0e2662b8ea59379edd32b36 100644 (file)
--- a/tests/libpakfire/makefile.c
+++ b/tests/libpakfire/makefile.c
@@ -174,7 +174,7 @@ static int test_dist_dummy(const struct test* t) {
 
        pakfire_archive* archive = NULL;
        struct pakfire_package* package = NULL;
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
 
        // Create a directory to write packages to
        char* tmp = test_mkdtemp();

diff --git a/tests/libpakfire/package.c b/tests/libpakfire/package.c
index a800e47d02a76b2f3cd75a0e182f4199fdad6e7b..456836e5e924d1651e5ddb6defa0ff5fad748142 100644 (file)
--- a/tests/libpakfire/package.c
+++ b/tests/libpakfire/package.c
@@ -250,7 +250,7 @@ FAIL:
 }
 
 static int test_filelist(const struct test* t) {
-       struct pakfire_filelist* filelist = NULL;
+       pakfire_filelist* filelist = NULL;
        struct pakfire_file* file = NULL;
        struct pakfire_package* pkg = NULL;
        int r = EXIT_FAILURE;