generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a gethnamaddr.c warning that's already fixed upstream.

Browse Source 
We're still way out of sync, but this cleans up a tiny corner.

Change-Id: I51e76601785bf351d6418841b56e08a900a84d82
This commit is contained in:
Elliott Hughes 2014-05-06 11:23:40 -07:00
parent 100168abff
commit 3e5f0c9849
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libc/dns/gethnamaddr.c
View File

@ -828,27 +828,27 @@ android_gethostbyaddrfornet_real(const void *addr,
assert(addr != NULL);
if (af == AF_INET6 && len == IN6ADDRSZ &&
(IN6_IS_ADDR_LINKLOCAL((const struct in6_addr *)(const void *)uaddr) ||
IN6_IS_ADDR_SITELOCAL((const struct in6_addr *)(const void *)uaddr))) {
if (af == AF_INET6 && len == NS_IN6ADDRSZ &&
(IN6_IS_ADDR_LINKLOCAL((const struct in6_addr *)addr) ||
IN6_IS_ADDR_SITELOCAL((const struct in6_addr *)addr))) {
h_errno = HOST_NOT_FOUND;
return NULL;
}
if (af == AF_INET6 && len == IN6ADDRSZ &&
(IN6_IS_ADDR_V4MAPPED((const struct in6_addr *)(const void *)uaddr) ||
IN6_IS_ADDR_V4COMPAT((const struct in6_addr *)(const void *)uaddr))) {
if (af == AF_INET6 && len == NS_IN6ADDRSZ &&
(IN6_IS_ADDR_V4MAPPED((const struct in6_addr *)addr) ||
IN6_IS_ADDR_V4COMPAT((const struct in6_addr *)addr))) {
/* Unmap. */
addr += IN6ADDRSZ - INADDRSZ;
uaddr += IN6ADDRSZ - INADDRSZ;
uaddr += NS_IN6ADDRSZ - NS_INADDRSZ;
addr = uaddr;
af = AF_INET;
len = INADDRSZ;
len = NS_INADDRSZ;
}
switch (af) {
case AF_INET:
size = INADDRSZ;
size = NS_INADDRSZ;
break;
case AF_INET6:
size = IN6ADDRSZ;
size = NS_IN6ADDRSZ;
break;
default:
errno = EAFNOSUPPORT;