filelist: Add flags argument to walk function

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

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index 4234be712ac2457cfc6ad23ea12b44d28bc62a67..d2eb5db18c4e3663402f64b87c7720a505095a13 100644 (file)
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -599,7 +599,8 @@ static int pakfire_build_package_mark_config_files(struct pakfire_build* build,
        if (!configfiles)
                return 0;
 
-       r = pakfire_filelist_walk(filelist, __pakfire_build_package_mark_config_files, configfiles);
+       r = pakfire_filelist_walk(filelist, __pakfire_build_package_mark_config_files,
+               configfiles, 0);
 
        // Cleanup
        if (configfiles) {
@@ -1040,7 +1041,7 @@ static int pakfire_build_post_process_files(struct pakfire_build* build,
                goto ERROR;
 
        // Find all files that need to be removed
-       r = pakfire_filelist_walk(filelist, callback, removees);
+       r = pakfire_filelist_walk(filelist, callback, removees, 0);
        if (r)
                goto ERROR;
 
@@ -1802,7 +1803,7 @@ static int pakfire_build_check_unpackaged_files(struct pakfire_build* build) {
        if (!pakfire_filelist_is_empty(filelist)) {
                ERROR(build->pakfire, "Unpackaged files found:\n");
 
-               r = pakfire_filelist_walk(filelist, __pakfire_build_unpackaged_file, NULL);
+               r = pakfire_filelist_walk(filelist, __pakfire_build_unpackaged_file, NULL, 0);
                if (r)
                        goto ERROR;
 

diff --git a/src/libpakfire/compress.c b/src/libpakfire/compress.c
index 110041e1351a799ea44e95c493f8fdb392342f0c..10120587c058057c5e43648bf49a8fa4d969013f 100644 (file)
--- a/src/libpakfire/compress.c
+++ b/src/libpakfire/compress.c
@@ -1077,7 +1077,7 @@ int pakfire_compress(struct pakfire* pakfire, struct archive* archive,
        archive_entry_linkresolver_set_strategy(data.linkresolver, archive_format(archive));
 
        // Walk through the entire filelist
-       r = pakfire_filelist_walk(filelist, __pakfire_compress, &data);
+       r = pakfire_filelist_walk(filelist, __pakfire_compress, &data, 0);
        if (r)
                goto ERROR;
 

diff --git a/src/libpakfire/filelist.c b/src/libpakfire/filelist.c
index 0c3ddad630b5ab34f20266cdd312ebc839f76510..68224819c72f4aa938e6997fb4de89846ece3b65 100644 (file)
--- a/src/libpakfire/filelist.c
+++ b/src/libpakfire/filelist.c
@@ -203,7 +203,7 @@ static int __pakfire_filelist_remove_one(
 
 int pakfire_filelist_remove_all(
                struct pakfire_filelist* list, struct pakfire_filelist* removees) {
-       return pakfire_filelist_walk(removees, __pakfire_filelist_remove_one, list);
+       return pakfire_filelist_walk(removees, __pakfire_filelist_remove_one, list, 0);
 }
 
 // Returns true if s contains globbing characters
@@ -407,7 +407,7 @@ int pakfire_filelist_contains(struct pakfire_filelist* list, const char* pattern
 }
 
 int pakfire_filelist_walk(struct pakfire_filelist* list,
-               pakfire_filelist_walk_callback callback, void* data) {
+               pakfire_filelist_walk_callback callback, void* data, int flags) {
        struct pakfire_filelist_element* element = NULL;
        int r = 0;
 
@@ -436,7 +436,7 @@ static int __pakfire_filelist_dump(
 }
 
 int pakfire_filelist_dump(struct pakfire_filelist* list, int flags) {
-       return pakfire_filelist_walk(list, __pakfire_filelist_dump, &flags);
+       return pakfire_filelist_walk(list, __pakfire_filelist_dump, &flags, 0);
 }
 
 /*
@@ -544,5 +544,5 @@ static int __pakfire_filelist_matches_class(struct pakfire* pakfire,
        Returns true if any file on the list matches class
 */
 int pakfire_filelist_matches_class(struct pakfire_filelist* list, int class) {
-       return pakfire_filelist_walk(list, __pakfire_filelist_matches_class, &class);
+       return pakfire_filelist_walk(list, __pakfire_filelist_matches_class, &class, 0);
 }

diff --git a/src/libpakfire/include/pakfire/filelist.h b/src/libpakfire/include/pakfire/filelist.h
index 0a129fb23ea60509bfe5e930f4ed7298359684f1..3aed020bd972fb336ae54c0b2776390ba896124e 100644 (file)
--- a/src/libpakfire/include/pakfire/filelist.h
+++ b/src/libpakfire/include/pakfire/filelist.h
@@ -56,7 +56,7 @@ typedef int (*pakfire_filelist_walk_callback)
        (struct pakfire* pakfire, struct pakfire_file* file, void* data);
 
 int pakfire_filelist_walk(struct pakfire_filelist* list,
-       pakfire_filelist_walk_callback callback, void* data);
+       pakfire_filelist_walk_callback callback, void* data, int flags);
 int pakfire_filelist_dump(struct pakfire_filelist* list, int flags);
 
 int pakfire_filelist_verify(struct pakfire_filelist* list, struct pakfire_filelist* errors);

diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index da6bbd84acbc5a98122df812d8aa762f0e9a02fa..72dcaabfb101383939a3dddb3d35395ca5dd710d 100644 (file)
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -1570,7 +1570,7 @@ static int __pakfire_package_set_filelist(struct pakfire* pakfire,
 
 PAKFIRE_EXPORT int pakfire_package_set_filelist(
                struct pakfire_package* pkg, struct pakfire_filelist* filelist) {
-       return pakfire_filelist_walk(filelist, __pakfire_package_set_filelist, pkg);
+       return pakfire_filelist_walk(filelist, __pakfire_package_set_filelist, pkg, 0);
 }
 
 int pakfire_package_set_filelist_from_string(struct pakfire_package* pkg, const char* files) {
@@ -1750,7 +1750,7 @@ static int pakfire_package_add_json_filelist(
        }
 
        // Walk through the filelist
-       r = pakfire_filelist_walk(filelist, __pakfire_package_add_json_filelist, object);
+       r = pakfire_filelist_walk(filelist, __pakfire_package_add_json_filelist, object, 0);
        if (r)
                goto ERROR;
 

diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index a93c4236822475b5033afacde84bae76b4d6327b..b379895ac0b414aa4d58d46bb13c709450fc7512 100644 (file)
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -620,7 +620,7 @@ static int __pakfire_packager_add_files(struct pakfire* pakfire,
 int pakfire_packager_add_files(
                struct pakfire_packager* packager, struct pakfire_filelist* filelist) {
        // Add all files on the filelist
-       return pakfire_filelist_walk(filelist, __pakfire_packager_add_files, packager);
+       return pakfire_filelist_walk(filelist, __pakfire_packager_add_files, packager, 0);
 }
 
 int pakfire_packager_add_scriptlet(struct pakfire_packager* packager,