treewide: auto-convert the simple cases to log_*_errno()

[elogind.git] / src / backlight / backlight.c

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 4d94ebf58a7e30b6b5ed7ad345a5235336f52b8e..ab05a7d1a7ae3501bcb5259387e8907efdbddfc3 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -211,7 +211,7 @@ static unsigned get_max_brightness(struct udev_device *device) {
 
         r = safe_atou(max_brightness_str, &max_brightness);
         if (r < 0) {
-                log_warning("Failed to parse 'max_brightness' \"%s\": %s", max_brightness_str, strerror(-r));
+                log_warning_errno(-r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str);
                 return 0;
         }
 
@@ -235,7 +235,7 @@ static void clamp_brightness(struct udev_device *device, char **value, unsigned
 
         r = safe_atou(*value, &brightness);
         if (r < 0) {
-                log_warning("Failed to parse brightness \"%s\": %s", *value, strerror(-r));
+                log_warning_errno(-r, "Failed to parse brightness \"%s\": %m", *value);
                 return;
         }
 
@@ -372,9 +372,12 @@ int main(int argc, char *argv[]) {
          * device probing should be complete), so that the validity
          * check at boot time doesn't have to be reliable. */
 
-        if (streq(argv[1], "load") && shall_restore_state()) {
+        if (streq(argv[1], "load")) {
                 _cleanup_free_ char *value = NULL;
 
+                if (!shall_restore_state())
+                        return EXIT_SUCCESS;
+
                 if (!validate_device(udev, device))
                         return EXIT_SUCCESS;
 
@@ -384,7 +387,7 @@ int main(int argc, char *argv[]) {
                         if (r == -ENOENT)
                                 return EXIT_SUCCESS;
 
-                        log_error("Failed to read %s: %s", saved, strerror(-r));
+                        log_error_errno(-r, "Failed to read %s: %m", saved);
                         return EXIT_FAILURE;
                 }
 
@@ -413,7 +416,7 @@ int main(int argc, char *argv[]) {
 
                 r = write_string_file(saved, value);
                 if (r < 0) {
-                        log_error("Failed to write %s: %s", saved, strerror(-r));
+                        log_error_errno(-r, "Failed to write %s: %m", saved);
                         return EXIT_FAILURE;
                 }