summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2017-02-09 20:08:44 +0100
committerLennart Poettering <lennart@poettering.net>2017-02-09 20:08:44 +0100
commit96bb2fd8bdd0533399ab3798ea0b23548f81b667 (patch)
treea7e1d4675dfc38b67f44388f8f3b87c942f4d5e0
parent09c624878abc325fc2768f3385988d6ceeaa2d87 (diff)
dropin: let's prefer strjoina() over strjoin()
-rw-r--r--src/shared/dropin.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index 3ed98f5e0b..0f29c5c457 100644
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -148,16 +148,14 @@ static int unit_file_find_dirs(
const char *suffix,
char ***dirs) {
- _cleanup_free_ char *path = NULL;
+ char *path;
int r;
assert(unit_path);
assert(name);
assert(suffix);
- path = strjoin(unit_path, "/", name, suffix);
- if (!path)
- return log_oom();
+ path = strjoina(unit_path, "/", name, suffix);
if (!unit_path_cache || set_get(unit_path_cache, path)) {
r = unit_file_find_dir(original_root, path, dirs);