diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-30 10:40:38 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-30 10:40:38 +0100 |
commit | 30016f21b36599a0c5c563f165db48ddb32d6521 (patch) | |
tree | 094a167b640b03c791f9764ca9c6a7d329aa8772 /src/basic/conf-files.c | |
parent | b2ac2b01c8ddaabbe63bcb7168dd752f44320d86 (diff) | |
download | systemd-30016f21b36599a0c5c563f165db48ddb32d6521.tar.gz |
tree-wide: replace path_join with path_join_many
Diffstat (limited to 'src/basic/conf-files.c')
-rw-r--r-- | src/basic/conf-files.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c index 7b44ae277d..4211600611 100644 --- a/src/basic/conf-files.c +++ b/src/basic/conf-files.c @@ -216,7 +216,7 @@ int conf_files_insert(char ***strv, const char *root, char **dirs, const char *p p2 = path_startswith(path, *dir); if (p2) { /* Our new entry has higher priority */ - t = path_join(root, path, NULL); + t = path_join_many(strempty(root), path); if (!t) return log_oom(); @@ -232,7 +232,7 @@ int conf_files_insert(char ***strv, const char *root, char **dirs, const char *p /* … we are not there yet, let's continue */ } - t = path_join(root, path, NULL); + t = path_join_many(strempty(root), path); if (!t) return log_oom(); @@ -318,7 +318,7 @@ int conf_files_list_with_replacement( if (r < 0) return log_error_errno(r, "Failed to extend config file list: %m"); - p = path_join(root, replacement, NULL); + p = path_join_many(strempty(root), replacement); if (!p) return log_oom(); } |