X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fconf-files.c;h=9ab08355e35cff0819462d4b2494d995643ff5d5;hb=7432b24b8357d913943580b442ffe7040e610f9e;hp=51f4e0105c689c59fcf02775dbd0941b6691a077;hpb=c33b329709ebe2755181980a050d02ec7c81ed87;p=elogind.git diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c index 51f4e0105..9ab08355e 100644 --- a/src/shared/conf-files.c +++ b/src/shared/conf-files.c @@ -19,13 +19,10 @@ along with systemd; If not, see . ***/ -#include #include -#include #include #include #include -#include #include #include "macro.h" @@ -44,7 +41,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) {