diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-24 20:49:00 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-07-17 14:27:23 +0200 |
| commit | 043fdc40105f976fc4884dbe95345d1cf05f5c64 (patch) | |
| tree | a2a092807c012f4bd2daa514964e291993edce55 | |
| parent | b5328434c91b10ad49647e2352e62b1fbdce329d (diff) | |
| download | systemd-043fdc40105f976fc4884dbe95345d1cf05f5c64.tar.gz | |
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.
| -rw-r--r-- | src/core/load-dropin.h | 11 | ||||
| -rw-r--r-- | src/shared/dropin.h | 14 | ||||
| -rw-r--r-- | src/systemctl/systemctl.c | 4 |
3 files changed, 9 insertions, 20 deletions
diff --git a/src/core/load-dropin.h b/src/core/load-dropin.h index bb10a76338..ea15554d88 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 ae7379beee..88e1674c52 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 3ce3e07bd7..019655e4a1 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; } |