filelist: Drop pattern matching from walk function

This is no longer being used.

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

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index 53c26d75154039da733febc7335f426bbd1b8ce1..112d842bfa76d8200720d24aee431af68fe02520 100644 (file)
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -1398,8 +1398,7 @@ static int pakfire_build_check_unpackaged_files(struct pakfire_build* build) {
        if (length) {
                ERROR(build->pakfire, "Unpackaged files found:\n");
 
-               r = pakfire_filelist_walk(filelist, NULL,
-                       __pakfire_build_unpackaged_file, NULL);
+               r = pakfire_filelist_walk(filelist, __pakfire_build_unpackaged_file, NULL);
                if (r)
                        goto ERROR;
 

diff --git a/src/libpakfire/compress.c b/src/libpakfire/compress.c
index d0b4dc3c07f5c6b61d430d2b0f821a56f42d03e7..347ec13ef5d2482f77276223a91c503870882089 100644 (file)
--- a/src/libpakfire/compress.c
+++ b/src/libpakfire/compress.c
@@ -982,7 +982,7 @@ int pakfire_compress(struct pakfire* pakfire, struct archive* archive,
        }
 
        // Walk through the entire filelist
-       r = pakfire_filelist_walk(filelist, NULL, __pakfire_compress, &data);
+       r = pakfire_filelist_walk(filelist, __pakfire_compress, &data);
        if (r)
                goto ERROR;
 

diff --git a/src/libpakfire/filelist.c b/src/libpakfire/filelist.c
index 4002399b3239990ae71f6bb1544a41f0dcbafe6b..d9e92b385b0274e3a427b8d0c956d32fdcdf689a 100644 (file)
--- a/src/libpakfire/filelist.c
+++ b/src/libpakfire/filelist.c
@@ -367,7 +367,7 @@ int pakfire_filelist_contains(struct pakfire_filelist* list, const char* pattern
 }
 
 int pakfire_filelist_walk(struct pakfire_filelist* list,
-               const char* pattern, pakfire_filelist_walk_callback callback, void* data) {
+               pakfire_filelist_walk_callback callback, void* data) {
        struct pakfire_file* file = NULL;
        int r = 0;
 
@@ -375,10 +375,6 @@ int pakfire_filelist_walk(struct pakfire_filelist* list,
        for (unsigned int i = 0; i < list->size; i++) {
                file = list->elements[i];
 
-               // Skip any files that don't match the pattern
-               if (pattern && !pakfire_file_matches(file, pattern))
-                       continue;
-
                // Call the callback
                r = callback(list->pakfire, file, data);
                if (r)
@@ -412,7 +408,7 @@ int pakfire_filelist_dump(struct pakfire_filelist* list, int debug) {
                return 0;
 #endif
 
-       return pakfire_filelist_walk(list, NULL, __pakfire_filelist_dump, &debug);
+       return pakfire_filelist_walk(list, __pakfire_filelist_dump, &debug);
 }
 
 /*

diff --git a/src/libpakfire/include/pakfire/filelist.h b/src/libpakfire/include/pakfire/filelist.h
index ba9d3e320278e9ca1d959907be75dec8b99edbf7..6cf9632231b70cb2cce33a11759daf281094148c 100644 (file)
--- a/src/libpakfire/include/pakfire/filelist.h
+++ b/src/libpakfire/include/pakfire/filelist.h
@@ -54,7 +54,7 @@ typedef int (*pakfire_filelist_walk_callback)
        (struct pakfire* pakfire, struct pakfire_file* file, void* data);
 
 int pakfire_filelist_walk(struct pakfire_filelist* list,
-       const char* pattern, pakfire_filelist_walk_callback callback, void* data);
+       pakfire_filelist_walk_callback callback, void* data);
 int pakfire_filelist_dump(struct pakfire_filelist* list, int debug);
 
 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 303fd1f4ac26b70bf898429ebdda7a0842791d4b..57ba24a50b110061617709ce2ce6c36fe77ee183 100644 (file)
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -1573,7 +1573,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, NULL, __pakfire_package_set_filelist, pkg);
+       return pakfire_filelist_walk(filelist, __pakfire_package_set_filelist, pkg);
 }
 
 int pakfire_package_set_filelist_from_string(struct pakfire_package* pkg, const char* files) {
@@ -1753,7 +1753,7 @@ static int pakfire_package_add_json_filelist(
        }
 
        // Walk through the filelist
-       r = pakfire_filelist_walk(filelist, NULL, __pakfire_package_add_json_filelist, object);
+       r = pakfire_filelist_walk(filelist, __pakfire_package_add_json_filelist, object);
        if (r)
                goto ERROR;
 

diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index 7e660a1641373b8e5f89068a53e5759f8e9d3a77..bc3a2795bdfa9c1d6a09754db8c8d9b0514499d0 100644 (file)
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -670,7 +670,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, NULL, __pakfire_packager_add_files, packager);
+       return pakfire_filelist_walk(filelist, __pakfire_packager_add_files, packager);
 }
 
 int pakfire_packager_add_scriptlet(struct pakfire_packager* packager,