diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2003-05-01 19:03:14 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2003-05-01 19:03:14 +0000 |
| commit | d05090827f0e5b95cc7d2bcdde8b3b4e0f986241 (patch) | |
| tree | 736595316c161b3d1ae559f331feaa6ba12b500e /lib/libc/net/getnameinfo.c | |
| parent | 9501b60383bd4123b406e604b1fbe8108778c634 (diff) | |
Notes
Diffstat (limited to 'lib/libc/net/getnameinfo.c')
| -rw-r--r-- | lib/libc/net/getnameinfo.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c index 1aec5be4abe2..cee07f6e0fe7 100644 --- a/lib/libc/net/getnameinfo.c +++ b/lib/libc/net/getnameinfo.c @@ -46,7 +46,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "namespace.h" #include <sys/types.h> #include <sys/socket.h> #include <net/if.h> @@ -58,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <stddef.h> #include <errno.h> -#include "un-namespace.h" static const struct afd { int a_af; @@ -147,12 +145,12 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) if (sp) { if (strlen(sp->s_name) + 1 > servlen) return EAI_MEMORY; - _strlcpy(serv, sp->s_name, servlen); + strlcpy(serv, sp->s_name, servlen); } else { snprintf(numserv, sizeof(numserv), "%u", ntohs(port)); if (strlen(numserv) + 1 > servlen) return EAI_MEMORY; - _strlcpy(serv, numserv, servlen); + strlcpy(serv, numserv, servlen); } } @@ -225,7 +223,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) numaddrlen = strlen(numaddr); if (numaddrlen + 1 > hostlen) /* don't forget terminator */ return EAI_MEMORY; - _strlcpy(host, numaddr, hostlen); + strlcpy(host, numaddr, hostlen); break; } } else { @@ -248,7 +246,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) freehostent(hp); return EAI_MEMORY; } - _strlcpy(host, hp->h_name, hostlen); + strlcpy(host, hp->h_name, hostlen); freehostent(hp); } else { if (flags & NI_NAMEREQD) @@ -295,7 +293,7 @@ ip6_parsenumeric(sa, addr, host, hostlen, flags) numaddrlen = strlen(numaddr); if (numaddrlen + 1 > hostlen) /* don't forget terminator */ return EAI_MEMORY; - _strlcpy(host, numaddr, hostlen); + strlcpy(host, numaddr, hostlen); if (((const struct sockaddr_in6 *)sa)->sin6_scope_id) { char zonebuf[MAXHOSTNAMELEN]; |