diff options
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/8bit-gap.c | 10 | ||||
| -rw-r--r-- | iconvdata/8bit-generic.c | 6 | ||||
| -rw-r--r-- | iconvdata/ansi_x3.110.c | 16 | ||||
| -rw-r--r-- | iconvdata/big5.c | 12 | ||||
| -rw-r--r-- | iconvdata/cns11643.h | 22 | ||||
| -rw-r--r-- | iconvdata/cns11643l1.h | 14 | ||||
| -rw-r--r-- | iconvdata/euc-cn.c | 18 | ||||
| -rw-r--r-- | iconvdata/euc-jp.c | 26 | ||||
| -rw-r--r-- | iconvdata/euc-kr.c | 16 | ||||
| -rw-r--r-- | iconvdata/euc-tw.c | 26 | ||||
| -rw-r--r-- | iconvdata/gb2312.h | 14 | ||||
| -rw-r--r-- | iconvdata/iso-2022-jp.c | 137 | ||||
| -rw-r--r-- | iconvdata/iso-2022-kr.c | 41 | ||||
| -rw-r--r-- | iconvdata/iso646.c | 204 | ||||
| -rw-r--r-- | iconvdata/iso8859-1.c | 4 | ||||
| -rw-r--r-- | iconvdata/iso_6937-2.c | 16 | ||||
| -rw-r--r-- | iconvdata/iso_6937.c | 16 | ||||
| -rw-r--r-- | iconvdata/jis0201.h | 6 | ||||
| -rw-r--r-- | iconvdata/jis0208.h | 16 | ||||
| -rw-r--r-- | iconvdata/jis0212.h | 14 | ||||
| -rw-r--r-- | iconvdata/johab.c | 32 | ||||
| -rw-r--r-- | iconvdata/ksc5601.h | 18 | ||||
| -rw-r--r-- | iconvdata/sjis.c | 18 | ||||
| -rw-r--r-- | iconvdata/t.61.c | 14 | ||||
| -rw-r--r-- | iconvdata/uhc.c | 28 |
25 files changed, 374 insertions, 370 deletions
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 <drepper@cygnus.com>, 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 <drepper@cygnus.com>, 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 <drepper@cygnus.com>, 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 <drepper@cygnus.com>, 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 <drepper@cygnus.com>, 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 <drepper@cygnus.com>, 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 <drepper@cygnus.com>, 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 <drepper@cygnus.com>, 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 |