From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Mar 2019 18:21:48 +0000 (+0100)
Subject: systemctl: minimize scope of 'p'
X-Git-Tag: v242-rc1~131^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb1ac50e4e19e241bbb8e919d2380f851896d2bd;p=thirdparty%2Fsystemd.git

systemctl: minimize scope of 'p'
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 7814d8313c9..03dea764cc6 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -7983,7 +7983,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                 {}
         };
 
-        const char *p;
         int c, r;
 
         assert(argc >= 0);
@@ -8003,6 +8002,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         return version();
 
                 case 't': {
+                        const char *p;
+
                         if (isempty(optarg))
                                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                                        "--type= requires arguments.");
@@ -8054,7 +8055,9 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                                 arg_properties = new0(char*, 1);
                                 if (!arg_properties)
                                         return log_oom();
-                        } else
+                        } else {
+                                const char *p;
+
                                 for (p = optarg;;) {
                                         _cleanup_free_ char *prop = NULL;
 
@@ -8069,6 +8072,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
 
                                         prop = NULL;
                                 }
+                        }
 
                         /* If the user asked for a particular
                          * property, show it to him, even if it is
@@ -8273,6 +8277,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_STATE: {
+                        const char *p;
+
                         if (isempty(optarg))
                                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                                        "--state= requires arguments.");