Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-usb.c

diff --git a/print-usb.c b/print-usb.c
index 7f453e33a28ac24be3782f87d019df63373beb46..04862881b5cd22ad0ae3c317b3415b9623290e9f 100644 (file)
--- a/print-usb.c
+++ b/print-usb.c
@@ -19,11 +19,13 @@
  *
  */
 
+/* \summary: USB printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include "netdissect.h"
 
@@ -133,8 +135,8 @@ usb_header_print(netdissect_options *ndo, const pcap_usb_header *uh)
  * is the number of bytes actually captured.
  */
 u_int
-usb_linux_48_byte_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
-                        register const u_char *p)
+usb_linux_48_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
+                           register const u_char *p)
 {
        if (h->caplen < sizeof(pcap_usb_header)) {
                ND_PRINT((ndo, "%s", tstr));
@@ -156,8 +158,8 @@ usb_linux_48_byte_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  * is the number of bytes actually captured.
  */
 u_int
-usb_linux_64_byte_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
-                        register const u_char *p)
+usb_linux_64_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
+                           register const u_char *p)
 {
        if (h->caplen < sizeof(pcap_usb_header_mmapped)) {
                ND_PRINT((ndo, "%s", tstr));