From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 29 Dec 2024 17:42:02 +0000 (+0000)
Subject: filelist: Drop the sort function again
X-Git-Tag: 0.9.30~664
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11c940967df6b77ca6c659b8d5273facc4ef4eff;p=pakfire.git

filelist: Drop the sort function again

The filelist was intended to be sorted all the time.

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

diff --git a/src/libpakfire/filelist.c b/src/libpakfire/filelist.c
index fc9e586cb..9f26059e8 100644
--- a/src/libpakfire/filelist.c
+++ b/src/libpakfire/filelist.c
@@ -230,18 +230,6 @@ int pakfire_filelist_remove_all(
 	return pakfire_filelist_walk(removees, __pakfire_filelist_remove_one, list, 0);
 }
 
-static int __pakfire_filelist_sort(const void* p1, const void* p2, void* data) {
-	struct pakfire_file* file1 = *((struct pakfire_file**)p1);
-	struct pakfire_file* file2 = *((struct pakfire_file**)p2);
-
-	return pakfire_file_cmp(file1, file2);
-}
-
-PAKFIRE_EXPORT void pakfire_filelist_sort(struct pakfire_filelist* list) {
-	qsort_r(list->files, list->num_files, sizeof(*list->files),
-		__pakfire_filelist_sort, NULL);
-}
-
 static int pakfire_filelist_match_patterns(const char* path,
 		const char** patterns, const int flags) {
 	char buffer[PATH_MAX];
diff --git a/src/libpakfire/include/pakfire/filelist.h b/src/libpakfire/include/pakfire/filelist.h
index a64179d65..4f1d93301 100644
--- a/src/libpakfire/include/pakfire/filelist.h
+++ b/src/libpakfire/include/pakfire/filelist.h
@@ -39,8 +39,6 @@ struct pakfire_file* pakfire_filelist_get(struct pakfire_filelist* list, size_t
 
 int pakfire_filelist_add(struct pakfire_filelist* list, struct pakfire_file* file);
 
-void pakfire_filelist_sort(struct pakfire_filelist* list);
-
 #ifdef PAKFIRE_PRIVATE
 
 #include <stdio.h>
diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index df81fb4b9..df584b1f7 100644
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -157,7 +157,6 @@ global:
 	pakfire_filelist_is_empty;
 	pakfire_filelist_length;
 	pakfire_filelist_ref;
-	pakfire_filelist_sort;
 	pakfire_filelist_unref;
 
 	# key
diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index fe126d783..e910000af 100644
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -409,9 +409,6 @@ int pakfire_packager_finish(struct pakfire_packager* packager, FILE* f) {
 			goto ERROR;
 	}
 
-	// Sort the filelist
-	pakfire_filelist_sort(packager->filelist);
-
 	// Add filelist
 	r = pakfire_package_set_filelist(packager->pkg, packager->filelist);
 	if (r)