diff options
Diffstat (limited to 'iconvdata')
-rw-r--r-- | iconvdata/8bit-gap.c | 6 | ||||
-rw-r--r-- | iconvdata/8bit-generic.c | 2 | ||||
-rw-r--r-- | iconvdata/ansi_x3.110.c | 9 | ||||
-rw-r--r-- | iconvdata/big5.c | 2 | ||||
-rw-r--r-- | iconvdata/big5hkscs.c | 2 | ||||
-rw-r--r-- | iconvdata/euc-cn.c | 3 | ||||
-rw-r--r-- | iconvdata/euc-jp.c | 3 | ||||
-rw-r--r-- | iconvdata/euc-kr.c | 2 | ||||
-rw-r--r-- | iconvdata/euc-tw.c | 3 | ||||
-rw-r--r-- | iconvdata/gbgbk.c | 3 | ||||
-rw-r--r-- | iconvdata/gbk.c | 3 | ||||
-rw-r--r-- | iconvdata/iso-2022-cn.c | 3 | ||||
-rw-r--r-- | iconvdata/iso-2022-jp.c | 6 | ||||
-rw-r--r-- | iconvdata/iso-2022-kr.c | 3 | ||||
-rw-r--r-- | iconvdata/iso646.c | 2 | ||||
-rw-r--r-- | iconvdata/iso8859-1.c | 2 | ||||
-rw-r--r-- | iconvdata/iso_6937-2.c | 5 | ||||
-rw-r--r-- | iconvdata/iso_6937.c | 5 | ||||
-rw-r--r-- | iconvdata/johab.c | 6 | ||||
-rw-r--r-- | iconvdata/sjis.c | 5 | ||||
-rw-r--r-- | iconvdata/t.61.c | 6 | ||||
-rw-r--r-- | iconvdata/uhc.c | 6 | ||||
-rw-r--r-- | iconvdata/unicode.c | 2 | ||||
-rw-r--r-- | iconvdata/utf-16.c | 6 |
24 files changed, 36 insertions, 59 deletions
diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c index 23a63fd..6394065 100644 --- a/iconvdata/8bit-gap.c +++ b/iconvdata/8bit-gap.c @@ -89,7 +89,7 @@ struct gap { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ @@ -112,7 +112,7 @@ struct gap { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ @@ -137,7 +137,7 @@ struct gap { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/8bit-generic.c b/iconvdata/8bit-generic.c index 62160c6..1478c5b 100644 --- a/iconvdata/8bit-generic.c +++ b/iconvdata/8bit-generic.c @@ -72,7 +72,7 @@ { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c index f403773..f338055 100644 --- a/iconvdata/ansi_x3.110.c +++ b/iconvdata/ansi_x3.110.c @@ -501,8 +501,7 @@ static const char from_ucs4[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ @@ -560,8 +559,7 @@ static const char from_ucs4[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ @@ -589,8 +587,7 @@ static const char from_ucs4[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/big5.c b/iconvdata/big5.c index 2e03937..8cad304 100644 --- a/iconvdata/big5.c +++ b/iconvdata/big5.c @@ -8589,7 +8589,7 @@ static const char from_ucs4_tab13[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/big5hkscs.c b/iconvdata/big5hkscs.c index b5fe966..0859dd8 100644 --- a/iconvdata/big5hkscs.c +++ b/iconvdata/big5hkscs.c @@ -12746,7 +12746,7 @@ static const char from_ucs4_tab14[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/euc-cn.c b/iconvdata/euc-cn.c index c7a02c2..075970c 100644 --- a/iconvdata/euc-cn.c +++ b/iconvdata/euc-cn.c @@ -145,8 +145,7 @@ { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c index 6cf89e3..771dc06 100644 --- a/iconvdata/euc-jp.c +++ b/iconvdata/euc-jp.c @@ -222,8 +222,7 @@ { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, \ - &inptr, inend, *outptrp, \ - &outptr, outend, \ + &inptr, inend, &outbuf, \ irreversible)); \ if (result != __GCONV_OK) \ break; \ diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c index 88794f2..e953df5 100644 --- a/iconvdata/euc-kr.c +++ b/iconvdata/euc-kr.c @@ -150,7 +150,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp) { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/euc-tw.c b/iconvdata/euc-tw.c index ee88d4e..f315247 100644 --- a/iconvdata/euc-tw.c +++ b/iconvdata/euc-tw.c @@ -197,8 +197,7 @@ { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/gbgbk.c b/iconvdata/gbgbk.c index c6f2e4e..15e72d9 100644 --- a/iconvdata/gbgbk.c +++ b/iconvdata/gbgbk.c @@ -106,8 +106,7 @@ { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c index f820591..669e4a9 100644 --- a/iconvdata/gbk.c +++ b/iconvdata/gbk.c @@ -13456,8 +13456,7 @@ static const char __gbk_from_ucs4_tab12[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, \ - irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c index af7f92d..818f2a7 100644 --- a/iconvdata/iso-2022-cn.c +++ b/iconvdata/iso-2022-cn.c @@ -328,8 +328,7 @@ enum { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, \ - &inptr, inend, *outptrp, \ - &outptr, outend, \ + &inptr, inend, &outbuf, \ irreversible)); \ if (result != __GCONV_OK) \ break; \ diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c index c6a43d1..b66c950 100644 --- a/iconvdata/iso-2022-jp.c +++ b/iconvdata/iso-2022-jp.c @@ -707,8 +707,7 @@ gconv_end (struct __gconv_step *data) { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, \ - &inptr, inend, *outptrp, \ - &outptr, outend, \ + &inptr, inend, &outbuf, \ irreversible)); \ if (result != __GCONV_OK) \ break; \ @@ -895,8 +894,7 @@ gconv_end (struct __gconv_step *data) result = DL_CALL_FCT \ (step_data->__trans.__trans_fct,\ (step, step_data, *inptrp, \ - &inptr, inend, *outptrp, \ - &outptr, outend, \ + &inptr, inend, &outbuf, \ irreversible)); \ if (result != __GCONV_OK) \ break; \ diff --git a/iconvdata/iso-2022-kr.c b/iconvdata/iso-2022-kr.c index 4601e22..d3cca52 100644 --- a/iconvdata/iso-2022-kr.c +++ b/iconvdata/iso-2022-kr.c @@ -259,8 +259,7 @@ enum { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c index f39f1b4..df81ee2 100644 --- a/iconvdata/iso646.c +++ b/iconvdata/iso646.c @@ -889,7 +889,7 @@ gconv_end (struct __gconv_step *data) { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/iso8859-1.c b/iconvdata/iso8859-1.c index fb1fabc..d69a201 100644 --- a/iconvdata/iso8859-1.c +++ b/iconvdata/iso8859-1.c @@ -53,7 +53,7 @@ { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/iso_6937-2.c b/iconvdata/iso_6937-2.c index 4f5a868..536d896 100644 --- a/iconvdata/iso_6937-2.c +++ b/iconvdata/iso_6937-2.c @@ -569,8 +569,7 @@ static const char from_ucs4[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ @@ -595,7 +594,7 @@ static const char from_ucs4[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/iso_6937.c b/iconvdata/iso_6937.c index b7ab084..f812ce2 100644 --- a/iconvdata/iso_6937.c +++ b/iconvdata/iso_6937.c @@ -546,8 +546,7 @@ static const char from_ucs4[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ @@ -572,7 +571,7 @@ static const char from_ucs4[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/johab.c b/iconvdata/johab.c index 7253ff6..ac3bf82 100644 --- a/iconvdata/johab.c +++ b/iconvdata/johab.c @@ -400,8 +400,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ @@ -446,8 +445,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c index 2641b24..806579b 100644 --- a/iconvdata/sjis.c +++ b/iconvdata/sjis.c @@ -4472,8 +4472,7 @@ static const char from_ucs4_extra[0x100][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ @@ -4501,7 +4500,7 @@ static const char from_ucs4_extra[0x100][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/t.61.c b/iconvdata/t.61.c index 991cce1..a7d4227 100644 --- a/iconvdata/t.61.c +++ b/iconvdata/t.61.c @@ -473,8 +473,7 @@ static const char from_ucs4[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ @@ -511,8 +510,7 @@ static const char from_ucs4[][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/uhc.c b/iconvdata/uhc.c index 232e5c8..9c494ff 100644 --- a/iconvdata/uhc.c +++ b/iconvdata/uhc.c @@ -3225,8 +3225,7 @@ static const char uhc_hangul_from_ucs[11172][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ @@ -3266,8 +3265,7 @@ static const char uhc_hangul_from_ucs[11172][2] = { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/unicode.c b/iconvdata/unicode.c index 438658e..e818c54 100644 --- a/iconvdata/unicode.c +++ b/iconvdata/unicode.c @@ -156,7 +156,7 @@ gconv_end (struct __gconv_step *data) { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, inend, \ - *outptrp, &outptr, outend, irreversible)); \ + &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c index bbb546e..44911fe 100644 --- a/iconvdata/utf-16.c +++ b/iconvdata/utf-16.c @@ -206,8 +206,7 @@ gconv_end (struct __gconv_step *data) { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ @@ -250,8 +249,7 @@ gconv_end (struct __gconv_step *data) { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, &inptr, \ - inend, *outptrp, &outptr, outend, \ - irreversible)); \ + inend, &outbuf, irreversible)); \ if (result != __GCONV_OK) \ break; \ } \ |