diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-06-22 20:02:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-22 20:02:46 +0200 |
| commit | cee97d57687e93e07a8ee36edf0e0d0f3317fccc (patch) | |
| tree | 7278ba990e750ae119cacfd6c19a0866579374ab /src/delta | |
| parent | 4c1567f29aeb60a6741874bca8a8e3a0bd69ed01 (diff) | |
| parent | a13de89d361e830f603f25011896e94d5256299d (diff) | |
| download | systemd-cee97d57687e93e07a8ee36edf0e0d0f3317fccc.tar.gz systemd-cee97d57687e93e07a8ee36edf0e0d0f3317fccc.tar.bz2 systemd-cee97d57687e93e07a8ee36edf0e0d0f3317fccc.zip | |
Merge pull request #12836 from yuwata/tree-wide-replace-strjoin
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 08d8867431..b910074964 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; @@ -432,7 +432,7 @@ static int process_suffix(const char *suffix, const char *onlyprefix) { if (should_skip_path(p, suffix) > 0) continue; - t = strjoin(p, "/", suffix); + t = path_join(p, suffix); if (!t) { r = -ENOMEM; goto finish; |