More nd_ification of structures.

[tcpdump] / print-usb.c

diff --git a/print-usb.c b/print-usb.c
index 75f78fc9025a825a4fc3064b768a00ddd4868b4b..04862881b5cd22ad0ae3c317b3415b9623290e9f 100644 (file)
--- a/print-usb.c
+++ b/print-usb.c
@@ -19,14 +19,15 @@
  *
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: USB printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 
 
 #if defined(HAVE_PCAP_USB_H) && defined(DLT_USB_LINUX)
@@ -134,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));
@@ -157,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));