about summary refs log tree commit diff
path: root/iconvdata/cns11643.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-20 18:41:05 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-20 18:41:05 +0000
commit8619129f3f0d5a9db6208be5bae6c2a8c9ce61a5 (patch)
tree033b6528f39a85f12db9d0859dbd1b90c2906eee /iconvdata/cns11643.h
parentf1fa8b68f3e7623a3ef86dcd0c7d090ccf0389f5 (diff)
downloadglibc-8619129f3f0d5a9db6208be5bae6c2a8c9ce61a5.tar.gz
glibc-8619129f3f0d5a9db6208be5bae6c2a8c9ce61a5.tar.xz
glibc-8619129f3f0d5a9db6208be5bae6c2a8c9ce61a5.zip
Update.
1998-04-20 18:00  Ulrich Drepper  <drepper@cygnus.com>

	* libc.map: Add __dgettext to GLIBC_2.0 and __libc_longjmp, and
	__libc_siglongjmp to GLIBC_2.1.

	* elf/dl-minimal.c (__assert_perror_fail): Don't use strerror, use
	__strerror_r.

	* iconv/Makefile: Don't run tests now.

	* iconv/iconv_prog.c (process_block): If loop is repeated, call iconv
	with correct output buffer.

	Major rewrite of the low-level gconv functionality.
	* iconv/gconv.c: Rewritten.
	* iconv/gconv.h: Likewise.
	* iconv/gconv_builtin.c: Likewise.
	* iconv/gconv_builtin.h: Likewise.
	* iconv/gconv_conf.c: Likewise.
	* iconv/gconv_int.h: Likewise.
	* iconv/gconv_open.c: Likewise.
	* iconv/gconv_simple.c: Likewise.
	* iconv/iconv.c: Likewise.
	* iconvdata/8bit-gap.c: Likewise.
	* iconvdata/8bit-generic.c: Likewise.
	* iconvdata/Makefile: Likewise.
	* iconvdata/big5.c: Likewise.
	* iconvdata/cns11643.c: Likewise.
	* iconvdata/cns11643.h: Likewise.
	* iconvdata/cns11643l1.c: Likewise.
	* iconvdata/cns11643l1.h: Likewise.
	* iconvdata/ebcdic-at-de-a.c: Likewise.
	* iconvdata/ebcdic-at-de.c: Likewise.
	* iconvdata/ebcdic-ca-fr.c: Likewise.
	* iconvdata/euccn.c: Likewise.
	* iconvdata/eucjp.c: Likewise.
	* iconvdata/euckr.c: Likewise.
	* iconvdata/euctw.c: Likewise.
	* iconvdata/gb2312.c: Likewise.
	* iconvdata/gb2312.h: Likewise.
	* iconvdata/hp-roman8.c: Likewise.
	* iconvdata/iso646.c: Likewise.
	* iconvdata/iso6937.c: Likewise.
	* iconvdata/iso8859-1.c: Likewise.
	* iconvdata/iso8859-10.c: Likewise.
	* iconvdata/iso8859-2.c: Likewise.
	* iconvdata/iso8859-3.c: Likewise.
	* iconvdata/iso8859-4.c: Likewise.
	* iconvdata/iso8859-5.c: Likewise.
	* iconvdata/iso8859-6.c: Likewise.
	* iconvdata/iso8859-7.c: Likewise.
	* iconvdata/iso8859-8.c: Likewise.
	* iconvdata/iso8859-9.c: Likewise.
	* iconvdata/jis0201.c: Likewise.
	* iconvdata/jis0201.h: Likewise.
	* iconvdata/jis0208.c: Likewise.
	* iconvdata/jis0208.h: Likewise.
	* iconvdata/jis0212.c: Likewise.
	* iconvdata/jis0212.h: Likewise.
	* iconvdata/johab.c: Likewise.
	* iconvdata/koi-8.c: Likewise.
	* iconvdata/koi8-r.c: Likewise.
	* iconvdata/ksc5601.c: Likewise.
	* iconvdata/ksc5601.h: Likewise.
	* iconvdata/latin-greek-1.c: Likewise.
	* iconvdata/latin-greek.c: Likewise.
	* iconvdata/run-iconv-test.sh: Likewise.
	* iconvdata/sjis.c: Likewise.
	* iconvdata/t61.c: Likewise.
	* iconvdata/uhc.c: Likewise.
	* wcsmbs/btowc.c: Likewise.
	* wcsmbs/mbrtowc.c: Likewise.
	* wcsmbs/mbsnrtowcs.c: Likewise.
	* wcsmbs/mbsrtowcs.c: Likewise.
	* wcsmbs/wcrtomb.c: Likewise.
	* wcsmbs/wcsmbsload.c: Likewise.
	* wcsmbs/wcsnrtombs.c: Likewise.
	* wcsmbs/wcsrtombs.c: Likewise.
	* wcsmbs/wctob.c: Likewise.
	* iconv/loop.c: New file.
	* iconv/skeleton.c: New file.

	* stdlib/mblen.c: Handle empty input string correctly.
	* stdlib/mbtowc.c: Likewise.

	* posix/getopt.c: Various cleanups.

	* sysdeps/arm/bits/setjmp.h: Add copyright text.
	* sysdeps/i386/bits/setjmp.h: Likewise.
	* sysdeps/m68k/bits/setjmp.h: Likewise.
	* sysdeps/powerpc/bits/setjmp.h: Likewise.
	* sysdeps/sparc/sparc32/bits/setjmp.h: Likewise.

	* sysdeps/generic/longjmp.c: Rename function to __libc_siglongjmp
	and make longjmp weak alias.

