Use more ND_TCHECK_n() macros

diff --git a/print-icmp6.c b/print-icmp6.c
index c65e07cf2e71869d591bf02a6662d9913a475f29..f0377ce43ebd1708690bf6683dc1ba9118818878 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -1350,7 +1350,7 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
                        case 1:
                                break;
                        case 2:
-                               ND_TCHECK2(*in6p, 8);
+                               ND_TCHECK_8(in6p);
                                memcpy(&in6, opri + 1, 8);
                                break;
                        case 3:

diff --git a/print-resp.c b/print-resp.c
index cc7212411377298eb8f6711d7d39e8e405369db7..d946c64945cc68f818d63ae0000a981c4cb31842 100644 (file)
--- a/print-resp.c
+++ b/print-resp.c
@@ -90,7 +90,7 @@ static int resp_get_length(netdissect_options *, register const u_char *, int, c
 #define FIND_CRLF(_ptr, _len)                   \
     for (;;) {                                  \
         LCHECK2(_len, 2);                       \
-        ND_TCHECK2(*_ptr, 2);                   \
+        ND_TCHECK_2(_ptr);                   \
         if (*_ptr == '\r' && *(_ptr+1) == '\n') \
             break;                              \
         _ptr++;                                 \

diff --git a/print-stp.c b/print-stp.c
index 66b6d0cd81095af1579d30117af698be43dfa01f..79e9ae33e9caf3de14ec95ce300dd8659a57a874 100644 (file)
--- a/print-stp.c
+++ b/print-stp.c
@@ -84,7 +84,7 @@ static const struct tok rstp_obj_port_role_values[] = {
     { 0, NULL}
 };
 
-#define ND_TCHECK_BRIDGE_ID(p) ND_TCHECK2(*(p), 8)
+#define ND_TCHECK_BRIDGE_ID(p) ND_TCHECK_8(p)
 
 static char *
 stp_print_bridge_id(const u_char *p)