Use the EXTRACT_U_1() macro in some utility functions

[tcpdump] / print-arcnet.c

diff --git a/print-arcnet.c b/print-arcnet.c
index 4dccf4a9c593bf56289d5bd416ccd99160f7e670..469361efebaadc71917fa2c9743b990a01146120 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -24,10 +24,10 @@
 /* \summary: Attached Resource Computer NETwork (ARCNET) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -118,9 +118,9 @@ static const struct tok arctypemap[] = {
        { 0, 0 }
 };
 
-static inline void
+static void
 arcnet_print(netdissect_options *ndo, const u_char *bp, u_int length, int phds,
-             int flag, u_int seqid)
+             u_int flag, u_int seqid)
 {
        const struct arc_header *ap;
        const char *arctypename;
@@ -130,47 +130,47 @@ arcnet_print(netdissect_options *ndo, const u_char *bp, u_int length, int phds,
 
 
        if (ndo->ndo_qflag) {
-               ND_PRINT((ndo, "%02x %02x %u: ",
+               ND_PRINT("%02x %02x %u: ",
                             EXTRACT_U_1(ap->arc_shost),
                             EXTRACT_U_1(ap->arc_dhost),
-                            length));
+                            length);
                return;
        }
 
        arctypename = tok2str(arctypemap, "%02x", EXTRACT_U_1(ap->arc_type));
 
        if (!phds) {
-               ND_PRINT((ndo, "%02x %02x %s %d: ",
+               ND_PRINT("%02x %02x %s %u: ",
                             EXTRACT_U_1(ap->arc_shost),
                             EXTRACT_U_1(ap->arc_dhost),
                             arctypename,
-                            length));
+                            length);
                return;
        }
 
        if (flag == 0) {
-               ND_PRINT((ndo, "%02x %02x %s seqid %04x %d: ",
+               ND_PRINT("%02x %02x %s seqid %04x %u: ",
                        EXTRACT_U_1(ap->arc_shost),
                        EXTRACT_U_1(ap->arc_dhost),
                        arctypename, seqid,
-                       length));
+                       length);
                return;
        }
 
        if (flag & 1)
-               ND_PRINT((ndo, "%02x %02x %s seqid %04x "
-                       "(first of %d fragments) %d: ",
+               ND_PRINT("%02x %02x %s seqid %04x "
+                       "(first of %u fragments) %u: ",
                        EXTRACT_U_1(ap->arc_shost),
                        EXTRACT_U_1(ap->arc_dhost),
                        arctypename, seqid,
-                       (flag + 3) / 2, length));
+                       (flag + 3) / 2, length);
        else
-               ND_PRINT((ndo, "%02x %02x %s seqid %04x "
-                       "(fragment %d) %d: ",
+               ND_PRINT("%02x %02x %s seqid %04x "
+                       "(fragment %u) %u: ",
                        EXTRACT_U_1(ap->arc_shost),
                        EXTRACT_U_1(ap->arc_dhost),
                        arctypename, seqid,
-                       flag/2 + 1, length));
+                       flag/2 + 1, length);
 }
 
 /*
@@ -186,12 +186,13 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
        u_int length = h->len;
        const struct arc_header *ap;
 
-       int phds, flag = 0, archdrlen = 0;
+       int phds;
+       u_int flag = 0, archdrlen = 0;
        u_int seqid = 0;
        u_char arc_type;
 
        if (caplen < ARC_HDRLEN || length < ARC_HDRLEN) {
-               ND_PRINT((ndo, "[|arcnet]"));
+               ND_PRINT("[|arcnet]");
                return (caplen);
        }
 
@@ -213,7 +214,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
        if (phds) {
                if (caplen < ARC_HDRNEWLEN || length < ARC_HDRNEWLEN) {
                        arcnet_print(ndo, p, length, 0, 0, 0);
-                       ND_PRINT((ndo, "[|phds]"));
+                       ND_PRINT("[|phds]");
                        return (caplen);
                }
 
@@ -221,7 +222,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
                if (flag == 0xff) {
                        if (caplen < ARC_HDRNEWLEN_EXC || length < ARC_HDRNEWLEN_EXC) {
                                arcnet_print(ndo, p, length, 0, 0, 0);
-                               ND_PRINT((ndo, "[|phds extended]"));
+                               ND_PRINT("[|phds extended]");
                                return (caplen);
                        }
                        flag = EXTRACT_U_1(ap->arc_flag2);
@@ -278,7 +279,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
        u_char arc_type;
 
        if (caplen < ARC_LINUX_HDRLEN || length < ARC_LINUX_HDRLEN) {
-               ND_PRINT((ndo, "[|arcnet]"));
+               ND_PRINT("[|arcnet]");
                return (caplen);
        }
 
@@ -289,7 +290,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
        default:
                archdrlen = ARC_LINUX_HDRNEWLEN;
                if (caplen < ARC_LINUX_HDRNEWLEN || length < ARC_LINUX_HDRNEWLEN) {
-                       ND_PRINT((ndo, "[|arcnet]"));
+                       ND_PRINT("[|arcnet]");
                        return (caplen);
                }
                break;
@@ -347,7 +348,7 @@ 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)
-                       ND_PRINT((ndo, "et1 "));
+                       ND_PRINT("et1 ");
                atalk_print(ndo, p, length);
                return (1);