From: F. Aragon <paco@voltanet.io>
Date: Wed, 26 Sep 2018 15:50:33 +0000 (+0200)
Subject: bfdd zebra: dead code (Coverity 1472624 1473199)
X-Git-Tag: frr-7.1-dev~323^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4848ef7430f9b7f48141d20f8c8cab2dc8dd34aa;p=mirror%2Ffrr.git

bfdd zebra: dead code (Coverity 1472624 1473199)

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

diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c
index 1c6d03195c..51dd9cb26d 100644
--- a/bfdd/bfdd_vty.c
+++ b/bfdd/bfdd_vty.c
@@ -886,14 +886,7 @@ static int bfd_configure_peer(struct bfd_peer_cfg *bpc, bool mhop,
 	if (local)
 		bpc->bpc_local = *local;
 
-	if (peer) {
-		bpc->bpc_peer = *peer;
-	} else {
-		/* Peer configuration is mandatory. */
-		snprintf(ebuf, ebuflen, "no peer configured");
-		return -1;
-	}
-
+	bpc->bpc_peer = *peer;
 	bpc->bpc_mhop = mhop;
 
 	/* Handle interface specification configuration. */
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index ea0bef3718..989d63f9b1 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -4269,10 +4269,8 @@ static void process_remote_macip_add(vni_t vni,
 					vni,
 					prefix_mac2str(macaddr,
 						       buf, sizeof(buf)),
-					ipa_len ? " IP " : "",
-					ipa_len ?
-					ipaddr2str(ipaddr,
-						   buf1, sizeof(buf1)) : "",
+					" IP ",
+					ipaddr2str(ipaddr, buf1, sizeof(buf1)),
 					n_type,
 					tmp_seq);
 				return;