Update.

	* 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.

diff --git a/ChangeLog b/ChangeLog
index e838861d1d3d78f4752a79678faeb2a6853c3fc4..e01a054c9f61d5b35db0dd843e91e268b84dee29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 

diff --git a/libio/iofwide.c b/libio/iofwide.c
index 5ca0a84f0d034a7b25e4618b80806efc99361291..bb26dddc8587d0a66987190b9d6721bdb5d06955 100644 (file)
--- a/libio/iofwide.c
+++ b/libio/iofwide.c
@@ -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"

diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c
index 1271a01ed685912d1fb389cfd5aabfaff45fa6bc..a6841032f20c75068ee7012434c4c1c008120813 100644 (file)
--- a/wcsmbs/btowc.c
+++ b/wcsmbs/btowc.c
@@ -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));

diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c
index 9809ed51a2be5ede0f713e3dee5bbfef6841fbf3..b67b3f7d3487ed64fb98f745553501bb33ca6809 100644 (file)
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -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.  */

diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
index 238458d25d5cce8891c5c79dfe564ac5dfbb56ee..51d9cd09f268383cc8ebcd4db5ca0fdfaa6880bd 100644 (file)
--- a/wcsmbs/mbsnrtowcs.c
+++ b/wcsmbs/mbsnrtowcs.c
@@ -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;

diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c
index 3c1f86a196db85b9a7bd8395f2f19c618adc44e2..77e631ea46247b15ac140212a08cc50d9bf913e1 100644 (file)
--- a/wcsmbs/mbsrtowcs.c
+++ b/wcsmbs/mbsrtowcs.c
@@ -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 ();

diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c
index f0bc8245843662331e87438c239f774a4ebcfef9..375a0000725b48d45e42ab87dc482a791c35f7ff 100644 (file)
--- a/wcsmbs/wcrtomb.c
+++ b/wcsmbs/wcrtomb.c
@@ -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.  */

diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c
index dae2216ae5a0cae4d4877aceb3d9df433b86736f..ec87d85a9934789eb072ea4ff679bd87d036010d 100644 (file)
--- a/wcsmbs/wcsnrtombs.c
+++ b/wcsmbs/wcsnrtombs.c
@@ -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;

diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
index 03ef013c7ce1487b353569b7af23787a9f00352a..b2e4c18ccc3a5fe009d9f69fcd90293615538bbd 100644 (file)
--- a/wcsmbs/wcsrtombs.c
+++ b/wcsmbs/wcsrtombs.c
@@ -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 ();

diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c
index fc4c38331debde0391d04ad78dab86d821784b07..800a37e2f821d66f9213617ed1d506546cfdf16e 100644 (file)
--- a/wcsmbs/wctob.c
+++ b/wcsmbs/wctob.c
@@ -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));