]> git.puffer.fish Git - matthieu/frr.git/commitdiff
pimd: Compiler warning about unset usage
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 7 Jun 2019 13:28:39 +0000 (09:28 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 7 Jun 2019 13:29:45 +0000 (09:29 -0400)
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
pimd/pim_mroute.c

index 866a19fc9831defe3fed610912782df567ef403e..ca0582434768dfba7da251fac285be22ba26c896 100644 (file)
@@ -897,11 +897,11 @@ int pim_mroute_add(struct channel_oil *c_oil, const char *name)
        int err;
        int orig = 0;
        int orig_iif_vif = 0;
-       struct pim_interface *pim_reg_ifp;
-       int orig_pimreg_ttl;
+       struct pim_interface *pim_reg_ifp = NULL;
+       int orig_pimreg_ttl = 0;
        bool pimreg_ttl_reset = false;
-       struct pim_interface *vxlan_ifp;
-       int orig_term_ttl;
+       struct pim_interface *vxlan_ifp = NULL;
+       int orig_term_ttl = 0;
        bool orig_term_ttl_reset = false;
 
        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)
                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] =
                        orig_pimreg_ttl;
+       }
 
        if (orig_term_ttl_reset)
                c_oil->oil.mfcc_ttls[vxlan_ifp->mroute_vif_index] =