Include <string.h> only if required.

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index f2ea96e2f73a9ce389bc52e4066c3d1e751838f5..a1b03f86aae62f912877bc9be149cef823b4dfb7 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -27,8 +27,7 @@
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "af.h"
@@ -82,12 +81,8 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
        uint32_t family;
 
        ndo->ndo_protocol = "null";
-       if (caplen < NULL_HDRLEN) {
-               ndo->ndo_ll_header_length += caplen;
-               nd_print_trunc(ndo);
-               return;
-       }
-       ndo->ndo_ll_header_length += NULL_HDRLEN;
+       ND_TCHECK_LEN(p, NULL_HDRLEN);
+       ndo->ndo_ll_hdr_len += NULL_HDRLEN;
 
        family = GET_HE_U_4(p);
 
@@ -140,6 +135,4 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                if (!ndo->ndo_suppress_default_print)
                        ND_DEFAULTPRINT(p, caplen);
        }
-
-       return;
 }