Use nd_ types, add host-endian extract routines, clean up signed vs. unsigned.

[tcpdump] / print.c

diff --git a/print.c b/print.c
index 703d7ef2b619aa6ff0461017503bf808ae83174f..ca231f146e01f24837adb36fa8b6b60d933b43c5 100644 (file)
--- a/print.c
+++ b/print.c
@@ -99,14 +99,12 @@ static const struct printer printers[] = {
 #ifdef DLT_IPV6
        { raw_if_print,         DLT_IPV6 },
 #endif
-#ifdef HAVE_PCAP_USB_H
 #ifdef DLT_USB_LINUX
        { usb_linux_48_byte_if_print, DLT_USB_LINUX},
 #endif /* DLT_USB_LINUX */
 #ifdef DLT_USB_LINUX_MMAPPED
        { usb_linux_64_byte_if_print, DLT_USB_LINUX_MMAPPED},
 #endif /* DLT_USB_LINUX_MMAPPED */
-#endif /* HAVE_PCAP_USB_H */
 #ifdef DLT_SYMANTEC_FIREWALL
        { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
 #endif
@@ -317,7 +315,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
        u_int hdrlen;
 
        if(ndo->ndo_packet_number)
-               ND_PRINT((ndo, "%5u  ", packets_captured));
+               ND_PRINT("%5u  ", packets_captured);
 
        ts_print(ndo, &h->ts);
 
@@ -394,7 +392,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
                }
        }
 
-       ND_PRINT((ndo, "\n"));
+       ND_PRINT("\n");
 }
 
 /*