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/shared/install.c | |
| parent | 4c1567f29aeb60a6741874bca8a8e3a0bd69ed01 (diff) | |
| parent | a13de89d361e830f603f25011896e94d5256299d (diff) | |
| download | systemd-cee97d57687e93e07a8ee36edf0e0d0f3317fccc.tar.gz | |
Merge pull request #12836 from yuwata/tree-wide-replace-strjoin
tree-wide: replace strjoin() with path_join()
Diffstat (limited to 'src/shared/install.c')
| -rw-r--r-- | src/shared/install.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/install.c b/src/shared/install.c index b13b1f6d9e..105412bc8f 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1424,7 +1424,7 @@ static int unit_file_search( STRV_FOREACH(p, paths->search_path) { _cleanup_free_ char *path = NULL; - path = strjoin(*p, "/", info->name); + path = path_join(*p, info->name); if (!path) return -ENOMEM; @@ -1447,7 +1447,7 @@ static int unit_file_search( STRV_FOREACH(p, paths->search_path) { _cleanup_free_ char *path = NULL; - path = strjoin(*p, "/", template); + path = path_join(*p, template); if (!path) return -ENOMEM; @@ -1840,7 +1840,7 @@ static int install_info_symlink_link( if (r > 0) return 0; - path = strjoin(config_path, "/", i->name); + path = path_join(config_path, i->name); if (!path) return -ENOMEM; @@ -2379,7 +2379,7 @@ int unit_file_revert( STRV_FOREACH(j, fs) { _cleanup_free_ char *t = NULL; - t = strjoin(*i, "/", *j); + t = path_join(*i, *j); if (!t) return -ENOMEM; |