chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc69274
)
util-lib: simplify kexec_loaded()
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sun, 15 Oct 2017 21:00:54 +0000
(23:00 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Sun, 15 Oct 2017 21:00:54 +0000
(23:00 +0200)
src/basic/util.c
patch
|
blob
|
history
diff --git
a/src/basic/util.c
b/src/basic/util.c
index 8358d3c08d6d2f5f33bff011123c4aa89fe27fdc..be9f17a0afba34b931014f076579f135fe1e5b58 100644
(file)
--- 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) {