2014-05-01 Steve Ellcey <sellcey@mips.com>

* iconvdata/ansi_x3.110.c (ONE_DIRECTION): Define.
	* iconvdata/armscii-8.c (ONE_DIRECTION): Define.
	* iconvdata/big5.c (ONE_DIRECTION): Define.
	* iconvdata/big5hkscs.c (ONE_DIRECTION): Define.
	* iconvdata/cp1255.c (ONE_DIRECTION): Define.
	* iconvdata/cp1258.c (ONE_DIRECTION): Define.
	* iconvdata/cp932.c (ONE_DIRECTION): Define.
	* iconvdata/euc-cn.c (ONE_DIRECTION): Define.
	* iconvdata/euc-jisx0213.c (ONE_DIRECTION): Define.
	* iconvdata/euc-jp-ms.c (ONE_DIRECTION): Define.
	* iconvdata/euc-jp.c (ONE_DIRECTION): Define.
	* iconvdata/euc-kr.c (ONE_DIRECTION): Define.
	* iconvdata/euc-tw.c (ONE_DIRECTION): Define.
	* iconvdata/gb18030.c (ONE_DIRECTION): Define.
	* iconvdata/gbbig5.c (ONE_DIRECTION): Define.
	* iconvdata/gbgbk.c (ONE_DIRECTION): Define.
	* iconvdata/gbk.c (ONE_DIRECTION): Define.
	* iconvdata/ibm1364.c (ONE_DIRECTION): Define.
	* iconvdata/ibm930.c (ONE_DIRECTION): Define.
	* iconvdata/ibm932.c (ONE_DIRECTION): Define.
	* iconvdata/ibm933.c (ONE_DIRECTION): Define.
	* iconvdata/ibm935.c (ONE_DIRECTION): Define.
	* iconvdata/ibm937.c (ONE_DIRECTION): Define.
	* iconvdata/ibm939.c (ONE_DIRECTION): Define.
	* iconvdata/ibm943.c (ONE_DIRECTION): Define.
	* iconvdata/iso-2022-cn-ext.c (ONE_DIRECTION): Define.
	* iconvdata/iso-2022-cn.c (ONE_DIRECTION): Define.
	* iconvdata/iso-2022-jp-3.c (ONE_DIRECTION): Define.
	* iconvdata/iso-2022-jp.c (ONE_DIRECTION): Define.
	* iconvdata/iso-2022-kr.c (ONE_DIRECTION): Define.
	* iconvdata/iso646.c (ONE_DIRECTION): Define.
	* iconvdata/iso8859-1.c (ONE_DIRECTION): Define.
	* iconvdata/iso_11548-1.c (ONE_DIRECTION): Define.
	* iconvdata/iso_6937-2.c (ONE_DIRECTION): Define.
	* iconvdata/iso_6937.c (ONE_DIRECTION): Define.
	* iconvdata/johab.c (ONE_DIRECTION): Define.
	* iconvdata/shift_jisx0213.c (ONE_DIRECTION): Define.
	* iconvdata/sjis.c (ONE_DIRECTION): Define.
	* iconvdata/t.61.c (ONE_DIRECTION): Define.
	* iconvdata/tcvn5712-1.c (ONE_DIRECTION): Define.
	* iconvdata/tscii.c (ONE_DIRECTION): Define.
	* iconvdata/uhc.c (ONE_DIRECTION): Define.
	* iconvdata/unicode.c (ONE_DIRECTION): Define.
	* iconvdata/utf-16.c (ONE_DIRECTION): Define.
	* iconvdata/utf-32.c (ONE_DIRECTION): Define.
	* iconvdata/utf-7.c (ONE_DIRECTION): Define.
This commit is contained in:
Steve Ellcey 2014-05-01 13:42:40 -07:00
parent bf895cb9c3
commit 13e402e77e
47 changed files with 96 additions and 0 deletions

View file

