X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsleep%2Fsleep.c;h=56b963a7292165865f407cb573e836bd27ce10f4;hb=fe21f16764147d51819a904d57ac36967f9913e3;hp=a7506ed7711a99f13ddcf8a5b033ba09eaf3980f;hpb=56f64d95763a799ba4475daf44d8e9f72a1bd474;p=elogind.git diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index a7506ed77..56b963a72 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -77,10 +77,8 @@ static int write_state(FILE **f, char **states) { fclose(*f); *f = fopen("/sys/power/state", "we"); - if (!*f) { - log_error_errno(errno, "Failed to open /sys/power/state: %m"); - return -errno; - } + if (!*f) + return log_error_errno(errno, "Failed to open /sys/power/state: %m"); } return r; @@ -101,10 +99,8 @@ static int execute(char **modes, char **states) { /* This file is opened first, so that if we hit an error, * we can abort before modifying any state. */ f = fopen("/sys/power/state", "we"); - if (!f) { - log_error_errno(errno, "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); @@ -125,7 +121,7 @@ static int execute(char **modes, char **states) { 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);