mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-08 17:42:12 +03:00
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>.
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user