diff options
| author | Susant Sahani <ssahani@vmware.com> | 2021-01-17 07:38:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-17 15:38:33 +0900 |
| commit | cda7fc8db36585c508bcfe4b22adaec82c686f1c (patch) | |
| tree | acf51795db5b25b8fa12259852a68ae7c70c495a /src/network/networkd-brvlan.c | |
| parent | e64652f70c1cb1a2fd86915a8d806491cf73b162 (diff) | |
| download | systemd-cda7fc8db36585c508bcfe4b22adaec82c686f1c.tar.gz | |
network: tighten variable scope used in loop (#18277)
Diffstat (limited to 'src/network/networkd-brvlan.c')
| -rw-r--r-- | src/network/networkd-brvlan.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c index e53c73c30c..2847b336c9 100644 --- a/src/network/networkd-brvlan.c +++ b/src/network/networkd-brvlan.c @@ -44,9 +44,9 @@ static int find_next_bit(int i, uint32_t x) { static int append_vlan_info_data(Link *const link, sd_netlink_message *req, uint16_t pvid, const uint32_t *br_vid_bitmap, const uint32_t *br_untagged_bitmap) { struct bridge_vlan_info br_vlan; - int i, j, k, r, cnt; - uint16_t begin, end; bool done, untagged = false; + uint16_t begin, end; + int r, cnt; assert(link); assert(req); @@ -56,16 +56,17 @@ static int append_vlan_info_data(Link *const link, sd_netlink_message *req, uint cnt = 0; begin = end = UINT16_MAX; - for (k = 0; k < BRIDGE_VLAN_BITMAP_LEN; k++) { - unsigned base_bit; - uint32_t vid_map = br_vid_bitmap[k]; + for (int k = 0; k < BRIDGE_VLAN_BITMAP_LEN; k++) { uint32_t untagged_map = br_untagged_bitmap[k]; + uint32_t vid_map = br_vid_bitmap[k]; + unsigned base_bit; + int i; base_bit = k * 32; i = -1; done = false; do { - j = find_next_bit(i, vid_map); + int j = find_next_bit(i, vid_map); if (j > 0) { /* first hit of any bit */ if (begin == UINT16_MAX && end == UINT16_MAX) { |