From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 12 Feb 2021 09:25:13 +0000 (+0100)
Subject: core/dbus-unit: reduce scope of iterator variables
X-Git-Tag: v248-rc1~115^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95d1e21e9071f3c6c0be87f238dbea86c93231fb;p=thirdparty%2Fsystemd.git

core/dbus-unit: reduce scope of iterator variables
---

diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index c9837df9a2e..561a4e887f9 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -811,7 +811,6 @@ static int property_get_refs(
                 sd_bus_error *error) {
 
         Unit *u = userdata;
-        const char *i;
         int r;
 
         assert(bus);
@@ -821,15 +820,15 @@ static int property_get_refs(
         if (r < 0)
                 return r;
 
-        for (i = sd_bus_track_first(u->bus_track); i; i = sd_bus_track_next(u->bus_track)) {
-                int c, k;
+        for (const char *i = sd_bus_track_first(u->bus_track); i; i = sd_bus_track_next(u->bus_track)) {
+                int c;
 
                 c = sd_bus_track_count_name(u->bus_track, i);
                 if (c < 0)
                         return c;
 
                 /* Add the item multiple times if the ref count for each is above 1 */
-                for (k = 0; k < c; k++) {
+                for (int k = 0; k < c; k++) {
                         r = sd_bus_message_append(reply, "s", i);
                         if (r < 0)
                                 return r;