shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

install: rename generator_paths() → generator_binary_paths()

Browse Source 
This is too confusing, as this funciton returns the paths to the generator
binaries, while usually when we refer to the just the "generator path" we mean
the generated unit files. Let's clean this up.
This commit is contained in:
Lennart Poettering 2016-04-06 20:48:58 +02:00
parent 07a7864324
commit 9183df707b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/manager.c
View File

@ -2715,7 +2715,7 @@ static int manager_run_generators(Manager *m) {
if (m->test_run)
return 0;
paths = generator_paths(m->unit_file_scope);
paths = generator_binary_paths(m->unit_file_scope);
if (!paths)
return log_oom();

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

@ -221,7 +221,7 @@ static char** user_dirs(
return tmp;
}
char **generator_paths(UnitFileScope scope) {
char **generator_binary_paths(UnitFileScope scope) {
switch (scope) {

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

@ -45,7 +45,7 @@ struct LookupPaths {
char *root_dir;
};
char **generator_paths(UnitFileScope scope);
char **generator_binary_paths(UnitFileScope scope);
int lookup_paths_init(LookupPaths *p, UnitFileScope scope, const char *root_dir);

8
src/test/test-path-lookup.c
View File

@ -51,13 +51,13 @@ static void test_paths(UnitFileScope scope) {
assert_se(rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL) >= 0);
}
static void print_generator_paths(UnitFileScope scope) {
static void print_generator_binary_paths(UnitFileScope scope) {
_cleanup_strv_free_ char **paths;
char **dir;
log_info("Generators dirs (%s):", scope == UNIT_FILE_SYSTEM ? "system" : "user");
paths = generator_paths(scope);
paths = generator_binary_paths(scope);
STRV_FOREACH(dir, paths)
log_info(" %s", *dir);
}
@ -71,8 +71,8 @@ int main(int argc, char **argv) {
test_paths(UNIT_FILE_USER);
test_paths(UNIT_FILE_GLOBAL);
print_generator_paths(UNIT_FILE_SYSTEM);
print_generator_paths(UNIT_FILE_USER);
print_generator_binary_paths(UNIT_FILE_SYSTEM);
print_generator_binary_paths(UNIT_FILE_USER);
return EXIT_SUCCESS;
}