From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 28 Feb 2017 15:08:21 +0000 (+0100)
Subject: service: make use of log_unit_warning_errno()'s return value
X-Git-Tag: v233~15^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8b509d3bec0cd32746315cf83c79cc3a7618c9c;p=thirdparty%2Fsystemd.git

service: make use of log_unit_warning_errno()'s return value
---

diff --git a/src/core/service.c b/src/core/service.c
index 3f87e083694..5bc8df3e1c1 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -849,11 +849,8 @@ static int service_load_pid_file(Service *s, bool may_warn) {
                 return r;
 
         r = unit_watch_pid(UNIT(s), pid);
-        if (r < 0) {
-                /* FIXME: we need to do something here */
-                log_unit_warning_errno(UNIT(s), r, "Failed to watch PID "PID_FMT" for service: %m", pid);
-                return r;
-        }
+        if (r < 0) /* FIXME: we need to do something here */
+                return log_unit_warning_errno(UNIT(s), r, "Failed to watch PID "PID_FMT" for service: %m", pid);
 
         return 0;
 }
@@ -1374,8 +1371,7 @@ static int service_spawn(
                 return r;
 
         r = unit_watch_pid(UNIT(s), pid);
-        if (r < 0)
-                /* FIXME: we need to do something here */
+        if (r < 0) /* FIXME: we need to do something here */
                 return r;
 
         *_pid = pid;