From: Mike Yuan <me@yhndnzj.com>
Date: Fri, 12 May 2023 18:38:41 +0000 (+0800)
Subject: conf-parser: move config_get_dropin_files to conf-files
X-Git-Tag: v254-rc1~429^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35c0e3444d7587e4e48d2590df78da682f7db0de;p=thirdparty%2Fsystemd.git

conf-parser: move config_get_dropin_files to conf-files
---

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index c31fe79ebda..a56f82f8a3e 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -350,3 +350,25 @@ int conf_files_list_with_replacement(
 
         return 0;
 }
+
+int conf_files_list_dropins(
+                char ***ret,
+                const char *dropin_dirname,
+                const char *root,
+                const char * const *dirs) {
+
+        _cleanup_strv_free_ char **dropin_dirs = NULL;
+        const char *suffix;
+        int r;
+
+        assert(ret);
+        assert(dropin_dirname);
+        assert(dirs);
+
+        suffix = strjoina("/", dropin_dirname);
+        r = strv_extend_strv_concat(&dropin_dirs, (char**) dirs, suffix);
+        if (r < 0)
+                return r;
+
+        return conf_files_list_strv(ret, ".conf", root, 0, (const char* const*) dropin_dirs);
+}
diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h
index 547c2fc137f..566cc8fda46 100644
--- a/src/basic/conf-files.h
+++ b/src/basic/conf-files.h
@@ -24,3 +24,8 @@ int conf_files_list_with_replacement(
                 const char *replacement,
                 char ***files,
                 char **replace_file);
+int conf_files_list_dropins(
+                char ***ret,
+                const char *dropin_dirname,
+                const char *root,
+                const char * const *dirs);
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 21ba7f69149..10bef002b01 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -581,28 +581,6 @@ int config_parse_config_file(
                                        sections, lookup, table, flags, userdata, NULL);
 }
 
-static int config_get_dropin_files(
-                const char* const* conf_file_dirs,
-                const char *dropin_dirname,
-                const char *root,
-                char ***ret) {
-
-        _cleanup_strv_free_ char **dropin_dirs = NULL;
-        const char *suffix;
-        int r;
-
-        assert(conf_file_dirs);
-        assert(dropin_dirname);
-        assert(ret);
-
-        suffix = strjoina("/", dropin_dirname);
-        r = strv_extend_strv_concat(&dropin_dirs, (char**) conf_file_dirs, suffix);
-        if (r < 0)
-                return r;
-
-        return conf_files_list_strv(ret, ".conf", root, 0, (const char* const*) dropin_dirs);
-}
-
 /* Parse each config file in the directories specified as strv. */
 int config_parse_many(
                 const char* const* conf_files,
@@ -625,7 +603,7 @@ int config_parse_many(
         assert(sections);
         assert(table);
 
-        r = config_get_dropin_files(conf_file_dirs, dropin_dirname, root, &files);
+        r = conf_files_list_dropins(&files, dropin_dirname, root, conf_file_dirs);
         if (r < 0)
                 return r;
 
@@ -661,7 +639,7 @@ static int dropins_get_stats_by_path(
         if (!strextend(&dropin_dirname, ".d"))
                 return -ENOMEM;
 
-        r = config_get_dropin_files(conf_file_dirs, dropin_dirname, /* root = */ NULL, &files);
+        r = conf_files_list_dropins(&files, dropin_dirname, /* root = */ NULL, conf_file_dirs);
         if (r < 0)
                 return r;