1998-04-18 20:29  Philip Blundell  <Philip.Blundell@pobox.com>

	* iconv/Makefile (routines): Only include gconv_dl if building for
	an ELF system - dynamic linking is not available on a.out.
	(CFLAGS-gconv_conf.c): Define STATIC_GCONV if omitting gconv_dl
	due to above check.
	* iconv/gconv_db.c: If STATIC_GCONV defined, don't try to call
	routines from gconv_dl.

1998-04-17  Gordon Matzigkeit  <gord@profitpress.com>

	* csu/init.c (_IO_stdin_used): Protect with USE_IN_LIBIO so that
	we can compile without libio.

1998-04-20 16:28  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/mach/hurd/Subdirs: Remove login.

1998-04-11  Gordon Matzigkeit  <gord@profitpress.com>

	* db2/compat.h: Include <errno.h>, to make sure we get the
	definition of EFTYPE before we define it ourselves.

1998-04-10  Gordon Matzigkeit  <gord@profitpress.com>

	* sysdeps/generic/bits/socket.h: Protect against multiple inclusion.
	* sysdeps/mach/hurd/bits/ioctls.h: Likewise.
	Fix typo to allow inclusion from sys/ioctl.h again.

1998-04-16  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* iconvdata/*.[ch]: Clean up namespace.  Optimize character lookup.

1998-04-16  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* libc.map: Export __strerror_r.  Remove _strerror_internal.

1998-04-16  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/generic/strcasestr.c: Undefine strcasestr, not strstr.
	Also undefine __strcasestr.

1998-04-16  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* posix/regex.c: Rename __re_max_failures back to re_max_failures,
	aliases do not work with global variables due to copy relocations.

1998-04-20 15:12  Ulrich Drepper  <drepper@cygnus.com>

	* manual/creature.texi: Fix type.  Patch by Andreas Schwab.

1998-04-20 13:47  Ulrich Drepper  <drepper@cygnus.com>

	* signal/sighold.c: Include stddef.h for NULL definition.
	* signal/sigrelse.c: Likewise.
	* sysdeps/posix/sigignore.c: Likewise.
	* sysdeps/posix/sigset.c: Likewise.
	* sysdeps/posix/waitid.c: Likewise.
	* sysdeps/unix/sysv/linux/rt_sigsuspend.c: Likewise.
	* sysdeps/unix/sysv/linux/rt_sigtimedwait.c: Likewise.
	* sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.
	* wcsmbs/mbsrtowcs.c: Include stdlib.h for MB_CUR_MAX.
	Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.

1998-04-13  Mark Kettenis  <kettenis@phys.uva.nl>

	* login/Makefile (headers): Remove utmpx.h and bits/utmpx.h.
	* login/getutent.c (getutxent): Remove alias.
	* login/getutent_r.c (setutxent, pututxline, endutxent):
	Remove aliases.
	* login/getutid.c (getutxid): Remove alias.
	* login/getutline.c (getutxline): Remove alias.
	* login/utmp.h: Add prototypes for __updwtmp, __getutent,
	__getutid, __getutline and __pututline.
	* login/utmpx.h: Moved to ...
	* sysdeps/gnu/utmpx.h: ... here.  [__USE_GNU]: Define UTMPX_FILE,
	UTMPX_FILENAME, WTMPX_FILE and WTMPX_FILENAME, declare utmpxname
	and updwtmpx.
	* login/updwtmp.c: Moved to ...
	* sysdeps/generic/updwtmp.c: ... here.  (updwtmp): Generalized by
	allowing file name transformation.
	* sysdeps/gnu/updwtmp.c: New file.  Use generic implementation with
	additional file name transformation.
	* sysdeps/unix/sysv/linux/updwtmp.c: Likewise.
	* login/utmp_file.c: Moved to ...
	* sysdeps/generic/utmp_file.c: ... here.  (setutent_file):
	Generalized by allowing file name transformation.  Do not
	print error message.  Library functions should not print them.
	Reported by Jim Meyering.
	* sysdeps/gnu/utmp_file.c: New file.  Use generic implementation
	with additional file name transformation.
	* sysdeps/unix/sysv/linux/utmp_file.c: Likewise.
	* sysdeps/gnu/Makefile [$(subdir)=login] (sysdep_routines): Add
	setutxent, getutxent, endutxent, getutxid, getutxid, getutxline,
	pututxline, utmpxname and updwtmpx.  (sysdep_headers): Add utmpx.h
	and bits/utmpx.h.
	* sysdeps/gnu/bits/utmpx.h [__USE_GNU] Include paths.h.
	(_PATH_UTMPX): Define to _PATH_UTMP.  (_PATH_WTMPX): Define to
	_PATH_WTMPX.  (RUN_LVL): Define only if __USE_GNU.  (ACCOUNTING):
	Define if __USE_GNU.
	* sysdeps/gnu/setutxent.c: New file.
	* sysdeps/gnu/getutxent.c: New file.
	* sysdeps/gnu/endutxent.c: New file.
	* sysdeps/gnu/getutxid.c: New file.
	* sysdeps/gnu/getutxline.c: New file.
	* sysdeps/gnu/pututxline.c: New file.
	* sysdeps/gnu/utmpxname.c: New file.
	* sysdeps/gnu/updwtmpx.c: New file.
	* sysdeps/unix/sysv/linux/paths.h (_PATH_UTMP_DB): Remove.
	* sysdeps/generic/bits/utmpx.h: Remove.

1998-04-20  Ulrich Drepper  <drepper@cygnus.com>

	* posix/wordexp-test.c (main): Initialize ifs element of ts for
	~root test.

1998-04-17 07:53  H.J. Lu  <hjl@gnu.org>

	* sysdeps/unix/sysv/linux/i386/s_pread64.S: Fix a typo.

1998-04-17 11:32  Ulrich Drepper  <drepper@cygnus.com>

	* libio/oldfileops.c (_IO_old_file_seekoff): Define temporary st
	variable using _G_stat64.
	* libio/fileops.c: Remove macro definition of fstat, it is in the
	global header.
	Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.

1998-04-17  Philip Blundell  <pb@nexus.co.uk>

	* sysdeps/arm/strlen.S: New file, based on code by Matthew Wilcox
	<willy@odie.barnet.ac.uk>.

1998-04-16  Philip Blundell  <Philip.Blundell@pobox.com>

	* inet/netinet/in.h (IN6_IS_ADDR_MC_NODELOCAL): New macro,
	required by IPv6 Basic API.
	(IN6_IS_ADDR_MC_LINKLOCAL): Likewise.
	(IN6_IS_ADDR_MC_SITELOCAL): Likewise.
	(IN6_IS_ADDR_MC_ORGLOCAL): Likewise.
	(IN6_IS_ADDR_MC_GLOBAL): Likewise.
Diffstat (limited to 'iconvdata/cns11643.h')
-rw-r--r--iconvdata/cns11643.h220
1 files changed, 102 insertions, 118 deletions
diff --git a/iconvdata/cns11643.h b/iconvdata/cns11643.h
index f791d4cdb3..ccab8011ce 100644
--- a/iconvdata/cns11643.h
+++ b/iconvdata/cns11643.h
@@ -21,8 +21,8 @@
 #include <stdint.h>
 
 /* Table for CNS 11643, plane 2 to UCS4 conversion.  */
