dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-07 16:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Lennart Poettering
2016-04-07 17:51:26 +02:00
parent c61b443d32
commit a69b4fb0f8
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/shared/path-lookup.c
View File

@@ -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.");
}
}

4
src/shared/path-lookup.h
View File

@@ -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);