From 82e4f85ce0ee65f90674ef4129c3bd4c43ca00c9 Mon Sep 17 00:00:00 2001 From: Roman Bogorodskiy Date: Tue, 21 Oct 2014 18:22:36 +0400 Subject: [PATCH] Fix cast errors with clang Build with clang fails with: CC util/libvirt_util_la-virsocketaddr.lo util/virsocketaddr.c:904:17: error: cast from 'struct sockaddr *' to 'struct sockaddr_in *' increases required alignment from 1 to 4 [-Werror,-Wcast-align] inet4 = (struct sockaddr_in*) res->ai_addr; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ util/virsocketaddr.c:909:17: error: cast from 'struct sockaddr *' to 'struct sockaddr_in6 *' increases required alignment from 1 to 4 [-Werror,-Wcast-align] inet6 = (struct sockaddr_in6*) res->ai_addr; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 errors generated. Fix that by replacing virSocketAddrParseInternal() call with virSocketAddrParse() in the virSocketAddrIsNumericLocalhost() function. virSocketAddrParse stores an address in virSocketAddr. virSocketAddr uses a union to store an address, so it doesn't need casting. --- src/util/virsocketaddr.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 5f54e6872..c5584af86 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -890,28 +890,19 @@ virSocketAddrNumericFamily(const char *address) bool virSocketAddrIsNumericLocalhost(const char *addr) { - struct addrinfo *res; + virSocketAddr res; struct in_addr tmp = { .s_addr = htonl(INADDR_LOOPBACK) }; - struct sockaddr_in *inet4; - struct sockaddr_in6 *inet6; - bool ret = false; - if (virSocketAddrParseInternal(&res, addr, AF_UNSPEC, false) < 0) - return ret; + if (virSocketAddrParse(&res, addr, AF_UNSPEC) < 0) + return false; - switch (res->ai_addr->sa_family) { + switch (res.data.stor.ss_family) { case AF_INET: - inet4 = (struct sockaddr_in*) res->ai_addr; - ret = memcmp(&inet4->sin_addr.s_addr, &tmp.s_addr, - sizeof(inet4->sin_addr.s_addr)) == 0; - break; + return memcmp(&res.data.inet4.sin_addr.s_addr, &tmp.s_addr, + sizeof(res.data.inet4.sin_addr.s_addr)) == 0; case AF_INET6: - inet6 = (struct sockaddr_in6*) res->ai_addr; - ret = IN6_IS_ADDR_LOOPBACK(&(inet6->sin6_addr)); - break; + return IN6_IS_ADDR_LOOPBACK(&res.data.inet6.sin6_addr); } - freeaddrinfo(res); - return ret; - + return false; } -- 2.39.5