CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-stp.c

diff --git a/print-stp.c b/print-stp.c
index 5030b2193f3b4edbaf216945a70916660ca90dfe..7e928b33f3b12dd1406e43d974a1d747a232dcb6 100644 (file)
--- a/print-stp.c
+++ b/print-stp.c
@@ -10,9 +10,7 @@
 
 /* \summary: IEEE 802.1d Spanning Tree Protocol (STP) printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -144,7 +142,7 @@ stp_print_config_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
  *
  * 2 -  bytes Protocol Id
  * 1 -  byte  Protocol Ver.
- * 1 -  byte  BPDU tye
+ * 1 -  byte  BPDU type
  * 1 -  byte  Flags
  * 8 -  bytes CIST Root Identifier
  * 4 -  bytes CIST External Path Cost
@@ -443,8 +441,7 @@ stp_print(netdissect_options *ndo, const u_char *p, u_int length)
             }
             stp_print_mstp_bpdu(ndo, stp_bpdu, length);
 
-            if (protocol_version == STP_PROTO_SPB)
-            {
+            if (protocol_version == STP_PROTO_SPB) {
               /* Validate v4 length */
               spb_len = GET_BE_U_2(p + MST_BPDU_VER3_LEN_OFFSET + mstp_len);
               spb_len += 2;