chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: add file system locks for controlling access to container images
[elogind.git]
/
src
/
shared
/
conf-files.c
diff --git
a/src/shared/conf-files.c
b/src/shared/conf-files.c
index c72a099b5a1bb5b6805e2f11f651bab3ab1786e5..51f4e0105c689c59fcf02775dbd0941b6691a077 100644
(file)
--- a/
src/shared/conf-files.c
+++ b/
src/shared/conf-files.c
@@
-109,7
+109,7
@@
static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
if (!path_strv_resolve_uniq(dirs, root))
return -ENOMEM;
if (!path_strv_resolve_uniq(dirs, root))
return -ENOMEM;
- fh = hashmap_new(
string_hash_func, string_compare_func
);
+ fh = hashmap_new(
&string_hash_ops
);
if (!fh)
return -ENOMEM;
if (!fh)
return -ENOMEM;
@@
-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)
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);
}
files = hashmap_get_strv(fh);