diff options
Diffstat (limited to 'iconvdata/utf-16.c')
| -rw-r--r-- | iconvdata/utf-16.c | 42 |
1 files changed, 2 insertions, 40 deletions
diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c index fd7bba72bf..4b7fefaf28 100644 --- a/iconvdata/utf-16.c +++ b/iconvdata/utf-16.c @@ -202,26 +202,7 @@ gconv_end (struct __gconv_step *data) { \ if (__builtin_expect (c, 0) >= 0x110000) \ { \ - if (step_data->__trans.__trans_fct != NULL) \ - { \ - result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ - (step, step_data, *inptrp, &inptr, \ - inend, &outptr, irreversible)); \ - if (result != __GCONV_OK) \ - break; \ - } \ - else if (! ignore_errors_p ()) \ - { \ - /* This is an illegal character. */ \ - result = __GCONV_ILLEGAL_INPUT; \ - break; \ - } \ - else \ - { \ - ++*irreversible; \ - inptr += 4; \ - } \ - continue; \ + STANDARD_ERR_HANDLER (4); \ } \ \ /* Generate a surrogate character. */ \ @@ -245,26 +226,7 @@ gconv_end (struct __gconv_step *data) { \ if (__builtin_expect (c, 0) >= 0x110000) \ { \ - if (step_data->__trans.__trans_fct != NULL) \ - { \ - result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ - (step, step_data, *inptrp, &inptr, \ - inend, &outptr, irreversible)); \ - if (result != __GCONV_OK) \ - break; \ - } \ - else if (! ignore_errors_p ()) \ - { \ - /* This is an illegal character. */ \ - result = __GCONV_ILLEGAL_INPUT; \ - break; \ - } \ - else \ - { \ - ++*irreversible; \ - inptr += 4; \ - } \ - continue; \ + STANDARD_ERR_HANDLER (4); \ } \ \ /* Generate a surrogate character. */ \ |