diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-02-23 12:30:14 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-04-13 11:34:48 +0200 |
| commit | b119facd27e3ab95cc5f1f33d14e29058fc4d51e (patch) | |
| tree | 899b9f7de44df8cd9deb657d03018e7eac2642f3 | |
| parent | dropin: don't fully suppress logging about ENAMETOOLONG. Just downgrade to LO... (diff) | |
| download | systemd-b119facd27e3ab95cc5f1f33d14e29058fc4d51e.tar.xz systemd-b119facd27e3ab95cc5f1f33d14e29058fc4d51e.zip | |
core: minor coding style changes
| -rw-r--r-- | src/core/load-dropin.c | 2 | ||||
| -rw-r--r-- | src/core/load-dropin.h | 2 | ||||
| -rw-r--r-- | src/shared/dropin.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c index 854c2fd853..0a56f0df86 100644 --- a/src/core/load-dropin.c +++ b/src/core/load-dropin.c @@ -51,8 +51,8 @@ static int process_deps(Unit *u, UnitDependency dependency, const char *dir_suff return r; STRV_FOREACH(p, paths) { - const char *entry; _cleanup_free_ char *target = NULL; + const char *entry; entry = basename(*p); diff --git a/src/core/load-dropin.h b/src/core/load-dropin.h index c97de616f1..583460e3dd 100644 --- a/src/core/load-dropin.h +++ b/src/core/load-dropin.h @@ -13,6 +13,8 @@ /* Read service data supplementary drop-in directories */ 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, diff --git a/src/shared/dropin.h b/src/shared/dropin.h index a14fcc023f..fa6f5402f9 100644 --- a/src/shared/dropin.h +++ b/src/shared/dropin.h @@ -36,6 +36,7 @@ static inline int unit_file_find_dropin_conf_paths( Set *unit_path_cache, Set *names, char ***paths) { + return unit_file_find_dropin_paths(original_root, lookup_path, unit_path_cache, |