chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: rename cg_update_unified() → cg_unified_update()
[elogind.git]
/
src
/
sleep
/
sleep.c
diff --git
a/src/sleep/sleep.c
b/src/sleep/sleep.c
index a2e8e603501a42f2da161537de3eb09fe336a91e..cf03c34b30e327accaa9fa7e78db1653f5b60efe 100644
(file)
--- a/
src/sleep/sleep.c
+++ b/
src/sleep/sleep.c
@@
-109,7
+109,7
@@
static int execute(char **modes, char **states) {
if (r < 0)
return r;
if (r < 0)
return r;
- execute_directories(dirs, DEFAULT_TIMEOUT_USEC, arguments);
+ execute_directories(dirs, DEFAULT_TIMEOUT_USEC,
NULL, NULL,
arguments);
log_struct(LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_START),
log_struct(LOG_INFO,
LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_START),
@@
-128,7
+128,7
@@
static int execute(char **modes, char **states) {
NULL);
arguments[1] = (char*) "post";
NULL);
arguments[1] = (char*) "post";
- execute_directories(dirs, DEFAULT_TIMEOUT_USEC, arguments);
+ execute_directories(dirs, DEFAULT_TIMEOUT_USEC,
NULL, NULL,
arguments);
return r;
}
return r;
}
@@
-220,9
+220,6
@@
finish:
#else
int do_sleep(const char *verb, char **modes, char **states) {
assert(verb);
#else
int do_sleep(const char *verb, char **modes, char **states) {
assert(verb);
- assert(modes);
- assert(states);
-
arg_verb = (char*)verb;
return execute(modes, states);
}
arg_verb = (char*)verb;
return execute(modes, states);
}