diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-12-21 07:28:33 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-12-21 07:28:33 +0000 |
| commit | 4b5b009cc3045ca026b061ce55160bd1eeb0888c (patch) | |
| tree | 2d96c43bf7b80ff910b72f68995aee66bde5d59b /iconv/gconv_charset.h | |
| parent | 808e0190f752df65c715ad389a34f27f836534ef (diff) | |
| download | glibc-4b5b009cc3045ca026b061ce55160bd1eeb0888c.tar.gz | |
* locale/xlocale.c (_nl_C_locobj): Mark as const.
* include/locale.h: Define _nl_C_locobj_ptr.
* iconv/gconv_charset.h: Use _nl_C_locobj_ptr instead of using pointer
to _nl_C_locobj because we also need a cast.
* iconv/gconv_conf.c: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_open.c: Likewise.
* locale/duplocale.c: Likewise.
* locale/freelocale.c: Likewise.
* locale/newlocale.c: Likewise.
* misc/syslog.c: Likewise.
* stdlib/strtod_l.c: Likewise.
* sysdeps/unix/sysv/linux/getloadavg.c: Likewise.
Diffstat (limited to 'iconv/gconv_charset.h')
| -rw-r--r-- | iconv/gconv_charset.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h index 4a3db73118..c18abec578 100644 --- a/iconv/gconv_charset.h +++ b/iconv/gconv_charset.h @@ -1,5 +1,5 @@ /* Charset name normalization. - Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. @@ -29,9 +29,9 @@ strip (char *wp, const char *s) while (*s != '\0') { - if (__isalnum_l (*s, &_nl_C_locobj) + if (__isalnum_l (*s, _nl_C_locobj_ptr) || *s == '_' || *s == '-' || *s == '.' || *s == ',') - *wp++ = __toupper_l (*s, &_nl_C_locobj); + *wp++ = __toupper_l (*s, _nl_C_locobj_ptr); else if (*s == '/') { if (++slash_count == 3) @@ -52,7 +52,7 @@ static inline char * __attribute__ ((unused, always_inline)) upstr (char *dst, const char *str) { char *cp = dst; - while ((*cp++ = __toupper_l (*str++, &_nl_C_locobj)) != '\0') + while ((*cp++ = __toupper_l (*str++, _nl_C_locobj_ptr)) != '\0') /* nothing */; return dst; } |