Clean up ISAKMP dissection, use nd_ types and EXTRACT_ macros.

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 2e5812e4c05eb49098c7b9de6d8730568ad07fee..14e50bd5e385447e08f6d22c350a4a10bc6b179e 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -60,7 +60,7 @@ 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)
@@ -93,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;
 
@@ -144,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);
 }
@@ -159,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)