about summary refs log tree commit diff
path: root/iconvdata/euc-jisx0213.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-04-24 21:09:14 +0000
committerUlrich Drepper <drepper@redhat.com>2002-04-24 21:09:14 +0000
commit0e15c4b6b59de21ef1f6f446a644ac3ed041016c (patch)
tree91bf4e1cc3603968d35d99d386aa004285bd585e /iconvdata/euc-jisx0213.c
parentd88f7ae3e7cbef651d9c62935a501c1cd5170a7f (diff)
downloadglibc-0e15c4b6b59de21ef1f6f446a644ac3ed041016c.tar.gz
glibc-0e15c4b6b59de21ef1f6f446a644ac3ed041016c.tar.xz
glibc-0e15c4b6b59de21ef1f6f446a644ac3ed041016c.zip
Update.
2002-04-24  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-load.c (open_verify): Correct __lseek parameters.
	Patch by Simon Hildrew <simon@hildrew.net> [PR libc/3354].

2002-04-23  H.J. Lu  <hjl@gnu.org>

	* include/math.h (isfinite): Fix a typo.

2002-04-24  Ulrich Drepper  <drepper@redhat.com>

	* libio/bug-ungetwc2.c (test_locale): Use the de_DE.UTF-8 locale
	which is created by the test suite.

2002-04-20  Bruno Haible  <bruno@clisp.org>

	* iconvdata/iso-2002-kr.c (MAX_NEEDED_FROM): Set to 4.
	(BODY for FROM_LOOP): Fix comparisons between inptr and inend.

2002-04-20  Bruno Haible  <bruno@clisp.org>

	* iconvdata/johab.c (BODY for FROM_LOOP): Change type of i, m, f,
	to avoid gcc warning.

2002-04-20  Bruno Haible  <bruno@clisp.org>

	* iconvdata/iso-2022-jp.c (EMIT_SHIFT_TO_INIT): Fix modification mask
	of data->__statep->__count.

2002-04-20  Bruno Haible  <bruno@clisp.org>

	* iconvdata/euc-jisx0213.c (BODY for TO_LOOP): Really ignore Unicode
	tag characters.
	* iconvdata/shift_jisx0213.c (BODY for TO_LOOP): Likewise.

	* sysdeps/unix/sysv/linux/x86_64/ldconfig.h: New file.
	* sysdeps/unix/sysv/linux/x86_64/dl-cache.h: New file.
Diffstat (limited to 'iconvdata/euc-jisx0213.c')
-rw-r--r--iconvdata/euc-jisx0213.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/iconvdata/euc-jisx0213.c b/iconvdata/euc-jisx0213.c
index c696f94ee8..a0062c8847 100644
--- a/iconvdata/euc-jisx0213.c
+++ b/iconvdata/euc-jisx0213.c
@@ -366,8 +366,8 @@ static const struct
       }									      \
     else								      \
       {									      \
-	ch = ucs4_to_jisx0213 (ch);					      \
-	if (ch == 0)							      \
+	uint32_t jch = ucs4_to_jisx0213 (ch);				      \
+	if (jch == 0)							      \
 	  {								      \
 	    UNICODE_TAG_HANDLER (ch, 4);				      \
 									      \
@@ -375,19 +375,19 @@ static const struct
 	    STANDARD_ERR_HANDLER (4);					      \
 	  }								      \
 									      \
-	if (ch & 0x0080)						      \
+	if (jch & 0x0080)						      \
 	  {								      \
 	    /* A possible match in comp_table_data.  We have to buffer it.  */\
 									      \
 	    /* We know it's a JISX 0213 plane 1 character.  */		      \
-	    assert ((ch & 0x8000) == 0);				      \
+	    assert ((jch & 0x8000) == 0);				      \
 									      \
-	    *statep = (ch | 0x8080) << 3;				      \
+	    *statep = (jch | 0x8080) << 3;				      \
 	    inptr += 4;							      \
 	    continue;							      \
 	  }								      \
 									      \
-	if (ch & 0x8000)						      \
+	if (jch & 0x8000)						      \
 	  {								      \
 	    /* JISX 0213 plane 2.  */					      \
 	    if (__builtin_expect (outptr + 2 >= outend, 0))		      \
@@ -406,8 +406,8 @@ static const struct
 		break;							      \
 	      }								      \
 	  }								      \
-	*outptr++ = (ch >> 8) | 0x80;					      \
-	*outptr++ = (ch & 0xff) | 0x80;					      \
+	*outptr++ = (jch >> 8) | 0x80;					      \
+	*outptr++ = (jch & 0xff) | 0x80;				      \
       }									      \
 									      \
     inptr += 4;								      \