From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Mon, 11 Dec 2017 21:21:33 +0000 (+0100)
Subject: Replace ND_TTEST2()/ND_TCHECK2() macros by macros using pointers (2/n)
X-Git-Tag: tcpdump-4.99-bp~1645
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/e2f0616cd0079cf894391f1f1e042a9457b69beb

Replace ND_TTEST2()/ND_TCHECK2() macros by macros using pointers (2/n)
---

diff --git a/extract.h b/extract.h
index 82ccae3c..28c828eb 100644
--- a/extract.h
+++ b/extract.h
@@ -410,29 +410,29 @@ EXTRACT_BE_S_8(const void *p)
 /*
  * Macros to check the presence of the values in question.
  */
-#define ND_TTEST_1(p) ND_TTEST2(*(p), 1)
-#define ND_TCHECK_1(p) ND_TCHECK2(*(p), 1)
+#define ND_TTEST_1(p) ND_TTEST_LEN((p), 1)
+#define ND_TCHECK_1(p) ND_TCHECK_LEN((p), 1)
 
-#define ND_TTEST_2(p) ND_TTEST2(*(p), 2)
-#define ND_TCHECK_2(p) ND_TCHECK2(*(p), 2)
+#define ND_TTEST_2(p) ND_TTEST_LEN((p), 2)
+#define ND_TCHECK_2(p) ND_TCHECK_LEN((p), 2)
 
-#define ND_TTEST_3(p) ND_TTEST2(*(p), 3)
-#define ND_TCHECK_3(p) ND_TCHECK2(*(p), 3)
+#define ND_TTEST_3(p) ND_TTEST_LEN((p), 3)
+#define ND_TCHECK_3(p) ND_TCHECK_LEN((p), 3)
 
-#define ND_TTEST_4(p) ND_TTEST2(*(p), 4)
-#define ND_TCHECK_4(p) ND_TCHECK2(*(p), 4)
+#define ND_TTEST_4(p) ND_TTEST_LEN((p), 4)
+#define ND_TCHECK_4(p) ND_TCHECK_LEN((p), 4)
 
-#define ND_TTEST_5(p) ND_TTEST2(*(p), 5)
-#define ND_TCHECK_5(p) ND_TCHECK2(*(p), 5)
+#define ND_TTEST_5(p) ND_TTEST_LEN((p), 5)
+#define ND_TCHECK_5(p) ND_TCHECK_LEN((p), 5)
 
-#define ND_TTEST_6(p) ND_TTEST2(*(p), 6)
-#define ND_TCHECK_6(p) ND_TCHECK2(*(p), 6)
+#define ND_TTEST_6(p) ND_TTEST_LEN((p), 6)
+#define ND_TCHECK_6(p) ND_TCHECK_LEN((p), 6)
 
-#define ND_TTEST_7(p) ND_TTEST2(*(p), 7)
-#define ND_TCHECK_7(p) ND_TCHECK2(*(p), 7)
+#define ND_TTEST_7(p) ND_TTEST_LEN((p), 7)
+#define ND_TCHECK_7(p) ND_TCHECK_LEN((p), 7)
 
-#define ND_TTEST_8(p) ND_TTEST2(*(p), 8)
-#define ND_TCHECK_8(p) ND_TCHECK2(*(p), 8)
+#define ND_TTEST_8(p) ND_TTEST_LEN((p), 8)
+#define ND_TCHECK_8(p) ND_TCHECK_LEN((p), 8)
 
-#define ND_TTEST_16(p) ND_TTEST2(*(p), 16)
-#define ND_TCHECK_16(p) ND_TCHECK2(*(p), 16)
+#define ND_TTEST_16(p) ND_TTEST_LEN((p), 16)
+#define ND_TCHECK_16(p) ND_TCHECK_LEN((p), 16)