@ -1,3 +1,52 @@
2014-05-01 Steve Ellcey <sellcey@mips.com>
* iconvdata/ansi_x3.110.c (ONE_DIRECTION): Define.
* iconvdata/armscii-8.c (ONE_DIRECTION): Define.
* iconvdata/big5.c (ONE_DIRECTION): Define.
* iconvdata/big5hkscs.c (ONE_DIRECTION): Define.
* iconvdata/cp1255.c (ONE_DIRECTION): Define.
* iconvdata/cp1258.c (ONE_DIRECTION): Define.
* iconvdata/cp932.c (ONE_DIRECTION): Define.
* iconvdata/euc-cn.c (ONE_DIRECTION): Define.
* iconvdata/euc-jisx0213.c (ONE_DIRECTION): Define.
* iconvdata/euc-jp-ms.c (ONE_DIRECTION): Define.
* iconvdata/euc-jp.c (ONE_DIRECTION): Define.
* iconvdata/euc-kr.c (ONE_DIRECTION): Define.
* iconvdata/euc-tw.c (ONE_DIRECTION): Define.
* iconvdata/gb18030.c (ONE_DIRECTION): Define.
* iconvdata/gbbig5.c (ONE_DIRECTION): Define.
* iconvdata/gbgbk.c (ONE_DIRECTION): Define.
* iconvdata/gbk.c (ONE_DIRECTION): Define.
* iconvdata/ibm1364.c (ONE_DIRECTION): Define.
* iconvdata/ibm930.c (ONE_DIRECTION): Define.
* iconvdata/ibm932.c (ONE_DIRECTION): Define.
* iconvdata/ibm933.c (ONE_DIRECTION): Define.
* iconvdata/ibm935.c (ONE_DIRECTION): Define.
* iconvdata/ibm937.c (ONE_DIRECTION): Define.
* iconvdata/ibm939.c (ONE_DIRECTION): Define.
* iconvdata/ibm943.c (ONE_DIRECTION): Define.
* iconvdata/iso-2022-cn-ext.c (ONE_DIRECTION): Define.
* iconvdata/iso-2022-cn.c (ONE_DIRECTION): Define.
* iconvdata/iso-2022-jp-3.c (ONE_DIRECTION): Define.
* iconvdata/iso-2022-jp.c (ONE_DIRECTION): Define.
* iconvdata/iso-2022-kr.c (ONE_DIRECTION): Define.
* iconvdata/iso646.c (ONE_DIRECTION): Define.
* iconvdata/iso8859-1.c (ONE_DIRECTION): Define.
* iconvdata/iso_11548-1.c (ONE_DIRECTION): Define.
* iconvdata/iso_6937-2.c (ONE_DIRECTION): Define.
* iconvdata/iso_6937.c (ONE_DIRECTION): Define.
* iconvdata/johab.c (ONE_DIRECTION): Define.
* iconvdata/shift_jisx0213.c (ONE_DIRECTION): Define.
* iconvdata/sjis.c (ONE_DIRECTION): Define.
* iconvdata/t.61.c (ONE_DIRECTION): Define.
* iconvdata/tcvn5712-1.c (ONE_DIRECTION): Define.
* iconvdata/tscii.c (ONE_DIRECTION): Define.
* iconvdata/uhc.c (ONE_DIRECTION): Define.
* iconvdata/unicode.c (ONE_DIRECTION): Define.
* iconvdata/utf-16.c (ONE_DIRECTION): Define.
* iconvdata/utf-32.c (ONE_DIRECTION): Define.
* iconvdata/utf-7.c (ONE_DIRECTION): Define.
2014-05-01 Roland McGrath <roland@hack.frob.com>
* libio/libioP.h [!_IO_USE_OLD_IO_FILE && !_G_IO_NO_BACKWARD_COMPAT]

View file

@ -390,6 +390,7 @@ static const char from_ucs4[][2] =
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from ANSI_X3.110 to UCS4. */
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM

View file

@ -28,6 +28,7 @@
#define DEFINE_FINI 1
#define MIN_NEEDED_FROM 1
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
static const uint16_t map_from_armscii_8[0xfe - 0xa2 + 1] =

View file

@ -8383,6 +8383,7 @@ static const char from_ucs4_tab15[][2] =
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from Big5 to UCS4. */

View file

