X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fload-dropin.c;h=8afaf45fe6acb1a55603341e7c57dc0584130a98;hb=a2c0e528b8b5ba370527db279605e4e4135689c1;hp=f2ffc9781ec95a7d3eb829582bc630a3da91089d;hpb=bcd816bd349241bcd9c0bfbfd9cfe7b034ba351b;p=elogind.git

diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index f2ffc9781..8afaf45fe 100644
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -58,22 +58,18 @@ static int iterate_dir(
                 if (errno == ENOENT)
                         return 0;
 
-                log_error("Failed to open directory %s: %m", path);
+                log_error_errno(errno, "Failed to open directory %s: %m", path);
                 return -errno;
         }
 
         for (;;) {
                 struct dirent *de;
                 _cleanup_free_ char *f = NULL;
-                int k;
 
                 errno = 0;
                 de = readdir(d);
-                if (!de && errno != 0) {
-                        k = errno;
-                        log_error("Failed to read directory %s: %s", path, strerror(k));
-                        return -k;
-                }
+                if (!de && errno != 0)
+                        return log_error_errno(errno, "Failed to read directory %s: %m", path);
 
                 if (!de)
                         break;
@@ -87,7 +83,7 @@ static int iterate_dir(
 
                 r = unit_add_dependency_by_name(u, dependency, de->d_name, f, true);
                 if (r < 0)
-                        log_error("Cannot add dependency %s to %s, ignoring: %s", de->d_name, u->id, strerror(-r));
+                        log_error_errno(r, "Cannot add dependency %s to %s, ignoring: %m", de->d_name, u->id);
         }
 
         return 0;
@@ -102,7 +98,6 @@ static int process_dir(
                 char ***strv) {
 
         _cleanup_free_ char *path = NULL;
-        int r, q;
 
         assert(u);
         assert(unit_path);
@@ -156,7 +151,7 @@ char **unit_find_dropin_paths(Unit *u) {
 
         r = conf_files_list_strv(&configs, ".conf", NULL, (const char**) strv);
         if (r < 0) {
-                log_error("Failed to get list of configuration files: %s", strerror(-r));
+                log_error_errno(r, "Failed to get list of configuration files: %m");
                 strv_free(configs);
                 return NULL;
         }
@@ -167,7 +162,6 @@ char **unit_find_dropin_paths(Unit *u) {
 int unit_load_dropin(Unit *u) {
         Iterator i;
         char *t, **f;
-        int r;
 
         assert(u);
 
@@ -183,13 +177,14 @@ int unit_load_dropin(Unit *u) {
         }
 
         u->dropin_paths = unit_find_dropin_paths(u);
-        if (! u->dropin_paths)
+        if (!u->dropin_paths)
                 return 0;
 
         STRV_FOREACH(f, u->dropin_paths) {
                 config_parse(u->id, *f, NULL,
-                             UNIT_VTABLE(u)->sections, config_item_perf_lookup,
-                             (void*) load_fragment_gperf_lookup, false, false, u);
+                             UNIT_VTABLE(u)->sections,
+                             config_item_perf_lookup, load_fragment_gperf_lookup,
+                             false, false, false, u);
         }
 
         u->dropin_mtime = now(CLOCK_REALTIME);