From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 24 Mar 2019 19:49:00 +0000 (+0100)
Subject: pid1: kill unit_file_find_dropin_paths() helper
X-Git-Tag: v243-rc1~77^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=043fdc40105f976fc4884dbe95345d1cf05f5c64;p=thirdparty%2Fsystemd.git

pid1: kill unit_file_find_dropin_paths() helper

It had two users, but it is just a very thin wrapper around
unit_file_find_dropin_paths(), so using it seems more complicated than directly
invoking unit_file_find_dropin_paths() twice.
---

diff --git a/src/core/load-dropin.h b/src/core/load-dropin.h
index bb10a76338b..ea15554d88b 100644
--- a/src/core/load-dropin.h
+++ b/src/core/load-dropin.h
@@ -9,11 +9,12 @@
 static inline int unit_find_dropin_paths(Unit *u, char ***paths) {
         assert(u);
 
-        return unit_file_find_dropin_conf_paths(NULL,
-                                                u->manager->lookup_paths.search_path,
-                                                u->manager->unit_path_cache,
-                                                u->names,
-                                                paths);
+        return unit_file_find_dropin_paths(NULL,
+                                           u->manager->lookup_paths.search_path,
+                                           u->manager->unit_path_cache,
+                                           ".d", ".conf",
+                                           u->names,
+                                           paths);
 }
 
 int unit_load_dropin(Unit *u);
diff --git a/src/shared/dropin.h b/src/shared/dropin.h
index ae7379beeec..88e1674c52d 100644
--- a/src/shared/dropin.h
+++ b/src/shared/dropin.h
@@ -23,17 +23,3 @@ int unit_file_find_dropin_paths(
                 const char *file_suffix,
                 Set *names,
                 char ***paths);
-
-static inline int unit_file_find_dropin_conf_paths(
-                const char *original_root,
-                char **lookup_path,
-                Set *unit_path_cache,
-                Set *names,
-                char ***paths) {
-
-        return unit_file_find_dropin_paths(original_root,
-                                           lookup_path,
-                                           unit_path_cache,
-                                           ".d", ".conf",
-                                           names, paths);
-}
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 3ce3e07bd7d..019655e4a1e 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2616,7 +2616,9 @@ static int unit_find_paths(
                         return log_error_errno(r, "Failed to add unit name: %m");
 
                 if (ret_dropin_paths) {
-                        r = unit_file_find_dropin_conf_paths(arg_root, lp->search_path, NULL, names, &dropins);
+                        r = unit_file_find_dropin_paths(arg_root, lp->search_path, NULL,
+                                                        ".d", ".conf",
+                                                        names, &dropins);
                         if (r < 0)
                                 return r;
                 }