Simplify some expressions

This will also help some future scripted code updates.

diff --git a/print-bgp.c b/print-bgp.c
index 7086d324b5a768b2c58e9f81ff85f1964fd53891..fffc226c21296e693f1338f18f27801d91b1cf78 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -549,7 +549,7 @@ decode_prefix4(netdissect_options *ndo,
        plenbytes = (plen + 7) / 8;
        ND_TCHECK2(pptr[1], plenbytes);
        ITEMCHECK(plenbytes);
-       memcpy(&addr, &pptr[1], plenbytes);
+       memcpy(&addr, pptr + 1, plenbytes);
        if (plen % 8) {
                ((u_char *)&addr)[plenbytes - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
@@ -597,7 +597,7 @@ decode_labeled_prefix4(netdissect_options *ndo,
        plenbytes = (plen + 7) / 8;
        ND_TCHECK2(pptr[4], plenbytes);
        ITEMCHECK(plenbytes);
-       memcpy(&addr, &pptr[4], plenbytes);
+       memcpy(&addr, pptr + 4, plenbytes);
        if (plen % 8) {
                ((u_char *)&addr)[plenbytes - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
@@ -801,7 +801,7 @@ decode_rt_routing_info(netdissect_options *ndo,
         */
        memset(&route_target, 0, sizeof(route_target));
        ND_TCHECK2(pptr[5], (plen + 7) / 8);
-       memcpy(&route_target, &pptr[5], (plen + 7) / 8);
+       memcpy(&route_target, pptr + 5, (plen + 7) / 8);
        /* Which specification says to do this? */
        if (plen % 8) {
                ((u_char *)&route_target)[(plen + 7) / 8 - 1] &=
@@ -837,7 +837,7 @@ decode_labeled_vpn_prefix4(netdissect_options *ndo,
 
        memset(&addr, 0, sizeof(addr));
        ND_TCHECK2(pptr[12], (plen + 7) / 8);
-       memcpy(&addr, &pptr[12], (plen + 7) / 8);
+       memcpy(&addr, pptr + 12, (plen + 7) / 8);
        if (plen % 8) {
                ((u_char *)&addr)[(plen + 7) / 8 - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
@@ -1147,7 +1147,7 @@ decode_prefix6(netdissect_options *ndo,
        plenbytes = (plen + 7) / 8;
        ND_TCHECK2(pd[1], plenbytes);
        ITEMCHECK(plenbytes);
-       memcpy(&addr, &pd[1], plenbytes);
+       memcpy(&addr, pd + 1, plenbytes);
        if (plen % 8) {
                addr.s6_addr[plenbytes - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
@@ -1186,7 +1186,7 @@ decode_labeled_prefix6(netdissect_options *ndo,
        memset(&addr, 0, sizeof(addr));
        plenbytes = (plen + 7) / 8;
        ND_TCHECK2(pptr[4], plenbytes);
-       memcpy(&addr, &pptr[4], plenbytes);
+       memcpy(&addr, pptr + 4, plenbytes);
        if (plen % 8) {
                addr.s6_addr[plenbytes - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
@@ -1227,7 +1227,7 @@ decode_labeled_vpn_prefix6(netdissect_options *ndo,
 
        memset(&addr, 0, sizeof(addr));
        ND_TCHECK2(pptr[12], (plen + 7) / 8);
-       memcpy(&addr, &pptr[12], (plen + 7) / 8);
+       memcpy(&addr, pptr + 12, (plen + 7) / 8);
        if (plen % 8) {
                addr.s6_addr[(plen + 7) / 8 - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
@@ -1261,7 +1261,7 @@ decode_clnp_prefix(netdissect_options *ndo,
 
        memset(&addr, 0, sizeof(addr));
        ND_TCHECK2(pptr[4], (plen + 7) / 8);
-       memcpy(&addr, &pptr[4], (plen + 7) / 8);
+       memcpy(&addr, pptr + 4, (plen + 7) / 8);
        if (plen % 8) {
                addr[(plen + 7) / 8 - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
@@ -1296,7 +1296,7 @@ decode_labeled_vpn_clnp_prefix(netdissect_options *ndo,
 
        memset(&addr, 0, sizeof(addr));
        ND_TCHECK2(pptr[12], (plen + 7) / 8);
-       memcpy(&addr, &pptr[12], (plen + 7) / 8);
+       memcpy(&addr, pptr + 12, (plen + 7) / 8);
        if (plen % 8) {
                addr[(plen + 7) / 8 - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);
@@ -2425,11 +2425,12 @@ bgp_capabilities_print(netdissect_options *ndo,
                     ND_PRINT((ndo, "\n\t\tno decoder for Capability %u",
                            cap_type));
                     if (ndo->ndo_vflag <= 1)
-                        print_unknown_data(ndo, &opt[i+2], "\n\t\t", cap_len);
+                        print_unknown_data(ndo, opt + i + 2, "\n\t\t",
+                                          cap_len);
                     break;
                 }
                 if (ndo->ndo_vflag > 1 && cap_len > 0) {
-                    print_unknown_data(ndo, &opt[i+2], "\n\t\t", cap_len);
+                    print_unknown_data(ndo, opt + i + 2, "\n\t\t", cap_len);
                 }
                 i += BGP_CAP_HEADER_SIZE + cap_len;
         }
@@ -2469,7 +2470,7 @@ bgp_open_print(netdissect_options *ndo,
        i = 0;
        while (i < bgpo.bgpo_optlen) {
                ND_TCHECK2(opt[i], BGP_OPT_SIZE);
-               memcpy(&bgpopt, &opt[i], BGP_OPT_SIZE);
+               memcpy(&bgpopt, opt + i, BGP_OPT_SIZE);
                if (i + 2 + bgpopt.bgpopt_len > bgpo.bgpo_optlen) {
                        ND_PRINT((ndo, "\n\t     Option %d, length: %u", bgpopt.bgpopt_type, bgpopt.bgpopt_len));
                        break;
@@ -2485,8 +2486,8 @@ bgp_open_print(netdissect_options *ndo,
                switch(bgpopt.bgpopt_type) {
 
                case BGP_OPT_CAP:
-                       bgp_capabilities_print(ndo, &opt[i+BGP_OPT_SIZE],
-                           bgpopt.bgpopt_len);
+                       bgp_capabilities_print(ndo, opt + i + BGP_OPT_SIZE,
+                                              bgpopt.bgpopt_len);
                        break;
 
                case BGP_OPT_AUTH:

diff --git a/print-hncp.c b/print-hncp.c
index 676ff278c2dfb4f8e963758ba121d58ceefab139..f6168fa6dde241f511ca5c089934230dc676318d 100644 (file)
--- a/print-hncp.c
+++ b/print-hncp.c
@@ -221,7 +221,7 @@ print_prefix(netdissect_options *ndo, const u_char *prefix, u_int max_length)
         plenbytes = (plen + 7) / 8;
         if (max_length < (u_int)plenbytes + IPV4_MAPPED_HEADING_LEN)
             return -3;
-        memcpy(&addr, &prefix[1 + IPV4_MAPPED_HEADING_LEN], plenbytes);
+        memcpy(&addr, prefix + IPV4_MAPPED_HEADING_LEN + 1, plenbytes);
         if (plen % 8) {
                ((u_char *)&addr)[plenbytes - 1] &=
                        ((0xff00 >> (plen % 8)) & 0xff);

diff --git a/print-ip6opts.c b/print-ip6opts.c
index de6c9c990525578ee8722cede92ff7344dfcb76a..1d036a893b268f9d7a5f594ff694a733f1a9f233 100644 (file)
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -149,8 +149,8 @@ ip6_opt_print(netdissect_options *ndo, const u_char *bp, int len)
            }
            ND_PRINT((ndo, "(homeaddr: %s", ip6addr_string(ndo, bp + i + 2)));
             if (bp[i + 1] > IP6OPT_HOMEADDR_MINLEN - 2) {
-               ip6_sopt_print(ndo, &bp[i + IP6OPT_HOMEADDR_MINLEN],
-                   (optlen - IP6OPT_HOMEADDR_MINLEN));
+               ip6_sopt_print(ndo, bp + i + IP6OPT_HOMEADDR_MINLEN,
+                               (optlen - IP6OPT_HOMEADDR_MINLEN));
            }
             ND_PRINT((ndo, ")"));
            break;

diff --git a/print-mobility.c b/print-mobility.c
index a30663808ddb5e18e29621129872658fa976f07b..33f4470b17f82d54048ace7133af60606c530661 100644 (file)
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -333,7 +333,7 @@ mobility_print(netdissect_options *ndo,
                break;
        }
        if (ndo->ndo_vflag)
-               if (mobility_opt_print(ndo, &bp[hlen], mhlen - hlen))
+               if (mobility_opt_print(ndo, bp + hlen, mhlen - hlen))
                        goto trunc;
 
        return(mhlen);

diff --git a/print-pim.c b/print-pim.c
index a84c3fb30f076c547e62c30ebf65211f4b013e67..1167c0bedb1beba78b351e2a244cc84f8224c7dc 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -321,7 +321,7 @@ pimv1_print(netdissect_options *ndo,
                if (ndo->ndo_vflag) {
                        if (len < 8)
                                goto trunc;
-                       pimv1_join_prune_print(ndo, &bp[8], len - 8);
+                       pimv1_join_prune_print(ndo, bp + 8, len - 8);
                }
                break;
        }

diff --git a/print-sl.c b/print-sl.c
index 419864ef28bdd7468a0ce20df848d9f32f41862c..ed29874ec31bcd6570e2cd6aa050b5c2c711e2bc 100644 (file)
--- a/print-sl.c
+++ b/print-sl.c
@@ -184,8 +184,8 @@ sliplink_print(netdissect_options *ndo,
                        return;
                }
                if (p[SLX_CHDR] & TYPE_COMPRESSED_TCP) {
-                       compressed_sl_print(ndo, &p[SLX_CHDR], ip,
-                           length, dir);
+                       compressed_sl_print(ndo, p + SLX_CHDR, ip,
+                                           length, dir);
                        ND_PRINT((ndo, ": "));
                } else
                        ND_PRINT((ndo, "slip-%d!: ", EXTRACT_U_1(p + SLX_CHDR)));

diff --git a/print-smb.c b/print-smb.c
index 3640b8764dbe58150a8203528dfb4dec0a2883b1..af775370ba983f3d728a1fc6a01de8fc45bcfdf1 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -1452,9 +1452,9 @@ netbeui_print(netdissect_options *ndo,
        for (i = 0; i < 128; i++) {
            if (&data2[i + 3] >= maxbuf)
                break;
-           if (memcmp(&data2[i], "\377SMB", 4) == 0) {
+           if (memcmp(data2 + i, "\377SMB", 4) == 0) {
                ND_PRINT((ndo, "found SMB packet at %d\n", i));
-               print_smb(ndo, &data2[i], maxbuf);
+               print_smb(ndo, data2 + i, maxbuf);
                break;
            }
        }
@@ -1490,9 +1490,9 @@ ipx_netbios_print(netdissect_options *ndo,
     for (i = 0; i < 128; i++) {
        if (&data[i + 4] > maxbuf)
            break;
-       if (memcmp(&data[i], "\377SMB", 4) == 0) {
-           smb_fdata(ndo, data, "\n>>> IPX transport ", &data[i], 0);
-           print_smb(ndo, &data[i], maxbuf);
+       if (memcmp(data + i, "\377SMB", 4) == 0) {
+           smb_fdata(ndo, data, "\n>>> IPX transport ", data + i, 0);
+           print_smb(ndo, data + i, maxbuf);
            ND_PRINT((ndo, "\n"));
            break;
        }

diff --git a/print-vjc.c b/print-vjc.c
index d06dfc7eab05b969dee3b2d258ba9d014f8ba546..597ba060456750dda87f4c91d377ea8f9a6e3df6 100644 (file)
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -106,7 +106,7 @@ vjc_print(netdissect_options *ndo, register const u_char *bp, u_short proto _U_)
                if (bp[1])
                        ND_PRINT((ndo, " "));
                ND_PRINT((ndo, "C=0x%02x ", bp[2]));
-               ND_PRINT((ndo, "sum=0x%04x ", *(const u_short *)&bp[3]));
+               ND_PRINT((ndo, "sum=0x%04x ", *(const u_short *)(bp + 3)));
                return -1;
        case TYPE_ERROR:
                if (ndo->ndo_eflag)

diff --git a/smbutil.c b/smbutil.c
index 3493265fd2ff61f28b5008904c28adfec8b44b74..c7ec75ed998ca4fb3a1b318c98591986cdc15477 100644 (file)
--- a/smbutil.c
+++ b/smbutil.c
@@ -287,9 +287,9 @@ smb_print_data(netdissect_options *ndo, const unsigned char *buf, int len)
        if (i%8 == 0)
            ND_PRINT((ndo, " "));
        if (i % 16 == 0) {
-           print_asc(ndo, &buf[i - 16], 8);
+           print_asc(ndo, buf + i - 16, 8);
            ND_PRINT((ndo, " "));
-           print_asc(ndo, &buf[i - 8], 8);
+           print_asc(ndo, buf + i - 8, 8);
            ND_PRINT((ndo, "\n"));
            if (i < len)
                ND_PRINT((ndo, "[%03X] ", i));
@@ -306,11 +306,11 @@ smb_print_data(netdissect_options *ndo, const unsigned char *buf, int len)
            ND_PRINT((ndo, "   "));
 
        n = min(8, i % 16);
-       print_asc(ndo, &buf[i - (i % 16)], n);
+       print_asc(ndo, buf + i - (i % 16), n);
        ND_PRINT((ndo, " "));
        n = (i % 16) - n;
        if (n > 0)
-           print_asc(ndo, &buf[i - n], n);
+           print_asc(ndo, buf + i - n, n);
        ND_PRINT((ndo, "\n"));
     }
     return;