From 995606ad5b0c18879ea670bff92b1952f6dae657 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Fri, 15 Jan 2021 17:38:00 +0100 Subject: [PATCH] network: manager tighten variable scope used in loop --- src/network/networkd-manager.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index f775a3398a0..47f0edf209b 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -488,12 +488,11 @@ static int ordered_set_put_dns_server(OrderedSet *s, int ifindex, struct in_addr static int ordered_set_put_dns_servers(OrderedSet *s, int ifindex, struct in_addr_full **dns, unsigned n) { int r, c = 0; - unsigned i; assert(s); assert(dns || n == 0); - for (i = 0; i < n; i++) { + for (unsigned i = 0; i < n; i++) { r = ordered_set_put_dns_server(s, ifindex, dns[i]); if (r < 0) return r; @@ -527,12 +526,11 @@ static int ordered_set_put_in4_addrv(OrderedSet *s, size_t n, bool (*predicate)(const struct in_addr *addr)) { int r, c = 0; - size_t i; assert(s); assert(n == 0 || addresses); - for (i = 0; i < n; i++) { + for (size_t i = 0; i < n; i++) { if (predicate && !predicate(&addresses[i])) continue; r = ordered_set_put_in4_addr(s, addresses+i); @@ -1115,7 +1113,7 @@ int manager_enumerate(Manager *m) { Link* manager_find_uplink(Manager *m, Link *exclude) { _cleanup_free_ struct local_address *gateways = NULL; - int n, i; + int n; assert(m); @@ -1129,7 +1127,7 @@ Link* manager_find_uplink(Manager *m, Link *exclude) { return NULL; } - for (i = 0; i < n; i++) { + for (int i = 0; i < n; i++) { Link *link; link = hashmap_get(m->links, INT_TO_PTR(gateways[i].ifindex)); -- 2.47.3