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_open.c | |
| parent | 808e0190f752df65c715ad389a34f27f836534ef (diff) | |
| download | glibc-4b5b009cc3045ca026b061ce55160bd1eeb0888c.tar glibc-4b5b009cc3045ca026b061ce55160bd1eeb0888c.tar.gz glibc-4b5b009cc3045ca026b061ce55160bd1eeb0888c.tar.bz2 glibc-4b5b009cc3045ca026b061ce55160bd1eeb0888c.zip | |
* 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_open.c')
| -rw-r--r-- | iconv/gconv_open.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c index 95f3203394..bbf27b3dc5 100644 --- a/iconv/gconv_open.c +++ b/iconv/gconv_open.c @@ -67,7 +67,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, tok = __strtok_r (tok, ",", &ptr); while (tok != NULL) { - if (__strcasecmp_l (tok, "TRANSLIT", &_nl_C_locobj) == 0) + if (__strcasecmp_l (tok, "TRANSLIT", _nl_C_locobj_ptr) == 0) { /* It's the builtin transliteration handling. We only support it for working on the internal encoding. */ @@ -101,7 +101,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, lastp->next = newp; } } - else if (__strcasecmp_l (tok, "IGNORE", &_nl_C_locobj) == 0) + else if (__strcasecmp_l (tok, "IGNORE", _nl_C_locobj_ptr) == 0) /* Set the flag to ignore all errors. */ conv_flags |= __GCONV_IGNORE_ERRORS; else @@ -115,7 +115,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, for (runp = trans; runp != NULL; runp = runp->next) if (runp->name != NULL && __strcasecmp_l (tok, runp->name, - &_nl_C_locobj) == 0) + _nl_C_locobj_ptr) == 0) break; else lastp = runp; @@ -235,7 +235,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, for (runp = trans; runp != NULL; runp = runp->next) for (n = 0; n < runp->ncsnames; ++n) if (__strcasecmp_l (steps[cnt].__from_name, - runp->csnames[n], &_nl_C_locobj) == 0) + runp->csnames[n], _nl_C_locobj_ptr) == 0) { void *data = NULL; |