X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/03a2d9c4c1e360def4f9d0473f9b378ef2f14431..d526e47658b691c4b5ca0d29759d1f67b7fb037b:/print-ascii.c diff --git a/print-ascii.c b/print-ascii.c index 151e5c28..14e50bd5 100644 --- a/print-ascii.c +++ b/print-ascii.c @@ -60,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') { /* @@ -92,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; @@ -143,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); } @@ -158,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)