@ -17738,6 +17738,7 @@ static struct
#define TO_LOOP to_big5hkscs
#define DEFINE_INIT 1
#define DEFINE_FINI 1
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 2
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -30,6 +30,7 @@
#define TO_LOOP to_cp1255
#define DEFINE_INIT 1
#define DEFINE_FINI 1
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 1
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -31,6 +31,7 @@
#define TO_LOOP to_cp1258
#define DEFINE_INIT 1
#define DEFINE_FINI 1
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 1
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -4534,6 +4534,7 @@ static const char from_ucs4_extra[229][2] =
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from CP932 to UCS4. */
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM

View file

@ -30,6 +30,7 @@
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from EUC-CN to UCS4. */

View file

@ -43,6 +43,7 @@
#define TO_LOOP to_euc_jisx0213
#define DEFINE_INIT 1
#define DEFINE_FINI 1
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 3
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -4641,6 +4641,7 @@ static const unsigned char from_ucs4_extra[229][2] =
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 3
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from EUC-JP-MS to UCS4. */

View file

@ -33,6 +33,7 @@
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 3
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from EUC-JP to UCS4. */

View file

@ -66,6 +66,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from EUC-KR to UCS4. */

View file

@ -31,6 +31,7 @@
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 4
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from EUC-TW to UCS4. */

View file

@ -24107,6 +24107,7 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 4
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from GB18030 to UCS4. */

View file

@ -4784,6 +4784,7 @@ const char __from_big5_to_gb2312 [13973][2] =
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 1
#define MAX_NEEDED_TO 2
#define ONE_DIRECTION 0
/* First define the conversion function from GB2312 to BIG5. */

View file

@ -32,6 +32,7 @@
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 1
#define MAX_NEEDED_TO 2
#define ONE_DIRECTION 0
/* First define the conversion function from GBK to GB2312. */

View file

@ -13130,6 +13130,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from GBK to UCS4. */

View file

@ -55,6 +55,7 @@
#else
# define MAX_NEEDED_TO 4
#endif
#define ONE_DIRECTION 0
#define PREPARE_LOOP \
int save_curcs; \
int *curcsp = &data->__statep->__count;

View file

@ -31,6 +31,7 @@
#define CHARSET_NAME "IBM930//"
#define FROM_LOOP from_ibm930
#define TO_LOOP to_ibm930
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 2
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -29,6 +29,7 @@
#define CHARSET_NAME "IBM932//"
#define FROM_LOOP from_ibm932
#define TO_LOOP to_ibm932
#define ONE_DIRECTION 0
/* Definitions of initialization and destructor function. */
#define DEFINE_INIT 1

View file

@ -31,6 +31,7 @@
#define CHARSET_NAME "IBM933//"
#define FROM_LOOP from_ibm933
#define TO_LOOP to_ibm933
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 2
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -31,6 +31,7 @@
#define CHARSET_NAME "IBM935//"
#define FROM_LOOP from_ibm935
#define TO_LOOP to_ibm935
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 2
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -31,6 +31,7 @@
#define CHARSET_NAME "IBM937//"
#define FROM_LOOP from_ibm937
#define TO_LOOP to_ibm937
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 2
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -31,6 +31,7 @@
#define CHARSET_NAME "IBM939//"
#define FROM_LOOP from_ibm939
#define TO_LOOP to_ibm939
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 2
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -29,6 +29,7 @@
#define CHARSET_NAME "IBM943//"
#define FROM_LOOP from_ibm943
#define TO_LOOP to_ibm943
#define ONE_DIRECTION 0
/* Definitions of initialization and destructor function. */
#define DEFINE_INIT 1

View file

@ -47,6 +47,7 @@
#define CHARSET_NAME "ISO-2022-CN-EXT//"
#define DEFINE_INIT 1
#define DEFINE_FINI 1
#define ONE_DIRECTION 0
#define FROM_LOOP from_iso2022cn_ext_loop
#define TO_LOOP to_iso2022cn_ext_loop
#define FROM_LOOP_MIN_NEEDED_FROM 1

View file