-extern const uint16_t cns11643l2_to_ucs4_tab[];
-extern const uint16_t cns11643l14_to_ucs4_tab[];
+extern const uint16_t __cns11643l2_to_ucs4_tab[];
+extern const uint16_t __cns11643l14_to_ucs4_tab[];
 
 
 static inline wchar_t
@@ -54,19 +54,19 @@ cns11643_to_ucs4 (const char **s, size_t avail, unsigned char offset)
     {
       if (idx > 0x2196)
 	return UNKNOWN_10646_CHAR;
-      result = cns11643l1_to_ucs4_tab[idx];
+      result = __cns11643l1_to_ucs4_tab[idx];
     }
   else if ((ch - 0x21 - offset) == 2)
     {
       if (idx > 0x1de1)
 	return UNKNOWN_10646_CHAR;
-      result = cns11643l2_to_ucs4_tab[idx];
+      result = __cns11643l2_to_ucs4_tab[idx];
     }
   else if ((ch - 0x21 - offset) == 0xe)
     {
       if (idx > 0x19bd)
 	return UNKNOWN_10646_CHAR;
-      result = cns11643l14_to_ucs4_tab[idx];
+      result = __cns11643l14_to_ucs4_tab[idx];
     }
   else
     return UNKNOWN_10646_CHAR;
