Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / print-ap1394.c

diff --git a/print-ap1394.c b/print-ap1394.c
index fe07a6739640c5a2da6a6d88da5c4a7538c4c17c..cb9d972f43b6f83a80db3e75f05e7b831db1b0d0 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -91,7 +91,6 @@ ap1394_if_print(const struct pcap_pkthdr *h, const u_char *p)
        u_int caplen = h->caplen;
        struct firewire_header *fp;
        u_short ether_type;
-       u_short extracted_ether_type;
 
        if (caplen < FIREWIRE_HDRLEN) {
                printf("[|ap1394]");
@@ -107,10 +106,7 @@ ap1394_if_print(const struct pcap_pkthdr *h, const u_char *p)
        p += FIREWIRE_HDRLEN;
 
        ether_type = EXTRACT_16BITS(&fp->firewire_type);
-
-       extracted_ether_type = 0;
-       if (ether_encap_print(ether_type, p, length, caplen,
-           &extracted_ether_type) == 0) {
+       if (ethertype_print(ether_type, p, length, caplen) == 0) {
                /* ether_type not known, print raw packet */
                if (!eflag)
                        ap1394_hdr_print((u_char *)fp, length + FIREWIRE_HDRLEN);