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>
This commit is contained in:
Donald Sharp 2018-07-29 13:06:49 -04:00
parent fe64533ad9
commit 51c4ed0a0e
2 changed files with 5 additions and 3 deletions

View 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,

View 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);
}
}