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 fb62e15c202880ea90b2e41275bffcf9034df760..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_print, 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_print, 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
@@ -151,49 +149,49 @@ static const struct printer printers[] = {
        { ltalk_if_print,       DLT_LTALK },
 #endif
 #ifdef DLT_JUNIPER_ATM1
-       { juniper_atm1_print,   DLT_JUNIPER_ATM1 },
+       { juniper_atm1_if_print, DLT_JUNIPER_ATM1 },
 #endif
 #ifdef DLT_JUNIPER_ATM2
-       { juniper_atm2_print,   DLT_JUNIPER_ATM2 },
+       { juniper_atm2_if_print, DLT_JUNIPER_ATM2 },
 #endif
 #ifdef DLT_JUNIPER_MFR
-       { juniper_mfr_print,    DLT_JUNIPER_MFR },
+       { juniper_mfr_if_print, DLT_JUNIPER_MFR },
 #endif
 #ifdef DLT_JUNIPER_MLFR
-       { juniper_mlfr_print,   DLT_JUNIPER_MLFR },
+       { juniper_mlfr_if_print, DLT_JUNIPER_MLFR },
 #endif
 #ifdef DLT_JUNIPER_MLPPP
-       { juniper_mlppp_print,  DLT_JUNIPER_MLPPP },
+       { juniper_mlppp_if_print, DLT_JUNIPER_MLPPP },
 #endif
 #ifdef DLT_JUNIPER_PPPOE
-       { juniper_pppoe_print,  DLT_JUNIPER_PPPOE },
+       { juniper_pppoe_if_print, DLT_JUNIPER_PPPOE },
 #endif
 #ifdef DLT_JUNIPER_PPPOE_ATM
-       { juniper_pppoe_atm_print, DLT_JUNIPER_PPPOE_ATM },
+       { juniper_pppoe_atm_if_print, DLT_JUNIPER_PPPOE_ATM },
 #endif
 #ifdef DLT_JUNIPER_GGSN
-       { juniper_ggsn_print,   DLT_JUNIPER_GGSN },
+       { juniper_ggsn_if_print, DLT_JUNIPER_GGSN },
 #endif
 #ifdef DLT_JUNIPER_ES
-       { juniper_es_print,     DLT_JUNIPER_ES },
+       { juniper_es_if_print,  DLT_JUNIPER_ES },
 #endif
 #ifdef DLT_JUNIPER_MONITOR
-       { juniper_monitor_print, DLT_JUNIPER_MONITOR },
+       { juniper_monitor_if_print, DLT_JUNIPER_MONITOR },
 #endif
 #ifdef DLT_JUNIPER_SERVICES
-       { juniper_services_print, DLT_JUNIPER_SERVICES },
+       { juniper_services_if_print, DLT_JUNIPER_SERVICES },
 #endif
 #ifdef DLT_JUNIPER_ETHER
-       { juniper_ether_print,  DLT_JUNIPER_ETHER },
+       { juniper_ether_if_print,       DLT_JUNIPER_ETHER },
 #endif
 #ifdef DLT_JUNIPER_PPP
-       { juniper_ppp_print,    DLT_JUNIPER_PPP },
+       { juniper_ppp_if_print, DLT_JUNIPER_PPP },
 #endif
 #ifdef DLT_JUNIPER_FRELAY
-       { juniper_frelay_print, DLT_JUNIPER_FRELAY },
+       { juniper_frelay_if_print,      DLT_JUNIPER_FRELAY },
 #endif
 #ifdef DLT_JUNIPER_CHDLC
-       { juniper_chdlc_print,  DLT_JUNIPER_CHDLC },
+       { juniper_chdlc_if_print,       DLT_JUNIPER_CHDLC },
 #endif
 #ifdef DLT_PKTAP
        { pktap_if_print,       DLT_PKTAP },
@@ -226,23 +224,16 @@ static const struct printer printers[] = {
 static void    ndo_default_print(netdissect_options *ndo, const u_char *bp,
                    u_int length);
 
-static void    ndo_error(netdissect_options *ndo, const char *fmt, ...)
-                   __attribute__((noreturn))
-#ifdef __ATTRIBUTE___FORMAT_OK
-                   __attribute__((format (printf, 2, 3)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-                   ;
-static void    ndo_warning(netdissect_options *ndo, const char *fmt, ...)
-#ifdef __ATTRIBUTE___FORMAT_OK
-                   __attribute__((format (printf, 2, 3)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-                   ;
-
-static int     ndo_printf(netdissect_options *ndo, const char *fmt, ...)
-#ifdef __ATTRIBUTE___FORMAT_OK
-                    __attribute ((format (printf, 2, 3)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-                    ;
+static void NORETURN ndo_error(netdissect_options *ndo,
+                    FORMAT_STRING(const char *fmt), ...)
+                    PRINTFLIKE(2, 3);
+static void    ndo_warning(netdissect_options *ndo,
+                   FORMAT_STRING(const char *fmt), ...)
+                   PRINTFLIKE(2, 3);
+
+static int     ndo_printf(netdissect_options *ndo,
+                    FORMAT_STRING(const char *fmt), ...)
+                    PRINTFLIKE(2, 3);
 
 void
 init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask,
@@ -324,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);
 
@@ -401,7 +392,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
                }
        }
 
-       ND_PRINT((ndo, "\n"));
+       ND_PRINT("\n");
 }
 
 /*