summaryrefslogtreecommitdiff
path: root/src/delta
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-06-21 03:07:01 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-06-21 03:26:16 +0900
commit657ee2d82b73818d0ee8c3c5962c1cb2dbd52b76 (patch)
tree3624791030beb2dfd75b654f24cf818a1c6444e2 /src/delta
parentf9dc94408d70dd2f44915f4c6d67dc498c1c6243 (diff)
downloadsystemd-657ee2d82b73818d0ee8c3c5962c1cb2dbd52b76.tar.gz
tree-wide: replace strjoin() with path_join()
Diffstat (limited to 'src/delta')
-rw-r--r--src/delta/delta.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/delta/delta.c b/src/delta/delta.c
index 63baa74794..8d121b969a 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -200,7 +200,7 @@ static int enumerate_dir_d(
assert(!endswith(drop, "/"));
- path = strjoin(toppath, "/", drop);
+ path = path_join(toppath, drop);
if (!path)
return -ENOMEM;
@@ -230,7 +230,7 @@ static int enumerate_dir_d(
if (!endswith(*file, ".conf"))
continue;
- p = strjoin(path, "/", *file);
+ p = path_join(path, *file);
if (!p)
return -ENOMEM;
d = p + strlen(toppath) + 1;
@@ -347,7 +347,7 @@ static int enumerate_dir(
STRV_FOREACH(t, files) {
_cleanup_free_ char *p = NULL;
- p = strjoin(path, "/", *t);
+ p = path_join(path, *t);
if (!p)
return -ENOMEM;
@@ -426,7 +426,7 @@ static int process_suffix(const char *suffix, const char *onlyprefix) {
if (should_skip_path(p, suffix))
continue;
- t = strjoin(p, "/", suffix);
+ t = path_join(p, suffix);
if (!t) {
r = -ENOMEM;
goto finish;