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

[tcpdump] / print-fddi.c

diff --git a/print-fddi.c b/print-fddi.c
index 75a1055fc4832c51d83af4f5e67960c076574cfc..ccdf588923658c0cede2352294a6bd48aa702a1c 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -21,9 +21,7 @@
 
 /* \summary: Fiber Distributed Data Interface (FDDI) printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -39,8 +37,8 @@
 
 struct fddi_header {
        nd_uint8_t  fddi_fc;            /* frame control */
-       nd_mac_addr fddi_dhost;
-       nd_mac_addr fddi_shost;
+       nd_mac48 fddi_dhost;
+       nd_mac48 fddi_shost;
 };
 
 /*
@@ -84,7 +82,7 @@ struct fddi_header {
 /*
  * Some FDDI interfaces use bit-swapped addresses.
  */
-#if defined(ultrix) || defined(__alpha) || defined(__bsdi) || defined(__NetBSD__) || defined(__linux__)
+#if defined(__alpha) || defined(__NetBSD__) || defined(__linux__)
 static int fddi_bitswap = 0;
 #else
 static int fddi_bitswap = 1;
@@ -256,8 +254,8 @@ fddi_hdr_print(netdissect_options *ndo,
 {
        const char *srcname, *dstname;
 
-       srcname = etheraddr_string(ndo, fsrc);
-       dstname = etheraddr_string(ndo, fdst);
+       srcname = mac48_string(ndo, fsrc);
+       dstname = mac48_string(ndo, fdst);
 
        if (!ndo->ndo_qflag)
                print_fddi_fc(ndo, GET_U_1(fddip->fddi_fc));
@@ -277,7 +275,7 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
 {
        const struct fddi_header *fddip = (const struct fddi_header *)p;
        uint8_t fc;
-       nd_mac_addr srcmac, dstmac;
+       nd_mac48 srcmac, dstmac;
        struct lladdr_info src, dst;
        int llc_hdrlen;
 
@@ -298,9 +296,9 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
                fddi_hdr_print(ndo, fddip, length, srcmac, dstmac);
 
        src.addr = srcmac;
-       src.addr_string = etheraddr_string;
+       src.addr_string = mac48_string;
        dst.addr = dstmac;
-       dst.addr_string = etheraddr_string;
+       dst.addr_string = mac48_string;
 
        /* Skip over FDDI MAC header */
        length -= FDDI_HDRLEN;