X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/49b23c5a9b0198bb382dcf43c458d46fcf2fa809..d526e47658b691c4b5ca0d29759d1f67b7fb037b:/print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 4ef38a17..14e50bd5 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -46,6 +46,7 @@
 #include <stdio.h>
 
 #include "netdissect.h"
+#include "extract.h"
 
 #define ASCII_LINELENGTH 300
 #define HEXDUMP_BYTES_PER_LINE 16
@@ -59,14 +60,15 @@ ascii_print(netdissect_options *ndo,
             const u_char *cp, u_int length)
 {
 	u_int caplength;
-	register u_char s;
+	u_char s;
 
 	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
 	if (length > caplength)
 		length = caplength;
 	ND_PRINT((ndo, "\n"));
 	while (length > 0) {
-		s = *cp++;
+		s = EXTRACT_U_1(cp);
+		cp++;
 		length--;
 		if (s == '\r') {
 			/*
@@ -78,7 +80,7 @@ ascii_print(netdissect_options *ndo,
 			 *
 			 * In the middle of a line, just print a '.'.
 			 */
-			if (length > 1 && *cp != '\n')
+			if (length > 1 && EXTRACT_U_1(cp) != '\n')
 				ND_PRINT((ndo, "."));
 		} else {
 			if (!ND_ISGRAPH(s) &&
@@ -91,13 +93,13 @@ ascii_print(netdissect_options *ndo,
 }
 
 void
-hex_and_ascii_print_with_offset(netdissect_options *ndo, register const char *ident,
-    register const u_char *cp, register u_int length, register u_int oset)
+hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident,
+    const u_char *cp, u_int length, u_int oset)
 {
 	u_int caplength;
-	register u_int i;
-	register int s1, s2;
-	register int nshorts;
+	u_int i;
+	int s1, s2;
+	int nshorts;
 	char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
 	char asciistuff[ASCII_LINELENGTH+1], *asp;
 
@@ -142,8 +144,8 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, register const char *id
 }
 
 void
-hex_and_ascii_print(netdissect_options *ndo, register const char *ident,
-    register const u_char *cp, register u_int length)
+hex_and_ascii_print(netdissect_options *ndo, const char *ident,
+    const u_char *cp, u_int length)
 {
 	hex_and_ascii_print_with_offset(ndo, ident, cp, length, 0);
 }
@@ -157,8 +159,8 @@ hex_print_with_offset(netdissect_options *ndo,
 		      u_int oset)
 {
 	u_int caplength;
-	register u_int i, s;
-	register int nshorts;
+	u_int i, s;
+	int nshorts;
 
 	caplength = (ndo->ndo_snapend >= cp) ? ndo->ndo_snapend - cp : 0;
 	if (length > caplength)