NTP: Run one test with -v and another without.

[tcpdump] / print.c

diff --git a/print.c b/print.c
index 9fedd9fba2b0e19b054413ee021c510eb2a859b7..20d8ab51e2e49a4cf474f75efbaff17375747b78 100644 (file)
--- a/print.c
+++ b/print.c
@@ -226,23 +226,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 _U_, 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 _U_, const char *fmt, ...)
-#ifdef __ATTRIBUTE___FORMAT_OK
-                   __attribute__((format (printf, 2, 3)))
-#endif /* __ATTRIBUTE___FORMAT_OK */
-                   ;
-
-static int     ndo_printf(netdissect_options *ndo _U_, 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,
@@ -329,8 +322,8 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
        ts_print(ndo, &h->ts);
 
        /*
-        * Some printers want to check that they're not walking off the
-        * end of the packet.
+        * Printers must check that they're not walking off the end of
+        * the packet.
         * Rather than pass it all the way down, we set this member
         * of the netdissect_options structure.
         */
@@ -401,7 +394,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
                }
        }
 
-       putchar('\n');
+       ND_PRINT((ndo, "\n"));
 }
 
 /*
@@ -429,6 +422,7 @@ ndo_error(netdissect_options *ndo, const char *fmt, ...)
                if (fmt[-1] != '\n')
                        (void)fputc('\n', stderr);
        }
+       nd_cleanup();
        exit(1);
        /* NOTREACHED */
 }
@@ -453,7 +447,7 @@ ndo_warning(netdissect_options *ndo, const char *fmt, ...)
 }
 
 static int
-ndo_printf(netdissect_options *ndo _U_, const char *fmt, ...)
+ndo_printf(netdissect_options *ndo, const char *fmt, ...)
 {
        va_list args;
        int ret;