diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-11-26 09:44:30 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-11-26 09:44:30 +0000 |
| commit | c3301189bde66bceb3e949e4938b167fc847dd86 (patch) | |
| tree | 2e449aae3fb42846f0338645ed73ef6311341902 /string | |
| parent | 8b6e67674da3b9db3208b914bd8d892abb62ec48 (diff) | |
| download | glibc-c3301189bde66bceb3e949e4938b167fc847dd86.tar.gz glibc-c3301189bde66bceb3e949e4938b167fc847dd86.tar.xz glibc-c3301189bde66bceb3e949e4938b167fc847dd86.zip | |
Update.
2000-11-26 Ulrich Drepper <drepper@redhat.com> * inet/getnameinfo.c: Adjust casts to avoid warnings. * inet/rcmd.c: Likewise. * inet/ruserpass.c: Likewise. * inet/netinet/in.h (IN6_IS_ADDR_UNSPECIFIED, IN6_IS_ADDR_LOOPBACK, IN6_IS_ADDR_MULTICAST, IN6_IS_ADDR_LINKLOCAL, IN6_IS_ADDR_SITELOCAL, IN6_IS_ADDR_V4MAPPED, IN6_IS_ADDR_V4COMPAT, IN6_ARE_ADDR_EQUAL, IN6_IS_ADDR_MC_NODELOCAL, IN6_IS_ADDR_MC_LINKLOCAL, IN6_IS_ADDR_MC_SITELOCAL, IN6_IS_ADDR_MC_ORGLOCAL, IN6_IS_ADDR_MC_GLOBAL): Preserve const in cast. * include/aliases.h: Add prototypes for internal __getalias* functions. * include/netdb.h: Add prototypes for __old_gethostent_r, __old_gethostbyaddr_r, __old_gethostbyname_r, __old_gethostbyname2_r, __old_getnetent_r, __old_getnetbyaddr_r, __old_getnetbyname_r, __old_getservent_r, __old_getservbyname_r, __old_getservbyport_r, __old_getprotoent_r, __old_getprotobyname_r, __old_getprotobynumber_r. * include/rpc/netdb.h: Add prototypes for __old_getrpcbyname_r, __old_getrpcbynumber_r, __old_getrpcent_r. * include/rpc/netdb.h: Add __getrpcbyname_r, __getrpcbynumber_r, __getrpcent_r prototypes.
Diffstat (limited to 'string')
| -rw-r--r-- | string/strcoll.c | 2 | ||||
| -rw-r--r-- | string/strnlen.c | 4 | ||||
| -rw-r--r-- | string/strxfrm.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/string/strcoll.c b/string/strcoll.c index 49725e1a69..64e00a251a 100644 --- a/string/strcoll.c +++ b/string/strcoll.c @@ -59,7 +59,7 @@ STRCOLL (s1, s2, l) { #ifdef USE_IN_EXTENDED_LOCALE_MODEL struct locale_data *current = l->__locales[LC_COLLATE]; - uint_fast32_t nrules = *((uint32_t *) current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].string); + uint_fast32_t nrules = *((const uint32_t *) current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].string); #else uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); #endif diff --git a/string/strnlen.c b/string/strnlen.c index 17b1193f0b..a50226f5fc 100644 --- a/string/strnlen.c +++ b/string/strnlen.c @@ -1,5 +1,5 @@ /* Find the length of STRING, but scan at most MAXLEN characters. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,6 +26,6 @@ size_t __strnlen (const char *string, size_t maxlen) { const char *end = memchr (string, '\0', maxlen); - return end ? end - string : maxlen; + return end ? (size_t) (end - string) : maxlen; } weak_alias (__strnlen, strnlen) diff --git a/string/strxfrm.c b/string/strxfrm.c index df44586a04..4a97c3e1cc 100644 --- a/string/strxfrm.c +++ b/string/strxfrm.c @@ -95,7 +95,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) { #ifdef USE_IN_EXTENDED_LOCALE_MODEL struct locale_data *current = l->__locales[LC_COLLATE]; - uint_fast32_t nrules = *((uint32_t *) current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].string); + uint_fast32_t nrules = *((const uint32_t *) current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].string); #else uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES); #endif @@ -393,7 +393,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) rule = rulesets[rulearr[idxcnt + 1] * nrules + pass]; } - if (backw_stop != ~0) + if (backw_stop != ~0ul) { /* Handle the pushed elements now. */ size_t backw; |