@@ -81,21 +81,21 @@ cns11643_to_ucs4 (const char **s, size_t avail, unsigned char offset)
 
 
 /* Tables for the UCS4 -> CNS conversion.  */
-extern const char cns11643l1_from_ucs4_tab1[][2];
-extern const char cns11643l1_from_ucs4_tab2[][2];
-extern const char cns11643l1_from_ucs4_tab3[][2];
-extern const char cns11643l1_from_ucs4_tab4[][2];
-extern const char cns11643l1_from_ucs4_tab5[][2];
-extern const char cns11643l1_from_ucs4_tab6[][2];
-extern const char cns11643l1_from_ucs4_tab7[][2];
-extern const char cns11643l1_from_ucs4_tab8[][2];
-extern const char cns11643l1_from_ucs4_tab9[][2];
-extern const char cns11643l1_from_ucs4_tab10[][2];
-extern const char cns11643l1_from_ucs4_tab11[][2];
-extern const char cns11643l1_from_ucs4_tab12[][2];
-extern const char cns11643l1_from_ucs4_tab13[][2];
-extern const char cns11643l1_from_ucs4_tab14[][2];
-extern const char cns11643_from_ucs4_tab[][3];
+extern const char __cns11643l1_from_ucs4_tab1[][2];
+extern const char __cns11643l1_from_ucs4_tab2[][2];
+extern const char __cns11643l1_from_ucs4_tab3[][2];
+extern const char __cns11643l1_from_ucs4_tab4[][2];
+extern const char __cns11643l1_from_ucs4_tab5[][2];
+extern const char __cns11643l1_from_ucs4_tab6[][2];
+extern const char __cns11643l1_from_ucs4_tab7[][2];
+extern const char __cns11643l1_from_ucs4_tab8[][2];
+extern const char __cns11643l1_from_ucs4_tab9[][2];
+extern const char __cns11643l1_from_ucs4_tab10[][2];
+extern const char __cns11643l1_from_ucs4_tab11[][2];
+extern const char __cns11643l1_from_ucs4_tab12[][2];
+extern const char __cns11643l1_from_ucs4_tab13[][2];
+extern const char __cns11643l1_from_ucs4_tab14[][2];
+extern const char __cns11643_from_ucs4_tab[][3];
 
 
 static inline size_t
