diff options
| author | Florian Weimer <fweimer@redhat.com> | 2014-09-12 09:17:32 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2014-09-12 09:17:32 +0200 |
| commit | ba7b4d294b01870ce3497971e9d07ee261cdc540 (patch) | |
| tree | f68e63afa5218a87f37c98c45ce8d7f62ec81bb0 /iconv/loop.c | |
| parent | 5379aebddd0a35c052e7149fb4ff88b49676516e (diff) | |
| download | glibc-ba7b4d294b01870ce3497971e9d07ee261cdc540.tar.gz glibc-ba7b4d294b01870ce3497971e9d07ee261cdc540.tar.xz glibc-ba7b4d294b01870ce3497971e9d07ee261cdc540.zip | |
Complete the removal of __gconv_translit_find
Prior to the 2.20 release, the function was just changed to fail unconditionally, in commit a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8. This commit removes the function completely, including gconv bits which depend on it. This changes the gconv ABI, which is not a public interface.
Diffstat (limited to 'iconv/loop.c')
| -rw-r--r-- | iconv/loop.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/iconv/loop.c b/iconv/loop.c index a480c0cd40..f4430ed968 100644 --- a/iconv/loop.c +++ b/iconv/loop.c @@ -213,8 +213,6 @@ points. */ #define STANDARD_TO_LOOP_ERR_HANDLER(Incr) \ { \ - struct __gconv_trans_data *trans; \ - \ result = __GCONV_ILLEGAL_INPUT; \ \ if (irreversible == NULL) \ @@ -227,14 +225,10 @@ UPDATE_PARAMS; \ \ /* First try the transliteration methods. */ \ - for (trans = step_data->__trans; trans != NULL; trans = trans->__next) \ - { \ - result = DL_CALL_FCT (trans->__trans_fct, \ - (step, step_data, trans->__data, *inptrp, \ - &inptr, inend, &outptr, irreversible)); \ - if (result != __GCONV_ILLEGAL_INPUT) \ - break; \ - } \ + if ((step_data->__flags & __GCONV_TRANSLIT) != 0) \ + result = __gconv_transliterate \ + (step, step_data, *inptrp, \ + &inptr, inend, &outptr, irreversible); \ \ REINIT_PARAMS; \ \ |