]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
util-lib: simplify kexec_loaded()
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sun, 15 Oct 2017 21:00:54 +0000 (23:00 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 18 Oct 2017 15:14:05 +0000 (17:14 +0200)
src/basic/util.c

index 687de40993052ddab3f64252fe66b98240a39cee..37fbfbf97fd9a39ce681f2795def32bc4a4c5bf9 100644 (file)
@@ -177,15 +177,12 @@ int block_get_whole_disk(dev_t d, dev_t *ret) {
 }
 
 bool kexec_loaded(void) {
-       bool loaded = false;
-       char *s;
-
-       if (read_one_line_file("/sys/kernel/kexec_loaded", &s) >= 0) {
-               if (s[0] == '1')
-                       loaded = true;
-               free(s);
-       }
-       return loaded;
+       _cleanup_free_ char *s = NULL;
+
+       if (read_one_line_file("/sys/kernel/kexec_loaded", &s) < 0)
+               return false;
+
+       return s[0] == '1';
 }
 
 int prot_from_flags(int flags) {