From 85830c4c4688b30d3d76111aa9a26745c7b141d6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 6 Jun 2000 03:16:30 +0000 Subject: Update. * iconv/gconv.h (__GCONV_IS_LAST, __GCONV_IGNORE_ERRORS): Define. (struct __gconv_step_data): Rename __is_last to __flags. * iconv/gconv_close.c: Change all uses of __is_last. * iconv/skeleton.c: Likewise. * iconvdata/iso-2022-cn.c: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconv/gconv_open.c: Likewise. Avoid unneeded initializations. Recognize IGNORE error handling, set flag, and remove from name. * iconv/loop.c (ignore_errors_p): Define. Add flags parameter to both functions. * iconv/skeleton.c: Pass flags to all conversion functions. * iconv/gconv_simple.c: Add flags parameter to all functions. Don't return error for invald error if ignore flag is set. (ucs4_internal_loop_single): Add missing pointer increment. (internal_ucs4le_loop_single): Likewise. * iconv/iconv_prog.c: Implement handling of -c parameter. * iconvdata/8bit-gap.c: Don't return error for invald error if ignore flag is set. * 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/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/fileops.c: Likewise. * 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. * iconvdata/ksc5601.h (ksc5601_to_ucs4): Undo *s change in all cases of --- 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 e0e4ceb139..0978f097f1 100644 --- a/wcsmbs/btowc.c +++ b/wcsmbs/btowc.c @@ -46,7 +46,7 @@ __btowc (c) data.__outbufend = data.__outbuf + sizeof (wchar_t); data.__invocation_counter = 0; data.__internal_use = 1; - data.__is_last = 1; + data.__flags = __GCONV_IS_LAST; data.__statep = &data.__state; /* Make sure we start in the initial state. */ diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c index 212b001422..6ecbdc5b5c 100644 --- a/wcsmbs/mbrtowc.c +++ b/wcsmbs/mbrtowc.c @@ -46,7 +46,7 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) /* Set information for this step. */ data.__invocation_counter = 0; data.__internal_use = 1; - data.__is_last = 1; + data.__flags = __GCONV_IS_LAST; data.__statep = ps ?: &state; /* A first special case is if S is NULL. This means put PS in the diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c index 42b5879f38..540afd0800 100644 --- a/wcsmbs/mbsnrtowcs.c +++ b/wcsmbs/mbsnrtowcs.c @@ -54,7 +54,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps) /* Tell where we want the result. */ data.__invocation_counter = 0; data.__internal_use = 1; - data.__is_last = 1; + data.__flags = __GCONV_IS_LAST; data.__statep = ps ?: &state; if (nmc == 0) diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c index facec0826b..aaafe3bf1e 100644 --- a/wcsmbs/mbsrtowcs.c +++ b/wcsmbs/mbsrtowcs.c @@ -50,7 +50,7 @@ __mbsrtowcs (dst, src, len, ps) /* Tell where we want the result. */ data.__invocation_counter = 0; data.__internal_use = 1; - data.__is_last = 1; + data.__flags = __GCONV_IS_LAST; data.__statep = ps ?: &state; /* Make sure we use the correct function. */ diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c index 7aef505ef3..5af383178c 100644 --- a/wcsmbs/wcrtomb.c +++ b/wcsmbs/wcrtomb.c @@ -46,7 +46,7 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps) /* Set information for this step. */ data.__invocation_counter = 0; data.__internal_use = 1; - data.__is_last = 1; + data.__flags = __GCONV_IS_LAST; data.__statep = ps ?: &state; /* A first special case is if S is NULL. This means put PS in the diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c index 50c33ec285..7005bdcf12 100644 --- a/wcsmbs/wcsnrtombs.c +++ b/wcsmbs/wcsnrtombs.c @@ -52,7 +52,7 @@ __wcsnrtombs (dst, src, nwc, len, ps) /* Tell where we want the result. */ data.__invocation_counter = 0; data.__internal_use = 1; - data.__is_last = 1; + data.__flags = __GCONV_IS_LAST; data.__statep = ps ?: &state; if (nwc == 0) diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c index 28af214f18..875ef16f75 100644 --- a/wcsmbs/wcsrtombs.c +++ b/wcsmbs/wcsrtombs.c @@ -48,7 +48,7 @@ __wcsrtombs (dst, src, len, ps) /* Tell where we want the result. */ data.__invocation_counter = 0; data.__internal_use = 1; - data.__is_last = 1; + data.__flags = __GCONV_IS_LAST; data.__statep = ps ?: &state; /* Make sure we use the correct function. */ diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c index 7e4c04f161..8c6372558e 100644 --- a/wcsmbs/wctob.c +++ b/wcsmbs/wctob.c @@ -40,7 +40,7 @@ wctob (c) data.__outbufend = buf + MB_LEN_MAX; data.__invocation_counter = 0; data.__internal_use = 1; - data.__is_last = 1; + data.__flags = __GCONV_IS_LAST; data.__statep = &data.__state; /* Make sure we start in the initial state. */ -- cgit 1.4.1