Force -t on in TESTonce.

[tcpdump] / print.c

diff --git a/print.c b/print.c
index 05e052272b50e394c91508c656c379dc8bbaa174..41ca9cadf8e493fc53f373483ba5c5d76d3653a8 100644 (file)
--- a/print.c
+++ b/print.c
@@ -226,26 +226,26 @@ 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, ...)
+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 _U_, const char *fmt, ...)
+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 _U_, const char *fmt, ...)
+static int     ndo_printf(netdissect_options *ndo, const char *fmt, ...)
 #ifdef __ATTRIBUTE___FORMAT_OK
                     __attribute ((format (printf, 2, 3)))
 #endif /* __ATTRIBUTE___FORMAT_OK */
                     ;
 
 void
-init_print(netdissect_options *ndo, u_int32_t localnet, u_int32_t mask,
+init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask,
     uint32_t timezone_offset)
 {
 
@@ -401,7 +401,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
                }
        }
 
-       putchar('\n');
+       ND_PRINT((ndo, "\n"));
 }
 
 /*
@@ -429,6 +429,7 @@ ndo_error(netdissect_options *ndo, const char *fmt, ...)
                if (fmt[-1] != '\n')
                        (void)fputc('\n', stderr);
        }
+       nd_cleanup();
        exit(1);
        /* NOTREACHED */
 }
@@ -453,7 +454,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;
@@ -462,6 +463,8 @@ ndo_printf(netdissect_options *ndo _U_, const char *fmt, ...)
        ret = vfprintf(stdout, fmt, args);
        va_end(args);
 
+       if (ret < 0)
+               ndo_error(ndo, "Unable to write output: %s", pcap_strerror(errno));
        return (ret);
 }