Fix '-tt' option printing when time > 2106-02-07T06:28:15Z

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 64b40424333fe7daefde0a74e33d647ee622cee1..f504d2f7f0cfb0305b3d9d51a07447f4a8694b38 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $      */
+/*     $NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $      */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,9 +38,7 @@
 
 /* \summary: ASCII packet dump printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -67,13 +65,13 @@ ascii_print(netdissect_options *ndo,
        int truncated = FALSE;
 
        ndo->ndo_protocol = "ascii";
-       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
+       caplength = ND_BYTES_AVAILABLE_AFTER(cp);
        if (length > caplength) {
                length = caplength;
                truncated = TRUE;
        }
        ND_PRINT("\n");
-       while (length > 0) {
+       while (length != 0) {
                s = GET_U_1(cp);
                cp++;
                length--;
@@ -113,7 +111,7 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *indent,
        char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
        char asciistuff[ASCII_LINELENGTH+1], *asp;
 
-       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
+       caplength = ND_BYTES_AVAILABLE_AFTER(cp);
        if (length > caplength) {
                length = caplength;
                truncated = TRUE;
@@ -181,7 +179,7 @@ hex_print_with_offset(netdissect_options *ndo,
        u_int nshorts;
        int truncated = FALSE;
 
-       caplength = (ndo->ndo_snapend > cp) ? ND_BYTES_AVAILABLE_AFTER(cp) : 0;
+       caplength = ND_BYTES_AVAILABLE_AFTER(cp);
        if (length > caplength) {
                length = caplength;
                truncated = TRUE;
@@ -214,22 +212,3 @@ hex_print(netdissect_options *ndo,
 {
        hex_print_with_offset(ndo, indent, cp, length, 0);
 }
-
-#ifdef MAIN
-int
-main(int argc, char *argv[])
-{
-       hex_print("\n\t", "Hello, World!\n", 14);
-       printf("\n");
-       hex_and_ascii_print("\n\t", "Hello, World!\n", 14);
-       printf("\n");
-       ascii_print("Hello, World!\n", 14);
-       printf("\n");
-#define TMSG "Now is the winter of our discontent...\n"
-       hex_print_with_offset("\n\t", TMSG, sizeof(TMSG) - 1, 0x100);
-       printf("\n");
-       hex_and_ascii_print_with_offset("\n\t", TMSG, sizeof(TMSG) - 1, 0x100);
-       printf("\n");
-       exit(0);
-}
-#endif /* MAIN */