chiark / gitweb /
treewide: simplify log_*_errno(r,...) immediately followed by "return r"
[elogind.git] / src / core / load-dropin.c
index 21c991526c7fdb804c3427e18eb7c6574cf01765..8da4adc9a20b0ef23e3302a590eeba732b46802f 100644 (file)
@@ -71,7 +71,7 @@ static int iterate_dir(
                 de = readdir(d);
                 if (!de && errno != 0) {
                         k = errno;
-                        log_error("Failed to read directory %s: %s", path, strerror(k));
+                        log_error_errno(k, "Failed to read directory %s: %m", path);
                         return -k;
                 }
 
@@ -87,7 +87,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 +155,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,7 +181,7 @@ 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) {