]> git.puffer.fish Git - matthieu/frr.git/commitdiff
staticd, zebra: Fix up code warnings
authorDonald Sharp <sharpd@cumulusnetworks.com>
Sun, 29 Jul 2018 17:06:49 +0000 (13:06 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Sun, 29 Jul 2018 17:06:49 +0000 (13:06 -0400)
CI found a couple of warnings that needed to be cleaned up.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
staticd/static_vty.c
zebra/rt_netlink.c

index 45a4d53ba16e64a4a63cd7711bfa94fbbaf120da..98153f71497d7ba34d2f3d0fd37f4699e71d836a 100644 (file)
@@ -1047,7 +1047,7 @@ DEFPY(ip_route_vrf,
        VTY_DECLVAR_CONTEXT(vrf, vrf);
        struct static_vrf *svrf = vrf->info;
        struct static_vrf *nh_svrf;
-        const char *flag = NULL;
+       const char *flag = NULL;
 
        if (table_str && !vrf_is_backend_netns()) {
                vty_out(vty,
index 918152aa6e2ce8ce8b8b7bccf1a314297011d9cd..246b24b688c524613a94ac22df3aec6f16e875c2 100644 (file)
@@ -644,12 +644,14 @@ static int netlink_route_change_read_unicast(struct nlmsghdr *h, ns_id_t ns_id,
                        if (gate)
                                memcpy(&nh.gate, gate, sz);
                        rib_delete(afi, SAFI_UNICAST, vrf_id, proto, 0, flags,
-                                  &p, &src_p, &nh, table, metric, distance, true);
+                                  &p, &src_p, &nh, table, metric, distance,
+                                  true);
                } else {
                        /* XXX: need to compare the entire list of nexthops
                         * here for NLM_F_APPEND stupidity */
                        rib_delete(afi, SAFI_UNICAST, vrf_id, proto, 0, flags,
-                                  &p, &src_p, NULL, table, metric, distance, true);
+                                  &p, &src_p, NULL, table, metric, distance,
+                                  true);
                }
        }