From: Mark Stapp <mjs@voltanet.io>
Date: Thu, 5 Mar 2020 13:35:55 +0000 (-0500)
Subject: zebra: clean up an SA warning in show_ip_route_all
X-Git-Tag: base_7.4~291^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F5914%2Fhead;p=mirror%2Ffrr.git

zebra: clean up an SA warning in show_ip_route_all

SA reports a redundant NULL check; remove it.

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

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 8c719f4b6a..f903065f44 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -915,8 +915,8 @@ static void do_show_route_helper(struct vty *vty, struct zebra_vrf *zvrf,
 	}
 }
 
-static void do_show_ip_route_all(struct vty *vty, struct zebra_vrf *zvrf, afi_t afi,
-				 bool use_fib, bool use_json,
+static void do_show_ip_route_all(struct vty *vty, struct zebra_vrf *zvrf,
+				 afi_t afi, bool use_fib, bool use_json,
 				 route_tag_t tag,
 				 const struct prefix *longer_prefix_p,
 				 bool supernets_only, int type,
@@ -934,12 +934,12 @@ static void do_show_ip_route_all(struct vty *vty, struct zebra_vrf *zvrf, afi_t
 		if (zrt->afi != afi ||
 		    zrt->safi != SAFI_UNICAST)
 			continue;
-		if (zrt->table)
-			do_show_ip_route(vty, zvrf_name(zvrf), afi,
-					 SAFI_UNICAST, use_fib, use_json,
-					 tag, longer_prefix_p,
-					 supernets_only, type,
-					 ospf_instance_id, zrt->tableid);
+
+		do_show_ip_route(vty, zvrf_name(zvrf), afi,
+				 SAFI_UNICAST, use_fib, use_json,
+				 tag, longer_prefix_p,
+				 supernets_only, type,
+				 ospf_instance_id, zrt->tableid);
 	}
 }