cleanup minor nitpicks mentioned in #3428
addr[nr / 32] |= (((uint32_t) 1) << (nr % 32));
}
-static inline int is_vid_valid(unsigned vid) {
- if (vid > VLANID_MAX || vid == 0)
- return -EINVAL;
- return 0;
-}
-
static int find_next_bit(int i, uint32_t x) {
int j;
if (r < 0)
return r;
- if (!_vid)
+ if (_vid == 0)
return -ERANGE;
r = parse_vlanid(p, &_vid_end);
if (r < 0)
return r;
- if (!_vid_end)
+ if (_vid_end == 0)
return -ERANGE;
} else {
r = parse_vlanid(_rvalue, &_vid);
if (r < 0)
return r;
- if (!_vid)
+ if (_vid == 0)
return -ERANGE;
}
free(link->ifname);
- if (link->kind)
- free(link->kind);
+ free(link->kind);
(void)unlink(link->state_file);
free(link->state_file);
log_link_error_errno(link, r, "Could not set bridge message: %m");
}
- if (link->network->bridge || NETDEV_KIND_BRIDGE == netdev_kind_from_string(link->kind)) {
+ if (link->network->bridge || streq("bridge", link->kind)) {
r = link_set_bridge_vlan(link);
if (r < 0)
log_link_error_errno(link, r, "Could not set bridge vlan: %m");