From 55985355ade2a038b567dd9b58153a98384ae703 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 12 Jun 2000 19:47:50 +0000 Subject: Update. 2000-06-12 Ulrich Drepper * Rules (%.out): Define GCONV_PATH in the environment. * assert/Depend: New file. * iconvdata/Depend: New file. * intl/Depend: New file. * timezone/Makefile (build-testdata): Add GCONV_PATH to environment. * intl/tst-gettext.sh: Likewise. * iconv/Makefile (routines): Add gconv_trans. * iconv/gconv_trans.c: New file. * iconv/gconv.h (struct __gconv_trans_data): New type. (__gconv_fct): New parameter with starting position in output buffer. (__gconv_trans_fct, __gconv_trans_context_fct, __gconv_trans_query_fct, __gconv_trans_init_fct, __gconv_trans_end_fct): New types. (struct __gconv_step): Add new member __trans. * iconv/gconv_int.h: Pretty print prototypes. (gconv_transliterate): New prototype. (__BUILTIN_TRANS): Update for new conversion function interface. * iconv/gconv.c (__gconv): Pass new parameter to conversion function. * iconv/gconv_open.c (__gconv_open): Recognize error handling suffix in names, find appropriate function, and install in the conversion steps it can be used. * iconv/skeleton.c: Add additional parameter for beginning of output buffer. Change calls of downstream functions. * iconv/loop.c: Change loop function interface completely. Pass in step and step_data structure. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * iconv/gconv_simple.c: Update interfaces of functions. Insert appropriate error handling code to use transliteration steps. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/big5hkscs.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gbgbk.c: Likewise. * iconvdata/gbk.c: Likewise. * iconvdata/iso-2022-cn.c: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * iconvdata/unicode.c: Likewise. * iconvdata/utf-16.c: Likewise. * libio/iofwide.c: Adjust to new interface of gconv functions. Use DL_CALL_FCT. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. --- iconvdata/iso-2022-cn.c | 58 +++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 24 deletions(-) (limited to 'iconvdata/iso-2022-cn.c') diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c index 38b138b928..af7f92d3ac 100644 --- a/iconvdata/iso-2022-cn.c +++ b/iconvdata/iso-2022-cn.c @@ -18,6 +18,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -140,16 +141,15 @@ enum line; we can simply ignore them \ - the initial byte of the SS2 sequence. \ */ \ - if (NEED_LENGTH_TEST \ - && (__builtin_expect (inptr + 1 > inend, 0) \ - || (inptr[1] == '$' \ - && (__builtin_expect (inptr + 2 > inend, 0) \ - || (inptr[2] == ')' \ - && __builtin_expect (inptr + 3 > inend, 0)) \ - || (inptr[2] == '*' \ - && __builtin_expect (inptr + 3 > inend, 0)))) \ - || (inptr[1] == SS2_1 \ - && __builtin_expect (inptr + 3 > inend, 0)))) \ + if (__builtin_expect (inptr + 1 > inend, 0) \ + || (inptr[1] == '$' \ + && (__builtin_expect (inptr + 2 > inend, 0) \ + || (inptr[2] == ')' \ + && __builtin_expect (inptr + 3 > inend, 0)) \ + || (inptr[2] == '*' \ + && __builtin_expect (inptr + 3 > inend, 0)))) \ + || (inptr[1] == SS2_1 \ + && __builtin_expect (inptr + 3 > inend, 0))) \ { \ result = __GCONV_EMPTY_INPUT; \ break; \ @@ -216,16 +216,14 @@ enum { \ /* That's pretty easy, we have a dedicated functions for this. */ \ if (set == GB2312_set) \ - ch = gb2312_to_ucs4 (&inptr, \ - NEED_LENGTH_TEST ? inend - inptr : 2, 0); \ + ch = gb2312_to_ucs4 (&inptr, inend - inptr, 0); \ else \ { \ assert (set == CNS11643_1_set); \ - ch = cns11643l1_to_ucs4 (&inptr, \ - NEED_LENGTH_TEST ? inend - inptr : 2, 0);\ + ch = cns11643l1_to_ucs4 (&inptr, inend - inptr, 0); \ } \ \ - if (NEED_LENGTH_TEST && __builtin_expect (ch, 1) == 0) \ + if (__builtin_expect (ch, 1) == 0) \ { \ result = __GCONV_EMPTY_INPUT; \ break; \ @@ -248,6 +246,7 @@ enum put32 (outptr, ch); \ outptr += 4; \ } +#define LOOP_NEED_FLAGS #define EXTRA_LOOP_DECLS , int *setp #define INIT_PARAMS int set = *setp & CURRENT_SEL_MASK; \ int ann = *setp & CURRENT_ANN_MASK @@ -272,7 +271,7 @@ enum { \ *outptr++ = SI; \ set = ASCII_set; \ - if (NEED_LENGTH_TEST && __builtin_expect (outptr == outend, 0)) \ + if (__builtin_expect (outptr == outend, 0)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -325,14 +324,26 @@ enum else \ { \ /* Even this does not work. Error. */ \ - if (! ignore_errors_p ()) \ + if (step_data->__trans.__trans_fct != NULL) \ + { \ + result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ + (step, step_data, *inptrp, \ + &inptr, inend, *outptrp, \ + &outptr, outend, \ + irreversible)); \ + if (result != __GCONV_OK) \ + break; \ + } \ + else if (! ignore_errors_p ()) \ { \ result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ - \ - inptr += 4; \ - ++*irreversible; \ + else \ + { \ + inptr += 4; \ + ++*irreversible; \ + } \ continue; \ } \ } \ @@ -348,8 +359,7 @@ enum { \ const char *escseq; \ \ - if (NEED_LENGTH_TEST \ - && __builtin_expect (outptr + 4 > outend, 0)) \ + if (__builtin_expect (outptr + 4 > outend, 0)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -404,8 +414,7 @@ enum break; \ } \ } \ - else if (NEED_LENGTH_TEST \ - && __builtin_expect (outptr + 2 > outend, 0)) \ + else if (__builtin_expect (outptr + 2 > outend, 0)) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ @@ -418,6 +427,7 @@ enum /* Now that we wrote the output increment the input pointer. */ \ inptr += 4; \ } +#define LOOP_NEED_FLAGS #define EXTRA_LOOP_DECLS , int *setp #define INIT_PARAMS int set = *setp & CURRENT_SEL_MASK; \ int ann = *setp & CURRENT_ANN_MASK -- cgit v1.2.3