chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify execute_directory()
[elogind.git]
/
src
/
sleep
/
sleep.c
diff --git
a/src/sleep/sleep.c
b/src/sleep/sleep.c
index 415893ba74e907833fd46400a32a3b27296ffa54..2fb5f0c8e049167801a1416453cf9adcf73fdd3f 100644
(file)
--- a/
src/sleep/sleep.c
+++ b/
src/sleep/sleep.c
@@
-107,7
+107,7
@@
static int execute(char **modes, char **states) {
if (r < 0)
return r;
if (r < 0)
return r;
- execute_directory(SYSTEM_SLEEP_PATH,
NULL,
DEFAULT_TIMEOUT_USEC, arguments);
+ execute_directory(SYSTEM_SLEEP_PATH, DEFAULT_TIMEOUT_USEC, arguments);
log_struct(LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_START),
log_struct(LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_START),
@@
-121,12
+121,12
@@
static int execute(char **modes, char **states) {
log_struct(LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_STOP),
log_struct(LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_STOP),
- LOG_MESSAGE("
MESSAGE=
System resumed."),
+ LOG_MESSAGE("System resumed."),
"SLEEP=%s", arg_verb,
NULL);
arguments[1] = (char*) "post";
"SLEEP=%s", arg_verb,
NULL);
arguments[1] = (char*) "post";
- execute_directory(SYSTEM_SLEEP_PATH,
NULL,
DEFAULT_TIMEOUT_USEC, arguments);
+ execute_directory(SYSTEM_SLEEP_PATH, DEFAULT_TIMEOUT_USEC, arguments);
return r;
}
return r;
}