diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-12-27 15:06:33 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-12-27 15:06:33 +0000 |
| commit | 1911b455dc562a3b6d6ae71a2517097044f98f5e (patch) | |
| tree | 946797705d73fb1545e2446dcd7118bbe607027f /iconv | |
| parent | 1bcfb5a5eb1c25b64a329c1edf6bcfb440cdbc93 (diff) | |
| download | glibc-1911b455dc562a3b6d6ae71a2517097044f98f5e.tar.gz glibc-1911b455dc562a3b6d6ae71a2517097044f98f5e.tar.xz glibc-1911b455dc562a3b6d6ae71a2517097044f98f5e.zip | |
* iconv/gconv_trans.c (__gconv_transliterate): Demangle step __fct
before calling it. 2005-12-27 David S. Miller <davem@sunset.davemloft.net> * sysdeps/unix/sysv/linux/sparc/Versions: Add new errlist-compat entry for up to 134 errnos.
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/gconv_trans.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/iconv/gconv_trans.c b/iconv/gconv_trans.c index e54c18490f..9e04e64ee2 100644 --- a/iconv/gconv_trans.c +++ b/iconv/gconv_trans.c @@ -54,6 +54,12 @@ __gconv_transliterate (struct __gconv_step *step, winbuf = (const uint32_t *) *inbufp; winbufend = (const uint32_t *) inbufend; + __gconv_fct fct = step->__fct; +#ifdef PTR_DEMANGLE + if (step->__shlib_handle != NULL) + PTR_DEMANGLE (fct); +#endif + /* If there is no transliteration information in the locale don't do anything and return the error. */ size = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_TRANSLIT_TAB_SIZE); @@ -119,7 +125,7 @@ __gconv_transliterate (struct __gconv_step *step, /* Try this input text. */ toinptr = (const unsigned char *) &to_tbl[idx2]; outptr = *outbufstart; - res = DL_CALL_FCT (step->__fct, + res = DL_CALL_FCT (fct, (step, step_data, &toinptr, (const unsigned char *) &to_tbl[idx2 + len], &outptr, NULL, 0, 0)); @@ -204,7 +210,7 @@ __gconv_transliterate (struct __gconv_step *step, ? __GCONV_EMPTY_INPUT : __GCONV_INCOMPLETE_INPUT); outptr = *outbufstart; - res = DL_CALL_FCT (step->__fct, + res = DL_CALL_FCT (fct, (step, step_data, &toinptr, (const unsigned char *) (default_missing + len), &outptr, NULL, 0, 0)); |