Remove unneeded '&' when getting a pointer to a nd_ipv6 type

diff --git a/print-ip6.c b/print-ip6.c
index 8c0f192ae558d78a4eac8b52c36496d87ab2a3e7..f22d2c05f52e9bad7447dacb5442ca318a8f3eb7 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -59,7 +59,7 @@ ip6_finddst(netdissect_options *ndo, struct in6_addr *dst,
        cp = (const u_char *)ip6;
        advance = sizeof(struct ip6_hdr);
        nh = EXTRACT_U_1(ip6->ip6_nxt);
-       dst_addr = (const void *)&ip6->ip6_dst;
+       dst_addr = (const void *)ip6->ip6_dst;
 
        while (cp < ndo->ndo_snapend) {
                cp += advance;
@@ -174,7 +174,7 @@ nextproto6_cksum(netdissect_options *ndo,
 
         /* pseudo-header */
         memset(&ph, 0, sizeof(ph));
-        UNALIGNED_MEMCPY(&ph.ph_src, &ip6->ip6_src, sizeof (struct in6_addr));
+        UNALIGNED_MEMCPY(&ph.ph_src, ip6->ip6_src, sizeof (struct in6_addr));
         nh = EXTRACT_U_1(ip6->ip6_nxt);
         switch (nh) {
 
@@ -193,7 +193,8 @@ nextproto6_cksum(netdissect_options *ndo,
                 break;
 
         default:
-                UNALIGNED_MEMCPY(&ph.ph_dst, &ip6->ip6_dst, sizeof (struct in6_addr));
+                UNALIGNED_MEMCPY(&ph.ph_dst, ip6->ip6_dst,
+                                 sizeof (struct in6_addr));
                 break;
         }
         ph.ph_len = htonl(len);

diff --git a/print-isakmp.c b/print-isakmp.c
index 7777b2ab4b80234591a333e61e485165a840a304..ba12f912d0998205b8cb578f2f84d9887d1c10f4 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -788,8 +788,10 @@ cookie_record(const cookie_t *in, const u_char *bp2)
        case 6:
                ip6 = (const struct ip6_hdr *)bp2;
                cookiecache[ninitiator].version = 6;
-               UNALIGNED_MEMCPY(&cookiecache[ninitiator].iaddr.in6, &ip6->ip6_src, sizeof(nd_ipv6));
-               UNALIGNED_MEMCPY(&cookiecache[ninitiator].raddr.in6, &ip6->ip6_dst, sizeof(nd_ipv6));
+               UNALIGNED_MEMCPY(&cookiecache[ninitiator].iaddr.in6,
+                                ip6->ip6_src, sizeof(nd_ipv6));
+               UNALIGNED_MEMCPY(&cookiecache[ninitiator].raddr.in6,
+                                ip6->ip6_dst, sizeof(nd_ipv6));
                break;
        default:
                return;
@@ -824,10 +826,10 @@ cookie_sidecheck(int i, const u_char *bp2, int initiator)
                        return 0;
                ip6 = (const struct ip6_hdr *)bp2;
                if (initiator) {
-                       if (UNALIGNED_MEMCMP(&ip6->ip6_src, &cookiecache[i].iaddr.in6, sizeof(nd_ipv6)) == 0)
+                       if (UNALIGNED_MEMCMP(ip6->ip6_src, &cookiecache[i].iaddr.in6, sizeof(nd_ipv6)) == 0)
                                return 1;
                } else {
-                       if (UNALIGNED_MEMCMP(&ip6->ip6_src, &cookiecache[i].raddr.in6, sizeof(nd_ipv6)) == 0)
+                       if (UNALIGNED_MEMCMP(ip6->ip6_src, &cookiecache[i].raddr.in6, sizeof(nd_ipv6)) == 0)
                                return 1;
                }
                break;

diff --git a/print-nfs.c b/print-nfs.c
index 22c36c993b878e4fd4346a509ab0a1d7cc9f9ccc..e240a0e7d872afb956428614bacfe8ca7e36fe60 100644 (file)
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -927,8 +927,10 @@ xid_map_enter(netdissect_options *ndo,
        }
        else if (ip6) {
                xmep->ipver = 6;
-               UNALIGNED_MEMCPY(&xmep->client, &ip6->ip6_src, sizeof(ip6->ip6_src));
-               UNALIGNED_MEMCPY(&xmep->server, &ip6->ip6_dst, sizeof(ip6->ip6_dst));
+               UNALIGNED_MEMCPY(&xmep->client, ip6->ip6_src,
+                                sizeof(ip6->ip6_src));
+               UNALIGNED_MEMCPY(&xmep->server, ip6->ip6_dst,
+                                sizeof(ip6->ip6_dst));
        }
        xmep->proc = EXTRACT_BE_U_4(&rp->rm_call.cb_proc);
        xmep->vers = EXTRACT_BE_U_4(&rp->rm_call.cb_vers);
@@ -968,10 +970,10 @@ xid_map_find(const struct sunrpc_msg *rp, const u_char *bp, uint32_t *proc,
                        }
                        break;
                case 6:
-                       if (UNALIGNED_MEMCMP(&ip6->ip6_src, &xmep->server,
-                                  sizeof(ip6->ip6_src)) != 0 ||
-                           UNALIGNED_MEMCMP(&ip6->ip6_dst, &xmep->client,
-                                  sizeof(ip6->ip6_dst)) != 0) {
+                       if (UNALIGNED_MEMCMP(ip6->ip6_src, &xmep->server,
+                                            sizeof(ip6->ip6_src)) != 0 ||
+                           UNALIGNED_MEMCMP(ip6->ip6_dst, &xmep->client,
+                                            sizeof(ip6->ip6_dst)) != 0) {
                                cmp = 0;
                        }
                        break;

diff --git a/print-tcp.c b/print-tcp.c
index 6deb97b328eda7e9c10eaac91af49d4ea36e873d..554f8a61eaaa6b423509c6dbe761f4bb93087081 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -262,8 +262,8 @@ tcp_print(netdissect_options *ndo,
                         struct tha6 tha;
 
                         tcp_seq_hash = tcp_seq_hash6;
-                        src = (const void *)&ip6->ip6_src;
-                        dst = (const void *)&ip6->ip6_dst;
+                        src = (const void *)ip6->ip6_src;
+                        dst = (const void *)ip6->ip6_dst;
                         if (sport > dport)
                                 rev = 1;
                         else if (sport == dport) {