From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 7 Apr 2023 20:02:56 +0000 (+0900)
Subject: conf-files: split out logic of copy and sort filenames from hashmap
X-Git-Tag: v254-rc1~779^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a39bddfbb0c233ade94a1d51755c42db3ece552;p=thirdparty%2Fsystemd.git

conf-files: split out logic of copy and sort filenames from hashmap

No functional change, preparation for the next commit.
---

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 2fb7ffa9267..9e7428a3c8e 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -125,6 +125,27 @@ static int base_cmp(char * const *a, char * const *b) {
         return path_compare_filename(*a, *b);
 }
 
+static int copy_and_sort_files_from_hashmap(Hashmap *fh, char ***ret) {
+        _cleanup_free_ char **sv = NULL;
+        char **files;
+
+        assert(ret);
+
+        sv = hashmap_get_strv(fh);
+        if (!sv)
+                return -ENOMEM;
+
+        /* The entries in the array given by hashmap_get_strv() are still owned by the hashmap. */
+        files = strv_copy(sv);
+        if (!files)
+                return -ENOMEM;
+
+        typesafe_qsort(files, strv_length(files), base_cmp);
+
+        *ret = files;
+        return 0;
+}
+
 int conf_files_list_strv(
                 char ***ret,
                 const char *suffix,
@@ -134,8 +155,6 @@ int conf_files_list_strv(
 
         _cleanup_hashmap_free_ Hashmap *fh = NULL;
         _cleanup_set_free_ Set *masked = NULL;
-        _cleanup_strv_free_ char **files = NULL;
-        _cleanup_free_ char **sv = NULL;
         int r;
 
         assert(ret);
@@ -158,19 +177,7 @@ int conf_files_list_strv(
                         log_debug_errno(r, "Failed to search for files in '%s', ignoring: %m", path);
         }
 
-        sv = hashmap_get_strv(fh);
-        if (!sv)
-                return -ENOMEM;
-
-        /* The entries in the array given by hashmap_get_strv() are still owned by the hashmap. */
-        files = strv_copy(sv);
-        if (!files)
-                return -ENOMEM;
-
-        typesafe_qsort(files, strv_length(files), base_cmp);
-        *ret = TAKE_PTR(files);
-
-        return 0;
+        return copy_and_sort_files_from_hashmap(fh, ret);
 }
 
 int conf_files_insert(char ***strv, const char *root, char **dirs, const char *path) {