chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: minor simplification for loop_write() and loop_read()
[elogind.git]
/
src
/
sleep
/
sleep.c
diff --git
a/src/sleep/sleep.c
b/src/sleep/sleep.c
index a56ab89e544133d36cbd03400e333f4c270dac0f..56b963a7292165865f407cb573e836bd27ce10f4 100644
(file)
--- a/
src/sleep/sleep.c
+++ b/
src/sleep/sleep.c
@@
-25,14
+25,15
@@
#include <string.h>
#include <getopt.h>
#include <string.h>
#include <getopt.h>
-#include "s
ystemd/s
d-id128.h"
-#include "s
ystemd/s
d-messages.h"
+#include "sd-id128.h"
+#include "sd-messages.h"
#include "log.h"
#include "util.h"
#include "strv.h"
#include "fileio.h"
#include "build.h"
#include "sleep-config.h"
#include "log.h"
#include "util.h"
#include "strv.h"
#include "fileio.h"
#include "build.h"
#include "sleep-config.h"
+#include "def.h"
static char* arg_verb = NULL;
static char* arg_verb = NULL;
@@
-41,97
+42,96
@@
static int write_mode(char **modes) {
char **mode;
STRV_FOREACH(mode, modes) {
char **mode;
STRV_FOREACH(mode, modes) {
- int k = write_string_file("/sys/power/disk", *mode);
+ int k;
+
+ k = write_string_file("/sys/power/disk", *mode);
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;
}
-static int write_state(FILE *f0, char **states) {
- FILE _cleanup_fclose_ *f = f0;
+static int write_state(FILE **f, char **states) {
char **state;
int r = 0;
STRV_FOREACH(state, states) {
int k;
char **state;
int r = 0;
STRV_FOREACH(state, states) {
int k;
- k = write_string_
to_file(
f, *state);
+ k = write_string_
stream(*
f, *state);
if (k == 0)
return 0;
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;
- fclose(f);
- f = fopen("/sys/power/state", "we");
- if (!f) {
- log_error("Failed to open /sys/power/state: %m");
- return -errno;
- }
+ fclose(*f);
+ *f = fopen("/sys/power/state", "we");
+ if (!*f)
+ return log_error_errno(errno, "Failed to open /sys/power/state: %m");
}
return r;
}
static int execute(char **modes, char **states) {
}
return r;
}
static int execute(char **modes, char **states) {
- char* arguments[4];
+
+ char *arguments[] = {
+ NULL,
+ (char*) "pre",
+ arg_verb,
+ NULL
+ };
+
int r;
int r;
- FILE *f;
- const char* note = strappenda("SLEEP=", arg_verb);
+ _cleanup_fclose_ FILE *f = NULL;
/* This file is opened first, so that if we hit an error,
/* This file is opened first, so that if we hit an error,
- * we can abort before mod
yf
ing any state. */
+ * we can abort before mod
ify
ing any state. */
f = fopen("/sys/power/state", "we");
f = fopen("/sys/power/state", "we");
- if (!f) {
- log_error("Failed to open /sys/power/state: %m");
- return -errno;
- }
+ if (!f)
+ return log_error_errno(errno, "Failed to open /sys/power/state: %m");
/* Configure the hibernation mode */
r = write_mode(modes);
if (r < 0)
return r;
/* Configure the hibernation mode */
r = write_mode(modes);
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, arguments);
+ execute_directory(SYSTEM_SLEEP_PATH, NULL, DEFAULT_TIMEOUT_USEC, arguments);
log_struct(LOG_INFO,
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);
NULL);
- r = write_state(f, states);
+ r = write_state(
&
f, states);
if (r < 0)
return r;
log_struct(LOG_INFO,
if (r < 0)
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("System resumed.")
,
+
"SLEEP=%s", arg_verb
,
NULL);
arguments[1] = (char*) "post";
NULL);
arguments[1] = (char*) "post";
- execute_directory(SYSTEM_SLEEP_PATH, NULL, arguments);
+ execute_directory(SYSTEM_SLEEP_PATH, NULL,
DEFAULT_TIMEOUT_USEC,
arguments);
return r;
}
return r;
}
-static
int
help(void) {
+static
void
help(void) {
printf("%s COMMAND\n\n"
"Suspend the system, hibernate the system, or both.\n\n"
"Commands:\n"
printf("%s COMMAND\n\n"
"Suspend the system, hibernate the system, or both.\n\n"
"Commands:\n"
@@
-140,10
+140,7
@@
static int help(void) {
" suspend Suspend the system\n"
" hibernate Hibernate the system\n"
" hybrid-sleep Both hibernate and suspend the system\n"
" suspend Suspend the system\n"
" hibernate Hibernate the system\n"
" hybrid-sleep Both hibernate and suspend the system\n"
- , program_invocation_short_name
- );
-
- return 0;
+ , program_invocation_short_name);
}
static int parse_argv(int argc, char *argv[]) {
}
static int parse_argv(int argc, char *argv[]) {
@@
-154,7
+151,7
@@
static int parse_argv(int argc, char *argv[]) {
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
- {
NULL, 0, NULL, 0
}
+ {}
};
int c;
};
int c;
@@
-162,11
+159,11
@@
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "
+
h", options, NULL)) >= 0)
+ while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0)
switch(c) {
case 'h':
help();
switch(c) {
case 'h':
help();
- return 0
/* done */;
+ return 0
; /* done */
case ARG_VERSION:
puts(PACKAGE_STRING);
case ARG_VERSION:
puts(PACKAGE_STRING);
@@
-177,8
+174,7
@@
static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
default:
return -EINVAL;
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
if (argc - optind != 1) {
}
if (argc - optind != 1) {