diff options
author | ume <ume@FreeBSD.org> | 2001-03-17 14:25:23 +0000 |
---|---|---|
committer | ume <ume@FreeBSD.org> | 2001-03-17 14:25:23 +0000 |
commit | 97ef17ff72184bfbc39e0cd85f2d8633a9fdf8b9 (patch) | |
tree | 38c3b988f4873a93fecc6e93cb5a5705a7a1515b | |
parent | fb6a60e51ddf4192e7720452e24a8b017fe5f65a (diff) | |
download | FreeBSD-src-97ef17ff72184bfbc39e0cd85f2d8633a9fdf8b9.zip FreeBSD-src-97ef17ff72184bfbc39e0cd85f2d8633a9fdf8b9.tar.gz |
Nuke non-standard EAI_RESNULL.
-rw-r--r-- | include/netdb.h | 3 | ||||
-rw-r--r-- | lib/libc/net/getaddrinfo.3 | 5 | ||||
-rw-r--r-- | lib/libc/net/getaddrinfo.c | 8 |
3 files changed, 1 insertions, 15 deletions
diff --git a/include/netdb.h b/include/netdb.h index f07cbf3..2e3ae67 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -157,8 +157,7 @@ struct addrinfo { #define EAI_SYSTEM 11 /* system error returned in errno */ #define EAI_BADHINTS 12 #define EAI_PROTOCOL 13 -#define EAI_RESNULL 14 -#define EAI_MAX 15 +#define EAI_MAX 14 /* * Flag values for getaddrinfo() diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3 index 2c1c765..ef645c5 100644 --- a/lib/libc/net/getaddrinfo.3 +++ b/lib/libc/net/getaddrinfo.3 @@ -560,11 +560,6 @@ Invalid value for .Fa hints . .It Dv EAI_PROTOCOL Resolved protocol is unknown. -.It Dv EAI_RESNULL -Argument -.Fa res -is -.Dv NULL . .It Dv EAI_MAX Unknown error. .El diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index 09cc623..c54b252 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -78,7 +78,6 @@ * diffs with other KAME platforms: * - other KAME platforms already nuked FAITH ($GAI), but as FreeBSD * 4.0-RELEASE supplies it, we still have the code here. - * - EAI_RESNULL support * - AI_ADDRCONFIG support is supplied * - EDNS0 support is not available due to resolver differences * - some of FreeBSD style (#define tabify and others) @@ -266,9 +265,6 @@ static char *ai_errlist[] = { "System error returned in errno", /* EAI_SYSTEM */ "Invalid value for hints", /* EAI_BADHINTS */ "Resolved protocol is unknown", /* EAI_PROTOCOL */ -#ifdef EAI_RESNULL - "Argument res is NULL", /* EAI_RESNULL */ -#endif "Unknown error", /* EAI_MAX */ }; @@ -382,10 +378,6 @@ getaddrinfo(hostname, servname, hints, res) if (hostname == NULL && servname == NULL) return EAI_NONAME; -#ifdef EAI_RESNULL - if (res == NULL) - return EAI_RESNULL; /* xxx */ -#endif if (hints) { /* error check for hints */ if (hints->ai_addrlen || hints->ai_canonname || |