X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fconf-files.c;h=da8745b284d7462d9a3a03297b0784aff9bf09ce;hb=30ab6a0fc1bb950c4dcd90dcd3dfe00a810c7fc1;hp=e6ee97a978472662236732c99f48583ae03e817b;hpb=d5099efc47d4e6ac60816b5381a5f607ab03f06e;p=elogind.git
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
index e6ee97a97..da8745b28 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"
@@ -39,12 +36,13 @@
static int files_add(Hashmap *h, const char *root, const char *path, const char *suffix) {
_cleanup_closedir_ DIR *dir = NULL;
- char *dirpath;
+ const char *dirpath;
+ int r;
assert(path);
assert(suffix);
- dirpath = strappenda(root ? root : "", path);
+ dirpath = prefix_roota(root, path);
dir = opendir(dirpath);
if (!dir) {
@@ -56,7 +54,6 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char
for (;;) {
struct dirent *de;
char *p;
- int r;
errno = 0;
de = readdir(dir);
@@ -118,8 +115,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);