diff options
| -rw-r--r-- | src/network/gethostbyaddr_r.c | 13 | ||||
| -rw-r--r-- | src/network/gethostbyname2_r.c | 14 |
2 files changed, 10 insertions, 17 deletions
diff --git a/src/network/gethostbyaddr_r.c b/src/network/gethostbyaddr_r.c index cdb1d503..73e76447 100644 --- a/src/network/gethostbyaddr_r.c +++ b/src/network/gethostbyaddr_r.c @@ -23,16 +23,13 @@ int gethostbyaddr_r(const void *a, socklen_t l, int af, else if (af==AF_INET && l==4) memcpy(&sa.sin.sin_addr, a, 4); else { *err = NO_RECOVERY; - return -1; + return EINVAL; } /* Align buffer and check for space for pointers and ip address */ i = (uintptr_t)buf & sizeof(char *)-1; if (!i) i = sizeof(char *); - if (buflen <= 5*sizeof(char *)-i + l) { - errno = ERANGE; - return -1; - } + if (buflen <= 5*sizeof(char *)-i + l) return ERANGE; buf += sizeof(char *)-i; buflen -= 5*sizeof(char *)-i + l; @@ -51,15 +48,15 @@ int gethostbyaddr_r(const void *a, socklen_t l, int af, switch (getnameinfo((void *)&sa, sl, buf, buflen, 0, 0, 0)) { case EAI_AGAIN: *err = TRY_AGAIN; - return -1; + return EAGAIN; case EAI_OVERFLOW: - errno = ERANGE; + return ERANGE; default: case EAI_MEMORY: case EAI_SYSTEM: case EAI_FAIL: *err = NO_RECOVERY; - return -1; + return errno; case 0: break; } diff --git a/src/network/gethostbyname2_r.c b/src/network/gethostbyname2_r.c index c2ed75b4..49e4e531 100644 --- a/src/network/gethostbyname2_r.c +++ b/src/network/gethostbyname2_r.c @@ -25,10 +25,7 @@ int gethostbyname2_r(const char *name, int af, /* Align buffer */ i = (uintptr_t)buf & sizeof(char *)-1; if (i) { - if (buflen < sizeof(char *)-i) { - errno = ERANGE; - return -1; - } + if (buflen < sizeof(char *)-i) return ERANGE; buf += sizeof(char *)-i; buflen -= sizeof(char *)-i; } @@ -37,16 +34,16 @@ int gethostbyname2_r(const char *name, int af, switch (getaddrinfo(name, 0, &hint, &ai)) { case EAI_NONAME: *err = HOST_NOT_FOUND; - return -1; + return errno; case EAI_AGAIN: *err = TRY_AGAIN; - return -1; + return errno; default: case EAI_MEMORY: case EAI_SYSTEM: case EAI_FAIL: *err = NO_RECOVERY; - return -1; + return errno; case 0: break; } @@ -63,8 +60,7 @@ int gethostbyname2_r(const char *name, int af, if (need > buflen) { freeaddrinfo(ai); - errno = ERANGE; - return -1; + return ERANGE; } h->h_aliases = (void *)buf; |