matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pimd: Compiler warning about unset usage

Browse source 
While this is impossible, make the compilers a bit happier
for those of us having to use something old.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com
This commit is contained in:
Donald Sharp 2019-06-07 09:28:39 -04:00
parent adc109b5a2
commit 42e01756c1
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pimd/pim_mroute.c
View file

@ -897,11 +897,11 @@ int pim_mroute_add(struct channel_oil *c_oil, const char *name)
int err; int err;
int orig = 0; int orig = 0;
int orig_iif_vif = 0; int orig_iif_vif = 0;
struct pim_interface *pim_reg_ifp; struct pim_interface *pim_reg_ifp = NULL;
int orig_pimreg_ttl; int orig_pimreg_ttl = 0;
bool pimreg_ttl_reset = false; bool pimreg_ttl_reset = false;
struct pim_interface *vxlan_ifp; struct pim_interface *vxlan_ifp = NULL;
int orig_term_ttl; int orig_term_ttl = 0;
bool orig_term_ttl_reset = false; bool orig_term_ttl_reset = false;
pim->mroute_add_last = pim_time_monotonic_sec(); pim->mroute_add_last = pim_time_monotonic_sec();
@ -985,9 +985,11 @@ int pim_mroute_add(struct channel_oil *c_oil, const char *name)
if (c_oil->oil.mfcc_origin.s_addr == INADDR_ANY) if (c_oil->oil.mfcc_origin.s_addr == INADDR_ANY)
c_oil->oil.mfcc_ttls[c_oil->oil.mfcc_parent] = orig; c_oil->oil.mfcc_ttls[c_oil->oil.mfcc_parent] = orig;
if (pimreg_ttl_reset) if (pimreg_ttl_reset) {
assert(pim_reg_ifp);
c_oil->oil.mfcc_ttls[pim_reg_ifp->mroute_vif_index] = c_oil->oil.mfcc_ttls[pim_reg_ifp->mroute_vif_index] =
orig_pimreg_ttl; orig_pimreg_ttl;
}
if (orig_term_ttl_reset) if (orig_term_ttl_reset)
c_oil->oil.mfcc_ttls[vxlan_ifp->mroute_vif_index] = c_oil->oil.mfcc_ttls[vxlan_ifp->mroute_vif_index] =