]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
proc-cmdline: return proper errors from shall_restore_state()
authorLennart Poettering <lennart@poettering.net>
Mon, 2 Nov 2015 22:07:58 +0000 (23:07 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 2 Nov 2015 22:44:05 +0000 (23:44 +0100)
Let's not eat up errors in shall_restore_state(), but in the consumers
instead, just for the sake of keeping the library calls generic.

src/backlight/backlight.c
src/basic/proc-cmdline.c
src/rfkill/rfkill.c

index 08980fba823859d587c9f841d4b0d11096373cd6..b0fa079fec2b560b0979d43704a1c4e8de1ce39b 100644 (file)
@@ -381,7 +381,7 @@ int main(int argc, char *argv[]) {
                 _cleanup_free_ char *value = NULL;
                 const char *clamp;
 
-                if (!shall_restore_state())
+                if (shall_restore_state() == 0)
                         return EXIT_SUCCESS;
 
                 if (!validate_device(udev, device))
index dd91ce7dbcc57550ed7211854ad1855395257dc5..778c9945018c63b265179ab708227702a9005dd1 100644 (file)
@@ -141,5 +141,5 @@ int shall_restore_state(void) {
         if (r == 0)
                 return true;
 
-        return parse_boolean(value) != 0;
+        return parse_boolean(value);
 }
index bb00f99ecf7b19b0d8968803ca8504636f3657ff..5c45a3ae6c519d17f2edb290c0e2faaea6ce16c3 100644 (file)
@@ -212,7 +212,7 @@ static int load_state(
         assert(udev);
         assert(event);
 
-        if (!shall_restore_state())
+        if (shall_restore_state() == 0)
                 return 0;
 
         r = find_device(udev, event, &device);