picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

network: minor coding-style update

Browse source
This commit is contained in:
Yu Watanabe 2019-07-05 16:34:01 +09:00
parent aaae57139b
commit 7bbb43a79a
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/network/networkd-brvlan.c
View file

@ -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, done, cnt;
int i, j, k, r, cnt;
uint16_t begin, end;
bool untagged = false;
bool done, untagged = false;
assert(link);
assert(req);
@ -63,7 +63,7 @@ static int append_vlan_info_data(Link *const link, sd_netlink_message *req, uint
base_bit = k * 32;
i = -1;
done = 0;
done = false;
do {
j = find_next_bit(i, vid_map);
if (j > 0) {
@ -80,7 +80,7 @@ static int append_vlan_info_data(Link *const link, sd_netlink_message *req, uint
goto next;
}
} else
done = 1;
done = true;
if (begin != UINT16_MAX) {
cnt++;
@ -149,9 +149,9 @@ static int set_brvlan_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *lin
int br_vlan_configure(Link *link, uint16_t pvid, uint32_t *br_vid_bitmap, uint32_t *br_untagged_bitmap) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
int r;
uint16_t flags;
sd_netlink *rtnl;
uint16_t flags;
int r;
assert(link);
assert(link->manager);
@ -253,8 +253,9 @@ int config_parse_brvlan_pvid(const char *unit, const char *filename,
int ltype, const char *rvalue, void *data,
void *userdata) {
Network *network = userdata;
int r;
uint16_t pvid;
int r;
r = parse_vlanid(rvalue, &pvid);
if (r < 0)
return r;
@ -271,8 +272,8 @@ int config_parse_brvlan_vlan(const char *unit, const char *filename,
int ltype, const char *rvalue, void *data,
void *userdata) {
Network *network = userdata;
int r;
uint16_t vid, vid_end;
int r;
assert(filename);
assert(section);