Merge pull request #7127 from keszybz/sundry-tweaks

Various unrelated small patches
2017-10-26 10:57:00 +02:00
parent af163d70ae 78344935fd
commit 35682fd4a1
5 changed files with 18 additions and 18 deletions
@@ -177,15 +177,12 @@ int block_get_whole_disk(dev_t d, dev_t *ret) {
 }

 bool kexec_loaded(void) {
-       bool loaded = false;
-       char *s;
+       _cleanup_free_ char *s = NULL;

-       if (read_one_line_file("/sys/kernel/kexec_loaded", &s) >= 0) {
-               if (s[0] == '1')
-                       loaded = true;
-               free(s);
-       }
-       return loaded;
+       if (read_one_line_file("/sys/kernel/kexec_loaded", &s) < 0)
+               return false;
+
+       return s[0] == '1';
 }

 int prot_from_flags(int flags) {