diff options
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/btowc.c | 5 | ||||
| -rw-r--r-- | wcsmbs/mbrtowc.c | 2 | ||||
| -rw-r--r-- | wcsmbs/mbsnrtowcs.c | 6 | ||||
| -rw-r--r-- | wcsmbs/mbsrtowcs.c | 4 | ||||
| -rw-r--r-- | wcsmbs/wcrtomb.c | 4 | ||||
| -rw-r--r-- | wcsmbs/wcsnrtombs.c | 7 | ||||
| -rw-r--r-- | wcsmbs/wcsrtombs.c | 5 | ||||
| -rw-r--r-- | wcsmbs/wctob.c | 4 |
8 files changed, 20 insertions, 17 deletions
diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c index bec0d48841..e0e4ceb139 100644 --- a/wcsmbs/btowc.c +++ b/wcsmbs/btowc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -59,7 +59,8 @@ __btowc (c) inbuf[0] = c; status = (*__wcsmbs_gconv_fcts.towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, - &inptr, inptr + 1, &dummy, 0); + &inptr, inptr + 1, &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 2aeb67c154..b0daf14fd5 100644 --- a/wcsmbs/mbrtowc.c +++ b/wcsmbs/mbrtowc.c @@ -69,7 +69,7 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) inbuf = (const unsigned char *) s; status = (*__wcsmbs_gconv_fcts.towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, &inbuf, inbuf + n, - &dummy, 0); + &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 b58a467854..94bd7b1ae7 100644 --- a/wcsmbs/mbsnrtowcs.c +++ b/wcsmbs/mbsnrtowcs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -78,7 +78,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps) data.__outbuf = (char *) buf; status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, &inbuf, - srcend, &result, 0); + srcend, &result, 0, 1); } while (status == __GCONV_FULL_OUTPUT); @@ -97,7 +97,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps) status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, (const unsigned char **) src, srcend, - &result, 0); + &result, 0, 1); /* We have to determine whether the last character converted is the NUL character. */ diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c index f8c39e69bb..afa63a74bb 100644 --- a/wcsmbs/mbsrtowcs.c +++ b/wcsmbs/mbsrtowcs.c @@ -77,7 +77,7 @@ __mbsrtowcs (dst, src, len, ps) data.__outbuf = (char *) buf; status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, &inbuf, - srcend, &non_reversible, 0); + srcend, &non_reversible, 0, 1); result += (wchar_t *) data.__outbuf - buf; } @@ -107,7 +107,7 @@ __mbsrtowcs (dst, src, len, ps) status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, (const unsigned char **) src, srcend, - &non_reversible, 0); + &non_reversible, 0, 1); result = (wchar_t *) data.__outbuf - dst; diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c index fb91167769..644d26bbc8 100644 --- a/wcsmbs/wcrtomb.c +++ b/wcsmbs/wcrtomb.c @@ -71,7 +71,7 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps) { status = (*__wcsmbs_gconv_fcts.tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, NULL, NULL, - &dummy, 1); + &dummy, 1, 1); if (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT) *data.__outbuf++ = '\0'; @@ -84,7 +84,7 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps) status = (*__wcsmbs_gconv_fcts.tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, &inbuf, inbuf + sizeof (wchar_t), - &dummy, 0); + &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 fb86992aea..50c33ec285 100644 --- a/wcsmbs/wcsnrtombs.c +++ b/wcsmbs/wcsnrtombs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -81,7 +81,8 @@ __wcsnrtombs (dst, src, nwc, len, ps) status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, (const unsigned char **) &inbuf, - (const unsigned char *) srcend, &dummy, 0); + (const unsigned char *) srcend, &dummy, + 0, 1); /* Count the number of bytes. */ result += data.__outbuf - buf; @@ -105,7 +106,7 @@ __wcsnrtombs (dst, src, nwc, len, ps) status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, (const unsigned char **) src, - (const unsigned char *) srcend, &dummy, 0); + (const unsigned char *) srcend, &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 6058db72c1..cbb39d36e6 100644 --- a/wcsmbs/wcsrtombs.c +++ b/wcsmbs/wcsrtombs.c @@ -78,7 +78,8 @@ __wcsrtombs (dst, src, len, ps) status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, (const unsigned char **) &inbuf, - (const unsigned char *) srcend, &dummy, 0); + (const unsigned char *) srcend, &dummy, + 0, 1); /* Count the number of bytes. */ result += data.__outbuf - buf; @@ -106,7 +107,7 @@ __wcsrtombs (dst, src, len, ps) status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, (const unsigned char **) src, - (const unsigned char *) srcend, &dummy, 0); + (const unsigned char *) srcend, &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 97a36f8d03..7e4c04f161 100644 --- a/wcsmbs/wctob.c +++ b/wcsmbs/wctob.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. @@ -55,7 +55,7 @@ wctob (c) status = (*__wcsmbs_gconv_fcts.tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data, (const unsigned char **) &inptr, (const unsigned char *) &inbuf[1], - &dummy, 0); + &dummy, 0, 1); /* The conversion failed or the output is too long. */ if ((status != __GCONV_OK && status != __GCONV_FULL_OUTPUT && status != __GCONV_EMPTY_INPUT) |