From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 20 Mar 2019 12:34:35 +0000 (+0100)
Subject: sd-bus: reduce scope of variable
X-Git-Tag: v242-rc1~100^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=afd5c1e37365d09648b6f11076d2a42008032ba7;p=thirdparty%2Fsystemd.git

sd-bus: reduce scope of variable
---

diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
index 4a50b5fad48..9221b33d487 100644
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -160,7 +160,6 @@ static int bus_socket_write_auth(sd_bus *b) {
 static int bus_socket_auth_verify_client(sd_bus *b) {
         char *d, *e, *f, *start;
         sd_id128_t peer;
-        unsigned i;
         int r;
 
         assert(b);
@@ -205,9 +204,8 @@ static int bus_socket_auth_verify_client(sd_bus *b) {
                  */
                 if (memcmp(b->rbuffer, "OK ", 3))
                         return -EPERM;
-        } else {
+        } else
                 return -EPERM;
-        }
 
         /* Now check the OK line. */
 
@@ -219,7 +217,7 @@ static int bus_socket_auth_verify_client(sd_bus *b) {
 
         b->auth = b->anonymous_auth ? BUS_AUTH_ANONYMOUS : BUS_AUTH_EXTERNAL;
 
-        for (i = 0; i < 32; i += 2) {
+        for (unsigned i = 0; i < 32; i += 2) {
                 int x, y;
 
                 x = unhexchar(d[2 + 3 + i]);