Reduce needless casts on void *

diff --git a/if-bsd.c b/if-bsd.c
index 8a480d1ff0d95090cf2f62106acbd7d15bddfee2..b876e1314d361aa7bf9c32ce6a10d8a804516fd3 100644 (file)
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -94,12 +94,12 @@
 
 #define COPYOUT(sin, sa) do {                                                \
        if ((sa) && ((sa)->sa_family == AF_INET || (sa)->sa_family == 255))   \
-               (sin) = ((struct sockaddr_in*)(void *)(sa))->sin_addr;        \
+               (sin) = ((struct sockaddr_in *)(void *)(sa))->sin_addr;       \
        } while (0)
 
 #define COPYOUT6(sin, sa) do {                                               \
        if ((sa) && ((sa)->sa_family == AF_INET6 || (sa)->sa_family == 255))  \
-               (sin) = ((struct sockaddr_in6*)(void *)(sa))->sin6_addr;      \
+               (sin) = ((struct sockaddr_in6 *)(void *)(sa))->sin6_addr;     \
        } while (0)
 
 #ifndef CLLADDR
@@ -466,8 +466,8 @@ if_copyrt(struct dhcpcd_ctx *ctx, struct rt *rt, struct rt_msghdr *rtm)
        struct sockaddr_in *sin;
        struct ipv4_addr *ia;
 
-       cp = (char *)(void *)(rtm + 1);
-       sa = (struct sockaddr *)(void *)cp;
+       cp = (void *)(rtm + 1);
+       sa = (void *)cp;
        if (sa->sa_family != AF_INET)
                return -1;
        if (~rtm->rtm_addrs & (RTA_DST | RTA_GATEWAY))
