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

bridge: checkpatch related cleanups 

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2017-10-27 09:15:23 +02:00
parent fab9a18a2e
commit bcddcddd29
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bridge/fdb.c
View File

@ -35,11 +35,12 @@ json_writer_t *jw_global;
static void usage(void) static void usage(void)
{ {
fprintf(stderr, "Usage: bridge fdb { add | append | del | replace } ADDR dev DEV\n" fprintf(stderr,
" [ self ] [ master ] [ use ] [ router ]\n" "Usage: bridge fdb { add | append | del | replace } ADDR dev DEV\n"
" [ local | static | dynamic ] [ dst IPADDR ] [ vlan VID ]\n" " [ self ] [ master ] [ use ] [ router ]\n"
" [ port PORT] [ vni VNI ] [ via DEV ]\n"); " [ local | static | dynamic ] [ dst IPADDR ] [ vlan VID ]\n"
fprintf(stderr, " bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ] [ state STATE ] ]\n"); " [ port PORT] [ vni VNI ] [ via DEV ]\n"
" bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ] [ state STATE ] ]\n");
exit(-1); exit(-1);
} }
@ -479,9 +480,9 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
} else if (matches(*argv, "use") == 0) { } else if (matches(*argv, "use") == 0) {
req.ndm.ndm_flags |= NTF_USE; req.ndm.ndm_flags |= NTF_USE;
} else { } else {
if (strcmp(*argv, "to") == 0) { if (strcmp(*argv, "to") == 0)
NEXT_ARG(); NEXT_ARG();
}
if (matches(*argv, "help") == 0) if (matches(*argv, "help") == 0)
usage(); usage();
if (addr) if (addr)

21
bridge/vlan.c
View File

@ -17,13 +17,14 @@
static unsigned int filter_index, filter_vlan; static unsigned int filter_index, filter_vlan;
static int last_ifidx = -1; static int last_ifidx = -1;
json_writer_t *jw_global = NULL; json_writer_t *jw_global;
static void usage(void) static void usage(void)
{ {
fprintf(stderr, "Usage: bridge vlan { add | del } vid VLAN_ID dev DEV [ pvid ] [ untagged ]\n"); fprintf(stderr,
fprintf(stderr, " [ self ] [ master ]\n"); "Usage: bridge vlan { add | del } vid VLAN_ID dev DEV [ pvid ] [ untagged ]\n"
fprintf(stderr, " bridge vlan { show } [ dev DEV ] [ vid VLAN_ID ]\n"); " [ self ] [ master ]\n"
" bridge vlan { show } [ dev DEV ] [ vid VLAN_ID ]\n");
exit(-1); exit(-1);
} }
@ -73,9 +74,8 @@ static int vlan_modify(int cmd, int argc, char **argv)
} else if (strcmp(*argv, "untagged") == 0) { } else if (strcmp(*argv, "untagged") == 0) {
vinfo.flags |= BRIDGE_VLAN_INFO_UNTAGGED; vinfo.flags |= BRIDGE_VLAN_INFO_UNTAGGED;
} else { } else {
if (matches(*argv, "help") == 0) { if (matches(*argv, "help") == 0)
NEXT_ARG(); NEXT_ARG();
}
} }
argc--; argv++; argc--; argv++;
} }
@ -216,9 +216,9 @@ static int print_vlan(const struct sockaddr_nl *who,
fprintf(fp, "%s\tNone\n", fprintf(fp, "%s\tNone\n",
ll_index_to_name(ifm->ifi_index)); ll_index_to_name(ifm->ifi_index));
return 0; return 0;
} else {
print_vlan_info(fp, tb[IFLA_AF_SPEC], ifm->ifi_index);
} }
print_vlan_info(fp, tb[IFLA_AF_SPEC], ifm->ifi_index);
if (!filter_vlan) { if (!filter_vlan) {
if (jw_global) if (jw_global)
jsonw_end_array(jw_global); jsonw_end_array(jw_global);
@ -332,9 +332,10 @@ static int vlan_show(int argc, char **argv)
} }
if (filter_dev) { if (filter_dev) {
if ((filter_index = if_nametoindex(filter_dev)) == 0) { filter_index = if_nametoindex(filter_dev);
if (filter_index == 0) {
fprintf(stderr, "Cannot find device \"%s\"\n", fprintf(stderr, "Cannot find device \"%s\"\n",
filter_dev); filter_dev);
return -1; return -1;
} }
} }