chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: more log_*_errno() conversions, multiline calls
[elogind.git]
/
src
/
sleep
/
sleep.c
diff --git
a/src/sleep/sleep.c
b/src/sleep/sleep.c
index ca00eea4ab76f105b357381925a7bb552ee1e7f7..626150258869ac456d9a5ef2ef3417d63e50e2dc 100644
(file)
--- a/
src/sleep/sleep.c
+++ b/
src/sleep/sleep.c
@@
-48,15
+48,14
@@
static int write_mode(char **modes) {
if (k == 0)
return 0;
if (k == 0)
return 0;
- log_debug
("Failed to write '%s' to /sys/power/disk: %s
",
-
*mode, strerror(-k)
);
+ log_debug
_errno(k, "Failed to write '%s' to /sys/power/disk: %m
",
+
*mode
);
if (r == 0)
r = k;
}
if (r < 0)
if (r == 0)
r = k;
}
if (r < 0)
- log_error("Failed to write mode to /sys/power/disk: %s",
- strerror(-r));
+ log_error_errno(r, "Failed to write mode to /sys/power/disk: %m");
return r;
}
return r;
}
@@
-71,8
+70,8
@@
static int write_state(FILE **f, char **states) {
k = write_string_stream(*f, *state);
if (k == 0)
return 0;
k = write_string_stream(*f, *state);
if (k == 0)
return 0;
- log_debug
("Failed to write '%s' to /sys/power/state: %s
",
-
*state, strerror(-k)
);
+ log_debug
_errno(k, "Failed to write '%s' to /sys/power/state: %m
",
+
*state
);
if (r == 0)
r = k;
if (r == 0)
r = k;
@@
-88,10
+87,16
@@
static int write_state(FILE **f, char **states) {
}
static int execute(char **modes, char **states) {
}
static int execute(char **modes, char **states) {
- char* arguments[4];
+
+ char *arguments[] = {
+ NULL,
+ (char*) "pre",
+ arg_verb,
+ NULL
+ };
+
int r;
_cleanup_fclose_ FILE *f = NULL;
int r;
_cleanup_fclose_ FILE *f = NULL;
- const char* note = strappenda("SLEEP=", arg_verb);
/* This file is opened first, so that if we hit an error,
* we can abort before modifying any state. */
/* This file is opened first, so that if we hit an error,
* we can abort before modifying any state. */
@@
-106,16
+111,12
@@
static int execute(char **modes, char **states) {
if (r < 0)
return r;
if (r < 0)
return r;
- arguments[0] = NULL;
- arguments[1] = (char*) "pre";
- arguments[2] = arg_verb;
- arguments[3] = NULL;
execute_directory(SYSTEM_SLEEP_PATH, NULL, DEFAULT_TIMEOUT_USEC, arguments);
log_struct(LOG_INFO,
execute_directory(SYSTEM_SLEEP_PATH, NULL, DEFAULT_TIMEOUT_USEC, arguments);
log_struct(LOG_INFO,
- MESSAGE_ID(SD_MESSAGE_SLEEP_START),
-
"MESSAGE=Suspending system..."
,
-
note
,
+
LOG_
MESSAGE_ID(SD_MESSAGE_SLEEP_START),
+
LOG_MESSAGE("Suspending system...")
,
+
"SLEEP=%s", arg_verb
,
NULL);
r = write_state(&f, states);
NULL);
r = write_state(&f, states);
@@
-123,9
+124,9
@@
static int execute(char **modes, char **states) {
return r;
log_struct(LOG_INFO,
return r;
log_struct(LOG_INFO,
- MESSAGE_ID(SD_MESSAGE_SLEEP_STOP),
-
"MESSAGE=System resumed."
,
-
note
,
+
LOG_
MESSAGE_ID(SD_MESSAGE_SLEEP_STOP),
+
LOG_MESSAGE("MESSAGE=System resumed.")
,
+
"SLEEP=%s", arg_verb
,
NULL);
arguments[1] = (char*) "post";
NULL);
arguments[1] = (char*) "post";