summaryrefslogtreecommitdiff
path: root/src/tmpfiles.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-04-28 23:51:24 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-04-28 23:51:24 +0200
commit44143309dd0b37d61d7d842ca58f01a65646ec71 (patch)
treeb22d8adcb45561c41348bc4361a24b9cc673d6f1 /src/tmpfiles.c
parentb23de6af893c11da4286bc416455cd0926d1532e (diff)
util: conf_files_list() return list as parameter
Diffstat (limited to 'src/tmpfiles.c')
-rw-r--r--src/tmpfiles.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index 1574a199fb..f36a75f8f2 100644
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -963,11 +963,16 @@ int main(int argc, char *argv[]) {
} else {
char **files, **f;
- files = conf_files_list(".conf",
- "/run/tmpfiles.d",
- "/etc/tmpfiles.d",
- "/usr/lib/tmpfiles.d",
- NULL);
+ r = conf_files_list(&files, ".conf",
+ "/run/tmpfiles.d",
+ "/etc/tmpfiles.d",
+ "/usr/lib/tmpfiles.d",
+ NULL);
+ if (r < 0) {
+ r = EXIT_FAILURE;
+ log_error("Failed to enumerate tmpfiles.d files: %s", strerror(-r));
+ goto finish;
+ }
STRV_FOREACH(f, files) {
if (read_config_file(*f, true) < 0)