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

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index dea50ac2758a8065843519e7fbe27a9182568602..725d583939afbae752c0866cd96c6eed17e7460b 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -21,14 +21,11 @@
 
 /* \summary: BSD loopback device printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "af.h"
@@ -82,11 +79,7 @@ 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_hdr_len += caplen;
-               nd_print_trunc(ndo);
-               return;
-       }
+       ND_TCHECK_LEN(p, NULL_HDRLEN);
        ndo->ndo_ll_hdr_len += NULL_HDRLEN;
 
        family = GET_HE_U_4(p);
@@ -111,25 +104,25 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 
        switch (family) {
 
-       case BSD_AFNUM_INET:
+       case BSD_AF_INET:
                ip_print(ndo, p, length);
                break;
 
-       case BSD_AFNUM_INET6_BSD:
-       case BSD_AFNUM_INET6_FREEBSD:
-       case BSD_AFNUM_INET6_DARWIN:
+       case BSD_AF_INET6_BSD:
+       case BSD_AF_INET6_FREEBSD:
+       case BSD_AF_INET6_DARWIN:
                ip6_print(ndo, p, length);
                break;
 
-       case BSD_AFNUM_ISO:
+       case BSD_AF_ISO:
                isoclns_print(ndo, p, length);
                break;
 
-       case BSD_AFNUM_APPLETALK:
+       case BSD_AF_APPLETALK:
                atalk_print(ndo, p, length);
                break;
 
-       case BSD_AFNUM_IPX:
+       case BSD_AF_IPX:
                ipx_print(ndo, p, length);
                break;