about summary refs log tree commit diff
path: root/iconvdata/jis0201.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-13 15:01:09 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-13 15:01:09 +0000
commit2b47435322f026277a936c039c6ea45b975c2876 (patch)
treef6984d4da34bb384cbb74f637e75907789d3e523 /iconvdata/jis0201.h
parent40b4c81d4ec13a7a5acdeb1288f1d897b511b36c (diff)
downloadglibc-2b47435322f026277a936c039c6ea45b975c2876.tar.gz
glibc-2b47435322f026277a936c039c6ea45b975c2876.tar.xz
glibc-2b47435322f026277a936c039c6ea45b975c2876.zip
Update.
1998-04-13 14:52  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/cns11643.c: New file.
	* iconvdata/cns11643.h: New file.
	* iconvdata/cns11643l1.c: New file.
	* iconvdata/cns11643l1.h: New file.
	* iconvdata/euctw.c: New file.
	* iconvdata/Makefile: Add rules for EUC-TW and CNS.
	* iconvdata/gconv-modules: Likewise.

	* iconvdata/eucjp.c: Several bug fixes and improvements.
	* iconvdata/gb2312.h: Likewise.
	* iconvdata/jis0201.h: Likewise.
	* iconvdata/jis0208.h: Likewise.
	* iconvdata/jis0212.h: Likewise.
Diffstat (limited to 'iconvdata/jis0201.h')
-rw-r--r--iconvdata/jis0201.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/iconvdata/jis0201.h b/iconvdata/jis0201.h
index e2e62f8554..8f920f9ec8 100644
--- a/iconvdata/jis0201.h
+++ b/iconvdata/jis0201.h
@@ -1,5 +1,5 @@
 /* Access functions for JISX0201 conversion.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -26,11 +26,11 @@ extern const wchar_t jis0201_to_ucs4[];
 
 
 static inline wchar_t
-jisx0201_to_ucs4 (char **s, size_t avail __attribute__ ((unused)))
+jisx0201_to_ucs4 (char ch)
 {
-  wchar_t val = jis0201_to_ucs4[*(unsigned char *) (*s)];
+  wchar_t val = jis0201_to_ucs4[(unsigned char) ch];
 
-  if (val == 0 && **s != '\0')
+  if (val == 0 && ch != '\0')
     val = UNKNOWN_10646_CHAR;
 
   return val;
@@ -38,7 +38,7 @@ jisx0201_to_ucs4 (char **s, size_t avail __attribute__ ((unused)))
 
 
 static inline size_t
-ucs4_to_jisx0201 (wchar_t wch, char **s, size_t avail __attribute__ ((unused)))
+ucs4_to_jisx0201 (wchar_t wch, char *s)
 {
   char ch;
 
@@ -51,9 +51,9 @@ ucs4_to_jisx0201 (wchar_t wch, char **s, size_t avail __attribute__ ((unused)))
   else if (wch >= 0xff61 && wch <= 0xff9f)
     ch = wch - 0xfec0;
   else
-    return 0;
+    return UNKNOWN_10646_CHAR;
 
-  *(*s)++ = ch;
+  s[0] = ch;
   return 1;
 }