chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
macro: clean up usage of gcc attributes
[elogind.git]
/
src
/
core
/
shutdown.c
diff --git
a/src/core/shutdown.c
b/src/core/shutdown.c
index fe7a0739db8d1feaab1e8ade3cfb5f7977fa9739..4709746de40b616fde8b8fbcb17260b9b5d34c21 100644
(file)
--- a/
src/core/shutdown.c
+++ b/
src/core/shutdown.c
@@
-145,13
+145,7
@@
int main(int argc, char *argv[]) {
size_t l;
FOREACH_WORD_QUOTED(w, l, line, state) {
size_t l;
FOREACH_WORD_QUOTED(w, l, line, state) {
- _cleanup_free_ char *word;
-
- word = strndup(w, l);
- if (!word)
- break;
-
- if (streq(word, "quiet")) {
+ if (l == 5 && memcmp(w, "quiet", 5) == 0) {
log_set_max_level(LOG_WARNING);
break;
}
log_set_max_level(LOG_WARNING);
break;
}
@@
-324,7
+318,7
@@
int main(int argc, char *argv[]) {
log_warning("kexec failed. Falling back to normal reboot.");
} else {
/* Child */
log_warning("kexec failed. Falling back to normal reboot.");
} else {
/* Child */
- const char *args[3] = {
"/sbin/kexec"
, "-e", NULL };
+ const char *args[3] = {
KEXEC
, "-e", NULL };
execv(args[0], (char * const *) args);
return EXIT_FAILURE;
}
execv(args[0], (char * const *) args);
return EXIT_FAILURE;
}