From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Aug 2014 14:20:17 +0000 (+0200)
Subject: service: don't invoke functions at the same time as declaring variables
X-Git-Tag: v217~803
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f49650cee2c5256dc0491432e1f12a4ae19be6c5;p=thirdparty%2Fsystemd.git

service: don't invoke functions at the same time as declaring variables
---

diff --git a/src/core/service.c b/src/core/service.c
index f10582d89e1..fc952e848f0 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -694,9 +694,13 @@ static void service_set_state(Service *s, ServiceState state) {
         /* For remain_after_exit services, let's see if we can "release" the
          * hold on the console, since unit_notify() only does that in case of
          * change of state */
-        if (state == SERVICE_EXITED && s->remain_after_exit &&
+        if (state == SERVICE_EXITED &&
+            s->remain_after_exit &&
             UNIT(s)->manager->n_on_console > 0) {
-                ExecContext *ec = unit_get_exec_context(UNIT(s));
+
+                ExecContext *ec;
+
+                ec = unit_get_exec_context(UNIT(s));
                 if (ec && exec_context_may_touch_console(ec)) {
                         Manager *m = UNIT(s)->manager;