From 96bb2fd8bdd0533399ab3798ea0b23548f81b667 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 9 Feb 2017 20:08:44 +0100 Subject: dropin: let's prefer strjoina() over strjoin() --- src/shared/dropin.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/shared/dropin.c') 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); -- cgit v1.2.1