summaryrefslogtreecommitdiff
path: root/src/shared/conf-files.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-02-08 11:22:39 -0500
committerAnthony G. Basile <blueness@gentoo.org>2015-02-08 11:22:39 -0500
commit21212e522478551f3d256619a2efe2b885ad0948 (patch)
treeb132101f9c1d5656596ed083a82c3ac220bce74a /src/shared/conf-files.c
parent750c8ded9b84ded5f08c34a3d82ff862da0398d8 (diff)
util: rework strappenda(), and rename it strjoina()
After all it is now much more like strjoin() than strappend(). At the same time, add support for NULL sentinels, even if they are normally not necessary. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/shared/conf-files.c')
-rw-r--r--src/shared/conf-files.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
index c68f361136..b4c2f7154c 100644
--- a/src/shared/conf-files.c
+++ b/src/shared/conf-files.c
@@ -42,7 +42,7 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char
assert(path);
assert(suffix);
- dirpath = strappenda(root ? root : "", path);
+ dirpath = strjoina(root ? root : "", path);
dir = opendir(dirpath);
if (!dir) {