aboutsummaryrefslogtreecommitdiff
path: root/resolv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-04-06 05:04:50 +0000
committerUlrich Drepper <drepper@redhat.com>2000-04-06 05:04:50 +0000
commita1303dc8dc57dbcd4605992dc177d11ae4d45aab (patch)
tree2aab8a4fbc1a903a38bae5d623df451dca64497b /resolv
parent2a0ff6ff1a3679479c729fce816fc21e73c54dfb (diff)
downloadglibc-a1303dc8dc57dbcd4605992dc177d11ae4d45aab.tar
glibc-a1303dc8dc57dbcd4605992dc177d11ae4d45aab.tar.gz
glibc-a1303dc8dc57dbcd4605992dc177d11ae4d45aab.tar.bz2
glibc-a1303dc8dc57dbcd4605992dc177d11ae4d45aab.zip
Update.
2000-04-05 Cristian Gafton <gafton@redhat.com> * ctype/ctype.h (__isctype_l): Define even if not __OPTIMIZE__ because it is used in generic code. * wctype/wctrans.c: Define __ctype32_toupper and __ctype32_tolower. * wcsmbs/wcwidth.h: Declare __ctype32_b. * intl/gettext.c: Include <locale.h>. * intl/ngettext.c: Likewise. 2000-04-05 Jakub Jelinek <jakub@redhat.com> * resolv/inet_ntop.c (inet_ntop4, inet_ntop6, inet_ntop): Use socklen_t type for size. * sysdeps/sparc/sparc32/dl-machine.h (RTLD_START): Rewrite for new init function interface. * sysdeps/sparc/sparc64/dl-machine.h (RTLD_START): Likewise. * sysdeps/unix/sysv/linux/sparc/bits/setjmp.h: Don't include sys/ucontext.h. (__jmp_buf): Declare the whole type structure here, don't use ucontext. * iconv/skeleton.c (put16u): Fix typo. Reported by Bruno Haible <haible@ilog.fr>.
Diffstat (limited to 'resolv')
-rw-r--r--resolv/inet_ntop.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/resolv/inet_ntop.c b/resolv/inet_ntop.c
index 2f076d4ba4..a95f684945 100644
--- a/resolv/inet_ntop.c
+++ b/resolv/inet_ntop.c
@@ -40,9 +40,9 @@ static char rcsid[] = "$Id$";
* sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
*/
-static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size))
+static const char *inet_ntop4 __P((const u_char *src, char *dst, socklen_t size))
internal_function;
-static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size))
+static const char *inet_ntop6 __P((const u_char *src, char *dst, socklen_t size))
internal_function;
/* char *
@@ -58,7 +58,7 @@ inet_ntop(af, src, dst, size)
int af;
const void *src;
char *dst;
- size_t size;
+ socklen_t size;
{
switch (af) {
case AF_INET:
@@ -88,7 +88,7 @@ internal_function
inet_ntop4(src, dst, size)
const u_char *src;
char *dst;
- size_t size;
+ socklen_t size;
{
static const char fmt[] = "%u.%u.%u.%u";
char tmp[sizeof "255.255.255.255"];
@@ -111,7 +111,7 @@ internal_function
inet_ntop6(src, dst, size)
const u_char *src;
char *dst;
- size_t size;
+ socklen_t size;
{
/*
* Note that int32_t and int16_t need only be "at least" large enough
@@ -189,7 +189,7 @@ inet_ntop6(src, dst, size)
/*
* Check for overflow, copy, and we're done.
*/
- if ((size_t)(tp - tmp) > size) {
+ if ((socklen_t)(tp - tmp) > size) {
__set_errno (ENOSPC);
return (NULL);
}