From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 15 Oct 2017 21:00:54 +0000 (+0200)
Subject: util-lib: simplify kexec_loaded()
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=eb76351fa5159983712e9c0c2f5de504fa434a78;p=elogind.git

util-lib: simplify kexec_loaded()
---

diff --git a/src/basic/util.c b/src/basic/util.c
index 8358d3c08..be9f17a0a 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -180,15 +180,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) {