diff --git a/src/net.cpp b/src/net.cpp --- a/src/net.cpp +++ b/src/net.cpp @@ -2302,7 +2302,8 @@ continue; } if (ifa->ifa_addr->sa_family == AF_INET) { - struct sockaddr_in *s4 = (struct sockaddr_in *)(ifa->ifa_addr); + struct sockaddr_in *s4 = + reinterpret_cast(ifa->ifa_addr); CNetAddr addr(s4->sin_addr); if (AddLocal(addr, LOCAL_IF)) { LogPrintf("%s: IPv4 %s: %s\n", __func__, ifa->ifa_name, @@ -2310,7 +2311,7 @@ } } else if (ifa->ifa_addr->sa_family == AF_INET6) { struct sockaddr_in6 *s6 = - (struct sockaddr_in6 *)(ifa->ifa_addr); + reinterpret_cast(ifa->ifa_addr); CNetAddr addr(s6->sin6_addr); if (AddLocal(addr, LOCAL_IF)) { LogPrintf("%s: IPv6 %s: %s\n", __func__, ifa->ifa_name, diff --git a/src/netaddress.cpp b/src/netaddress.cpp --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -480,10 +480,12 @@ bool CService::SetSockAddr(const struct sockaddr *paddr) { switch (paddr->sa_family) { case AF_INET: - *this = CService(*(const struct sockaddr_in *)paddr); + *this = CService( + *(reinterpret_cast(paddr))); return true; case AF_INET6: - *this = CService(*(const struct sockaddr_in6 *)paddr); + *this = CService( + *(reinterpret_cast(paddr))); return true; default: return false; @@ -508,7 +510,8 @@ if (IsIPv4()) { if (*addrlen < (socklen_t)sizeof(struct sockaddr_in)) return false; *addrlen = sizeof(struct sockaddr_in); - struct sockaddr_in *paddrin = (struct sockaddr_in *)paddr; + struct sockaddr_in *paddrin = + reinterpret_cast(paddr); memset(paddrin, 0, *addrlen); if (!GetInAddr(&paddrin->sin_addr)) return false; paddrin->sin_family = AF_INET; @@ -518,7 +521,8 @@ if (IsIPv6()) { if (*addrlen < (socklen_t)sizeof(struct sockaddr_in6)) return false; *addrlen = sizeof(struct sockaddr_in6); - struct sockaddr_in6 *paddrin6 = (struct sockaddr_in6 *)paddr; + struct sockaddr_in6 *paddrin6 = + reinterpret_cast(paddr); memset(paddrin6, 0, *addrlen); if (!GetIn6Addr(&paddrin6->sin6_addr)) return false; paddrin6->sin6_scope_id = scopeId; diff --git a/src/netbase.cpp b/src/netbase.cpp --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -90,13 +90,15 @@ CNetAddr resolved; if (aiTrav->ai_family == AF_INET) { assert(aiTrav->ai_addrlen >= sizeof(sockaddr_in)); - resolved = - CNetAddr(((struct sockaddr_in *)(aiTrav->ai_addr))->sin_addr); + resolved = CNetAddr( + (reinterpret_cast(aiTrav->ai_addr)) + ->sin_addr); } if (aiTrav->ai_family == AF_INET6) { assert(aiTrav->ai_addrlen >= sizeof(sockaddr_in6)); - struct sockaddr_in6 *s6 = (struct sockaddr_in6 *)aiTrav->ai_addr; + struct sockaddr_in6 *s6 = + reinterpret_cast(aiTrav->ai_addr); resolved = CNetAddr(s6->sin6_addr, s6->sin6_scope_id); } diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp --- a/src/test/cuckoocache_tests.cpp +++ b/src/test/cuckoocache_tests.cpp @@ -31,7 +31,7 @@ * insecure_GetRandHash fills in a uint256 from local_rand_ctx */ void insecure_GetRandHash(uint256 &t) { - uint32_t *ptr = (uint32_t *)t.begin(); + uint32_t *ptr = reinterpret_cast(t.begin()); for (uint8_t j = 0; j < 8; ++j) { *(ptr++) = local_rand_ctx.rand32(); } @@ -70,7 +70,7 @@ uint32_t n_insert = static_cast(load * (bytes / sizeof(uint256))); hashes.resize(n_insert); for (uint32_t i = 0; i < n_insert; ++i) { - uint32_t *ptr = (uint32_t *)hashes[i].begin(); + uint32_t *ptr = reinterpret_cast(hashes[i].begin()); for (uint8_t j = 0; j < 8; ++j) { *(ptr++) = local_rand_ctx.rand32(); } @@ -143,7 +143,7 @@ uint32_t n_insert = static_cast(load * (bytes / sizeof(uint256))); hashes.resize(n_insert); for (uint32_t i = 0; i < n_insert; ++i) { - uint32_t *ptr = (uint32_t *)hashes[i].begin(); + uint32_t *ptr = reinterpret_cast(hashes[i].begin()); for (uint8_t j = 0; j < 8; ++j) { *(ptr++) = local_rand_ctx.rand32(); } @@ -212,7 +212,7 @@ uint32_t n_insert = static_cast(load * (bytes / sizeof(uint256))); hashes.resize(n_insert); for (uint32_t i = 0; i < n_insert; ++i) { - uint32_t *ptr = (uint32_t *)hashes[i].begin(); + uint32_t *ptr = reinterpret_cast(hashes[i].begin()); for (uint8_t j = 0; j < 8; ++j) { *(ptr++) = local_rand_ctx.rand32(); } @@ -327,7 +327,8 @@ inserts.resize(n_insert); reads.reserve(n_insert / 2); for (uint32_t i = 0; i < n_insert; ++i) { - uint32_t *ptr = (uint32_t *)inserts[i].begin(); + uint32_t *ptr = + reinterpret_cast(inserts[i].begin()); for (uint8_t j = 0; j < 8; ++j) { *(ptr++) = local_rand_ctx.rand32(); }