@@ -103,120 +103,104 @@ ucs4_to_cns11643 (wchar_t wch, char *s, size_t avail)
 {
   unsigned int ch = (unsigned int) wch;
   char buf[2];
-  const char *cp = NULL;
+  const char *cp = buf;
   int needed = 2;
 
-  if (ch < 0xa7)
-    cp = "";
-  else if (ch < 0xf7)
-    cp = cns11643l1_from_ucs4_tab1[ch - 0xa7];
-  else if (ch < 0x2c7)
-    cp = "";
-  else if (ch <= 0x2d9)
-    cp = cns11643l1_from_ucs4_tab2[ch - 0x2c7];
-  else if (ch < 0x391)
-    cp = "";
-  else if (ch <= 0x3c9)
-    cp = cns11643l1_from_ucs4_tab3[ch - 0x391];
-  else if (ch < 0x2013)
-    cp = "";
-  else if (ch <= 0x203e)
-    cp = cns11643l1_from_ucs4_tab4[ch - 0x2013];
-  else if (ch == 0x2103)
-    cp = "\x22\x6a";
-  else if (ch == 0x2105)
-    cp = "\x22\x22";
-  else if (ch == 0x2109)
-    cp = "\x22\x6b";
-  else if (ch < 0x2160)
-    cp = "";
-  else if (ch <= 0x2169)
+  switch (ch)
     {
+    case 0xa7 ... 0xf7:
+      cp = __cns11643l1_from_ucs4_tab1[ch - 0xa7];
+      break;
+    case 0x2c7 ... 0x2d9:
+      cp = __cns11643l1_from_ucs4_tab2[ch - 0x2c7];
+      break;
+    case 0x391 ... 0x3c9:
+      cp = __cns11643l1_from_ucs4_tab3[ch - 0x391];
+      break;
+    case 0x2013 ... 0x203e:
+      cp = __cns11643l1_from_ucs4_tab4[ch - 0x2013];
+      break;
+    case 0x2103:
+      cp = "\x22\x6a";
+      break;
+    case 0x2105:
+      cp = "\x22\x22";
+      break;
+    case 0x2109:
+      cp = "\x22\x6b";
+      break;
+    case 0x2160 ...0x2169:
       buf[0] = '\x24';
       buf[1] = '\x2b' + (ch - 0x2160);
-      cp = buf;
-    }
-  else if (ch < 0x2170)
-    cp = "";
-  else if (ch <= 0x2179)
-    {
+      break;
+    case 0x2170 ... 0x2179:
       buf[0] = '\x26';
       buf[1] = '\x35' + (ch - 0x2170);
-      cp = buf;
-    }
-  else if (ch < 0x2190)
-    cp = "";
-  else if (ch <= 0x2199)
-    cp = cns11643l1_from_ucs4_tab5[ch - 0x2190];
-  else if (ch < 0x2215)
-    cp = "";
-  else if (ch <= 0x2267)
-    cp = cns11643l1_from_ucs4_tab6[ch - 0x2215];
-  else if (ch == 0x22a5)
-    cp = "\x22\x47";
-  else if (ch == 0x22bf)
-    cp = "\x22\x4a";
-  else if (ch < 0x2400)
-    cp = "";
-  else if (ch <= 0x2421)
-    cp = cns11643l1_from_ucs4_tab7[ch - 0x2400];
-  else if (ch < 0x2460)
-    cp = "";
-  else if (ch <= 0x247d)
-    cp = cns11643l1_from_ucs4_tab8[ch - 0x2460];
-  else if (ch < 0x2500)
-    cp = "";
-  else if (ch <= 0x2642)
-    cp = cns11643l1_from_ucs4_tab9[ch - 0x2500];
-  else if (ch < 0x3000)
-    cp = "";
-  else if (ch <= 0x3029)
-    cp = cns11643l1_from_ucs4_tab10[ch - 0x3000];
-  else if (ch == 0x30fb)
-    cp = "\x21\x26";
-  else if (ch < 0x3105)
-    cp = "";
-  else if (ch <= 0x3129)
-    {
+      break;
+    case 0x2190 ... 0x2199:
+      cp = __cns11643l1_from_ucs4_tab5[ch - 0x2190];
+      break;
+    case 0x2215 ... 0x2267:
+      cp = __cns11643l1_from_ucs4_tab6[ch - 0x2215];
+      break;
+    case 0x22a5:
+      cp = "\x22\x47";
+      break;
+    case 0x22bf:
+      cp = "\x22\x4a";
+      break;
+    case 0x2400 ... 0x2421:
+      cp = __cns11643l1_from_ucs4_tab7[ch - 0x2400];
+      break;
+    case 0x2460 ... 0x247d:
+      cp = __cns11643l1_from_ucs4_tab8[ch - 0x2460];
+      break;
+    case 0x2500 ... 0x2642:
+      cp = __cns11643l1_from_ucs4_tab9[ch - 0x2500];
+    case 0x3000 ... 0x3029:
+      cp = __cns11643l1_from_ucs4_tab10[ch - 0x3000];
+      break;
+    case 0x30fb:
+      cp = "\x21\x26";
+      break;
+    case 0x3105 ... 0x3129:
       buf[0] = '\x25';
       buf[1] = '\x26' + (ch - 0x3105);
-      cp = buf;
-    }
-  else if (ch == 0x32a3)
-    cp = "\x22\x21";
-  else if (ch < 0x338e)
-    cp = "";
-  else if (ch <= 0x33d5)
-    cp = cns11643l1_from_ucs4_tab11[ch - 0x338e];
-  else if (ch < 0x4e00)
-    cp = "";
-  else if (ch <= 0x9f9c)
-    {
-      cp = cns11643l1_from_ucs4_tab12[ch - 0x4e00];
+      break;
+    case 0x32a3:
+      cp = "\x22\x21";
+      break;
+    case 0x338e ... 0x33d5:
+      cp = __cns11643l1_from_ucs4_tab11[ch - 0x338e];
+      break;
+    case 0x4e00 ... 0x9f9c:
+      cp = __cns11643l1_from_ucs4_tab12[ch - 0x4e00];
 
       if (cp[0] == '\0')
 	{
 	  /* Let's try the other planes.  */
 	  needed = 3;
-	  cp = cns11643_from_ucs4_tab[ch - 0x4e00];
+	  cp = __cns11643_from_ucs4_tab[ch - 0x4e00];
 	}
+      break;
+    case 0xfe30 ... 0xfe6b:
+      cp = __cns11643l1_from_ucs4_tab13[ch - 0xfe30];
+      break;
+    case 0xff01 ... 0xff5d:
+      cp = __cns11643l1_from_ucs4_tab14[ch - 0xff01];
+      break;
+    case 0xffe0:
+      cp = "\x22\x66";
+      break;
+    case 0xffe1:
+      cp = "\x22\x67";
+      break;
+    case 0xffe5:
+      cp = "\x22\x64";
+      break;
+    default:
+      cp = "";
     }
-  else if (ch < 0xfe30)
-    cp = "";
-  else if (ch <= 0xfe6b)
-    cp = cns11643l1_from_ucs4_tab13[ch - 0xfe30];
-  else if (ch < 0xff01)
-    cp = "";
-  else if (ch <= 0xff5d)
-    cp = cns11643l1_from_ucs4_tab14[ch - 0xff01];
-  else if (ch == 0xffe0)
-    cp = "\x22\x66";
-  else if (ch == 0xffe1)
-    cp = "\x22\x67";
-  else if (ch == 0xffe5)
-    cp = "\x22\x64";
-  else
-    cp = "";
 
   if (cp[0] == '\0')
     return UNKNOWN_10646_CHAR;