From a3f3c077bbf26f717b2d93d2024c440ac20f7f20 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 17 Mar 2023 14:33:30 +0000 Subject: [PATCH] filelist: Add flags argument to walk function Signed-off-by: Michael Tremer --- src/libpakfire/build.c | 7 ++++--- src/libpakfire/compress.c | 2 +- src/libpakfire/filelist.c | 8 ++++---- src/libpakfire/include/pakfire/filelist.h | 2 +- src/libpakfire/package.c | 4 ++-- src/libpakfire/packager.c | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c index 4234be712..d2eb5db18 100644 --- 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 110041e13..10120587c 100644 --- 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 0c3ddad63..68224819c 100644 --- 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 0a129fb23..3aed020bd 100644 --- 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 da6bbd84a..72dcaabfb 100644 --- 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 a93c42368..b379895ac 100644 --- 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, -- 2.39.5