aboutsummaryrefslogtreecommitdiff
path: root/iconvdata
diff options
context:
space:
mode:
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/8bit-gap.c6
-rw-r--r--iconvdata/8bit-generic.c2
-rw-r--r--iconvdata/ansi_x3.110.c9
-rw-r--r--iconvdata/big5.c2
-rw-r--r--iconvdata/big5hkscs.c2
-rw-r--r--iconvdata/euc-cn.c3
-rw-r--r--iconvdata/euc-jp.c3
-rw-r--r--iconvdata/euc-kr.c2
-rw-r--r--iconvdata/euc-tw.c3
-rw-r--r--iconvdata/gbgbk.c3
-rw-r--r--iconvdata/gbk.c3
-rw-r--r--iconvdata/iso-2022-cn.c3
-rw-r--r--iconvdata/iso-2022-jp.c6
-rw-r--r--iconvdata/iso-2022-kr.c3
-rw-r--r--iconvdata/iso646.c2
-rw-r--r--iconvdata/iso8859-1.c2
-rw-r--r--iconvdata/iso_6937-2.c5
-rw-r--r--iconvdata/iso_6937.c5
-rw-r--r--iconvdata/johab.c6
-rw-r--r--iconvdata/sjis.c5
-rw-r--r--iconvdata/t.61.c6
-rw-r--r--iconvdata/uhc.c6
-rw-r--r--iconvdata/unicode.c2
-rw-r--r--iconvdata/utf-16.c6
24 files changed, 36 insertions, 59 deletions
diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c
index 23a63fd9e4..6394065c56 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 62160c6efa..1478c5be59 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 f403773d9d..f338055f39 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 2e039376d0..8cad304c7a 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 b5fe9663e5..0859dd8f09 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 c7a02c2cd4..075970ce96 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 6cf89e3aa6..771dc069e8 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 88794f2f02..e953df5dc9 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 ee88d4e2a7..f3152478e2 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 c6f2e4e0c2..15e72d9cfb 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 f82059195e..669e4a9c9f 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 af7f92d3ac..818f2a773c 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 c6a43d121d..b66c9503b5 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 4601e22e68..d3cca52d05 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 f39f1b4d6d..df81ee2be6 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 fb1fabc4f6..d69a201fed 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 4f5a8689b8..536d8965fa 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 b7ab0841eb..f812ce2c93 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 7253ff6cb8..ac3bf82b27 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 2641b24743..806579b283 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 991cce1626..a7d42277c9 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 232e5c8416..9c494ff705 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 438658edb9..e818c54c31 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 bbb546ef9a..44911feb42 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; \
} \