SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pid1: kill unit_file_find_dropin_paths() helper

Browse Source 
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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2019-07-17 14:27:23 +02:00
parent b5328434c9
commit 043fdc4010
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/load-dropin.h
+6 -5
View File
@@ -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);
src/shared/dropin.h
-14
View File
@@ -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);
}
src/systemctl/systemctl.c
+3 -1
View File
@@ -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;
}