From d64b6ad07585b8a37e5fecc9a47fcee766d52ede Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 16 Jun 1999 22:55:47 +0000 Subject: Update. * Versions.def: Add GLIBC_2.2 for libc. * iconv/gconv.h: Make header suitable for inclusion in public header by protecting all names with __. * iconv/gconv.c: Adapt for symbol name changes. * iconv/gconv.h: Likewise. * iconv/gconv_builtin.c: Likewise. * iconv/gconv_close.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_open.c: Likewise. * iconv/gconv_simple.c: Likewise. * iconv/iconv.c: Likewise. * iconv/iconv_close.c: Likewise. * iconv/iconv_open.c: Likewise. * iconv/loop.c: Likewise. * iconv/skeleton.c: Likewise. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/cns11643.h: Likewise. * iconvdata/cns11643l1.h: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gb2312.h: 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/jis0201.h: Likewise. * iconvdata/jis0208.h: Likewise. * iconvdata/jis0212.h: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/ksc5601.h: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * stdlib/mblen.c: Likewise. * stdlib/mbtowc.c: Likewise. * stdlib/wctomb.c: Likewise. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wchar.h: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * wcsmbs/wcsmbsload.h: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * include/limits.h (MB_LEN_MAX): Increase to 16. * sysdeps/generic/_G_config.h: Define _G_fpos_t as struct. Define _G_iconv_t. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. * include/wchar.h: Change mbstate_t to __mbstate_t. * libio/Makefile (routines): Add wfiledoalloc, oldiofgetpos, oldiofgetpos64, oldiofsetpos, oldiofsetpos64, fputwc, fputwc_u, getwc, getwc_u, getwchar, getwchar_u, iofgetws, iofgetws_u, iofputws, iofputws_u, iogetwline, iowpadn, ioungetwc, putwc, putwc_u, putchar, putchar_u, swprintf, vwprintf, wprintf, wscanf, fwscanf, vwscanf, vswprintf, iovswscanf, swscanf, wgenops, wstrops, wfileops, and iofwide. (tests): Add tst_swprintf, tst_wprintf, tst_swscanf, and tst_wscanf. * libio/Versions: Add _IO_fgetpos, _IO_fgetpos64, _IO_fsetpos, _IO_fsetpos64, fgetpos, fgetpos64, fgetwc, fgetwc_unlocked, fgetws, fgetws_unlocked, fputwc, fputwc_unlocked, fputws, fputws_unlocked, fsetpos, fsetpos64, fwide, fwprintf, fwscanf, getwc, getwc_unlocked, getwchar, getwchar_unlocked, putwc, putwc_unlocked, putwchar, putwchar_unlocked, swprintf, swscanf, ungetwc, vfwprintf, vswprintf, vwprintf, vfwscanf, vswscanf, vwscanf, wprintf, and wscanf to GLIBC_2.2 for libc. * libio/libio.h: Define codecvt struct. Define _IO_wide_data. Extend _IO_file contain pointer to codecvt, widedata and mode. (_IO_getwc_unlocked): New macro. (_IO_putwc_unlocked): New macro. (_IO_fwide): New macro. * libio/libioP.h: Add new prototypes and adjust existing declarations. * libio/fileops.c (_IO_new_file_close_it): Reset normal or widedata buffers based on mode. (new_do_write): Set _IO_write_end to _IO_buf_end if stream is wide oriented. (_IO_new_file_overflow): Don't depend only on _IO_CURRENTLY_PUTTING flag to be enough to signal unallocated buffer. For wide oriented stream don't make it linebuffered. Don't use _IO_do_flush, use _IO_new_do_write directly. (_IO_new_file_seekoff): Change return value type to _IO_off64_t. (_IO_file_seek): Likewise. * libio/genops.c (_IO_least_marker): Make global. (__underflow): Orient stream if not already done. (__uflow): Likewise. (_IO_default_seekpos): Change to type _IO_off64_t. (_IO_default_seekoff): Likewise. (_IO_default_seek): Likewise. (_IO_no_init): New function. Similar to _IO_init but allows to orient in initialization. * libio/iolibio.h: Add prototype for _IO_vswprintf. Change _IO_pos_BAD to use _IO_off64_t. * libio/ftello.c: Use _IO_off_t. For now abort when use with wide char stream. * libio/ftello64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofopncook.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/oldfileops.c: Likewise. * libio/iofgetpos.c: Store state of conversion if necessary. * libio/iofgetpos64.c: Likewise. * libio/iofsetpos.c: Restore conversion state if necessary. * libio/iofsetpos64.c: Likewise. * libio/iofdopen.c: Initialize so that stream can be wide oriented. * libio/iofopen.c: Likewise. * libio/iofopen64.c: Likewise. * libio/iopopen.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/iofputs.c: Orient stream if not already happened. * libio/iofputs_u.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iofwrite_u.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Handle not yet oriented stream. * libio/iosetvbuf.c: Likewise. * libio/oldstdfiles.c: Adjust FILEBUF_LITERAL call. * libio/stdfiles.c: Likewise. * libio/strops.c (_IO_str_overflow): Correctly free buffer after failed allocation. (_IO_str_seekoff): Use _IO_off64_t. * libio/vasprintf.c: Pre-orient stream. * libio/vsnprintf.c: Likewise. * libio/fputwc.c: New file. * libio/fputwc_u.c: New file. * libio/fwprintf.c: New file. * libio/fwscanf.c: New file. * libio/getwc.c: New file. * libio/getwc_u.c: New file. * libio/getwchar.c: New file. * libio/getwchar_u.c: New file. * libio/iofgetws.c: New file. * libio/iofgetws_u.c: New file. * libio/iofputws.c: New file. * libio/iofputws_u.c: New file. * libio/iofwide.c: New file. * libio/iogetwline.c: New file. * libio/ioungetwc.c: New file. * libio/iovswscanf.c: New file. * libio/iowpadn.c: New file. * libio/oldiofgetpos.c: New file. * libio/oldiofgetpos64.c: New file. * libio/oldiofsetpos.c: New file. * libio/oldiofsetpos64.c: New file. * libio/putwc.c: New file. * libio/putwc_u.c: New file. * libio/putwchar.c: New file. * libio/putwchar_u.c: New file. * libio/swprintf.c: New file. * libio/swscanf.c: New file. * libio/tst_swprintf.c: New file. * libio/tst_swscanf.c: New file. * libio/tst_wprintf.c: New file. * libio/tst_wscanf.c: New file. * libio/tst_wscanf.input: New file. * libio/vswprintf.c: New file. * libio/vwprintf.c: New file. * libio/vwscanf.c: New file. * libio/wfiledoalloc.c: New file. * libio/wfileops.c: New file. * libio/wgenops.c: New file. * libio/wprintf.c: New file. * libio/wscanf.c: New file. * libio/wstrops.c: New file. * stdio-common/Makefile (routines): Add _itowa, itowa-digits, vfwprintf, and vfwscanf. * stdio-common/_itoa.c (base_table): Rename to _IO_base_table and make global. * stdio-common/_itowa.c: New file. * stdio-common/_itowa.h: New file. * stdio-common/itoa-digits.c: Minimal optimization. * stdio-common/itowa-digits.c: New file. * stdio-common/printf-parse.h: Allow use in wide character context. * stdio-common/printf-prs.c: Define ISASCII and MBRLEN. * stdio-common/printf.h (printf_info): Add wide bit. * stdio-common/printf_fp.c: Determine from wide bit whether stream is wide oriented or not. * stdio-common/printf_size.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * stdlib/strfmon.c: Call __printf_fp with wide bit cleared. * stdio-common/vfprintf.c: Rewrite to allow use in wide character context. * stdio-common/vfscand.c: Likewise. * stdio-common/vfwprintf.c: New file. * stdio-common/vfwscanf.c: New file. * time/Makefile (routines): Add wcsftime. (tests): Add tst_wcsftime. * time/Versions: Add wcsftime to GLIBC_2.2 for libc. * time/strftime.c: Make usable as wcsftime. * time/wcsftime.c: New file. * time/tst_wcsftime.c: New file. * wcsmbs/Makefile (routines): Add wmempcpy and wcschrnul. * wcsmbs/Versions: Add wmempcpy and wcschrnul to GLIBC_2.2 for libc. * wcsmbs/wcschrnul.c: New file. * wcsmbs/wmemcpy.c: New file. * wcsmbs/wmemcpy.c: Rename to __wmemcpy and make wmemcpy weak alias. * wcsmbs/wmemmove.c: Likewise for wmemmove. * manual/stdio.texi: Document is_char and wide element if printf_info. * manual/time.texi: Document wcsftime. * include/wchar.h: Add prototypes for __wmemcpy, __wmempcpy, __wmemmove, __wcschrnul, and __vfwscanf. * locale/langinfo.h: Add new LC_TIME entries for wchar_t data. * locale/C-time.c: Adapt for above change. * locale/categories.def: Likewise. * locale/localeinfo.h: Likewise. * localedata/Makefile: Don't run tests for now. --- iconvdata/8bit-gap.c | 10 +-- iconvdata/8bit-generic.c | 6 +- iconvdata/ansi_x3.110.c | 16 ++-- iconvdata/big5.c | 12 +-- iconvdata/cns11643.h | 22 ++--- iconvdata/cns11643l1.h | 14 ++-- iconvdata/euc-cn.c | 18 ++--- iconvdata/euc-jp.c | 26 +++--- iconvdata/euc-kr.c | 16 ++-- iconvdata/euc-tw.c | 26 +++--- iconvdata/gb2312.h | 14 ++-- iconvdata/iso-2022-jp.c | 137 +++++++++++++++---------------- iconvdata/iso-2022-kr.c | 41 +++++----- iconvdata/iso646.c | 204 +++++++++++++++++++++++------------------------ iconvdata/iso8859-1.c | 4 +- iconvdata/iso_6937-2.c | 16 ++-- iconvdata/iso_6937.c | 16 ++-- iconvdata/jis0201.h | 6 +- iconvdata/jis0208.h | 16 ++-- iconvdata/jis0212.h | 14 ++-- iconvdata/johab.c | 32 ++++---- iconvdata/ksc5601.h | 18 ++--- iconvdata/sjis.c | 18 ++--- iconvdata/t.61.c | 14 ++-- iconvdata/uhc.c | 28 +++---- 25 files changed, 374 insertions(+), 370 deletions(-) (limited to 'iconvdata') diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c index d9fe4dd8ae..5ab2975bde 100644 --- a/iconvdata/8bit-gap.c +++ b/iconvdata/8bit-gap.c @@ -1,6 +1,6 @@ /* Generic conversion to and from 8bit charsets, converting from UCS using gaps. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -51,7 +51,7 @@ struct gap if (HAS_HOLES && ch == L'\0' && *inptr != '\0') \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -74,7 +74,7 @@ struct gap if (ch >= 0xffff) \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ while (ch > rp->end) \ @@ -82,7 +82,7 @@ struct gap if (ch < rp->start) \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -90,7 +90,7 @@ struct gap if (ch != 0 && res == '\0') \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ diff --git a/iconvdata/8bit-generic.c b/iconvdata/8bit-generic.c index 2ea333199e..bd9da7a576 100644 --- a/iconvdata/8bit-generic.c +++ b/iconvdata/8bit-generic.c @@ -1,5 +1,5 @@ /* Generic conversion to and from 8bit charsets. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -37,7 +37,7 @@ if (HAS_HOLES && ch == L'\0' && *inptr != '\0') \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -59,7 +59,7 @@ || (ch != 0 && from_ucs4[ch] == '\0')) \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c index c754ce05f6..9371c5ae55 100644 --- a/iconvdata/ansi_x3.110.c +++ b/iconvdata/ansi_x3.110.c @@ -1,5 +1,5 @@ /* Generic conversion to and from ANSI_X3.110-1983. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -409,7 +409,7 @@ static const char from_ucs4[][2] = if (NEED_LENGTH_TEST && inptr + 1 >= inend) \ { \ /* The second character is not available. */ \ - result = GCONV_INCOMPLETE_INPUT; \ + result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ \ @@ -418,7 +418,7 @@ static const char from_ucs4[][2] = if (ch2 < 0x20 || ch2 >= 0x80) \ { \ /* This is illegal. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -435,7 +435,7 @@ static const char from_ucs4[][2] = if (ch == 0 && *inptr != '\0') \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -477,7 +477,7 @@ static const char from_ucs4[][2] = if (tmp[0] == '\0') \ { \ /* Illegal characters. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ tmp[1] = '\0'; \ @@ -518,7 +518,7 @@ static const char from_ucs4[][2] = else \ { \ /* Illegal characters. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ } \ @@ -529,7 +529,7 @@ static const char from_ucs4[][2] = if (cp[0] == '\0' && ch != 0) \ { \ /* Illegal. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ } \ @@ -542,7 +542,7 @@ static const char from_ucs4[][2] = { \ /* The result does not fit into the buffer. */ \ --outptr; \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ \ diff --git a/iconvdata/big5.c b/iconvdata/big5.c index b9ffce6905..5551bbaba8 100644 --- a/iconvdata/big5.c +++ b/iconvdata/big5.c @@ -1,5 +1,5 @@ /* Mapping tables for Big5 handling. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -8441,7 +8441,7 @@ static const char from_ucs4_tab13[][2] = if (NEED_LENGTH_TEST && inptr + 1 >= inend) \ { \ /* The second character is not available. */ \ - result = GCONV_INCOMPLETE_INPUT; \ + result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ \ @@ -8455,7 +8455,7 @@ static const char from_ucs4_tab13[][2] = else \ { \ /* This is illegal. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -8466,7 +8466,7 @@ static const char from_ucs4_tab13[][2] = if (ch == 0 && *inptr != '\0') \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -8566,7 +8566,7 @@ static const char from_ucs4_tab13[][2] = if (cp[0] == '\0' && ch != 0) \ { \ /* Illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -8574,7 +8574,7 @@ static const char from_ucs4_tab13[][2] = if (NEED_LENGTH_TEST && cp[1] != '\0' && outptr + 1 >= outend) \ { \ /* We have not enough room. */ \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ \ diff --git a/iconvdata/cns11643.h b/iconvdata/cns11643.h index 342c8777b6..27c484bbd2 100644 --- a/iconvdata/cns11643.h +++ b/iconvdata/cns11643.h @@ -1,5 +1,5 @@ /* Access functions for CNS 11643, plane 2 handling. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -35,46 +35,46 @@ cns11643_to_ucs4 (const char **s, size_t avail, unsigned char offset) int idx; if (ch < offset || (ch - offset) <= 0x20 || (ch - offset) > 0x30) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; if (avail < 3) return 0; ch2 = (*s)[1]; if ((ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; ch3 = (*s)[2]; if ((ch3 - offset) <= 0x20 || (ch3 - offset) >= 0x7f) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; idx = (ch2 - 0x21 - offset) * 94 + (ch3 - 0x21 - offset); if ((ch - 0x21 - offset) == 1) { if (idx > 0x2196) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; result = __cns11643l1_to_ucs4_tab[idx]; } else if ((ch - 0x21 - offset) == 2) { if (idx > 0x1de1) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; result = __cns11643l2_to_ucs4_tab[idx]; } else if ((ch - 0x21 - offset) == 0xe) { if (idx > 0x19bd) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; result = __cns11643l14_to_ucs4_tab[idx]; } else - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; if (result != L'\0') (*s) += 3; else - result = UNKNOWN_10646_CHAR; + result = __UNKNOWN_10646_CHAR; return result; } @@ -200,11 +200,11 @@ ucs4_to_cns11643 (uint32_t wch, char *s, size_t avail) cp = "\x22\x64"; break; default: - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; } if (cp[0] == '\0') - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; if (avail < needed) return 0; diff --git a/iconvdata/cns11643l1.h b/iconvdata/cns11643l1.h index 5e5abb76e4..3e0d042fa1 100644 --- a/iconvdata/cns11643l1.h +++ b/iconvdata/cns11643l1.h @@ -1,5 +1,5 @@ /* Access functions for CNS 11643, plane 1 handling. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -33,22 +33,22 @@ cns11643l1_to_ucs4 (const char **s, size_t avail, unsigned char offset) int idx; if (ch < offset || (ch - offset) <= 0x20 || (ch - offset) > 0x7d) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; if (avail < 2) return 0; ch2 = (*s)[1]; if ((ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; idx = (ch - 0x21 - offset) * 94 + (ch2 - 0x21 - offset); if (idx > 0x2196) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; (*s) += 2; - return __cns11643l1_to_ucs4_tab[idx] ?: ((*s) -= 2, UNKNOWN_10646_CHAR); + return __cns11643l1_to_ucs4_tab[idx] ?: ((*s) -= 2, __UNKNOWN_10646_CHAR); } @@ -163,11 +163,11 @@ ucs4_to_cns11643l1 (uint32_t wch, char *s, size_t avail) cp = "\x22\x64"; break; default: - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; } if (cp[0] == '\0') - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; if (avail < 2) return 0; diff --git a/iconvdata/euc-cn.c b/iconvdata/euc-cn.c index 89b8f48ebb..fa2f7cb579 100644 --- a/iconvdata/euc-cn.c +++ b/iconvdata/euc-cn.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-CN handling. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -47,7 +47,7 @@ if ((ch <= 0xa0 || ch > 0xfe) && ch != 0x8e && ch != 0x8f) \ { \ /* This is illegal. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ else \ @@ -60,7 +60,7 @@ { \ /* The second character is not available. Store \ the intermediate result. */ \ - result = GCONV_INCOMPLETE_INPUT; \ + result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ \ @@ -70,7 +70,7 @@ if (ch < 0xa1) \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -78,10 +78,10 @@ endp = inptr; \ \ ch = gb2312_to_ucs4 (&endp, 2, 0x80); \ - if (ch == UNKNOWN_10646_CHAR) \ + if (ch == __UNKNOWN_10646_CHAR) \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -114,10 +114,10 @@ ? outend - outptr : MAX_NEEDED_OUTPUT)); \ if (!NEED_LENGTH_TEST || found != 0) \ { \ - if (found == UNKNOWN_10646_CHAR) \ + if (found == __UNKNOWN_10646_CHAR) \ { \ /* Illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -128,7 +128,7 @@ else \ { \ /* We ran out of space. */ \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ } \ diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c index 4936e40b62..3d97c01ce9 100644 --- a/iconvdata/euc-jp.c +++ b/iconvdata/euc-jp.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-JP handling. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -49,7 +49,7 @@ else if ((ch <= 0xa0 || ch > 0xfe) && ch != 0x8e && ch != 0x8f) \ { \ /* This is illegal. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ else \ @@ -62,7 +62,7 @@ { \ /* The second character is not available. Store the \ intermediate result. */ \ - result = GCONV_INCOMPLETE_INPUT; \ + result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ \ @@ -72,7 +72,7 @@ if (ch2 < 0xa1) \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -108,13 +108,13 @@ if (NEED_LENGTH_TEST && ch == 0) \ { \ /* Not enough input available. */ \ - result = GCONV_INCOMPLETE_INPUT; \ + result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ - if (ch == UNKNOWN_10646_CHAR) \ + if (ch == __UNKNOWN_10646_CHAR) \ { \ /* Illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ inptr = endp; \ @@ -152,12 +152,12 @@ /* See whether we have room for at least two characters. */ \ if (NEED_LENGTH_TEST && outptr + 1 >= outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ \ found = ucs4_to_jisx0201 (ch, outptr + 1); \ - if (found != UNKNOWN_10646_CHAR) \ + if (found != __UNKNOWN_10646_CHAR) \ { \ /* Yes, it's a JIS 0201 character. Store the shift byte. */ \ *outptr = 0x8e; \ @@ -168,7 +168,7 @@ /* No JIS 0201 character. */ \ found = ucs4_to_jisx0208 (ch, outptr, 2); \ /* Please note that we always have enough room for the output. */ \ - if (found != UNKNOWN_10646_CHAR) \ + if (found != __UNKNOWN_10646_CHAR) \ { \ /* It's a JIS 0208 character, adjust it for EUC-JP. */ \ *outptr++ += 0x80; \ @@ -184,10 +184,10 @@ if (found == 0) \ { \ /* We ran out of space. */ \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ - else if (found != UNKNOWN_10646_CHAR) \ + else if (found != __UNKNOWN_10646_CHAR) \ { \ /* It's a JIS 0212 character, adjust it for EUC-JP. */ \ *outptr++ = 0x8f; \ @@ -197,7 +197,7 @@ else \ { \ /* Illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ } \ diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c index 61046b392b..4f511705a4 100644 --- a/iconvdata/euc-kr.c +++ b/iconvdata/euc-kr.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-KR handling. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jungshik Shin and Ulrich Drepper , 1998. @@ -28,7 +28,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp) { if (ch > 0x7f) { - if (ucs4_to_ksc5601 (ch, cp, 2) != UNKNOWN_10646_CHAR) + if (ucs4_to_ksc5601 (ch, cp, 2) != __UNKNOWN_10646_CHAR) { cp[0] |= 0x80; cp[1] |= 0x80; @@ -79,7 +79,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp) else if (ch <= 0xa0 || ch > 0xfe || ch == 0xc9) \ { \ /* This is illegal. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ else \ @@ -91,13 +91,13 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp) if (NEED_LENGTH_TEST && ch == 0) \ { \ /* The second character is not available. */ \ - result = GCONV_INCOMPLETE_INPUT; \ + result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ - if (ch == UNKNOWN_10646_CHAR) \ + if (ch == __UNKNOWN_10646_CHAR) \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ } \ @@ -124,7 +124,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp) if (cp[0] == '\0' && ch != 0) \ { \ /* Illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -136,7 +136,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp) { \ /* The result does not fit into the buffer. */ \ --outptr; \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ *outptr++ = cp[1]; \ diff --git a/iconvdata/euc-tw.c b/iconvdata/euc-tw.c index ca1cdac40e..477290889d 100644 --- a/iconvdata/euc-tw.c +++ b/iconvdata/euc-tw.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-TW handling. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -48,7 +48,7 @@ else if ((ch <= 0xa0 || ch > 0xfe) && ch != 0x8e) \ { \ /* This is illegal. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ else \ @@ -61,7 +61,7 @@ { \ /* The second character is not available. Store the \ intermediate result. */ \ - result = GCONV_INCOMPLETE_INPUT; \ + result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ \ @@ -71,7 +71,7 @@ if (ch2 < 0xa1 || ch2 == 0xff) \ { \ /* This is an illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -85,10 +85,10 @@ 0x80); \ /* Please note that we need not test for the missing input \ characters here anymore. */ \ - if (ch == UNKNOWN_10646_CHAR) \ + if (ch == __UNKNOWN_10646_CHAR) \ { \ /* Illegal input. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -104,10 +104,10 @@ 0x80); \ /* Please note that we need not test for the missing input \ characters here anymore. */ \ - if (ch == UNKNOWN_10646_CHAR) \ + if (ch == __UNKNOWN_10646_CHAR) \ { \ /* Illegal input. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -142,10 +142,10 @@ if (NEED_LENGTH_TEST && found == 0) \ { \ /* We ran out of space. */ \ - result = GCONV_INCOMPLETE_INPUT; \ + result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ - if (found != UNKNOWN_10646_CHAR) \ + if (found != __UNKNOWN_10646_CHAR) \ { \ /* It's a CNS 11643, plane 1 character, adjust it for EUC-TW. */ \ *outptr++ += 0x80; \ @@ -161,13 +161,13 @@ if (NEED_LENGTH_TEST && found == 0) \ { \ /* We ran out of space. */ \ - result = GCONV_INCOMPLETE_INPUT; \ + result = __GCONV_INCOMPLETE_INPUT; \ break; \ } \ - if (found == UNKNOWN_10646_CHAR) \ + if (found == __UNKNOWN_10646_CHAR) \ { \ /* No legal input. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ diff --git a/iconvdata/gb2312.h b/iconvdata/gb2312.h index cde9375e84..5cac987f2f 100644 --- a/iconvdata/gb2312.h +++ b/iconvdata/gb2312.h @@ -1,5 +1,5 @@ /* Access functions for GB2312 conversion. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -37,22 +37,22 @@ gb2312_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset) int idx; if (ch < offset || (ch - offset) <= 0x20 || (ch - offset) > 0x77) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; if (avail < 2) return 0; ch2 = (*s)[1]; if ((ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; idx = (ch - 0x21 - offset) * 94 + (ch2 - 0x21 - offset); if (idx > 0x1ff1) - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; (*s) += 2; - return __gb2312_to_ucs[idx] ?: ((*s) -= 2, UNKNOWN_10646_CHAR); + return __gb2312_to_ucs[idx] ?: ((*s) -= 2, __UNKNOWN_10646_CHAR); } @@ -210,11 +210,11 @@ ucs4_to_gb2312 (uint32_t wch, unsigned char *s, size_t avail) cp = "\x23\x24"; break; default: - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; } if (cp[0] == '\0') - return UNKNOWN_10646_CHAR; + return __UNKNOWN_10646_CHAR; assert (cp[1] != '\0'); diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c index bb158491f2..31b1cbcd14 100644 --- a/iconvdata/iso-2022-jp.c +++ b/iconvdata/iso-2022-jp.c @@ -53,10 +53,10 @@ struct gap #define MAX_NEEDED_TO 4 #define FROM_DIRECTION (dir == from_iso2022jp) #define PREPARE_LOOP \ - enum direction dir = ((struct iso2022jp_data *) step->data)->dir; \ - enum variant var = ((struct iso2022jp_data *) step->data)->var; \ + enum direction dir = ((struct iso2022jp_data *) step->__data)->dir; \ + enum variant var = ((struct iso2022jp_data *) step->__data)->var; \ int save_set; \ - int *setp = &data->statep->count; + int *setp = &data->__statep->count; #define EXTRA_LOOP_ARGS , var, setp @@ -109,7 +109,7 @@ enum int -gconv_init (struct gconv_step *step) +gconv_init (struct __gconv_step *step) { /* Determine which direction. */ struct iso2022jp_data *new_data; @@ -117,59 +117,59 @@ gconv_init (struct gconv_step *step) enum variant var = illegal_var; int result; - if (__strcasecmp (step->from_name, "ISO-2022-JP//") == 0) + if (__strcasecmp (step->__from_name, "ISO-2022-JP//") == 0) { dir = from_iso2022jp; var = iso2022jp; } - else if (__strcasecmp (step->to_name, "ISO-2022-JP//") == 0) + else if (__strcasecmp (step->__to_name, "ISO-2022-JP//") == 0) { dir = to_iso2022jp; var = iso2022jp; } - else if (__strcasecmp (step->from_name, "ISO-2022-JP-2//") == 0) + else if (__strcasecmp (step->__from_name, "ISO-2022-JP-2//") == 0) { dir = from_iso2022jp; var = iso2022jp2; } - else if (__strcasecmp (step->to_name, "ISO-2022-JP-2//") == 0) + else if (__strcasecmp (step->__to_name, "ISO-2022-JP-2//") == 0) { dir = to_iso2022jp; var = iso2022jp2; } - result = GCONV_NOCONV; + result = __GCONV_NOCONV; if (dir != illegal_dir) { new_data = (struct iso2022jp_data *) malloc (sizeof (struct iso2022jp_data)); - result = GCONV_NOMEM; + result = __GCONV_NOMEM; if (new_data != NULL) { new_data->dir = dir; new_data->var = var; - step->data = new_data; + step->__data = new_data; if (dir == from_iso2022jp) { - step->min_needed_from = MIN_NEEDED_FROM; - step->max_needed_from = MAX_NEEDED_FROM; - step->min_needed_to = MIN_NEEDED_TO; - step->max_needed_to = MAX_NEEDED_TO; + step->__min_needed_from = MIN_NEEDED_FROM; + step->__max_needed_from = MAX_NEEDED_FROM; + step->__min_needed_to = MIN_NEEDED_TO; + step->__max_needed_to = MAX_NEEDED_TO; } else { - step->min_needed_from = MIN_NEEDED_TO; - step->max_needed_from = MAX_NEEDED_TO; - step->min_needed_to = MIN_NEEDED_FROM; - step->max_needed_to = MAX_NEEDED_FROM + 2; + step->__min_needed_from = MIN_NEEDED_TO; + step->__max_needed_from = MAX_NEEDED_TO; + step->__min_needed_to = MIN_NEEDED_FROM; + step->__max_needed_to = MAX_NEEDED_FROM + 2; } /* Yes, this is a stateful encoding. */ - step->stateful = 1; + step->__stateful = 1; - result = GCONV_OK; + result = __GCONV_OK; } } @@ -178,9 +178,9 @@ gconv_init (struct gconv_step *step) void -gconv_end (struct gconv_step *data) +gconv_end (struct __gconv_step *data) { - free (data->data); + free (data->__data); } @@ -188,33 +188,33 @@ gconv_end (struct gconv_step *data) the output state to the initial state. This has to be done during the flushing. */ #define EMIT_SHIFT_TO_INIT \ - if (data->statep->count != ASCII_set) \ + if (data->__statep->count != ASCII_set) \ { \ - enum direction dir = ((struct iso2022jp_data *) step->data)->dir; \ + enum direction dir = ((struct iso2022jp_data *) step->__data)->dir; \ \ if (dir == from_iso2022jp) \ /* It's easy, we don't have to emit anything, we just reset the \ state for the input. Note that this also clears the G2 \ designation. */ \ - data->statep->count = ASCII_set; \ + data->__statep->count = ASCII_set; \ else \ { \ - unsigned char *outbuf = data->outbuf; \ + unsigned char *outbuf = data->__outbuf; \ \ /* We are not in the initial state. To switch back we have \ to emit the sequence `Esc ( B'. */ \ - if (outbuf + 3 > data->outbufend) \ + if (outbuf + 3 > data->__outbufend) \ /* We don't have enough room in the output buffer. */ \ - status = GCONV_FULL_OUTPUT; \ + status = __GCONV_FULL_OUTPUT; \ else \ { \ /* Write out the shift sequence. */ \ *outbuf++ = ESC; \ *outbuf++ = '('; \ *outbuf++ = 'B'; \ - data->outbuf = outbuf; \ + data->__outbuf = outbuf; \ /* Note that this also clears the G2 designation. */ \ - data->statep->count = ASCII_set; \ + data->__statep->count = ASCII_set; \ } \ } \ } @@ -251,7 +251,7 @@ gconv_end (struct gconv_step *data) && inptr + 3 >= inend)) \ { \ /* Not enough input available. */ \ - result = GCONV_EMPTY_INPUT; \ + result = __GCONV_EMPTY_INPUT; \ break; \ } \ \ @@ -354,20 +354,20 @@ gconv_end (struct gconv_step *data) /* We use the table from the ISO 8859-7 module. */ \ if (inptr[2] < 0x20 || inptr[2] > 0x80) \ { \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ ch = iso88597_to_ucs4[inptr[2] - 0x20]; \ if (ch == 0) \ { \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ inptr += 3; \ } \ else \ { \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ } \ @@ -378,9 +378,9 @@ gconv_end (struct gconv_step *data) { \ /* Use the JIS X 0201 table. */ \ ch = jisx0201_to_ucs4 (ch); \ - if (ch == UNKNOWN_10646_CHAR) \ + if (ch == __UNKNOWN_10646_CHAR) \ { \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ ++inptr; \ @@ -389,9 +389,9 @@ gconv_end (struct gconv_step *data) { \ /* Use the JIS X 0201 table. */ \ ch = jisx0201_to_ucs4 (ch + 0x80); \ - if (ch == UNKNOWN_10646_CHAR) \ + if (ch == __UNKNOWN_10646_CHAR) \ { \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ ++inptr; \ @@ -424,12 +424,12 @@ gconv_end (struct gconv_step *data) \ if (NEED_LENGTH_TEST && ch == 0) \ { \ - result = GCONV_EMPTY_INPUT; \ + result = __GCONV_EMPTY_INPUT; \ break; \ } \ - else if (ch == UNKNOWN_10646_CHAR) \ + else if (ch == __UNKNOWN_10646_CHAR) \ { \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ } \ @@ -474,25 +474,27 @@ gconv_end (struct gconv_step *data) { \ unsigned char buf[2]; \ written = ucs4_to_jisx0201 (ch, buf); \ - if (written != UNKNOWN_10646_CHAR && buf[0] > 0x20 && buf[0] < 0x80) \ + if (written != __UNKNOWN_10646_CHAR && buf[0] > 0x20 \ + && buf[0] < 0x80) \ { \ *outptr++ = buf[0]; \ written = 1; \ } \ else \ - written = UNKNOWN_10646_CHAR; \ + written = __UNKNOWN_10646_CHAR; \ } \ else if (set == JISX0201_Kana_set) \ { \ unsigned char buf[2]; \ written = ucs4_to_jisx0201 (ch, buf); \ - if (written != UNKNOWN_10646_CHAR && buf[0] > 0xa0 && buf[0] < 0xe0) \ + if (written != __UNKNOWN_10646_CHAR && buf[0] > 0xa0 \ + && buf[0] < 0xe0) \ { \ *outptr++ = buf[0] - 0x80; \ written = 1; \ } \ else \ - written = UNKNOWN_10646_CHAR; \ + written = __UNKNOWN_10646_CHAR; \ } \ else \ { \ @@ -518,14 +520,14 @@ gconv_end (struct gconv_step *data) \ if (NEED_LENGTH_TEST && written == 0) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ - else if (written != UNKNOWN_10646_CHAR) \ + else if (written != __UNKNOWN_10646_CHAR) \ outptr += written; \ } \ \ - if (written == UNKNOWN_10646_CHAR || written == 0) \ + if (written == __UNKNOWN_10646_CHAR || written == 0) \ { \ if (set2 == ISO88591_set) \ { \ @@ -557,7 +559,7 @@ gconv_end (struct gconv_step *data) } \ } \ \ - if (written == UNKNOWN_10646_CHAR || written == 0) \ + if (written == __UNKNOWN_10646_CHAR || written == 0) \ { \ /* Either this is an unknown character or we have to switch \ the currently selected character set. The character sets \ @@ -576,7 +578,7 @@ gconv_end (struct gconv_step *data) escape sequence. */ \ if (NEED_LENGTH_TEST && outptr + 4 > outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ \ @@ -600,12 +602,12 @@ gconv_end (struct gconv_step *data) unsigned char buf[2]; \ \ written = ucs4_to_jisx0201 (ch, buf); \ - if (written != UNKNOWN_10646_CHAR && buf[0] < 0x80) \ + if (written != __UNKNOWN_10646_CHAR && buf[0] < 0x80) \ { \ /* We use JIS X 0201. */ \ if (NEED_LENGTH_TEST && outptr + 4 > outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ \ @@ -618,12 +620,12 @@ gconv_end (struct gconv_step *data) else \ { \ written = ucs4_to_jisx0208 (ch, buf, 2); \ - if (written != UNKNOWN_10646_CHAR) \ + if (written != __UNKNOWN_10646_CHAR) \ { \ /* We use JIS X 0208. */ \ if (NEED_LENGTH_TEST && outptr + 5 > outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ \ @@ -637,18 +639,18 @@ gconv_end (struct gconv_step *data) else if (var == iso2022jp) \ { \ /* We have no other choice. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ else \ { \ written = ucs4_to_jisx0212 (ch, buf, 2); \ - if (written != UNKNOWN_10646_CHAR) \ + if (written != __UNKNOWN_10646_CHAR) \ { \ /* We use JIS X 0212. */ \ if (NEED_LENGTH_TEST && outptr + 6 > outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ *outptr++ = ESC; \ @@ -662,12 +664,13 @@ gconv_end (struct gconv_step *data) else \ { \ written = ucs4_to_jisx0201 (ch, buf); \ - if (written != UNKNOWN_10646_CHAR && buf[0] >= 0x80) \ + if (written != __UNKNOWN_10646_CHAR \ + && buf[0] >= 0x80) \ { \ /* We use JIS X 0201. */ \ if (NEED_LENGTH_TEST && outptr + 4 > outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ \ @@ -682,7 +685,7 @@ gconv_end (struct gconv_step *data) /* ISO 8859-1 upper half. */ \ if (NEED_LENGTH_TEST && outptr + 6 > outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ \ @@ -697,12 +700,12 @@ gconv_end (struct gconv_step *data) else \ { \ written = ucs4_to_gb2312 (ch, buf, 2); \ - if (written != UNKNOWN_10646_CHAR) \ + if (written != __UNKNOWN_10646_CHAR) \ { \ /* We use GB 2312. */ \ if (NEED_LENGTH_TEST && outptr + 5 > outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ \ @@ -716,13 +719,13 @@ gconv_end (struct gconv_step *data) else \ { \ written = ucs4_to_ksc5601 (ch, buf, 2); \ - if (written != UNKNOWN_10646_CHAR) \ + if (written != __UNKNOWN_10646_CHAR) \ { \ /* We use KSC 5601. */ \ if (NEED_LENGTH_TEST \ && outptr + 6 > outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ *outptr++ = ESC; \ @@ -752,7 +755,7 @@ gconv_end (struct gconv_step *data) if (NEED_LENGTH_TEST \ && outptr + 6 > outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ *outptr++ = ESC; \ @@ -765,7 +768,7 @@ gconv_end (struct gconv_step *data) } \ else \ { \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ } \ diff --git a/iconvdata/iso-2022-kr.c b/iconvdata/iso-2022-kr.c index a0c213cdfe..178753f5c8 100644 --- a/iconvdata/iso-2022-kr.c +++ b/iconvdata/iso-2022-kr.c @@ -44,12 +44,13 @@ #define MAX_NEEDED_TO 4 #define PREPARE_LOOP \ int save_set; \ - int *setp = &data->statep->count; \ - if (!FROM_DIRECTION && !data->internal_use && data->invocation_counter == 0)\ + int *setp = &data->__statep->count; \ + if (!FROM_DIRECTION && !data->__internal_use \ + && data->__invocation_counter == 0) \ { \ /* Emit the designator sequence. */ \ if (outbuf + 4 > outend) \ - return GCONV_FULL_OUTPUT; \ + return __GCONV_FULL_OUTPUT; \ \ *outbuf++ = ESC; \ *outbuf++ = '$'; \ @@ -72,27 +73,27 @@ enum the output state to the initial state. This has to be done during the flushing. */ #define EMIT_SHIFT_TO_INIT \ - if (data->statep->count != ASCII_set) \ + if (data->__statep->count != ASCII_set) \ { \ if (FROM_DIRECTION) \ /* It's easy, we don't have to emit anything, we just reset the \ state for the input. */ \ - data->statep->count = ASCII_set; \ + data->__statep->count = ASCII_set; \ else \ { \ - unsigned char *outbuf = data->outbuf; \ + unsigned char *outbuf = data->__outbuf; \ \ /* We are not in the initial state. To switch back we have \ to emit `SI'. */ \ - if (outbuf == data->outbufend) \ + if (outbuf == data->__outbufend) \ /* We don't have enough room in the output buffer. */ \ - status = GCONV_FULL_OUTPUT; \ + status = __GCONV_FULL_OUTPUT; \ else \ { \ /* Write out the shift sequence. */ \ *outbuf++ = SI; \ - data->outbuf = outbuf; \ - data->statep->count = ASCII_set; \ + data->__outbuf = outbuf; \ + data->__statep->count = ASCII_set; \ } \ } \ } @@ -119,7 +120,7 @@ enum /* This is a 7bit character set, disallow all 8bit characters. */ \ if (ch > 0x7f) \ { \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ @@ -136,7 +137,7 @@ enum || (inptr[2] == ')' && inptr + 3 > inend)))) \ \ { \ - result = GCONV_EMPTY_INPUT; \ + result = __GCONV_EMPTY_INPUT; \ break; \ } \ if (inptr[1] == '$' && inptr[2] == ')' && inptr[3] == 'C') \ @@ -165,7 +166,7 @@ enum { \ if (ch >= 0x80) \ { \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ /* Almost done, just advance the input pointer. */ \ @@ -181,12 +182,12 @@ enum \ if (NEED_LENGTH_TEST && ch == 0) \ { \ - result = GCONV_EMPTY_INPUT; \ + result = __GCONV_EMPTY_INPUT; \ break; \ } \ - else if (ch == UNKNOWN_10646_CHAR) \ + else if (ch == __UNKNOWN_10646_CHAR) \ { \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ } \ @@ -221,7 +222,7 @@ enum set = ASCII_set; \ if (NEED_LENGTH_TEST && outptr == outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ } \ @@ -235,10 +236,10 @@ enum \ written = ucs4_to_ksc5601 (ch, buf, 2); \ \ - if (written == UNKNOWN_10646_CHAR) \ + if (written == __UNKNOWN_10646_CHAR) \ { \ /* Illegal character. */ \ - result = GCONV_ILLEGAL_INPUT; \ + result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ assert (written == 2); \ @@ -252,7 +253,7 @@ enum \ if (NEED_LENGTH_TEST && outptr + 2 > outend) \ { \ - result = GCONV_FULL_OUTPUT; \ + result = __GCONV_FULL_OUTPUT; \ break; \ } \ \ diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c index 701a71db44..5b2ba7282f 100644 --- a/iconvdata/iso646.c +++ b/iconvdata/iso646.c @@ -1,5 +1,5 @@ /* Conversion to and from the various ISO 646 CCS. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -45,8 +45,8 @@ #define MIN_NEEDED_TO 4 #define FROM_DIRECTION (dir == from_iso646) #define PREPARE_LOOP \ - enum direction dir = ((struct iso646_data *) step->data)->dir; \ - enum variant var = ((struct iso646_data *) step->data)->var; + enum direction dir = ((struct iso646_data *) step->__data)->dir; \ + enum variant var = ((struct iso646_data *) step->__data)->var; #define EXTRA_LOOP_ARGS , var @@ -124,7 +124,7 @@ struct iso646_data int -gconv_init (struct gconv_step *step) +gconv_init (struct __gconv_step *step) { /* Determine which direction. */ struct iso646_data *new_data; @@ -133,47 +133,47 @@ gconv_init (struct gconv_step *step) int result; for (var = sizeof (names) / sizeof (names[0]) - 1; var > illegal_var; --var) - if (__strcasecmp (step->from_name, names[var]) == 0) + if (__strcasecmp (step->__from_name, names[var]) == 0) { dir = from_iso646; break; } - else if (__strcasecmp (step->to_name, names[var]) == 0) + else if (__strcasecmp (step->__to_name, names[var]) == 0) { dir = to_iso646; break; } - result = GCONV_NOCONV; + result = __GCONV_NOCONV; if (dir != illegal_dir) { new_data = (struct iso646_data *) malloc (sizeof (struct iso646_data)); - result = GCONV_NOMEM; + result = __GCONV_NOMEM; if (new_data != NULL) { new_data->dir = dir; new_data->var = var; - step->data = new_data; + step->__data = new_data; if (var == from_iso646) { - step->min_needed_from = MIN_NEEDED_FROM; - step->max_needed_from = MIN_NEEDED_FROM; - step->min_needed_to = MIN_NEEDED_TO; - step->max_needed_to = MIN_NEEDED_TO; + step->__min_needed_from = MIN_NEEDED_FROM; + step->__max_needed_from = MIN_NEEDED_FROM; + step->__min_needed_to = MIN_NEEDED_TO; + step->__max_needed_to = MIN_NEEDED_TO; } else { - step->min_needed_from = MIN_NEEDED_TO; - step->max_needed_from = MIN_NEEDED_TO; - step->min_needed_to = MIN_NEEDED_FROM; - step->max_needed_to = MIN_NEEDED_FROM; + step->__min_needed_from = MIN_NEEDED_TO; + step->__max_needed_from = MIN_NEEDED_TO; + step->__min_needed_to = MIN_NEEDED_FROM; + step->__max_needed_to = MIN_NEEDED_FROM; } - step->stateful = 0; + step->__stateful = 0; - result = GCONV_OK; + result = __GCONV_OK; } } @@ -182,9 +182,9 @@ gconv_init (struct gconv_step *step) void -gconv_end (struct gconv_step *data) +gconv_end (struct __gconv_step *data) { - free (data->data); + free (data->__data); } @@ -195,7 +195,7 @@ gconv_end (struct gconv_step *data) #define BODY \ { \ uint32_t ch; \ - int failure = GCONV_OK; \ + int failure = __GCONV_OK; \ \ ch = *inptr; \ switch (ch) \ @@ -308,7 +308,7 @@ gconv_end (struct gconv_step *data) ch = 0xf9; \ else if (var == JP_OCR_B) \ /* Illegal character. */ \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ else if (var == YU) \ ch = 0x17e; \ else if (var == HU) \ @@ -382,7 +382,7 @@ gconv_end (struct gconv_step *data) ch = 0xec; \ else if (var == JP_OCR_B) \ /* Illegal character. */ \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ else if (var == YU) \ ch = 0x10d; \ else if (var == HU) \ @@ -398,13 +398,13 @@ gconv_end (struct gconv_step *data) break; \ case 0x80 ... 0xff: \ /* Illegal character. */ \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ break; \ } \ \ /* Hopefully gcc can recognize that the following `if' is only true \ when we reach the default case in the `switch' statement. */ \ - if (failure == GCONV_ILLEGAL_INPUT) \ + if (failure == __GCONV_ILLEGAL_INPUT) \ { \ /* Exit the loop with an error. */ \ result = failure; \ @@ -424,7 +424,7 @@ gconv_end (struct gconv_step *data) #define BODY \ { \ unsigned char ch; \ - int failure = GCONV_OK; \ + int failure = __GCONV_OK; \ \ ch = *((uint32_t *) inptr); \ switch (*((uint32_t *) inptr)) \ @@ -432,17 +432,17 @@ gconv_end (struct gconv_step *data) case 0x23: \ if (var == GB || var == ES || var == IT || var == FR || var == FR1 \ || var == NO2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ break; \ case 0x24: \ if (var == CN || var == HU || var == CU || var == SE || var == SE2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ break; \ case 0x40: \ if (var == CA || var == CA2 || var == DE || var == ES || var == ES2 \ || var == IT || var == YU || var == HU || var == FR || var == FR1 \ || var == PT || var == PT2 || var == SE2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ break; \ case 0x5b: \ if (var == CA || var == CA2 || var == DE || var == DK || var == ES \ @@ -450,7 +450,7 @@ gconv_end (struct gconv_step *data) || var == HU || var == FR || var == FR1 || var == NO \ || var == NO2 || var == PT || var == PT2 || var == SE \ || var == SE2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ else if (var == CU) \ ch = 0x7d; \ break; \ @@ -460,7 +460,7 @@ gconv_end (struct gconv_step *data) || var == YU || var == KR || var == HU || var == CU || var == FR \ || var == FR1 || var == NO || var == NO2 || var == PT \ || var == PT2 || var == SE || var == SE2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ break; \ case 0x5d: \ if (var == CA || var == CA2 || var == DE || var == DK || var == ES \ @@ -468,17 +468,17 @@ gconv_end (struct gconv_step *data) || var == HU || var == FR || var == FR1 || var == NO \ || var == NO2 || var == PT || var == PT2 || var == SE \ || var == SE2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ break; \ case 0x5e: \ if (var == CA || var == CA2 || var == ES2 || var == YU || var == CU \ || var == SE2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ break; \ case 0x60: \ if (var == CA || var == CA2 || var == IT || var == JP_OCR_B \ || var == YU || var == HU || var == FR || var == SE2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ break; \ case 0x7b: \ if (var == CA || var == CA2 || var == DE || var == DK || var == ES \ @@ -486,14 +486,14 @@ gconv_end (struct gconv_step *data) || var == CU || var == FR || var == FR1 || var == NO \ || var == NO2 || var == PT || var == PT2 || var == SE \ || var == SE2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ break; \ case 0x7c: \ if (var == CA || var == CA2 || var == DE || var == DK || var == ES \ || var == ES2 || var == IT || var == YU || var == HU || var == CU \ || var == FR || var == FR1 || var == NO || var == PT \ || var == PT2 || var == SE || var == SE2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ else if (var == NO2) \ ch = 0x7e; \ break; \ @@ -502,7 +502,7 @@ gconv_end (struct gconv_step *data) || var == ES2 || var == IT || var == YU || var == HU || var == CU \ || var == FR || var == FR1 || var == NO || var == NO2 \ || var == PT || var == PT2 || var == SE || var == SE2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLEGAL_INPUT; \ break; \ case 0x7e: \ if (var == GB || var == CA || var == CA2 || var == DE || var == ES2 \ @@ -510,21 +510,21 @@ gconv_end (struct gconv_step *data) || var == YU || var == HU || var == CU || var == FR || var == FR1 \ || var == NO || var == NO2 || var == PT || var == SE \ || var == SE2) \ - failure = GCONV_ILLEGAL_INPUT; \ + failure = __GCONV_ILLE