X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/032d569e681df53b6e0b03fc20bdb1970faafa20..refs/heads/coverity_scan:/print-ascii.c?ds=inline

diff --git a/print-ascii.c b/print-ascii.c
index b4789435..f504d2f7 100644
--- 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--;
@@ -103,7 +101,7 @@ ascii_print(netdissect_options *ndo,
 
 static void
 hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *indent,
-    const u_char *cp, u_int length, u_int oset)
+				const u_char *cp, u_int length, u_int offset)
 {
 	u_int caplength;
 	u_int i;
@@ -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;
@@ -135,10 +133,10 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *indent,
 		if (i >= HEXDUMP_SHORTS_PER_LINE) {
 			*hsp = *asp = '\0';
 			ND_PRINT("%s0x%04x: %-*s  %s",
-			    indent, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+			    indent, offset, HEXDUMP_HEXSTUFF_PER_LINE,
 			    hexstuff, asciistuff);
 			i = 0; hsp = hexstuff; asp = asciistuff;
-			oset += HEXDUMP_BYTES_PER_LINE;
+			offset += HEXDUMP_BYTES_PER_LINE;
 		}
 		nshorts--;
 	}
@@ -154,7 +152,7 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *indent,
 	if (i > 0) {
 		*hsp = *asp = '\0';
 		ND_PRINT("%s0x%04x: %-*s  %s",
-		     indent, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+		     indent, offset, HEXDUMP_HEXSTUFF_PER_LINE,
 		     hexstuff, asciistuff);
 	}
 	if (truncated)
@@ -163,7 +161,7 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *indent,
 
 void
 hex_and_ascii_print(netdissect_options *ndo, const char *indent,
-    const u_char *cp, u_int length)
+		    const u_char *cp, u_int length)
 {
 	hex_and_ascii_print_with_offset(ndo, indent, cp, length, 0);
 }
@@ -174,14 +172,14 @@ hex_and_ascii_print(netdissect_options *ndo, const char *indent,
 void
 hex_print_with_offset(netdissect_options *ndo,
                       const char *indent, const u_char *cp, u_int length,
-		      u_int oset)
+		      u_int offset)
 {
 	u_int caplength;
 	u_int i, s;
 	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;
@@ -190,8 +188,8 @@ hex_print_with_offset(netdissect_options *ndo,
 	i = 0;
 	while (nshorts != 0) {
 		if ((i++ % 8) == 0) {
-			ND_PRINT("%s0x%04x: ", indent, oset);
-			oset += HEXDUMP_BYTES_PER_LINE;
+			ND_PRINT("%s0x%04x: ", indent, offset);
+			offset += HEXDUMP_BYTES_PER_LINE;
 		}
 		s = GET_U_1(cp);
 		cp++;
@@ -201,7 +199,7 @@ hex_print_with_offset(netdissect_options *ndo,
 	}
 	if (length & 1) {
 		if ((i % 8) == 0)
-			ND_PRINT("%s0x%04x: ", indent, oset);
+			ND_PRINT("%s0x%04x: ", indent, offset);
 		ND_PRINT(" %02x", GET_U_1(cp));
 	}
 	if (truncated)
@@ -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 */