From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 20 Oct 2022 10:38:41 +0000 (+0200)
Subject: tree-wide: inline declarations of sd_netlink_message iterators
X-Git-Tag: v252-rc3~15^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d856e1a745ef82a81c283353b80293332672287a;p=thirdparty%2Fsystemd.git

tree-wide: inline declarations of sd_netlink_message iterators

Most places were already converted, but a few weren't for some reason.
---

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index fc8d5b06630..316e2ea4033 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -189,7 +189,6 @@ fail:
 
 static int manager_rtnl_listen(Manager *m) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL, *reply = NULL;
-        sd_netlink_message *i;
         int r;
 
         assert(m);
@@ -232,7 +231,7 @@ static int manager_rtnl_listen(Manager *m) {
         if (r < 0)
                 return r;
 
-        for (i = reply; i; i = sd_netlink_message_next(i)) {
+        for (sd_netlink_message *i = reply; i; i = sd_netlink_message_next(i)) {
                 r = manager_process_link(m->rtnl, i, m);
                 if (r < 0)
                         return r;
@@ -254,7 +253,7 @@ static int manager_rtnl_listen(Manager *m) {
         if (r < 0)
                 return r;
 
-        for (i = reply; i; i = sd_netlink_message_next(i)) {
+        for (sd_netlink_message *i = reply; i; i = sd_netlink_message_next(i)) {
                 r = manager_process_address(m->rtnl, i, m);
                 if (r < 0)
                         return r;
diff --git a/src/shared/local-addresses.c b/src/shared/local-addresses.c
index 4d6bf9307d0..2876f72d16f 100644
--- a/src/shared/local-addresses.c
+++ b/src/shared/local-addresses.c
@@ -68,7 +68,6 @@ int local_addresses(
         _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
         _cleanup_free_ struct local_address *list = NULL;
         size_t n_list = 0;
-        sd_netlink_message *m;
         int r;
 
         if (context)
@@ -91,7 +90,7 @@ int local_addresses(
         if (r < 0)
                 return r;
 
-        for (m = reply; m; m = sd_netlink_message_next(m)) {
+        for (sd_netlink_message *m = reply; m; m = sd_netlink_message_next(m)) {
                 struct local_address *a;
                 unsigned char flags;
                 uint16_t type;