From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Apr 2016 15:51:26 +0000 (+0200)
Subject: path-lookup: move generator_binary_paths() to end of file
X-Git-Tag: v230~185^2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a69b4fb0f80689b96f492a557368ed880365edee;p=thirdparty%2Fsystemd.git

path-lookup: move generator_binary_paths() to end of file

Let's keep the code that manipulates LookupPaths together, and move
generator_binary_paths() to the end of the .h and .c files, since it is not
strictly related to that.
---

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 68b432216e2..1c8e22eee71 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -223,30 +223,6 @@ static char** user_dirs(
         return tmp;
 }
 
-char **generator_binary_paths(UnitFileScope scope) {
-
-        switch (scope) {
-
-        case UNIT_FILE_SYSTEM:
-                return strv_new("/run/systemd/system-generators",
-                                "/etc/systemd/system-generators",
-                                "/usr/local/lib/systemd/system-generators",
-                                SYSTEM_GENERATOR_PATH,
-                                NULL);
-
-        case UNIT_FILE_GLOBAL:
-        case UNIT_FILE_USER:
-                return strv_new("/run/systemd/user-generators",
-                                "/etc/systemd/user-generators",
-                                "/usr/local/lib/systemd/user-generators",
-                                USER_GENERATOR_PATH,
-                                NULL);
-
-        default:
-                assert_not_reached("Hmm, unexpected scope.");
-        }
-}
-
 static int acquire_generator_dirs(
                 UnitFileScope scope,
                 char **generator,
@@ -815,3 +791,27 @@ void lookup_paths_flush_generator(LookupPaths *p) {
         if (p->generator_late)
                 (void) rm_rf(p->generator_late, REMOVE_ROOT);
 }
+
+char **generator_binary_paths(UnitFileScope scope) {
+
+        switch (scope) {
+
+        case UNIT_FILE_SYSTEM:
+                return strv_new("/run/systemd/system-generators",
+                                "/etc/systemd/system-generators",
+                                "/usr/local/lib/systemd/system-generators",
+                                SYSTEM_GENERATOR_PATH,
+                                NULL);
+
+        case UNIT_FILE_GLOBAL:
+        case UNIT_FILE_USER:
+                return strv_new("/run/systemd/user-generators",
+                                "/etc/systemd/user-generators",
+                                "/usr/local/lib/systemd/user-generators",
+                                USER_GENERATOR_PATH,
+                                NULL);
+
+        default:
+                assert_not_reached("Hmm, unexpected scope.");
+        }
+}
diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h
index 89254cbac5d..ad05c0c5377 100644
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -58,8 +58,6 @@ struct LookupPaths {
         char *root_dir;
 };
 
-char **generator_binary_paths(UnitFileScope scope);
-
 int lookup_paths_init(LookupPaths *p, UnitFileScope scope, const char *root_dir);
 
 int lookup_paths_reduce(LookupPaths *p);
@@ -70,3 +68,5 @@ void lookup_paths_flush_generator(LookupPaths *p);
 
 void lookup_paths_free(LookupPaths *p);
 #define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free)
+
+char **generator_binary_paths(UnitFileScope scope);