summaryrefslogtreecommitdiff
path: root/src/basic/conf-files.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-01-02 21:32:45 +0100
committerLennart Poettering <lennart@poettering.net>2016-01-02 22:16:16 +0100
commit31d5192d0c661cf1dfe1f86bc00e2dc5a1e1092b (patch)
treeb92d5769d24c392327ede3527cc4904ba94b2b6d /src/basic/conf-files.c
parent8ad182a1245c31bdfe6c0cf66ee93d43d1c5ae63 (diff)
downloadsystemd-31d5192d0c661cf1dfe1f86bc00e2dc5a1e1092b.tar.gz
basic: modernize conf-files.c a bit
Diffstat (limited to 'src/basic/conf-files.c')
-rw-r--r--src/basic/conf-files.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 75dad228e3..5854caeb51 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -41,6 +41,7 @@
static int files_add(Hashmap *h, const char *root, const char *path, const char *suffix) {
_cleanup_closedir_ DIR *dir = NULL;
const char *dirpath;
+ struct dirent *de;
int r;
assert(path);
@@ -55,18 +56,9 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char
return -errno;
}
- for (;;) {
- struct dirent *de;
+ FOREACH_DIRENT(de, dir, return -errno) {
char *p;
- errno = 0;
- de = readdir(dir);
- if (!de && errno != 0)
- return -errno;
-
- if (!de)
- break;
-
if (!dirent_is_file_with_suffix(de, suffix))
continue;
@@ -116,17 +108,15 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
STRV_FOREACH(p, dirs) {
r = files_add(fh, root, *p, suffix);
- if (r == -ENOMEM) {
+ if (r == -ENOMEM)
return r;
- } else if (r < 0)
- log_debug_errno(r, "Failed to search for files in %s: %m",
- *p);
+ if (r < 0)
+ log_debug_errno(r, "Failed to search for files in %s, ignoring: %m", *p);
}
files = hashmap_get_strv(fh);
- if (files == NULL) {
+ if (!files)
return -ENOMEM;
- }
qsort_safe(files, hashmap_size(fh), sizeof(char *), base_cmp);
*strv = files;