Use the EXTRACT_U_1() macro in some utility functions

[tcpdump] / print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index f02bfaf7938259eeb0b973a72ceafa9ebf5317e8..9777909b48fd94aacfa4d7421c036b1677605f64 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -1,10 +1,10 @@
 /* \summary: Solaris DLT_IPNET 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"
@@ -33,32 +33,32 @@ static const struct tok ipnet_values[] = {
        { 0,                    NULL }
 };
 
-static inline void
+static void
 ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
        const ipnet_hdr_t *hdr;
        hdr = (const ipnet_hdr_t *)bp;
 
        ND_TCHECK_SIZE(hdr);
-       ND_PRINT((ndo, "%d > %d", EXTRACT_BE_U_4(hdr->iph_zsrc),
-                 EXTRACT_BE_U_4(hdr->iph_zdst)));
+       ND_PRINT("%u > %u", EXTRACT_BE_U_4(hdr->iph_zsrc),
+                 EXTRACT_BE_U_4(hdr->iph_zdst));
 
        if (!ndo->ndo_qflag) {
-               ND_PRINT((ndo,", family %s (%d)",
+               ND_PRINT(", family %s (%u)",
                           tok2str(ipnet_values, "Unknown",
                                   EXTRACT_U_1(hdr->iph_family)),
-                          EXTRACT_U_1(hdr->iph_family)));
+                          EXTRACT_U_1(hdr->iph_family));
         } else {
-               ND_PRINT((ndo,", %s",
+               ND_PRINT(", %s",
                           tok2str(ipnet_values,
                                   "Unknown Ethertype (0x%04x)",
-                                 EXTRACT_U_1(hdr->iph_family))));
+                                 EXTRACT_U_1(hdr->iph_family)));
         }
 
-       ND_PRINT((ndo, ", length %u: ", length));
+       ND_PRINT(", length %u: ", length);
        return;
 trunc:
-       ND_PRINT((ndo, " %s", tstr));
+       ND_PRINT(" %s", tstr);
 }
 
 static void
@@ -99,7 +99,7 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
        }
        return;
 trunc:
-       ND_PRINT((ndo, " %s", tstr));
+       ND_PRINT(" %s", tstr);
 }
 
 /*