Use pointer expressions like in most similar cases

diff --git a/print-isakmp.c b/print-isakmp.c
index e902b0b65f196b3a30c7c80f597d0b5172c8f25a..109066c6948cbf64f91ba8fe5dcb1a574b51d685 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -922,7 +922,7 @@ ikev1_attrmap_print(netdissect_options *ndo,
        if (p[0] & 0x80)
                totlen = 4;
        else {
-               ND_TCHECK_2(&p[2]);
+               ND_TCHECK_2(p + 2);
                totlen = 4 + EXTRACT_BE_U_2(p + 2);
        }
        if (ep2 < p + totlen) {
@@ -930,7 +930,7 @@ ikev1_attrmap_print(netdissect_options *ndo,
                return ep2 + 1;
        }
 
-       ND_TCHECK_2(&p[0]);
+       ND_TCHECK_2(p);
        ND_PRINT((ndo,"("));
        t = EXTRACT_BE_U_2(p) & 0x7fff;
        if (map && t < nmap && map[t].type)
@@ -939,7 +939,7 @@ ikev1_attrmap_print(netdissect_options *ndo,
                ND_PRINT((ndo,"type=#%d ", t));
        if (p[0] & 0x80) {
                ND_PRINT((ndo,"value="));
-               ND_TCHECK_2(&p[2]);
+               ND_TCHECK_2(p + 2);
                v = EXTRACT_BE_U_2(p + 2);
                if (map && t < nmap && v < map[t].nvalue && map[t].value[v])
                        ND_PRINT((ndo,"%s", map[t].value[v]));
@@ -973,7 +973,7 @@ ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep2)
        if (p[0] & 0x80)
                totlen = 4;
        else {
-               ND_TCHECK_2(&p[2]);
+               ND_TCHECK_2(p + 2);
                totlen = 4 + EXTRACT_BE_U_2(p + 2);
        }
        if (ep2 < p + totlen) {
@@ -981,7 +981,7 @@ ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep2)
                return ep2 + 1;
        }
 
-       ND_TCHECK_2(&p[0]);
+       ND_TCHECK_2(p);
        ND_PRINT((ndo,"("));
        t = EXTRACT_BE_U_2(p) & 0x7fff;
        ND_PRINT((ndo,"type=#%d ", t));

diff --git a/print-mobility.c b/print-mobility.c
index 8a352cbaab2b3185da5fde0a905b8467eeefa075..1a9b657a81c78f36ec2138367133334e393add47 100644 (file)
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -150,7 +150,7 @@ mobility_opt_print(netdissect_options *ndo,
                                goto trunc;
                        }
                        /* units of 4 secs */
-                       ND_TCHECK_2(&bp[i + 2]);
+                       ND_TCHECK_2(bp + i + 2);
                        ND_PRINT((ndo, "(refresh: %u)",
                                EXTRACT_BE_U_2(bp + i + 2) << 2));
                        break;
@@ -159,7 +159,7 @@ mobility_opt_print(netdissect_options *ndo,
                                ND_PRINT((ndo, "(altcoa: trunc)"));
                                goto trunc;
                        }
-                       ND_TCHECK_16(&bp[i + 2]);
+                       ND_TCHECK_16(bp + i + 2);
                        ND_PRINT((ndo, "(alt-CoA: %s)", ip6addr_string(ndo, &bp[i+2])));
                        break;
                case IP6MOPT_NONCEID:
@@ -167,8 +167,8 @@ mobility_opt_print(netdissect_options *ndo,
                                ND_PRINT((ndo, "(ni: trunc)"));
                                goto trunc;
                        }
-                       ND_TCHECK_2(&bp[i + 2]);
-                       ND_TCHECK_2(&bp[i + 4]);
+                       ND_TCHECK_2(bp + i + 2);
+                       ND_TCHECK_2(bp + i + 4);
                        ND_PRINT((ndo, "(ni: ho=0x%04x co=0x%04x)",
                                EXTRACT_BE_U_2(bp + i + 2),
                                EXTRACT_BE_U_2(bp + i + 4)));
@@ -247,7 +247,7 @@ mobility_print(netdissect_options *ndo,
        case IP6M_CAREOF_TEST_INIT:
                hlen = IP6M_MINLEN;
                if (ndo->ndo_vflag) {
-                       ND_TCHECK_4(&bp[hlen + 4]);
+                       ND_TCHECK_4(bp + hlen + 4);
                        ND_PRINT((ndo, " %s Init Cookie=%08x:%08x",
                               type == IP6M_HOME_TEST_INIT ? "Home" : "Care-of",
                               EXTRACT_BE_U_4(bp + hlen),
@@ -261,7 +261,7 @@ mobility_print(netdissect_options *ndo,
                ND_PRINT((ndo, " nonce id=0x%x", EXTRACT_BE_U_2(&mh->ip6m_data16[0])));
                hlen = IP6M_MINLEN;
                if (ndo->ndo_vflag) {
-                       ND_TCHECK_4(&bp[hlen + 4]);
+                       ND_TCHECK_4(bp + hlen + 4);
                        ND_PRINT((ndo, " %s Init Cookie=%08x:%08x",
                               type == IP6M_HOME_TEST ? "Home" : "Care-of",
                               EXTRACT_BE_U_4(bp + hlen),
@@ -269,7 +269,7 @@ mobility_print(netdissect_options *ndo,
                }
                hlen += 8;
                if (ndo->ndo_vflag) {
-                       ND_TCHECK_4(&bp[hlen + 4]);
+                       ND_TCHECK_4(bp + hlen + 4);
                        ND_PRINT((ndo, " %s Keygen Token=%08x:%08x",
                               type == IP6M_HOME_TEST ? "Home" : "Care-of",
                               EXTRACT_BE_U_4(bp + hlen),
@@ -281,7 +281,7 @@ mobility_print(netdissect_options *ndo,
                ND_TCHECK(mh->ip6m_data16[0]);
                ND_PRINT((ndo, " seq#=%u", EXTRACT_BE_U_2(&mh->ip6m_data16[0])));
                hlen = IP6M_MINLEN;
-               ND_TCHECK_2(&bp[hlen]);
+               ND_TCHECK_2(bp + hlen);
                if (bp[hlen] & 0xf0) {
                        ND_PRINT((ndo, " "));
                        if (bp[hlen] & 0x80)
@@ -297,7 +297,7 @@ mobility_print(netdissect_options *ndo,
                hlen += 1;
                /* Reserved (8bits) */
                hlen += 1;
-               ND_TCHECK_2(&bp[hlen]);
+               ND_TCHECK_2(bp + hlen);
                /* units of 4 secs */
                ND_PRINT((ndo, " lifetime=%u", EXTRACT_BE_U_2(bp + hlen) << 2));
                hlen += 2;
@@ -310,10 +310,10 @@ mobility_print(netdissect_options *ndo,
                        ND_PRINT((ndo, " K"));
                /* Reserved (7bits) */
                hlen = IP6M_MINLEN;
-               ND_TCHECK_2(&bp[hlen]);
+               ND_TCHECK_2(bp + hlen);
                ND_PRINT((ndo, " seq#=%u", EXTRACT_BE_U_2(bp + hlen)));
                hlen += 2;
-               ND_TCHECK_2(&bp[hlen]);
+               ND_TCHECK_2(bp + hlen);
                /* units of 4 secs */
                ND_PRINT((ndo, " lifetime=%u", EXTRACT_BE_U_2(bp + hlen) << 2));
                hlen += 2;

diff --git a/print-pim.c b/print-pim.c
index 859d7bc65ed817bdd9d0d844a74b00b820fa88b9..1674537e8fb2f07f2696d38be119133caf00a540 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -1130,7 +1130,7 @@ pimv2_print(netdissect_options *ndo,
                ND_PRINT((ndo, " prio=%d", bp[1]));
                if (len < 4)
                        goto trunc;
-               ND_TCHECK_2(&bp[2]);
+               ND_TCHECK_2(bp + 2);
                ND_PRINT((ndo, " holdtime="));
                unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 2));
                bp += 4;

diff --git a/print-smb.c b/print-smb.c
index fc95562cfeb59c245f8fe876d381896d4a451f01..b652b006fbe4d027e9973cfa8a2c9003d952d9bb 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -823,7 +823,7 @@ print_smb(netdissect_options *ndo,
     if (ndo->ndo_vflag < 2)
        return;
 
-    ND_TCHECK_2(&buf[10]);
+    ND_TCHECK_2(buf + 10);
     flags2 = EXTRACT_LE_U_2(buf + 10);
     unicodestr = flags2 & 0x8000;
     nterrcodes = flags2 & 0x4000;