matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iplink: bridge: remove unnecessary returns 

invarg exits so no need to return, remove this c&p error from my recent
patches

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
This commit is contained in:
Nikolay Aleksandrov 2016-02-18 20:54:34 +01:00 committed by Stephen Hemminger
parent c6d0cfb54b
commit 8a4cd3943f
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ip/iplink_bridge.c
View File

@ -116,19 +116,17 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv,
__u8 vlan_filter; __u8 vlan_filter;
NEXT_ARG(); NEXT_ARG();
if (get_u8(&vlan_filter, *argv, 0)) { if (get_u8(&vlan_filter, *argv, 0))
invarg("invalid vlan_filtering", *argv); invarg("invalid vlan_filtering", *argv);
return -1;
}
addattr8(n, 1024, IFLA_BR_VLAN_FILTERING, vlan_filter); addattr8(n, 1024, IFLA_BR_VLAN_FILTERING, vlan_filter);
} else if (matches(*argv, "vlan_protocol") == 0) { } else if (matches(*argv, "vlan_protocol") == 0) {
__u16 vlan_proto; __u16 vlan_proto;
NEXT_ARG(); NEXT_ARG();
if (ll_proto_a2n(&vlan_proto, *argv)) { if (ll_proto_a2n(&vlan_proto, *argv))
invarg("invalid vlan_protocol", *argv); invarg("invalid vlan_protocol", *argv);
return -1;
}
addattr16(n, 1024, IFLA_BR_VLAN_PROTOCOL, vlan_proto); addattr16(n, 1024, IFLA_BR_VLAN_PROTOCOL, vlan_proto);
} else if (matches(*argv, "group_fwd_mask") == 0) { } else if (matches(*argv, "group_fwd_mask") == 0) {
__u16 fwd_mask; __u16 fwd_mask;
@ -243,85 +241,77 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv,
__u64 mcast_membership_intvl; __u64 mcast_membership_intvl;
NEXT_ARG(); NEXT_ARG();
if (get_u64(&mcast_membership_intvl, *argv, 0)) { if (get_u64(&mcast_membership_intvl, *argv, 0))
invarg("invalid mcast_membership_interval", invarg("invalid mcast_membership_interval",
*argv); *argv);
return -1;
}
addattr64(n, 1024, IFLA_BR_MCAST_MEMBERSHIP_INTVL, addattr64(n, 1024, IFLA_BR_MCAST_MEMBERSHIP_INTVL,
mcast_membership_intvl); mcast_membership_intvl);
} else if (matches(*argv, "mcast_querier_interval") == 0) { } else if (matches(*argv, "mcast_querier_interval") == 0) {
__u64 mcast_querier_intvl; __u64 mcast_querier_intvl;
NEXT_ARG(); NEXT_ARG();
if (get_u64(&mcast_querier_intvl, *argv, 0)) { if (get_u64(&mcast_querier_intvl, *argv, 0))
invarg("invalid mcast_querier_interval", invarg("invalid mcast_querier_interval",
*argv); *argv);
return -1;
}
addattr64(n, 1024, IFLA_BR_MCAST_QUERIER_INTVL, addattr64(n, 1024, IFLA_BR_MCAST_QUERIER_INTVL,
mcast_querier_intvl); mcast_querier_intvl);
} else if (matches(*argv, "mcast_query_interval") == 0) { } else if (matches(*argv, "mcast_query_interval") == 0) {
__u64 mcast_query_intvl; __u64 mcast_query_intvl;
NEXT_ARG(); NEXT_ARG();
if (get_u64(&mcast_query_intvl, *argv, 0)) { if (get_u64(&mcast_query_intvl, *argv, 0))
invarg("invalid mcast_query_interval", invarg("invalid mcast_query_interval",
*argv); *argv);
return -1;
}
addattr64(n, 1024, IFLA_BR_MCAST_QUERY_INTVL, addattr64(n, 1024, IFLA_BR_MCAST_QUERY_INTVL,
mcast_query_intvl); mcast_query_intvl);
} else if (!matches(*argv, "mcast_query_response_interval")) { } else if (!matches(*argv, "mcast_query_response_interval")) {
__u64 mcast_query_resp_intvl; __u64 mcast_query_resp_intvl;
NEXT_ARG(); NEXT_ARG();
if (get_u64(&mcast_query_resp_intvl, *argv, 0)) { if (get_u64(&mcast_query_resp_intvl, *argv, 0))
invarg("invalid mcast_query_response_interval", invarg("invalid mcast_query_response_interval",
*argv); *argv);
return -1;
}
addattr64(n, 1024, IFLA_BR_MCAST_QUERY_RESPONSE_INTVL, addattr64(n, 1024, IFLA_BR_MCAST_QUERY_RESPONSE_INTVL,
mcast_query_resp_intvl); mcast_query_resp_intvl);
} else if (!matches(*argv, "mcast_startup_query_interval")) { } else if (!matches(*argv, "mcast_startup_query_interval")) {
__u64 mcast_startup_query_intvl; __u64 mcast_startup_query_intvl;
NEXT_ARG(); NEXT_ARG();
if (get_u64(&mcast_startup_query_intvl, *argv, 0)) { if (get_u64(&mcast_startup_query_intvl, *argv, 0))
invarg("invalid mcast_startup_query_interval", invarg("invalid mcast_startup_query_interval",
*argv); *argv);
return -1;
}
addattr64(n, 1024, IFLA_BR_MCAST_STARTUP_QUERY_INTVL, addattr64(n, 1024, IFLA_BR_MCAST_STARTUP_QUERY_INTVL,
mcast_startup_query_intvl); mcast_startup_query_intvl);
} else if (matches(*argv, "nf_call_iptables") == 0) { } else if (matches(*argv, "nf_call_iptables") == 0) {
__u8 nf_call_ipt; __u8 nf_call_ipt;
NEXT_ARG(); NEXT_ARG();
if (get_u8(&nf_call_ipt, *argv, 0)) { if (get_u8(&nf_call_ipt, *argv, 0))
invarg("invalid nf_call_iptables", *argv); invarg("invalid nf_call_iptables", *argv);
return -1;
}
addattr8(n, 1024, IFLA_BR_NF_CALL_IPTABLES, addattr8(n, 1024, IFLA_BR_NF_CALL_IPTABLES,
nf_call_ipt); nf_call_ipt);
} else if (matches(*argv, "nf_call_ip6tables") == 0) { } else if (matches(*argv, "nf_call_ip6tables") == 0) {
__u8 nf_call_ip6t; __u8 nf_call_ip6t;
NEXT_ARG(); NEXT_ARG();
if (get_u8(&nf_call_ip6t, *argv, 0)) { if (get_u8(&nf_call_ip6t, *argv, 0))
invarg("invalid nf_call_ip6tables", *argv); invarg("invalid nf_call_ip6tables", *argv);
return -1;
}
addattr8(n, 1024, IFLA_BR_NF_CALL_IP6TABLES, addattr8(n, 1024, IFLA_BR_NF_CALL_IP6TABLES,
nf_call_ip6t); nf_call_ip6t);
} else if (matches(*argv, "nf_call_arptables") == 0) { } else if (matches(*argv, "nf_call_arptables") == 0) {
__u8 nf_call_arpt; __u8 nf_call_arpt;
NEXT_ARG(); NEXT_ARG();
if (get_u8(&nf_call_arpt, *argv, 0)) { if (get_u8(&nf_call_arpt, *argv, 0))
invarg("invalid nf_call_arptables", *argv); invarg("invalid nf_call_arptables", *argv);
return -1;
}
addattr8(n, 1024, IFLA_BR_NF_CALL_ARPTABLES, addattr8(n, 1024, IFLA_BR_NF_CALL_ARPTABLES,
nf_call_arpt); nf_call_arpt);
} else if (matches(*argv, "help") == 0) { } else if (matches(*argv, "help") == 0) {