summaryrefslogtreecommitdiff
path: root/zebra/zebra_rib.c
diff options
context:
space:
mode:
authorRuss White <russ@riw.us>2018-06-29 13:24:42 -0400
committerGitHub <noreply@github.com>2018-06-29 13:24:42 -0400
commit42edc486069eb0517a54ee5b4e7176a2bbfc24f0 (patch)
tree5412243161902c5507d822a0f3d8480fe0f1191a /zebra/zebra_rib.c
parentb723011d397898959c8a6bd46bb3233e20c7cf9a (diff)
parent0cfbff749e4a47c96511f2eeed4bd970a7b65c68 (diff)
Merge pull request #2514 from pacovn/Coverity_1462467_1465497_Control_flow_issues
zebra: control flow issues (Coverity 1462467 1465497)
Diffstat (limited to 'zebra/zebra_rib.c')
-rw-r--r--zebra/zebra_rib.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index bd00823ed8..8935956b25 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1428,18 +1428,14 @@ static void rib_process_update_fib(struct zebra_vrf *zvrf,
if (new != old)
zlog_debug(
"%u:%s: Deleting route rn %p, re %p (type %d) "
- "old %p (type %d) - %s",
+ "old %p (type %d) - nexthop inactive",
zvrf_id(zvrf), buf, rn, new,
- new->type, old, old->type,
- nh_active ? "install failed"
- : "nexthop inactive");
+ new->type, old, old->type);
else
zlog_debug(
- "%u:%s: Deleting route rn %p, re %p (type %d) - %s",
+ "%u:%s: Deleting route rn %p, re %p (type %d) - nexthop inactive",
zvrf_id(zvrf), buf, rn, new,
- new->type,
- nh_active ? "install failed"
- : "nexthop inactive");
+ new->type);
}
/* If labeled-unicast route, uninstall transit LSP. */