X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/6ec714988caac3bf9fedc766ae51a2248896ec80..a909db55ebc50de487e65f19b3250d0b45763d2d:/print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 14e50bd5..bd87f6ac 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -39,10 +39,10 @@
 /* \summary: ASCII packet dump printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 #include <stdio.h>
 
 #include "netdissect.h"
@@ -65,7 +65,7 @@ ascii_print(netdissect_options *ndo,
 	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
 	if (length > caplength)
 		length = caplength;
-	ND_PRINT((ndo, "\n"));
+	ND_PRINT("\n");
 	while (length > 0) {
 		s = EXTRACT_U_1(cp);
 		cp++;
@@ -81,13 +81,13 @@ ascii_print(netdissect_options *ndo,
 			 * In the middle of a line, just print a '.'.
 			 */
 			if (length > 1 && EXTRACT_U_1(cp) != '\n')
-				ND_PRINT((ndo, "."));
+				ND_PRINT(".");
 		} else {
 			if (!ND_ISGRAPH(s) &&
 			    (s != '\t' && s != ' ' && s != '\n'))
-				ND_PRINT((ndo, "."));
+				ND_PRINT(".");
 			else
-				ND_PRINT((ndo, "%c", s));
+				ND_PRINT("%c", s);
 		}
 	}
 }
@@ -110,8 +110,10 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
 	i = 0;
 	hsp = hexstuff; asp = asciistuff;
 	while (--nshorts >= 0) {
-		s1 = *cp++;
-		s2 = *cp++;
+		s1 = EXTRACT_U_1(cp);
+		cp++;
+		s2 = EXTRACT_U_1(cp);
+		cp++;
 		(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
 		    " %02x%02x", s1, s2);
 		hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
@@ -120,15 +122,16 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
 		i++;
 		if (i >= HEXDUMP_SHORTS_PER_LINE) {
 			*hsp = *asp = '\0';
-			ND_PRINT((ndo, "%s0x%04x: %-*s  %s",
+			ND_PRINT("%s0x%04x: %-*s  %s",
 			    ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
-			    hexstuff, asciistuff));
+			    hexstuff, asciistuff);
 			i = 0; hsp = hexstuff; asp = asciistuff;
 			oset += HEXDUMP_BYTES_PER_LINE;
 		}
 	}
 	if (length & 1) {
-		s1 = *cp++;
+		s1 = EXTRACT_U_1(cp);
+		cp++;
 		(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
 		    " %02x", s1);
 		hsp += 3;
@@ -137,9 +140,9 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
 	}
 	if (i > 0) {
 		*hsp = *asp = '\0';
-		ND_PRINT((ndo, "%s0x%04x: %-*s  %s",
+		ND_PRINT("%s0x%04x: %-*s  %s",
 		     ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
-		     hexstuff, asciistuff));
+		     hexstuff, asciistuff);
 	}
 }
 
@@ -169,16 +172,18 @@ hex_print_with_offset(netdissect_options *ndo,
 	i = 0;
 	while (--nshorts >= 0) {
 		if ((i++ % 8) == 0) {
-			ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
+			ND_PRINT("%s0x%04x: ", ident, oset);
 			oset += HEXDUMP_BYTES_PER_LINE;
 		}
-		s = *cp++;
-		ND_PRINT((ndo," %02x%02x", s, *cp++));
+		s = EXTRACT_U_1(cp);
+		cp++;
+		ND_PRINT(" %02x%02x", s, EXTRACT_U_1(cp));
+		cp++;
 	}
 	if (length & 1) {
 		if ((i % 8) == 0)
-			ND_PRINT((ndo,"%s0x%04x: ", ident, oset));
-		ND_PRINT((ndo," %02x", *cp));
+			ND_PRINT("%s0x%04x: ", ident, oset);
+		ND_PRINT(" %02x", EXTRACT_U_1(cp));
 	}
 }