summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2018-07-29 13:06:49 -0400
committerDonald Sharp <sharpd@cumulusnetworks.com>2018-07-29 13:06:49 -0400
commit51c4ed0a0e556e24ebc86f7173b8b64ee9ff8ba3 (patch)
tree76f7c00aecac2842cccec18a4183c1a161249ecc
parentfe64533ad9a780366ce143480c26a6ee61ea14ba (diff)
staticd, zebra: Fix up code warnings
CI found a couple of warnings that needed to be cleaned up. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
-rw-r--r--staticd/static_vty.c2
-rw-r--r--zebra/rt_netlink.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/staticd/static_vty.c b/staticd/static_vty.c
index 45a4d53ba1..98153f7149 100644
--- a/staticd/static_vty.c
+++ b/staticd/static_vty.c
@@ -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,
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 918152aa6e..246b24b688 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -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);
}
}