X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fload-dropin.c;h=7a17baaf8930359b1f8be1a3eb654fff99aa368a;hb=23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41;hp=6ff592be8b1cf944e9177ceae96a62b7c6ab1b52;hpb=f74df7baa27a41440bda92cced2ca8d63742113f;p=elogind.git

diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index 6ff592be8..7a17baaf8 100644
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -65,15 +65,11 @@ static int iterate_dir(
         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;
@@ -155,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;
         }
@@ -181,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);