sd-network: reduce scope of some variables

diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index 13a0a5d92957602f63b1260ed10509dbde473c63..c23e439250ad6c61a020a2e88327a19bc337bdd6 100644 (file)
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -658,15 +658,12 @@ size_t serialize_in_addrs(FILE *f,
                           size_t size,
                           bool with_leading_space,
                           bool (*predicate)(const struct in_addr *addr)) {
-        size_t count;
-        size_t i;
-
         assert(f);
         assert(addresses);
 
-        count = 0;
+        size_t count = 0;
 
-        for (i = 0; i < size; i++) {
+        for (size_t i = 0; i < size; i++) {
                 char sbuf[INET_ADDRSTRLEN];
 
                 if (predicate && !predicate(&addresses[i]))
@@ -719,13 +716,11 @@ int deserialize_in_addrs(struct in_addr **ret, const char *string) {
 }
 
 void serialize_in6_addrs(FILE *f, const struct in6_addr *addresses, size_t size) {
-        unsigned i;
-
         assert(f);
         assert(addresses);
         assert(size);
 
-        for (i = 0; i < size; i++) {
+        for (size_t i = 0; i < size; i++) {
                 char buffer[INET6_ADDRSTRLEN];
 
                 fputs(inet_ntop(AF_INET6, addresses+i, buffer, sizeof(buffer)), f);
@@ -772,8 +767,6 @@ int deserialize_in6_addrs(struct in6_addr **ret, const char *string) {
 }
 
 void serialize_dhcp_routes(FILE *f, const char *key, sd_dhcp_route **routes, size_t size) {
-        unsigned i;
-
         assert(f);
         assert(key);
         assert(routes);
@@ -781,7 +774,7 @@ void serialize_dhcp_routes(FILE *f, const char *key, sd_dhcp_route **routes, siz
 
         fprintf(f, "%s=", key);
 
-        for (i = 0; i < size; i++) {
+        for (size_t i = 0; i < size; i++) {
                 char sbuf[INET_ADDRSTRLEN];
                 struct in_addr dest, gw;
                 uint8_t length;
@@ -790,8 +783,8 @@ void serialize_dhcp_routes(FILE *f, const char *key, sd_dhcp_route **routes, siz
                 assert_se(sd_dhcp_route_get_gateway(routes[i], &gw) >= 0);
                 assert_se(sd_dhcp_route_get_destination_prefix_length(routes[i], &length) >= 0);
 
-                fprintf(f, "%s/%" PRIu8, inet_ntop(AF_INET, &dest, sbuf, sizeof(sbuf)), length);
-                fprintf(f, ",%s%s", inet_ntop(AF_INET, &gw, sbuf, sizeof(sbuf)), (i < (size - 1)) ? " ": "");
+                fprintf(f, "%s/%" PRIu8, inet_ntop(AF_INET, &dest, sbuf, sizeof sbuf), length);
+                fprintf(f, ",%s%s", inet_ntop(AF_INET, &gw, sbuf, sizeof sbuf), i < size - 1 ? " ": "");
         }
 
         fputs("\n", f);

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index fbabe6786862063fda9b50e9a1c0597f664c4835..43b5d8e3c95c54d4ccc113f08a856557a5f9458b 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -3982,11 +3982,9 @@ static void print_link_hashmap(FILE *f, const char *prefix, Hashmap* h) {
 }
 
 static void link_save_dns(FILE *f, struct in_addr_data *dns, unsigned n_dns, bool *space) {
-        unsigned j;
-        int r;
-
-        for (j = 0; j < n_dns; j++) {
+        for (unsigned j = 0; j < n_dns; j++) {
                 _cleanup_free_ char *b = NULL;
+                int r;
 
                 r = in_addr_to_string(dns[j].family, &dns[j].address, &b);
                 if (r < 0) {