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/skeleton.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/skeleton.c')
-rw-r--r-- | iconv/skeleton.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/iconv/skeleton.c b/iconv/skeleton.c index 73dc1860a9..acd60e2f88 100644 --- a/iconv/skeleton.c +++ b/iconv/skeleton.c @@ -501,8 +501,9 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data, } else { - /* We preserve the initial values of the pointer variables. */ - const unsigned char *inptr = *inptrp; + /* We preserve the initial values of the pointer variables, + but only some conversion modules need it. */ + const unsigned char *inptr __attribute__ ((__unused__)) = *inptrp; unsigned char *outbuf = (__builtin_expect (outbufstart == NULL, 1) ? data->__outbuf : *outbufstart); unsigned char *outend = data->__outbufend; @@ -592,8 +593,6 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data, while (1) { - struct __gconv_trans_data *trans; - /* Remember the start value for this round. */ inptr = *inptrp; /* The outbuf buffer is empty. */ @@ -640,13 +639,6 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data, return status; } - /* Give the transliteration module the chance to store the - original text and the result in case it needs a context. */ - for (trans = data->__trans; trans != NULL; trans = trans->__next) - if (trans->__trans_context_fct != NULL) - DL_CALL_FCT (trans->__trans_context_fct, - (trans->__data, inptr, *inptrp, outstart, outbuf)); - /* We finished one use of the loops. */ ++data->__invocation_counter; |