tree-wide: several cleanups (#39746)

This commit is contained in:
Chris Down
2025-11-16 15:40:39 +08:00
committed by GitHub
7 changed files with 137 additions and 185 deletions
+8 -6
View File
@@ -261,8 +261,7 @@ int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, const
if (r == 0)
break;
if (!GREEDY_REALLOC(routes, size + 1))
return -ENOMEM;
struct sd_dhcp_route route = {};
tok = word;
@@ -272,7 +271,7 @@ int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, const
continue;
*tok_end = '\0';
r = inet_aton(tok, &routes[size].dst_addr);
r = inet_aton(tok, &route.dst_addr);
if (r == 0)
continue;
@@ -289,15 +288,18 @@ int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, const
if (r < 0 || n > 32)
continue;
routes[size].dst_prefixlen = (uint8_t) n;
route.dst_prefixlen = (uint8_t) n;
tok = tok_end + 1;
/* get the gateway */
r = inet_aton(tok, &routes[size].gw_addr);
r = inet_aton(tok, &route.gw_addr);
if (r == 0)
continue;
size++;
if (!GREEDY_REALLOC(routes, size + 1))
return -ENOMEM;
routes[size++] = route;
}
*ret_size = size;