From: Mario Limonciello <mario.limonciello@dell.com>
Date: Thu, 29 Mar 2018 13:56:23 +0000 (-0500)
Subject: sleep: Move the error level debugging for write_mode and write_state
X-Git-Tag: v239~422^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8406%2Fhead;p=thirdparty%2Fsystemd.git

sleep: Move the error level debugging for write_mode and write_state

This makes it more consistent with other code used in the file.

Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
---

diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 1163a0f56ac..cee3f345939 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -120,9 +120,6 @@ static int write_mode(char **modes) {
                         r = k;
         }
 
-        if (r < 0)
-                log_error_errno(r, "Failed to write mode to /sys/power/disk: %m");
-
         return r;
 }
 
@@ -144,7 +141,7 @@ static int write_state(FILE **f, char **states) {
                 fclose(*f);
                 *f = fopen("/sys/power/state", "we");
                 if (!*f)
-                        return log_error_errno(errno, "Failed to open /sys/power/state: %m");
+                        return -errno;
         }
 
         return r;
@@ -179,7 +176,7 @@ static int execute(char **modes, char **states) {
                         return log_error_errno(r, "Failed to write hibernation disk offset: %m");
                 r = write_mode(modes);
                 if (r < 0)
-                        return r;
+                        return log_error_errno(r, "Failed to write mode to /sys/power/disk: %m");;
         }
 
         execute_directories(dirs, DEFAULT_TIMEOUT_USEC, NULL, NULL, arguments);
@@ -192,7 +189,7 @@ static int execute(char **modes, char **states) {
 
         r = write_state(&f, states);
         if (r < 0)
-                return r;
+                return log_error_errno(r, "Failed to write /sys/power/state: %m");
 
         log_struct(LOG_INFO,
                    "MESSAGE_ID=" SD_MESSAGE_SLEEP_STOP_STR,