diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-09-08 11:58:29 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-09-08 12:14:05 +0200 |
commit | 90e74a66e663f1776457d599cb7d5ce44785a56c (patch) | |
tree | 16ce28594b8dc475e37df9a3b80accb96e748efa /src/libsystemd-network/dhcp-option.c | |
parent | 12375b95ddcb7dbbcbc5969b87822d39115d8acf (diff) | |
download | systemd-90e74a66e663f1776457d599cb7d5ce44785a56c.tar.gz |
tree-wide: define iterator inside of the macro
Diffstat (limited to 'src/libsystemd-network/dhcp-option.c')
-rw-r--r-- | src/libsystemd-network/dhcp-option.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsystemd-network/dhcp-option.c b/src/libsystemd-network/dhcp-option.c index e03c1a894d..6fe8a3779d 100644 --- a/src/libsystemd-network/dhcp-option.c +++ b/src/libsystemd-network/dhcp-option.c @@ -81,9 +81,8 @@ static int option_append(uint8_t options[], size_t size, size_t *offset, OrderedHashmap *s = (OrderedHashmap *) optval; struct sd_dhcp_option *p; size_t l = 0; - Iterator i; - ORDERED_HASHMAP_FOREACH(p, s, i) + ORDERED_HASHMAP_FOREACH(p, s) l += p->length + 2; if (*offset + l + 2 > size) @@ -94,7 +93,7 @@ static int option_append(uint8_t options[], size_t size, size_t *offset, *offset += 2; - ORDERED_HASHMAP_FOREACH(p, s, i) { + ORDERED_HASHMAP_FOREACH(p, s) { options[*offset] = p->option; options[*offset + 1] = p->length; memcpy(&options[*offset + 2], p->data, p->length); |