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

[tcpdump] / print-realtek.c

diff --git a/print-realtek.c b/print-realtek.c
index 2aae3fe46c5ce169563c29aa73783be7f6ecf60f..6b3b23971200f8cdd82ccec029ed944ecc5b4f1e 100644 (file)
--- a/print-realtek.c
+++ b/print-realtek.c
@@ -25,9 +25,7 @@
 
 /* \summary: printer for various Realtek protocols */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -117,7 +115,7 @@ rrcp_print(netdissect_options *ndo,
                tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode));
        if (rrcp_opcode==RRCP_OPCODE_GET_CONFIGURATION ||
            rrcp_opcode==RRCP_OPCODE_SET_CONFIGURATION){
-           ND_PRINT(" addr=0x%04x, data=0x%08x",
+           ND_PRINT(" addr=0x%04x, data=0x%08x",
                     GET_LE_U_2(cp + RRCP_REG_ADDR_OFFSET),
                     GET_LE_U_4(cp + RRCP_REG_DATA_OFFSET));
        }
@@ -128,7 +126,7 @@ rrcp_print(netdissect_options *ndo,
            ND_PRINT(" downlink_port=%u, uplink_port=%u, uplink_mac=%s, vendor_id=%08x ,chip_id=%04x ",
                     GET_U_1(cp + RRCP_DOWNLINK_PORT_OFFSET),
                     GET_U_1(cp + RRCP_UPLINK_PORT_OFFSET),
-                    GET_ETHERADDR_STRING(cp + RRCP_UPLINK_MAC_OFFSET),
+                    GET_MAC48_STRING(cp + RRCP_UPLINK_MAC_OFFSET),
                     GET_BE_U_4(cp + RRCP_VENDOR_ID_OFFSET),
                     GET_BE_U_2(cp + RRCP_CHIP_ID_OFFSET));
        }else if (rrcp_opcode==RRCP_OPCODE_GET_CONFIGURATION ||