INN commit: trunk/lib (network.c)
INN Commit
rra at isc.org
Tue Aug 27 18:41:25 UTC 2013
Date: Tuesday, August 27, 2013 @ 11:41:25
Author: iulius
Revision: 9534
add const casts
Modified:
trunk/lib/network.c
-----------+
network.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
Modified: network.c
===================================================================
--- network.c 2013-08-27 17:52:38 UTC (rev 9533)
+++ network.c 2013-08-27 18:41:25 UTC (rev 9534)
@@ -645,7 +645,7 @@
if (addr->sa_family == AF_INET6) {
const struct sockaddr_in6 *sin6;
- sin6 = (const struct sockaddr_in6 *) (void *) addr;
+ sin6 = (const struct sockaddr_in6 *) (const void *) addr;
if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
struct in_addr in;
@@ -659,7 +659,7 @@
if (addr->sa_family == AF_INET) {
const struct sockaddr_in *sin;
- sin = (const struct sockaddr_in *) (void *) addr;
+ sin = (const struct sockaddr_in *) (const void *) addr;
result = inet_ntop(AF_INET, &sin->sin_addr, dst, size);
return (result != NULL);
} else {
@@ -677,20 +677,20 @@
bool
network_sockaddr_equal(const struct sockaddr *a, const struct sockaddr *b)
{
- const struct sockaddr_in *a4 = (const struct sockaddr_in *) (void *) a;
- const struct sockaddr_in *b4 = (const struct sockaddr_in *) (void *) b;
+ const struct sockaddr_in *a4 = (const struct sockaddr_in *) (const void *) a;
+ const struct sockaddr_in *b4 = (const struct sockaddr_in *) (const void *) b;
#ifdef HAVE_INET6
- const struct sockaddr_in6 *a6 = (const struct sockaddr_in6 *) (void *) a;
- const struct sockaddr_in6 *b6 = (const struct sockaddr_in6 *) (void *) b;
+ const struct sockaddr_in6 *a6 = (const struct sockaddr_in6 *) (const void *) a;
+ const struct sockaddr_in6 *b6 = (const struct sockaddr_in6 *) (const void *) b;
const struct sockaddr *tmp;
if (a->sa_family == AF_INET && b->sa_family == AF_INET6) {
tmp = a;
a = b;
b = tmp;
- a6 = (const struct sockaddr_in6 *) (void *) a;
- b4 = (const struct sockaddr_in *) (void *) b;
+ a6 = (const struct sockaddr_in6 *) (const void *) a;
+ b4 = (const struct sockaddr_in *) (const void *) b;
}
if (a->sa_family == AF_INET6) {
if (b->sa_family == AF_INET6)
@@ -726,14 +726,14 @@
const struct sockaddr_in6 *sin6;
if (sa->sa_family == AF_INET6) {
- sin6 = (const struct sockaddr_in6 *) (void *) sa;
+ sin6 = (const struct sockaddr_in6 *) (const void *) sa;
return htons(sin6->sin6_port);
}
#endif
if (sa->sa_family != AF_INET)
return 0;
else {
- sin = (const struct sockaddr_in *) (void *) sa;
+ sin = (const struct sockaddr_in *) (const void *) sa;
return htons(sin->sin_port);
}
}
More information about the inn-committers
mailing list