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

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

diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index d5b6f27b8d06480380affc36f453dc5ca5b1134e..0acb092418ce86d28af949ff464f3cef51a40326 100644 (file)
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
 
         r = mkdir_p("/var/lib/systemd/rfkill", 0755);
         if (r < 0) {
-                log_error("Failed to create rfkill directory: %s", strerror(-r));
+                log_error_errno(-r, "Failed to create rfkill directory: %m");
                 return EXIT_FAILURE;
         }
 
@@ -95,22 +95,25 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        if (streq(argv[1], "load") && restore_state()) {
+        if (streq(argv[1], "load")) {
                 _cleanup_free_ char *value = NULL;
 
+                if (!shall_restore_state())
+                        return EXIT_SUCCESS;
+
                 r = read_one_line_file(saved, &value);
                 if (r < 0) {
 
                         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;
                 }
 
                 r = udev_device_set_sysattr_value(device, "soft", value);
                 if (r < 0) {
-                        log_error("Failed to write system attribute: %s", strerror(-r));
+                        log_error_errno(-r, "Failed to write system attribute: %m");
                         return EXIT_FAILURE;
                 }
 
@@ -119,13 +122,13 @@ int main(int argc, char *argv[]) {
 
                 value = udev_device_get_sysattr_value(device, "soft");
                 if (!value) {
-                        log_error("Failed to read system attribute: %s", strerror(-r));
+                        log_error_errno(-r, "Failed to read system attribute: %m");
                         return EXIT_FAILURE;
                 }
 
                 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;
                 }