aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-16 00:39:38 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-16 00:39:38 +0000
commitf1d5c60ddef851078544e6b8456b18534b9a2a95 (patch)
treee75b7ab28ae1b6b8276d663556ddda7eb640ce5d /wcsmbs
parentf5361098c526e43f0437a491ed48122794b35451 (diff)
downloadglibc-f1d5c60ddef851078544e6b8456b18534b9a2a95.tar
glibc-f1d5c60ddef851078544e6b8456b18534b9a2a95.tar.gz
glibc-f1d5c60ddef851078544e6b8456b18534b9a2a95.tar.bz2
glibc-f1d5c60ddef851078544e6b8456b18534b9a2a95.zip
Update.
2000-06-15 Ulrich Drepper <drepper@redhat.com> * iconv/gconv.h (__gconv_fct): Change type of fifth parameter to unsigned char **. (__gconv_init_fct): Remove two parameters. * iconv/gconv_int.h (__gconv_transliterate): Renamed from gconv_transliterate. Remove two parameters. Change prototypes of builtin functions according to __gconv_fct change. * iconv/skeleton.c: Change type of fifth parameter. make sure it is != NULL only during error handling. Stop in this case after the conversion. * iconv/gconv_trans.c: Replace with real implementation for __gconv_transliterate. * iconv/gconv_open.c: Adjust for renaming of __gconv_transliterate. * iconv/gconv.c: Change calls to downstream functions once again. Use NULL for the fifth parameter instead of pointer to output buffer. * libio/iofwide.c: Likewise. * 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. * iconv/gconv_simple.c: Remove two parameters from error handling function call. * 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.
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/btowc.c2
-rw-r--r--wcsmbs/mbrtowc.c2
-rw-r--r--wcsmbs/mbsnrtowcs.c4
-rw-r--r--wcsmbs/mbsrtowcs.c4
-rw-r--r--wcsmbs/wcrtomb.c5
-rw-r--r--wcsmbs/wcsnrtombs.c4
-rw-r--r--wcsmbs/wcsrtombs.c4
-rw-r--r--wcsmbs/wctob.c2
8 files changed, 13 insertions, 14 deletions
diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c
index a6841032f2..cf0ec0825c 100644
--- a/wcsmbs/btowc.c
+++ b/wcsmbs/btowc.c
@@ -62,7 +62,7 @@ __btowc (c)
status = DL_CALL_FCT (__wcsmbs_gconv_fcts.towc->__fct,
(__wcsmbs_gconv_fcts.towc, &data, &inptr, inptr + 1,
- data.__outbuf, &dummy, 0, 1));
+ NULL, &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 b67b3f7d34..6f5417980b 100644
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -73,7 +73,7 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
inbuf = (const unsigned char *) s;
status = DL_CALL_FCT (__wcsmbs_gconv_fcts.towc->__fct,
(__wcsmbs_gconv_fcts.towc, &data, &inbuf, inbuf + n,
- data.__outbuf, &dummy, 0, 1));
+ NULL, &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 51d9cd09f2..0410232187 100644
--- a/wcsmbs/mbsnrtowcs.c
+++ b/wcsmbs/mbsnrtowcs.c
@@ -82,7 +82,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
data.__outbuf = (unsigned char *) buf;
status = DL_CALL_FCT (towc->__fct,
- (towc, &data, &inbuf, srcend, data.__outbuf,
+ (towc, &data, &inbuf, srcend, NULL,
&dummy, 0, 1));
result += (wchar_t *) data.__outbuf - buf;
@@ -104,7 +104,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
status = DL_CALL_FCT (towc->__fct,
(towc, &data, (const unsigned char **) src, srcend,
- data.__outbuf, &dummy, 0, 1));
+ NULL, &dummy, 0, 1));
result = (wchar_t *) data.__outbuf - dst;
diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c
index 77e631ea46..73a24a7608 100644
--- a/wcsmbs/mbsrtowcs.c
+++ b/wcsmbs/mbsrtowcs.c
@@ -79,7 +79,7 @@ __mbsrtowcs (dst, src, len, ps)
data.__outbuf = (char *) buf;
status = DL_CALL_FCT (towc->__fct,
- (towc, &data, &inbuf, srcend, data.__outbuf,
+ (towc, &data, &inbuf, srcend, NULL,
&non_reversible, 0, 1));
result += (wchar_t *) data.__outbuf - buf;
@@ -110,7 +110,7 @@ __mbsrtowcs (dst, src, len, ps)
status = DL_CALL_FCT (towc->__fct,
(towc, &data, (const unsigned char **) src, srcend,
- data.__outbuf, &non_reversible, 0, 1));
+ NULL, &non_reversible, 0, 1));
result = (wchar_t *) data.__outbuf - dst;
diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c
index 375a000072..f7100d4fc7 100644
--- a/wcsmbs/wcrtomb.c
+++ b/wcsmbs/wcrtomb.c
@@ -75,7 +75,7 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
{
status = DL_CALL_FCT (__wcsmbs_gconv_fcts.tomb->__fct,
(__wcsmbs_gconv_fcts.tomb, &data, NULL, NULL,
- data.__outbuf, &dummy, 1, 1));
+ NULL, &dummy, 1, 1));
if (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
*data.__outbuf++ = '\0';
@@ -87,8 +87,7 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
status = DL_CALL_FCT (__wcsmbs_gconv_fcts.tomb->__fct,
(__wcsmbs_gconv_fcts.tomb, &data, &inbuf,
- inbuf + sizeof (wchar_t), data.__outbuf, &dummy,
- 0, 1));
+ inbuf + sizeof (wchar_t), NULL, &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 ec87d85a99..f7b4363779 100644
--- a/wcsmbs/wcsnrtombs.c
+++ b/wcsmbs/wcsnrtombs.c
@@ -83,7 +83,7 @@ __wcsnrtombs (dst, src, nwc, len, ps)
status = DL_CALL_FCT (tomb->__fct,
(tomb, &data, (const unsigned char **) &inbuf,
- (const unsigned char *) srcend, data.__outbuf,
+ (const unsigned char *) srcend, NULL,
&dummy, 0, 1));
/* Count the number of bytes. */
@@ -108,7 +108,7 @@ __wcsnrtombs (dst, src, nwc, len, ps)
status = DL_CALL_FCT (tomb->__fct,
(tomb, &data, (const unsigned char **) src,
- (const unsigned char *) srcend, data.__outbuf,
+ (const unsigned char *) srcend, NULL,
&dummy, 0, 1));
/* Count the number of bytes. */
diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
index b2e4c18ccc..3c731aaa54 100644
--- a/wcsmbs/wcsrtombs.c
+++ b/wcsmbs/wcsrtombs.c
@@ -80,7 +80,7 @@ __wcsrtombs (dst, src, len, ps)
status = DL_CALL_FCT (tomb->__fct,
(tomb, &data, (const unsigned char **) &inbuf,
- (const unsigned char *) srcend, data.__outbuf,
+ (const unsigned char *) srcend, NULL,
&dummy, 0, 1));
/* Count the number of bytes. */
@@ -109,7 +109,7 @@ __wcsrtombs (dst, src, len, ps)
status = DL_CALL_FCT (tomb->__fct,
(tomb, &data, (const unsigned char **) src,
- (const unsigned char *) srcend, data.__outbuf,
+ (const unsigned char *) srcend, NULL,
&dummy, 0, 1));
/* Count the number of bytes. */
diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c
index 800a37e2f8..cee739c251 100644
--- a/wcsmbs/wctob.c
+++ b/wcsmbs/wctob.c
@@ -58,7 +58,7 @@ wctob (c)
(__wcsmbs_gconv_fcts.tomb, &data,
(const unsigned char **) &inptr,
(const unsigned char *) &inbuf[1],
- data.__outbuf, &dummy, 0, 1));
+ NULL, &dummy, 0, 1));
/* The conversion failed or the output is too long. */
if ((status != __GCONV_OK && status != __GCONV_FULL_OUTPUT