From: paco <paco@voltanet.io>
Date: Wed, 13 Jun 2018 10:25:45 +0000 (+0200)
Subject: bgpd: dead code (Coverity 1399246)
X-Git-Tag: frr-6.1-dev~335^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F2420%2Fhead;p=mirror%2Ffrr.git

bgpd: dead code (Coverity 1399246)

Signed-off-by: F. Aragon <paco@voltanet.io>
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index d4ebd54e46..c1851a3e02 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -8016,16 +8016,11 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
 		if (count)
 			vty_out(vty, "\nTotal number of neighbors %d\n", count);
 		else {
-			if (use_json)
-				vty_out(vty,
-					"{\"error\": {\"message\": \"No %s neighbor configured\"}}\n",
-					afi_safi_print(afi, safi));
-			else
-				vty_out(vty, "No %s neighbor is configured\n",
-					afi_safi_print(afi, safi));
+			vty_out(vty, "No %s neighbor is configured\n",
+				afi_safi_print(afi, safi));
 		}
 
-		if (dn_count && !use_json) {
+		if (dn_count) {
 			vty_out(vty, "* - dynamic neighbor\n");
 			vty_out(vty, "%d dynamic neighbor(s), limit %d\n",
 				dn_count, bgp->dynamic_neighbors_limit);