X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fconf-files.c;h=db4937db8898f341cfeff1094cd1d0c5925b581f;hb=d5d8429a12c4b1ef0dcd226c0904f00f4fa4898a;hp=e6ee97a978472662236732c99f48583ae03e817b;hpb=d5099efc47d4e6ac60816b5381a5f607ab03f06e;p=elogind.git

diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
index e6ee97a97..db4937db8 100644
--- a/src/shared/conf-files.c
+++ b/src/shared/conf-files.c
@@ -44,7 +44,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) {
@@ -118,8 +118,8 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
                 if (r == -ENOMEM) {
                         return r;
                 } else if (r < 0)
-                        log_debug("Failed to search for files in %s: %s",
-                                  *p, strerror(-r));
+                        log_debug_errno(r, "Failed to search for files in %s: %m",
+                                        *p);
         }
 
         files = hashmap_get_strv(fh);