summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/load-dropin.c36
1 files changed, 13 insertions, 23 deletions
diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index 35040090ac..546e560b85 100644
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -100,8 +100,8 @@ static int process_dir(
UnitDependency dependency,
char ***strv) {
+ _cleanup_free_ char *path = NULL;
int r;
- char *path;
assert(u);
assert(unit_path);
@@ -112,39 +112,29 @@ static int process_dir(
if (!path)
return log_oom();
- if (u->manager->unit_path_cache &&
- !set_get(u->manager->unit_path_cache, path))
- r = 0;
- else
+ if (!u->manager->unit_path_cache || set_get(u->manager->unit_path_cache, path)) {
r = iterate_dir(u, path, dependency, strv);
- free(path);
-
- if (r < 0)
- return r;
+ if (r < 0)
+ return r;
+ }
if (u->instance) {
- char *template;
+ _cleanup_free_ char *template = NULL, *p = NULL;
/* Also try the template dir */
template = unit_name_template(name);
if (!template)
return log_oom();
- path = strjoin(unit_path, "/", template, suffix, NULL);
- free(template);
-
- if (!path)
+ p = strjoin(unit_path, "/", template, suffix, NULL);
+ if (!p)
return log_oom();
- if (u->manager->unit_path_cache &&
- !set_get(u->manager->unit_path_cache, path))
- r = 0;
- else
- r = iterate_dir(u, path, dependency, strv);
- free(path);
-
- if (r < 0)
- return r;
+ if (!u->manager->unit_path_cache || set_get(u->manager->unit_path_cache, p)) {
+ r = iterate_dir(u, p, dependency, strv);
+ if (r < 0)
+ return r;
+ }
}
return 0;