From: F. Aragon <paco@voltanet.io>
Date: Thu, 13 Sep 2018 10:05:20 +0000 (+0200)
Subject: nhrpd: missing operand added
X-Git-Tag: frr-7.1-dev~370^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=57b0ac508ef6f5e1d0f802b8a258f5cf48d11256;p=mirror%2Ffrr.git

nhrpd: missing operand added

Detected using -Wgnu-conditional-omitted-operand

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

diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c
index e051830f85..203d4aa98c 100644
--- a/nhrpd/nhrp_peer.c
+++ b/nhrpd/nhrp_peer.c
@@ -814,8 +814,9 @@ static void nhrp_packet_debug(struct zbuf *zb, const char *dir)
 
 	reply = packet_types[hdr->type].type == PACKET_REPLY;
 	debugf(NHRP_DEBUG_COMMON, "%s %s(%d) %s -> %s", dir,
-	       packet_types[hdr->type].name ?: "Unknown", hdr->type,
-	       reply ? buf[1] : buf[0], reply ? buf[0] : buf[1]);
+	       (packet_types[hdr->type].name ? packet_types[hdr->type].name
+					     : "Unknown"),
+	       hdr->type, reply ? buf[1] : buf[0], reply ? buf[0] : buf[1]);
 }
 
 static int proto2afi(uint16_t proto)