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. --- wcsmbs/btowc.c | 7 ++++--- wcsmbs/mbrtowc.c | 7 ++++--- wcsmbs/mbsnrtowcs.c | 14 ++++++++------ wcsmbs/mbsrtowcs.c | 12 +++++++----- wcsmbs/wcrtomb.c | 15 ++++++++------- wcsmbs/wcsnrtombs.c | 16 +++++++++------- wcsmbs/wcsrtombs.c | 16 +++++++++------- wcsmbs/wctob.c | 11 +++++++---- 8 files changed, 56 insertions(+), 42 deletions(-) (limited to 'wcsmbs') diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c index 0978f097f1..1271a01ed6 100644 --- a/wcsmbs/btowc.c +++ b/wcsmbs/btowc.c @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -58,9 +59,9 @@ __btowc (c) /* Create the input string. */ inbuf[0] = c; - status = (*__wcsmbs_gconv_fcts.towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, - &inptr, inptr + 1, &dummy, - 0, 1); + status = DL_CALL_FCT (__wcsmbs_gconv_fcts.towc->__fct, + (__wcsmbs_gconv_fcts.towc, &data, &inptr, inptr + 1, + data.__outbuf, &dummy, 0, 1)); /* The conversion failed. */ if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT && status != __GCONV_EMPTY_INPUT) diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c index 6ecbdc5b5c..9809ed51a2 100644 --- a/wcsmbs/mbrtowc.c +++ b/wcsmbs/mbrtowc.c @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -69,9 +70,9 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) /* Do a normal conversion. */ inbuf = (const unsigned char *) s; - status = (*__wcsmbs_gconv_fcts.towc->__fct) (__wcsmbs_gconv_fcts.towc, - &data, &inbuf, inbuf + n, - &dummy, 0, 1); + status = DL_CALL_FCT (__wcsmbs_gconv_fcts.towc->__fct, + (__wcsmbs_gconv_fcts.towc, &data, &inbuf, inbuf + n, + data.__outbuf, &dummy, 0, 1)); /* There must not be any problems with the conversion but illegal input characters. The output buffer must be large enough, otherwise the diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c index 540afd0800..238458d25d 100644 --- a/wcsmbs/mbsnrtowcs.c +++ b/wcsmbs/mbsnrtowcs.c @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -49,7 +50,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps) size_t result; int status; struct __gconv_step *towc; - size_t non_reversible; + size_t dummy; /* Tell where we want the result. */ data.__invocation_counter = 0; @@ -79,8 +80,9 @@ __mbsnrtowcs (dst, src, nmc, len, ps) { data.__outbuf = (unsigned char *) buf; - status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, &inbuf, - srcend, &non_reversible, 0, 1); + status = DL_CALL_FCT (towc->__fct, + (towc, &data, &inbuf, srcend, data.__outbuf, + &dummy, 0, 1)); result += (wchar_t *) data.__outbuf - buf; } @@ -99,9 +101,9 @@ __mbsnrtowcs (dst, src, nmc, len, ps) data.__outbuf = (unsigned char *) dst; data.__outbufend = data.__outbuf + len * sizeof (wchar_t); - status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, - (const unsigned char **) src, srcend, - &non_reversible, 0, 1); + status = DL_CALL_FCT (towc->__fct, + (towc, &data, (const unsigned char **) src, srcend, + data.__outbuf, &dummy, 0, 1)); result = (wchar_t *) data.__outbuf - dst; diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c index aaafe3bf1e..3c1f86a196 100644 --- a/wcsmbs/mbsrtowcs.c +++ b/wcsmbs/mbsrtowcs.c @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -76,8 +77,9 @@ __mbsrtowcs (dst, src, len, ps) { data.__outbuf = (char *) buf; - status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, &inbuf, - srcend, &non_reversible, 0, 1); + status = DL_CALL_FCT (towc->__fct, + (towc, &data, &inbuf, srcend, data.__outbuf, + &non_reversible, 0, 1)); result += (wchar_t *) data.__outbuf - buf; } @@ -105,9 +107,9 @@ __mbsrtowcs (dst, src, len, ps) data.__outbuf = (unsigned char *) dst; data.__outbufend = data.__outbuf + len * sizeof (wchar_t); - status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, - (const unsigned char **) src, srcend, - &non_reversible, 0, 1); + status = DL_CALL_FCT (towc->__fct, + (towc, &data, (const unsigned char **) src, srcend, + data.__outbuf, &non_reversible, 0, 1)); result = (wchar_t *) data.__outbuf - dst; diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c index 5af383178c..f0bc824584 100644 --- a/wcsmbs/wcrtomb.c +++ b/wcsmbs/wcrtomb.c @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -71,9 +72,9 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps) by a NUL byte. */ if (wc == L'\0') { - status = (*__wcsmbs_gconv_fcts.tomb->__fct) (__wcsmbs_gconv_fcts.tomb, - &data, NULL, NULL, - &dummy, 1, 1); + status = DL_CALL_FCT (__wcsmbs_gconv_fcts.tomb->__fct, + (__wcsmbs_gconv_fcts.tomb, &data, NULL, NULL, + data.__outbuf, &dummy, 1, 1)); if (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT) *data.__outbuf++ = '\0'; @@ -83,10 +84,10 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps) /* Do a normal conversion. */ const unsigned char *inbuf = (const unsigned char *) &wc; - status = (*__wcsmbs_gconv_fcts.tomb->__fct) (__wcsmbs_gconv_fcts.tomb, - &data, &inbuf, - inbuf + sizeof (wchar_t), - &dummy, 0, 1); + status = DL_CALL_FCT (__wcsmbs_gconv_fcts.tomb->__fct, + (__wcsmbs_gconv_fcts.tomb, &data, &inbuf, + inbuf + sizeof (wchar_t), data.__outbuf, &dummy, + 0, 1)); } /* There must not be any problems with the conversion but illegal input diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c index 7005bdcf12..dae2216ae5 100644 --- a/wcsmbs/wcsnrtombs.c +++ b/wcsmbs/wcsnrtombs.c @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -79,10 +80,10 @@ __wcsnrtombs (dst, src, nwc, len, ps) { data.__outbuf = buf; - status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, - (const unsigned char **) &inbuf, - (const unsigned char *) srcend, &dummy, - 0, 1); + status = DL_CALL_FCT (tomb->__fct, + (tomb, &data, (const unsigned char **) &inbuf, + (const unsigned char *) srcend, data.__outbuf, + &dummy, 0, 1)); /* Count the number of bytes. */ result += data.__outbuf - buf; @@ -104,9 +105,10 @@ __wcsnrtombs (dst, src, nwc, len, ps) data.__outbuf = dst; data.__outbufend = dst + len; - status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, - (const unsigned char **) src, - (const unsigned char *) srcend, &dummy, 0, 1); + status = DL_CALL_FCT (tomb->__fct, + (tomb, &data, (const unsigned char **) src, + (const unsigned char *) srcend, data.__outbuf, + &dummy, 0, 1)); /* Count the number of bytes. */ result = data.__outbuf - (unsigned char *) dst; diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c index 875ef16f75..03ef013c7c 100644 --- a/wcsmbs/wcsrtombs.c +++ b/wcsmbs/wcsrtombs.c @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -76,10 +77,10 @@ __wcsrtombs (dst, src, len, ps) { data.__outbuf = buf; - status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, - (const unsigned char **) &inbuf, - (const unsigned char *) srcend, &dummy, - 0, 1); + status = DL_CALL_FCT (tomb->__fct, + (tomb, &data, (const unsigned char **) &inbuf, + (const unsigned char *) srcend, data.__outbuf, + &dummy, 0, 1)); /* Count the number of bytes. */ result += data.__outbuf - buf; @@ -105,9 +106,10 @@ __wcsrtombs (dst, src, len, ps) data.__outbuf = dst; data.__outbufend = dst + len; - status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, - (const unsigned char **) src, - (const unsigned char *) srcend, &dummy, 0, 1); + status = DL_CALL_FCT (tomb->__fct, + (tomb, &data, (const unsigned char **) src, + (const unsigned char *) srcend, data.__outbuf, + &dummy, 0, 1)); /* Count the number of bytes. */ result = data.__outbuf - (unsigned char *) dst; diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c index 8c6372558e..fc4c38331d 100644 --- a/wcsmbs/wctob.c +++ b/wcsmbs/wctob.c @@ -17,6 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include @@ -52,10 +53,12 @@ wctob (c) /* Create the input string. */ inbuf[0] = c; - status = (*__wcsmbs_gconv_fcts.tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, - (const unsigned char **) &inptr, - (const unsigned char *) &inbuf[1], - &dummy, 0, 1); + status = DL_CALL_FCT (__wcsmbs_gconv_fcts.tomb->__fct, + (__wcsmbs_gconv_fcts.tomb, &data, + (const unsigned char **) &inptr, + (const unsigned char *) &inbuf[1], + data.__outbuf, &dummy, 0, 1)); + /* The conversion failed or the output is too long. */ if ((status != __GCONV_OK && status != __GCONV_FULL_OUTPUT && status != __GCONV_EMPTY_INPUT) -- cgit 1.4.1