bridge: checkpatch related cleanups

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

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

diff --git a/bridge/vlan.c b/bridge/vlan.c
index fc361ae4751e0f784912ebab35647f65aede6708..ccd14bf4c5e3f018fef2862a11a795e0e009988e 100644 (file)
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -17,13 +17,14 @@
 static unsigned int filter_index, filter_vlan;
 static int last_ifidx = -1;
 
-json_writer_t *jw_global = NULL;
+json_writer_t *jw_global;
 
 static void usage(void)
 {
-       fprintf(stderr, "Usage: bridge vlan { add | del } vid VLAN_ID dev DEV [ pvid ] [ untagged ]\n");
-       fprintf(stderr, "                                                     [ self ] [ master ]\n");
-       fprintf(stderr, "       bridge vlan { show } [ dev DEV ] [ vid VLAN_ID ]\n");
+       fprintf(stderr,
+               "Usage: bridge vlan { add | del } vid VLAN_ID dev DEV [ pvid ] [ untagged ]\n"
+               "                                                     [ self ] [ master ]\n"
+               "       bridge vlan { show } [ dev DEV ] [ vid VLAN_ID ]\n");
        exit(-1);
 }
 
@@ -73,9 +74,8 @@ static int vlan_modify(int cmd, int argc, char **argv)
                } else if (strcmp(*argv, "untagged") == 0) {
                        vinfo.flags |= BRIDGE_VLAN_INFO_UNTAGGED;
                } else {
-                       if (matches(*argv, "help") == 0) {
+                       if (matches(*argv, "help") == 0)
                                NEXT_ARG();
-                       }
                }
                argc--; argv++;
        }
@@ -216,9 +216,9 @@ static int print_vlan(const struct sockaddr_nl *who,
                        fprintf(fp, "%s\tNone\n",
                                ll_index_to_name(ifm->ifi_index));
                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 (jw_global)
                        jsonw_end_array(jw_global);
@@ -332,9 +332,10 @@ static int vlan_show(int argc, char **argv)
        }
 
        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",
-                              filter_dev);
+                               filter_dev);
                        return -1;
                }
        }