Update ND_PRINT() as a variadic macro

[tcpdump] / print-ap1394.c

diff --git a/print-ap1394.c b/print-ap1394.c
index e3ddcc04614d0e4ffeedd0d12bf912e44b49a570..655ce7ca14fa4c2ad6771731eae826c226578cf6 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -63,20 +63,20 @@ ap1394_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
        fp = (const struct firewire_header *)bp;
 
-       ND_PRINT((ndo, "%s > %s",
+       ND_PRINT("%s > %s",
                     fwaddr_string(ndo, fp->firewire_shost),
-                    fwaddr_string(ndo, fp->firewire_dhost)));
+                    fwaddr_string(ndo, fp->firewire_dhost));
 
        firewire_type = EXTRACT_BE_U_2(fp->firewire_type);
        if (!ndo->ndo_qflag) {
-               ND_PRINT((ndo, ", ethertype %s (0x%04x)",
+               ND_PRINT(", ethertype %s (0x%04x)",
                               tok2str(ethertype_values,"Unknown", firewire_type),
-                               firewire_type));
+                               firewire_type);
         } else {
-                ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", firewire_type)));
+                ND_PRINT(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", firewire_type));
         }
 
-       ND_PRINT((ndo, ", length %u: ", length));
+       ND_PRINT(", length %u: ", length);
 }
 
 /*
@@ -95,7 +95,7 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
        struct lladdr_info src, dst;
 
        if (caplen < FIREWIRE_HDRLEN) {
-               ND_PRINT((ndo, "[|ap1394]"));
+               ND_PRINT("[|ap1394]");
                return FIREWIRE_HDRLEN;
        }