@ -44,6 +44,7 @@
#define DEFINE_FINI 1
#define FROM_LOOP from_iso2022cn_loop
#define TO_LOOP to_iso2022cn_loop
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 4
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -37,6 +37,7 @@
#define TO_LOOP to_iso2022jp3_loop
#define DEFINE_INIT 1
#define DEFINE_FINI 1
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 4
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -48,6 +48,7 @@ struct gap
/* Definitions used in the body of the `gconv' function. */
#define FROM_LOOP from_iso2022jp_loop
#define TO_LOOP to_iso2022jp_loop
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 4
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -42,6 +42,7 @@
#define MAX_NEEDED_FROM 4
#define MIN_NEEDED_TO 4
#define MAX_NEEDED_TO 4
#define ONE_DIRECTION 0
#define PREPARE_LOOP \
int save_set; \
int *setp = &data->__statep->__count; \

View file

@ -43,6 +43,8 @@
#define DEFINE_FINI 0
#define MIN_NEEDED_FROM 1
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
#define FROM_DIRECTION (dir == from_iso646)
#define PREPARE_LOOP \
enum direction dir = ((struct iso646_data *) step->__data)->dir; \

View file

@ -28,6 +28,7 @@
#define DEFINE_FINI 1
#define MIN_NEEDED_FROM 1
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from ISO 8859-1 to UCS4. */
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM

View file

@ -29,6 +29,7 @@
#define DEFINE_FINI 1
#define MIN_NEEDED_FROM 1
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
#define BRAILLE_UCS_BASE 0x2800

View file

@ -380,6 +380,7 @@ static const char from_ucs4[][2] =
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from ISO 6937-2 to UCS4. */

View file

@ -380,6 +380,7 @@ static const char from_ucs4[][2] =
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from ISO 6937 to UCS4. */

View file

@ -150,6 +150,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from JOHAB to UCS4. */

View file

@ -43,6 +43,7 @@
#define TO_LOOP to_shift_jisx0213
#define DEFINE_INIT 1
#define DEFINE_FINI 1
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 2
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -4320,6 +4320,7 @@ static const char from_ucs4_extra[0x100][2] =
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from SJIS to UCS4. */
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM

View file

@ -373,6 +373,7 @@ static const char from_ucs4[][2] =
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from T.61 to UCS4. */
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM

View file

@ -29,6 +29,7 @@
#define TO_LOOP to_tcvn5712_1
#define DEFINE_INIT 1
#define DEFINE_FINI 1
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 1
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -38,6 +38,7 @@
#define TO_LOOP to_tscii
#define DEFINE_INIT 1
#define DEFINE_FINI 1
#define ONE_DIRECTION 0
#define FROM_LOOP_MIN_NEEDED_FROM 1
#define FROM_LOOP_MAX_NEEDED_FROM 2
#define FROM_LOOP_MIN_NEEDED_TO 4

View file

@ -3044,6 +3044,7 @@ static const char uhc_hangul_from_ucs[11172][2] =
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
/* First define the conversion function from UHC to UCS4. */
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM

View file

@ -38,6 +38,7 @@
#define DEFINE_FINI 0
#define MIN_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
#define FROM_DIRECTION (dir == from_unicode)
#define PREPARE_LOOP \
enum direction dir = ((struct unicode_data *) step->__data)->dir; \

View file

@ -39,6 +39,7 @@
#define MIN_NEEDED_FROM 2
#define MAX_NEEDED_FROM 4
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
#define FROM_DIRECTION (dir == from_utf16)
#define PREPARE_LOOP \
enum direction dir = ((struct utf16_data *) step->__data)->dir; \

View file

@ -37,6 +37,7 @@
#define DEFINE_FINI 0
#define MIN_NEEDED_FROM 4
#define MIN_NEEDED_TO 4
#define ONE_DIRECTION 0
#define FROM_DIRECTION (dir == from_utf32)
#define PREPARE_LOOP \
enum direction dir = ((struct utf32_data *) step->__data)->dir; \

View file

@ -120,6 +120,7 @@ base64 (unsigned int i)
#define MAX_NEEDED_FROM 6
#define MIN_NEEDED_TO 4
#define MAX_NEEDED_TO 4
#define ONE_DIRECTION 0
#define PREPARE_LOOP \
mbstate_t saved_state; \
mbstate_t *statep = data->__statep;