From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Wed, 29 Nov 2017 20:06:51 +0000 (+0100)
Subject: Use more ND_TCHECK_n() macros
X-Git-Tag: tcpdump-4.99-bp~1698
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/415160c0c2d210358a0225be53922728f7cd9651

Use more ND_TCHECK_n() macros
---

diff --git a/print-icmp6.c b/print-icmp6.c
index c65e07cf..f0377ce4 100644
--- 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 cc721241..d946c649 100644
--- 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 66b6d0cd..79e9ae33 100644
--- 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)