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/sysv-generator/sysv-generator.c | |
| parent | bpf-firewall: optimization for IPAddressXYZ="any" (and unprivileged users) (diff) | |
| parent | sd-path: use _cleanup_ attribute (diff) | |
| download | systemd-cee97d57687e93e07a8ee36edf0e0d0f3317fccc.tar.xz systemd-cee97d57687e93e07a8ee36edf0e0d0f3317fccc.zip | |
Merge pull request #12836 from yuwata/tree-wide-replace-strjoin
tree-wide: replace strjoin() with path_join()
Diffstat (limited to 'src/sysv-generator/sysv-generator.c')
| -rw-r--r-- | src/sysv-generator/sysv-generator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 514b6e0169..13a9a77e81 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -784,7 +784,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { continue; } - fpath = strjoin(*path, "/", de->d_name); + fpath = path_join(*path, de->d_name); if (!fpath) return log_oom(); @@ -829,7 +829,7 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic _cleanup_free_ char *path = NULL; struct dirent *de; - path = strjoin(*p, "/", rcnd_table[i].path); + path = path_join(*p, rcnd_table[i].path); if (!path) { r = log_oom(); goto finish; @@ -859,7 +859,7 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic if (a < 0 || b < 0) continue; - fpath = strjoin(*p, "/", de->d_name); + fpath = path_join(*p, de->d_name); if (!fpath) { r = log_oom(); goto finish; |