diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-05-16 18:19:18 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-05-16 18:19:18 +0000 |
| commit | 74e133858878bf14222273726f8b9d72b39df01e (patch) | |
| tree | d56edec4654a053a4c4e7421273a3f229d689e7d | |
| parent | 91c8a74b8b9f7bf24aae101190750c2ec7b9ab23 (diff) | |
| download | glibc-74e133858878bf14222273726f8b9d72b39df01e.tar.gz glibc-74e133858878bf14222273726f8b9d72b39df01e.tar.xz glibc-74e133858878bf14222273726f8b9d72b39df01e.zip | |
* string/strcasestr.c (CMP_FUNC): Use __strncasecmp, not strncasecmp. cvs/fedora-glibc-20080516T2152
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | localedata/ChangeLog | 4 | ||||
| -rw-r--r-- | localedata/locales/iso14651_t1_common | 3 | ||||
| -rw-r--r-- | string/strcasestr.c | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 01dd75a433..110f60889c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2008-05-16 Ulrich Drepper <drepper@redhat.com> + * string/strcasestr.c (CMP_FUNC): Use __strncasecmp, not strncasecmp. + * sysdeps/posix/getaddrinfo.c (gaih_inet): After gethostbyname4_r lookup, don't assign canon unconditionally. diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 93fc456e77..878b10cce2 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +2008-05-16 Ulrich Drepper <drepper@redhat.com> + + * locales/iso14651_t1_common: Remove duplicate U0C7B definition. + 2008-05-14 Ulrich Drepper <drepper@redhat.com> [BZ #6438] diff --git a/localedata/locales/iso14651_t1_common b/localedata/locales/iso14651_t1_common index ca3a8144cb..e9721fd078 100644 --- a/localedata/locales/iso14651_t1_common +++ b/localedata/locales/iso14651_t1_common @@ -3416,7 +3416,8 @@ order_start <TELUGU>;forward;forward;forward;forward,position <U0C15> <t-ka>;<BAS>;<MIN>;IGNORE <U0C16> <t-kha>;<BAS>;<MIN>;IGNORE <U0C17> <t-ga>;<BAS>;<MIN>;IGNORE -<U0C7B> <t-gga>;<BAS>;<MIN>;IGNORE +#XXX This is wrong since there is already a definition for U0C7B. +#<U0C7B> <t-gga>;<BAS>;<MIN>;IGNORE <U0C18> <t-gha>;<BAS>;<MIN>;IGNORE <U0C19> <t-nga>;<BAS>;<MIN>;IGNORE <U0C1A> <t-ca>;<BAS>;<MIN>;IGNORE diff --git a/string/strcasestr.c b/string/strcasestr.c index 9de19aafa8..92f2eac7c8 100644 --- a/string/strcasestr.c +++ b/string/strcasestr.c @@ -46,7 +46,7 @@ && ((h_l) = (j) + (n_l))) #define CANON_ELEMENT(c) TOLOWER (c) #define CMP_FUNC(p1, p2, l) \ - strncasecmp ((const char *) (p1), (const char *) (p2), l) + __strncasecmp ((const char *) (p1), (const char *) (p2), l) #include "str-two-way.h" #undef strcasestr |