From 44143309dd0b37d61d7d842ca58f01a65646ec71 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 28 Apr 2011 23:51:24 +0200
Subject: util: conf_files_list() return list as parameter

---
 src/sysctl.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/sysctl.c')

diff --git a/src/sysctl.c b/src/sysctl.c
index 1d42e9378b..814cfea592 100644
--- a/src/sysctl.c
+++ b/src/sysctl.c
@@ -138,13 +138,17 @@ int main(int argc, char *argv[]) {
         else {
                 char **files, **f;
 
-                r = apply_file("/etc/sysctl.conf", true);
-
-                files = conf_files_list(".conf",
-                                        "/run/sysctl.d",
-                                        "/etc/sysctl.d",
-                                        "/usr/lib/sysctl.d",
-                                        NULL);
+                apply_file("/etc/sysctl.conf", true);
+
+                r = conf_files_list(&files, ".conf",
+                                    "/run/sysctl.d",
+                                    "/etc/sysctl.d",
+                                    "/usr/lib/sysctl.d",
+                                    NULL);
+                if (r < 0) {
+                        log_error("Failed to enumerate sysctl.d files: %s", strerror(-r));
+                        goto finish;
+                }
 
                 STRV_FOREACH(f, files) {
                         int k;
@@ -156,6 +160,6 @@ int main(int argc, char *argv[]) {
 
                 strv_free(files);
         }
-
+finish:
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
-- 
cgit v1.2.3-54-g00ecf