projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix nftw FTW_MOUNT flag
[musl]
/
src
/
network
/
gethostbyname2_r.c
diff --git
a/src/network/gethostbyname2_r.c
b/src/network/gethostbyname2_r.c
index
c2ed75b
..
27eb080
100644
(file)
--- a/
src/network/gethostbyname2_r.c
+++ b/
src/network/gethostbyname2_r.c
@@
-5,7
+5,7
@@
#include <string.h>
#include <netinet/in.h>
#include <errno.h>
#include <string.h>
#include <netinet/in.h>
#include <errno.h>
-#include <
inttypes
.h>
+#include <
stdint
.h>
int gethostbyname2_r(const char *name, int af,
struct hostent *h, char *buf, size_t buflen,
int gethostbyname2_r(const char *name, int af,
struct hostent *h, char *buf, size_t buflen,
@@
-25,28
+25,24
@@
int gethostbyname2_r(const char *name, int af,
/* Align buffer */
i = (uintptr_t)buf & sizeof(char *)-1;
if (i) {
/* 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;
}
buf += sizeof(char *)-i;
buflen -= sizeof(char *)-i;
}
- getaddrinfo(name, 0, &hint, &ai);
switch (getaddrinfo(name, 0, &hint, &ai)) {
case EAI_NONAME:
*err = HOST_NOT_FOUND;
switch (getaddrinfo(name, 0, &hint, &ai)) {
case EAI_NONAME:
*err = HOST_NOT_FOUND;
- return
-1
;
+ return
errno
;
case EAI_AGAIN:
*err = TRY_AGAIN;
case EAI_AGAIN:
*err = TRY_AGAIN;
- return
-1
;
+ return
errno
;
default:
case EAI_MEMORY:
case EAI_SYSTEM:
case EAI_FAIL:
*err = NO_RECOVERY;
default:
case EAI_MEMORY:
case EAI_SYSTEM:
case EAI_FAIL:
*err = NO_RECOVERY;
- return
-1
;
+ return
errno
;
case 0:
break;
}
case 0:
break;
}
@@
-63,8
+59,7
@@
int gethostbyname2_r(const char *name, int af,
if (need > buflen) {
freeaddrinfo(ai);
if (need > buflen) {
freeaddrinfo(ai);
- errno = ERANGE;
- return -1;
+ return ERANGE;
}
h->h_aliases = (void *)buf;
}
h->h_aliases = (void *)buf;