From d620426811688301eb1cbe6e63773d6430b2706e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 19 Jun 2000 21:12:06 +0000 Subject: Update. 2000-06-19 Ulrich Drepper * iconv/gconv.h (__gconv_trans_fct): Add new parameter. General namespace cleanup. (struct __gconv_trans_data): Add next field. (struct __gconv_step_data): Make __trans a pointer. * iconv/gconv_conf.c: Split out code to find gconv directories from __gconv_read_conf in new functions. * iconv/gconv_int.h: Define new data structure and declare new functions for handling of gconv directory list. * iconv/gconv_open.c: Allow more than one error handling step being used. Call function to load error handling module if it is none of the builtin transformations. * iconv/gconv_close.c: Add code to free transliteration data. * iconv/gconv_trans.c: Add functions to load and unload modules implementing transliteration etc. * iconv/skeleton.c: Call all context functions now that more than one module is allowed. * iconv/loop.c (STANDARD_ERR_HANDLING): New macro. * iconv/gconv_simple.c: Use STANDARD_ERR_HANDLING macro for places where the full error handling using transliteration is needed. * 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: Reset __trans member of __gconv_trans_data structure correctly after last change. * 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. * localedata/Makefile: Set -Wno-format for some files since gcc does not know all the format specifiers. 2000-06-18 Ulrich Drepper * locale/loadlocale.c (_nl_unload_locale): Remove a bit of unneeded code. * locale/lc-time.c (_nl_init_era_entries): Likewise. --- wcsmbs/btowc.c | 2 +- wcsmbs/mbrtowc.c | 2 +- wcsmbs/mbsnrtowcs.c | 2 +- wcsmbs/mbsrtowcs.c | 2 +- wcsmbs/wcrtomb.c | 2 +- wcsmbs/wcsnrtombs.c | 2 +- wcsmbs/wcsrtombs.c | 2 +- wcsmbs/wctob.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'wcsmbs') diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c index cf0ec0825c..14d076c670 100644 --- a/wcsmbs/btowc.c +++ b/wcsmbs/btowc.c @@ -49,7 +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)); + data.__trans = NULL; /* 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 6f5417980b..d78a38bd43 100644 --- a/wcsmbs/mbrtowc.c +++ b/wcsmbs/mbrtowc.c @@ -49,7 +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)); + data.__trans = NULL; /* 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 0410232187..d8c0cdc786 100644 --- a/wcsmbs/mbsnrtowcs.c +++ b/wcsmbs/mbsnrtowcs.c @@ -57,7 +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)); + data.__trans = NULL; if (nmc == 0) return 0; diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c index 73a24a7608..9f9351810e 100644 --- a/wcsmbs/mbsrtowcs.c +++ b/wcsmbs/mbsrtowcs.c @@ -53,7 +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)); + data.__trans = NULL; /* Make sure we use the correct function. */ update_conversion_ptrs (); diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c index f7100d4fc7..ec75e579a4 100644 --- a/wcsmbs/wcrtomb.c +++ b/wcsmbs/wcrtomb.c @@ -49,7 +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)); + data.__trans = NULL; /* 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 f7b4363779..129d0990fe 100644 --- a/wcsmbs/wcsnrtombs.c +++ b/wcsmbs/wcsnrtombs.c @@ -55,7 +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)); + data.__trans = NULL; if (nwc == 0) return 0; diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c index 3c731aaa54..22dc76c3cb 100644 --- a/wcsmbs/wcsrtombs.c +++ b/wcsmbs/wcsrtombs.c @@ -51,7 +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)); + data.__trans = NULL; /* Make sure we use the correct function. */ update_conversion_ptrs (); diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c index cee739c251..0ee17ce443 100644 --- a/wcsmbs/wctob.c +++ b/wcsmbs/wctob.c @@ -43,7 +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)); + data.__trans = NULL; /* Make sure we start in the initial state. */ memset (&data.__state, '\0', sizeof (mbstate_t)); -- cgit v1.2.3