@@ -500,7 +500,7 @@ if_copyrt(struct dhcpcd_ctx *ctx, struct rt *rt, struct rt_msghdr *rtm)
        if (rtm->rtm_index)
                rt->iface = if_findindex(ctx->ifaces, rtm->rtm_index);
        else if (rtm->rtm_addrs & RTA_IFP) {
-               sdl = (struct sockaddr_dl *)(void *)rti_info[RTAX_IFP];
+               sdl = (void *)rti_info[RTAX_IFP];
                rt->iface = if_findsdl(ctx, sdl);
        } else if (rtm->rtm_addrs & RTA_GATEWAY) {
                sa = rti_info[RTAX_GATEWAY];
@@ -709,7 +709,7 @@ if_initrt(struct interface *ifp)
 
        end = buf + needed;
        for (p = buf; p < end; p += rtm->rtm_msglen) {
-               rtm = (struct rt_msghdr *)(void *)p;
+               rtm = (void *)p;
                if (if_copyrt(ifp->ctx, &rt, rtm) == 0)
                        ipv4_handlert(ifp->ctx, RTM_ADD, &rt);
        }
@@ -726,7 +726,7 @@ if_addrflags(const struct in_addr *addr, const struct interface *ifp)
 
        memset(&ifr, 0, sizeof(ifr));
        strlcpy(ifr.ifr_name, ifp->name, sizeof(ifr.ifr_name));
-       sin = (struct sockaddr_in *)(void *)&ifr.ifr_addr;
+       sin = (void *)&ifr.ifr_addr;
        sin->sin_family = AF_INET;
        sin->sin_addr = *addr;
        if (ioctl(ifp->ctx->pf_inet_fd, SIOCGIFAFLAG_IN, &ifr) == -1)
@@ -829,8 +829,8 @@ if_copyrt6(struct dhcpcd_ctx *ctx, struct rt6 *rt, struct rt_msghdr *rtm)
        struct sockaddr_in6 *sin;
        struct ipv6_addr *ia;
 
-       cp = (char *)(void *)(rtm + 1);
-       sa = (struct sockaddr *)(void *)cp;
+       cp = (void *)(rtm + 1);
+       sa = (void *)cp;
        if (sa->sa_family != AF_INET6)
                return -1;
        if (~rtm->rtm_addrs & (RTA_DST | RTA_GATEWAY))
@@ -862,7 +862,7 @@ if_copyrt6(struct dhcpcd_ctx *ctx, struct rt6 *rt, struct rt_msghdr *rtm)
                struct sockaddr_in6 *sin6;
                size_t e, i, len = 0, final = 0;
 
-               sin6 = (struct sockaddr_in6 *)(void *)rti_info[RTAX_NETMASK];
+               sin6 = (void *)rti_info[RTAX_NETMASK];
                rt->net = sin6->sin6_addr;
                e = sin6->sin6_len - offsetof(struct sockaddr_in6, sin6_addr);
                if (e > sizeof(struct in6_addr))
@@ -904,7 +904,7 @@ if_copyrt6(struct dhcpcd_ctx *ctx, struct rt6 *rt, struct rt_msghdr *rtm)
        if (rtm->rtm_index)
                rt->iface = if_findindex(ctx->ifaces, rtm->rtm_index);
        else if (rtm->rtm_addrs & RTA_IFP) {
-               sdl = (struct sockaddr_dl *)(void *)rti_info[RTAX_IFP];
+               sdl = (void *)rti_info[RTAX_IFP];
                rt->iface = if_findsdl(ctx, sdl);
        } else if (rtm->rtm_addrs & RTA_GATEWAY) {
                sa = rti_info[RTAX_GATEWAY];
@@ -1079,7 +1079,7 @@ if_initrt6(struct interface *ifp)
 
        end = buf + needed;
        for (p = buf; p < end; p += rtm->rtm_msglen) {
-               rtm = (struct rt_msghdr *)(void *)p;
+               rtm = (void *)p;
                if (if_copyrt6(ifp->ctx, &rt, rtm) == 0)
                        ipv6_handlert(ifp->ctx, RTM_ADD, &rt);
        }
@@ -1171,7 +1171,7 @@ if_managelink(struct dhcpcd_ctx *ctx)
                return -1;
        e = msg + bytes;
        for (p = msg; p < e; p += rtm->rtm_msglen) {
-               rtm = (struct rt_msghdr *)(void *)p;
+               rtm = (void *)p;
                if (rtm->rtm_type == RTM_MISS)
                        continue;
                /* Ignore messages generated by us */
@@ -1195,7 +1195,7 @@ if_managelink(struct dhcpcd_ctx *ctx)
                switch(rtm->rtm_type) {
 #ifdef RTM_IFANNOUNCE
                case RTM_IFANNOUNCE:
-                       ifan = (struct if_announcemsghdr *)(void *)p;
+                       ifan = (void *)p;
                        switch(ifan->ifan_what) {
                        case IFAN_ARRIVAL:
                                dhcpcd_handleinterface(ctx, 1,
@@ -1209,7 +1209,7 @@ if_managelink(struct dhcpcd_ctx *ctx)
                        break;
 #endif
                case RTM_IFINFO:
-                       ifm = (struct if_msghdr *)(void *)p;
+                       ifm = (void *)p;
                        ifp = if_findindex(ctx->ifaces, ifm->ifm_index);
                        if (ifp == NULL)
                                break;
@@ -1237,8 +1237,8 @@ if_managelink(struct dhcpcd_ctx *ctx)
                case RTM_ADD:
                case RTM_CHANGE:
                case RTM_DELETE:
-                       cp = (char *)(void *)(rtm + 1);
-                       sa = (struct sockaddr *)(void *)cp;
+                       cp = (void *)(rtm + 1);
+                       sa = (void *)cp;
                        switch (sa->sa_family) {
 #ifdef INET
                        case AF_INET:
@@ -1286,11 +1286,11 @@ if_managelink(struct dhcpcd_ctx *ctx)
 #endif
                case RTM_DELADDR:       /* FALLTHROUGH */
                case RTM_NEWADDR:
-                       ifam = (struct ifa_msghdr *)(void *)p;
+                       ifam = (void *)p;
                        ifp = if_findindex(ctx->ifaces, ifam->ifam_index);
                        if (ifp == NULL)
                                break;
-                       cp = (char *)(void *)(ifam + 1);
+                       cp = (void *)(ifam + 1);
                        get_addrs(ifam->ifam_addrs, cp, rti_info);
                        if (rti_info[RTAX_IFA] == NULL)
                                break;
@@ -1328,12 +1328,10 @@ if_managelink(struct dhcpcd_ctx *ctx)
 #endif
 #ifdef INET6
                        case AF_INET6:
-                               sin6 = (struct sockaddr_in6*)(void *)
-                                   rti_info[RTAX_IFA];
+                               sin6 = (void *)rti_info[RTAX_IFA];
                                ia6 = sin6->sin6_addr;
                                DESCOPE(&ia6);
-                               sin6 = (struct sockaddr_in6*)(void *)
-                                   rti_info[RTAX_NETMASK];
+                               sin6 = (void *)rti_info[RTAX_NETMASK];
                                net6 = sin6->sin6_addr;
                                DESCOPE(&net6);
                                if (rtm->rtm_type == RTM_NEWADDR) {

diff --git a/if.c b/if.c
index 997c5e4f82fe046f63a3dab15a9755f2f80e579a..52609c9363b68206a23ce2469b2a4fc8a20f8158 100644 (file)
--- a/if.c
+++ b/if.c
@@ -198,10 +198,8 @@ static void if_learnaddrs1(struct dhcpcd_ctx *ctx, struct if_head *ifs,
                switch(ifa->ifa_addr->sa_family) {
 #ifdef INET
                case AF_INET:
-                       addr = (const struct sockaddr_in *)
-                           (void *)ifa->ifa_addr;
-                       net = (const struct sockaddr_in *)
-                           (void *)ifa->ifa_netmask;
+                       addr = (void *)ifa->ifa_addr;
+                       net = (void *)ifa->ifa_netmask;
                        if (ifa->ifa_flags & IFF_POINTOPOINT)
                                dst = (const struct sockaddr_in *)
                                    (void *)ifa->ifa_dstaddr;
@@ -216,8 +214,8 @@ static void if_learnaddrs1(struct dhcpcd_ctx *ctx, struct if_head *ifs,
 #endif
 #ifdef INET6
                case AF_INET6:
-                       sin6 = (struct sockaddr_in6 *)(void *)ifa->ifa_addr;
-                       net6 = (struct sockaddr_in6 *)(void *)ifa->ifa_netmask;
+                       sin6 = (void *)ifa->ifa_addr;
+                       net6 = (void *)ifa->ifa_netmask;
 #ifdef __KAME__
                        if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))
                                /* Remove the scope from the address */
@@ -374,7 +372,7 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
 
                if (ifa->ifa_addr != NULL) {
 #ifdef AF_LINK
-                       sdl = (const struct sockaddr_dl *)(void *)ifa->ifa_addr;
+                       sdl = (const void *)ifa->ifa_addr;
 
 #ifdef IFLR_ACTIVE
                        /* We need to check for active address */
@@ -458,7 +456,7 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
 #endif
                        memcpy(ifp->hwaddr, CLLADDR(sdl), ifp->hwlen);
 #elif AF_PACKET
-                       sll = (const struct sockaddr_ll *)(void *)ifa->ifa_addr;
+                       sll = (const void *)ifa->ifa_addr;
                        ifp->index = (unsigned int)sll->sll_ifindex;
                        ifp->family = sll->sll_hatype;
                        ifp->hwlen = sll->sll_halen;

diff --git a/ipv6nd.c b/ipv6nd.c
index 3282267b69446a406153beabe878b59b0c573011..78be3b0b00d3c3fe0101d03198e3d98027f9e7ac 100644 (file)
--- a/ipv6nd.c
+++ b/ipv6nd.c
@@ -243,7 +243,7 @@ ipv6nd_makersprobe(struct interface *ifp)
        state->rs = calloc(1, state->rslen);
        if (state->rs == NULL)
                return -1;
-       rs = (struct nd_router_solicit *)(void *)state->rs;
+       rs = (void *)state->rs;
        rs->nd_rs_type = ND_ROUTER_SOLICIT;
        rs->nd_rs_code = 0;
        rs->nd_rs_cksum = 0;
@@ -924,7 +924,7 @@ ipv6nd_handlera(struct dhcpcd_ctx *dctx, struct interface *ifp,
 
                switch (ndo->nd_opt_type) {
                case ND_OPT_PREFIX_INFORMATION:
-                       pi = (struct nd_opt_prefix_info *)(void *)ndo;
+                       pi = (void *)ndo;
                        if (pi->nd_opt_pi_len != 4) {
                                logger(ifp->ctx, new_data ? LOG_ERR : LOG_DEBUG,
                                    "%s: invalid option len for prefix",
@@ -1050,7 +1050,7 @@ ipv6nd_handlera(struct dhcpcd_ctx *dctx, struct interface *ifp,
                        break;
 
                case ND_OPT_MTU:
-                       mtu = (struct nd_opt_mtu *)(void *)p;
+                       mtu = (void *)p;
                        mtuv = ntohl(mtu->nd_opt_mtu_mtu);
                        if (mtuv < IPV6_MMTU) {
                                logger(ifp->ctx, LOG_ERR, "%s: invalid MTU %d",
@@ -1061,7 +1061,7 @@ ipv6nd_handlera(struct dhcpcd_ctx *dctx, struct interface *ifp,
                        break;
 
                case ND_OPT_RDNSS:
-                       rdnss = (struct nd_opt_rdnss *)(void *)p;
+                       rdnss = (void *)p;
                        if (rdnss->nd_opt_rdnss_lifetime &&
                            rdnss->nd_opt_rdnss_len > 1)
                                rap->hasdns = 1;