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

[tcpdump] / print-openflow-1.3.c

diff --git a/print-openflow-1.3.c b/print-openflow-1.3.c
index 8008c2f38ccb4d8746189957e13086abbd5d5c33..11817d459da2ceddc19cddca37ab2af5ce469d8c 100644 (file)
--- a/print-openflow-1.3.c
+++ b/print-openflow-1.3.c
@@ -33,9 +33,7 @@
 
 /* \summary: OpenFlow protocol version 1.3 printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -655,8 +653,8 @@ of13_port_print(netdissect_options *ndo,
        /* pad */
        cp += 4;
        /* hw_addr */
-       ND_PRINT(", hw_addr %s", GET_ETHERADDR_STRING(cp));
-       cp += MAC_ADDR_LEN;
+       ND_PRINT(", hw_addr %s", GET_MAC48_STRING(cp));
+       cp += MAC48_LEN;
        /* pad2 */
        cp += 2;
        /* name */
@@ -676,7 +674,7 @@ of13_port_print(netdissect_options *ndo,
        cp += 4;
        /* state */
        ND_PRINT("\n\t   state 0x%08x", GET_BE_U_4(cp));
-       of_bitmap_print(ndo, ofpps_bm, GET_BE_U_4(cp), OFPPS_U);;
+       of_bitmap_print(ndo, ofpps_bm, GET_BE_U_4(cp), OFPPS_U);
        cp += 4;
        /* curr */
        ND_PRINT("\n\t   curr 0x%08x", GET_BE_U_4(cp));
@@ -812,8 +810,8 @@ of13_port_mod_print(netdissect_options *ndo,
        /* pad */
        cp += 4;
        /* hw_addr */
-       ND_PRINT(", hw_addr %s", GET_ETHERADDR_STRING(cp));
-       cp += MAC_ADDR_LEN;
+       ND_PRINT(", hw_addr %s", GET_MAC48_STRING(cp));
+       cp += MAC48_LEN;
        /* pad2 */
        cp += 2;
        /* config */