* libio/iofwide.c (_IO_fwide): Initialize transliteration part of
	step data structure.
	* 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.
This commit is contained in:
Ulrich Drepper 2000-06-13 02:55:54 +00:00
parent 0aaf6d96f8
commit ff048a13e5
10 changed files with 25 additions and 0 deletions

View File

@ -1,5 +1,16 @@
2000-06-12 Ulrich Drepper <drepper@redhat.com>
* libio/iofwide.c (_IO_fwide): Initialize transliteration part of
step data structure.
* 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.
* sysdeps/unix/sysv/linux/sh/Dist: There is no ioperm file.
* sysdeps/unix/sysv/linux/sh/oldgetrlimit64.c: Removed.

View File

@ -124,6 +124,9 @@ _IO_fwide (fp, mode)
cc->__cd_in.__cd.__data[0].__internal_use = 1;
cc->__cd_in.__cd.__data[0].__flags = __GCONV_IS_LAST;
cc->__cd_in.__cd.__data[0].__statep = &fp->_wide_data->_IO_state;
/* XXX For now no transliteration. */
memset (&cc->__cd_in.__cd.__data[0].__trans, '\0',
sizeof (struct __gconv_trans_data));
cc->__cd_out.__cd.__nsteps = 1; /* Only one step allowed. */
cc->__cd_out.__cd.__steps = fcts.tomb;
@ -132,6 +135,9 @@ _IO_fwide (fp, mode)
cc->__cd_out.__cd.__data[0].__internal_use = 1;
cc->__cd_out.__cd.__data[0].__flags = __GCONV_IS_LAST;
cc->__cd_out.__cd.__data[0].__statep = &fp->_wide_data->_IO_state;
/* XXX For now no transliteration. */
memset (&cc->__cd_out.__cd.__data[0].__trans, '\0',
sizeof (struct __gconv_trans_data));
}
#else
# error "somehow determine this from LC_CTYPE"

View File

@ -49,6 +49,7 @@ __btowc (c)
data.__internal_use = 1;
data.__flags = __GCONV_IS_LAST;
data.__statep = &data.__state;
memset (&data.__trans, '\0', sizeof (struct __gconv_trans_data));
/* Make sure we start in the initial state. */
memset (&data.__state, '\0', sizeof (mbstate_t));

View File

@ -49,6 +49,7 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
data.__internal_use = 1;
data.__flags = __GCONV_IS_LAST;
data.__statep = ps ?: &state;
memset (&data.__trans, '\0', sizeof (struct __gconv_trans_data));
/* A first special case is if S is NULL. This means put PS in the
initial state. */

View File

@ -57,6 +57,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
data.__internal_use = 1;
data.__flags = __GCONV_IS_LAST;
data.__statep = ps ?: &state;
memset (&data.__trans, '\0', sizeof (struct __gconv_trans_data));
if (nmc == 0)
return 0;

View File

@ -53,6 +53,7 @@ __mbsrtowcs (dst, src, len, ps)
data.__internal_use = 1;
data.__flags = __GCONV_IS_LAST;
data.__statep = ps ?: &state;
memset (&data.__trans, '\0', sizeof (struct __gconv_trans_data));
/* Make sure we use the correct function. */
update_conversion_ptrs ();

View File

@ -49,6 +49,7 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
data.__internal_use = 1;
data.__flags = __GCONV_IS_LAST;
data.__statep = ps ?: &state;
memset (&data.__trans, '\0', sizeof (struct __gconv_trans_data));
/* A first special case is if S is NULL. This means put PS in the
initial state. */

View File

@ -55,6 +55,7 @@ __wcsnrtombs (dst, src, nwc, len, ps)
data.__internal_use = 1;
data.__flags = __GCONV_IS_LAST;
data.__statep = ps ?: &state;
memset (&data.__trans, '\0', sizeof (struct __gconv_trans_data));
if (nwc == 0)
return 0;

View File

@ -51,6 +51,7 @@ __wcsrtombs (dst, src, len, ps)
data.__internal_use = 1;
data.__flags = __GCONV_IS_LAST;
data.__statep = ps ?: &state;
memset (&data.__trans, '\0', sizeof (struct __gconv_trans_data));
/* Make sure we use the correct function. */
update_conversion_ptrs ();

View File

@ -43,6 +43,7 @@ wctob (c)
data.__internal_use = 1;
data.__flags = __GCONV_IS_LAST;
data.__statep = &data.__state;
memset (&data.__trans, '\0', sizeof (struct __gconv_trans_data));
/* Make sure we start in the initial state. */
memset (&data.__state, '\0', sizeof (mbstate_t));