From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 24 Jan 2024 05:39:20 +0000 (+0900)
Subject: core/service: declare 'int r' at the beginning
X-Git-Tag: v256-rc1~1057^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c917a807015ff3e895c1e6865ab04995fb1dbce8;p=thirdparty%2Fsystemd.git

core/service: declare 'int r' at the beginning
---

diff --git a/src/core/service.c b/src/core/service.c
index 97b547084ee..5ebaddf1882 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -3701,6 +3701,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         Service *s = SERVICE(u);
         ServiceResult f;
         ExitClean clean_mode;
+        int r;
 
         assert(s);
         assert(pid >= 0);
@@ -3952,7 +3953,6 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
 
                                 if (s->pid_file) {
                                         bool has_start_post;
-                                        int r;
 
                                         /* Let's try to load the pid file here if we can.
                                          * The PID file might actually be created by a START_POST
@@ -3979,8 +3979,6 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                                 }
 
                                 if (s->pid_file) {
-                                        int r;
-
                                         r = service_load_pid_file(s, true);
                                         if (r < 0) {
                                                 r = service_demand_pid_file(s);