From: 0xAX <0xAX@users.noreply.github.com>
Date: Mon, 10 Oct 2016 17:51:33 +0000 (+0300)
Subject: tree-wide: pass return value of make_null_stdio() to warning instead of errno (#4328)
X-Git-Tag: v232~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c76cf844d6e59ca5ac5eb3e6c60b3e501815c5b8;p=thirdparty%2Fsystemd.git

tree-wide: pass return value of make_null_stdio() to warning instead of errno (#4328)

as @poettering suggested in the #4320
---

diff --git a/src/core/main.c b/src/core/main.c
index 0fad3933233..30d9c43fbb3 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1532,8 +1532,9 @@ int main(int argc, char *argv[]) {
                  * need to do that for user instances since they never log
                  * into the console. */
                 log_show_color(colors_enabled());
-                if (make_null_stdio() < 0)
-                        log_warning_errno(errno, "Failed to redirect standard streams to /dev/null: %m");
+                r = make_null_stdio();
+                if (r < 0)
+                        log_warning_errno(r, "Failed to redirect standard streams to /dev/null: %m");
         }
 
         r = initialize_join_controllers();
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 6000d9c7ec6..535d317c276 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1738,9 +1738,12 @@ int main(int argc, char *argv[]) {
                 log_info("starting version " VERSION);
 
                 /* connect /dev/null to stdin, stdout, stderr */
-                if (log_get_max_level() < LOG_DEBUG)
-                        if (make_null_stdio() < 0)
-                                log_warning_errno(errno, "Failed to redirect standard streams to /dev/null: %m");
+                if (log_get_max_level() < LOG_DEBUG) {
+                        r = make_null_stdio();
+                        if (r < 0)
+                                log_warning_errno(r, "Failed to redirect standard streams to /dev/null: %m");
+                }
+
 
 
                 pid = fork();