From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Thu, 16 Jul 2020 16:28:44 +0000 (+0200)
Subject: MPLS: Rework some tests
X-Git-Tag: tcpdump-4.99-bp~320
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/3af5630a29ebce1432ba13b59a597b86340604e6

MPLS: Rework some tests

This should address a warning with some AppVeyor builds (VS 16 2019):
warning C4061: enumerator 'PT_UNKNOWN' in switch of enum
'mpls_packet_type' is not explicitly handled by a case label
---

diff --git a/print-mpls.c b/print-mpls.c
index 62b79957..4351507e 100644
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -183,28 +183,26 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	/*
 	 * Print the payload.
 	 */
-	if (pt == PT_UNKNOWN) {
+	switch (pt) {
+	case PT_UNKNOWN:
 		if (!ndo->ndo_suppress_default_print)
 			ND_DEFAULTPRINT(p, length);
-		return;
-	}
-	ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
-	switch (pt) {
+		break;
 
 	case PT_IPV4:
+		ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
 		ip_print(ndo, p, length);
 		break;
 
 	case PT_IPV6:
+		ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
 		ip6_print(ndo, p, length);
 		break;
 
 	case PT_OSI:
+		ND_PRINT(ndo->ndo_vflag ? "\n\t" : " ");
 		isoclns_print(ndo, p, length);
 		break;
-
-	default:
-		break;
 	}
 	return;