BOOTP: try to fix 2 newly added compile warnings

[tcpdump] / print-arcnet.c

diff --git a/print-arcnet.c b/print-arcnet.c
index 4f32dce465ba546dbbd465a245707e0ac11e2ede..640d31beb06fed2b39b543ebac4807593ae34ff6 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -21,6 +21,7 @@
  * From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -242,7 +243,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
        }
 
        if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
-               ndo->ndo_default_print(ndo, p, caplen);
+               ND_DEFAULTPRINT(p, caplen);
 
        return (archdrlen);
 }
@@ -301,7 +302,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
        p += archdrlen;
 
        if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
-               ndo->ndo_default_print(ndo, p, caplen);
+               ND_DEFAULTPRINT(p, caplen);
 
        return (archdrlen);
 }
@@ -339,12 +340,12 @@ arcnet_encap_print(netdissect_options *ndo, u_char arctype, const u_char *p,
 
        case ARCTYPE_ATALK:     /* XXX was this ever used? */
                if (ndo->ndo_vflag)
-                       fputs("et1 ", stdout);
+                       ND_PRINT((ndo, "et1 "));
                atalk_print(p, length);
                return (1);
 
        case ARCTYPE_IPX:
-               ipx_print(p, length);
+               ipx_print(ndo, p, length);
                return (1);
 
        default: