Use nd_ types, add EXTRACT_ calls, use %u for unsigned values.

[tcpdump] / print-carp.c

diff --git a/print-carp.c b/print-carp.c
index b439a2d7a6fb4e92a45a59410162a946e5009354..807e977f0ee53d7b1d30ebe8e1f5dcb46aee1765 100644 (file)
--- a/print-carp.c
+++ b/print-carp.c
@@ -46,7 +46,7 @@
 #include "extract.h"
 
 void
-carp_print(netdissect_options *ndo, register const u_char *bp, register u_int len, int ttl)
+carp_print(netdissect_options *ndo, const u_char *bp, u_int len, int ttl)
 {
        int version, type;
        const char *type_s;
@@ -71,7 +71,7 @@ carp_print(netdissect_options *ndo, register const u_char *bp, register u_int le
                struct cksum_vec vec[1];
                vec[0].ptr = (const uint8_t *)bp;
                vec[0].len = len;
-               if (ND_TTEST2(bp[0], len) && in_cksum(vec, 1))
+               if (ND_TTEST_LEN(bp, len) && in_cksum(vec, 1))
                        ND_PRINT((ndo, " (bad carp cksum %x!)",
                                EXTRACT_BE_U_2(bp + 6)));
        }