diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-20 20:07:01 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-20 20:26:16 +0200 |
| commit | 657ee2d82b73818d0ee8c3c5962c1cb2dbd52b76 (patch) | |
| tree | 3624791030beb2dfd75b654f24cf818a1c6444e2 /src/delta | |
| parent | sd-resolve: suppress false positive MSan warnings (diff) | |
| download | systemd-657ee2d82b73818d0ee8c3c5962c1cb2dbd52b76.tar.xz systemd-657ee2d82b73818d0ee8c3c5962c1cb2dbd52b76.zip | |
tree-wide: replace strjoin() with path_join()
Diffstat (limited to 'src/delta')
| -rw-r--r-- | src/delta/delta.c | 8 |
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; |