diff options
Diffstat (limited to 'src/shared/conf-files.c')
| -rw-r--r-- | src/shared/conf-files.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c index dc4f970313..2de4fe0a37 100644 --- a/src/shared/conf-files.c +++ b/src/shared/conf-files.c @@ -39,10 +39,12 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char *suffix) { _cleanup_closedir_ DIR *dir = NULL; - _cleanup_free_ char *dirpath = NULL; + char *dirpath; - if (asprintf(&dirpath, "%s%s", root ? root : "", path) < 0) - return -ENOMEM; + assert(path); + assert(suffix); + + dirpath = strappenda(root ? root : "", path); dir = opendir(dirpath); if (!dir) { @@ -96,7 +98,7 @@ static int base_cmp(const void *a, const void *b) { } static int conf_files_list_strv_internal(char ***strv, const char *suffix, const char *root, char **dirs) { - Hashmap *fh; + _cleanup_hashmap_free_ Hashmap *fh = NULL; char **files, **p; int r; @@ -104,7 +106,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const assert(suffix); /* This alters the dirs string array */ - if (!path_strv_canonicalize_uniq(dirs)) + if (!path_strv_resolve_uniq(dirs, root)) return -ENOMEM; fh = hashmap_new(string_hash_func, string_compare_func); @@ -114,7 +116,6 @@ 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) { - hashmap_free_free(fh); return r; } else if (r < 0) log_debug("Failed to search for files in %s: %s", @@ -123,14 +124,12 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const files = hashmap_get_strv(fh); if (files == NULL) { - hashmap_free_free(fh); return -ENOMEM; } qsort_safe(files, hashmap_size(fh), sizeof(char *), base_cmp); *strv = files; - hashmap_free(fh); return 0; } |