From 0ecb606cb6cf65de1d9fc8a919bceb4be476c602 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 12 Jul 2007 18:26:36 +0000 Subject: 2.5-18.1 --- iconv/gconv_trans.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'iconv/gconv_trans.c') 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)); -- cgit v1.2.3