zebra: fix some coverity SA warnings

Fix several coverity scan warnings.

Signed-off-by: Mark Stapp <mjs@voltanet.io>

diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index a2365ee76b1bd4faa4e8da2e138702cd78f67b50..df8d673b514ae2d88d2b7580008af9aefa450335 100644 (file)
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -1581,7 +1581,7 @@ static int dplane_ctx_route_init(struct zebra_dplane_ctx *ctx,
        dplane_ctx_ns_init(ctx, zns, (op == DPLANE_OP_ROUTE_UPDATE));
 
 #ifdef HAVE_NETLINK
-       if (re->nhe) {
+       {
                struct nhg_hash_entry *nhe = zebra_nhg_resolve(re->nhe);
 
                ctx->u.rinfo.nhe.id = nhe->id;

diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index fceddcb7459dc0c346ed6f4ba231e1e0cb622911..de044c0ea09ec4dad007ef509c973546fb8ad7f9 100644 (file)
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -459,11 +459,7 @@ uint32_t zebra_nhg_id_key(const void *arg)
 static bool nhg_compare_nexthops(const struct nexthop *nh1,
                                 const struct nexthop *nh2)
 {
-       if (nh1 && !nh2)
-               return false;
-
-       if (!nh1 && nh2)
-               return false;
+       assert(nh1 != NULL && nh2 != NULL);
 
        /*
         * We have to check the active flag of each individual one,
@@ -518,13 +514,17 @@ bool zebra_nhg_hash_equal(const void *arg1, const void *arg2)
 
        /* Nexthops should be in-order, so we simply compare them in-place */
        for (nexthop1 = nhe1->nhg.nexthop, nexthop2 = nhe2->nhg.nexthop;
-            nexthop1 || nexthop2;
+            nexthop1 && nexthop2;
             nexthop1 = nexthop1->next, nexthop2 = nexthop2->next) {
 
                if (!nhg_compare_nexthops(nexthop1, nexthop2))
                        return false;
        }
 
+       /* Check for unequal list lengths */
+       if (nexthop1 || nexthop2)
+               return false;
+
        /* If there's no backup info, comparison is done. */
        if ((nhe1->backup_info == NULL) && (nhe2->backup_info == NULL))
                return true;
@@ -550,7 +550,7 @@ bool zebra_nhg_hash_equal(const void *arg1, const void *arg2)
        /* Have to compare the backup nexthops */
        for (nexthop1 = nhe1->backup_info->nhe->nhg.nexthop,
             nexthop2 = nhe2->backup_info->nhe->nhg.nexthop;
-            nexthop1 || nexthop2;
+            nexthop1 && nexthop2;
             nexthop1 = nexthop1->next, nexthop2 = nexthop2->next) {
 
                if (!nhg_compare_nexthops(nexthop1, nexthop2))
@@ -1475,9 +1475,7 @@ zebra_nhg_rib_find_nhe(struct nhg_hash_entry *rt_nhe, afi_t rt_afi)
        }
 
        if (IS_ZEBRA_DEBUG_NHG_DETAIL)
-               zlog_debug("%s: rt_nhe %p (%u)",
-                          __func__, rt_nhe,
-                          rt_nhe ? rt_nhe->id : 0);
+               zlog_debug("%s: rt_nhe %p (%u)", __func__, rt_nhe, rt_nhe->id);
 
        zebra_nhe_find(&nhe, rt_nhe, NULL, rt_afi);
 
@@ -1568,14 +1566,10 @@ void zebra_nhg_free(struct nhg_hash_entry *nhe)
                /* Group or singleton? */
                if (nhe->nhg.nexthop && nhe->nhg.nexthop->next)
                        zlog_debug("%s: nhe %p (%u), refcnt %d",
-                                  __func__, nhe,
-                                  (nhe ? nhe->id : 0),
-                                  (nhe ? nhe->refcnt : 0));
+                                  __func__, nhe, nhe->id, nhe->refcnt);
                else
                        zlog_debug("%s: nhe %p (%u), refcnt %d, NH %pNHv",
-                                  __func__, nhe,
-                                  (nhe ? nhe->id : 0),
-                                  (nhe ? nhe->refcnt : 0),
+                                  __func__, nhe, nhe->id, nhe->refcnt,
                                   nhe->nhg.nexthop);
        }
 
@@ -1942,13 +1936,14 @@ static int nexthop_active(afi_t afi, struct route_entry *re,
                                nexthop_set_resolved(afi, newhop, nexthop);
                                resolved = 1;
                        }
+
                        if (resolved)
                                re->nexthop_mtu = match->mtu;
-
-                       if (!resolved && IS_ZEBRA_DEBUG_RIB_DETAILED)
+                       else if (IS_ZEBRA_DEBUG_RIB_DETAILED)
                                zlog_debug(
                                        "        %s: Recursion failed to find",
                                        __func__);
+
                        return resolved;
                } else if (re->type == ZEBRA_ROUTE_STATIC) {
                        resolved = 0;