aboutsummaryrefslogtreecommitdiff
path: root/iconvdata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-04-27 05:54:27 +0000
committerUlrich Drepper <drepper@redhat.com>2006-04-27 05:54:27 +0000
commit15627a21c69c42c8e2fb6b7f049191a744f682cd (patch)
tree4917b164d2ea93bdb5830b847b53305c92037c61 /iconvdata
parentb8c31ac16178e6f86b2dea8ba8e535339f545089 (diff)
downloadglibc-15627a21c69c42c8e2fb6b7f049191a744f682cd.zip
glibc-15627a21c69c42c8e2fb6b7f049191a744f682cd.tar.gz
glibc-15627a21c69c42c8e2fb6b7f049191a744f682cd.tar.bz2
[BZ #1386]
* iconvdata/ibm932.c: Change mapping to allow round-trips. * iconvdata/ibm943.c: Likewise. Patch by Masahide Washizawa <WASHI@jp.ibm.com>.
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/ibm932.c16
-rw-r--r--iconvdata/ibm943.c16
2 files changed, 4 insertions, 28 deletions
diff --git a/iconvdata/ibm932.c b/iconvdata/ibm932.c
index 8f05581..4fb1582 100644
--- a/iconvdata/ibm932.c
+++ b/iconvdata/ibm932.c
@@ -94,16 +94,10 @@
} \
else \
{ \
- if (res == 0x1c) \
- res = 0x1a; \
- else if (res == 0x7f) \
- res = 0x1c; \
- else if (res == 0xa5) \
+ if (res == 0xa5) \
res = 0x5c; \
else if (res == 0x203e) \
res = 0x7e; \
- else if (res == 0x1a) \
- res = 0x7f; \
put32 (outptr, res); \
outptr += 4; \
inptr++; \
@@ -117,16 +111,10 @@
uint32_t res = __ibm932sb_to_ucs4[c]; \
if (res == 0 && c != 0) \
return WEOF; \
- if (res == 0x1c) \
- res = 0x1a; \
- else if (res == 0x7f) \
- res = 0x1c; \
- else if (res == 0xa5) \
+ if (res == 0xa5) \
res = 0x5c; \
else if (res == 0x203e) \
res = 0x7e; \
- else if (res == 0x1a) \
- res = 0x7f; \
return res; \
}
#include <iconv/loop.c>
diff --git a/iconvdata/ibm943.c b/iconvdata/ibm943.c
index daeac1d..119bb1f 100644
--- a/iconvdata/ibm943.c
+++ b/iconvdata/ibm943.c
@@ -95,16 +95,10 @@
} \
else \
{ \
- if (res == 0x1c) \
- res = 0x1a; \
- else if (res == 0x7f) \
- res = 0x1c; \
- else if (res == 0xa5) \
+ if (res == 0xa5) \
res = 0x5c; \
else if (res == 0x203e) \
res = 0x7e; \
- else if (res == 0x1a) \
- res = 0x7f; \
put32 (outptr, res); \
outptr += 4; \
inptr++; \
@@ -118,16 +112,10 @@
uint32_t res = __ibm943sb_to_ucs4[c]; \
if (res == 0 && c != 0) \
return WEOF; \
- if (res == 0x1c) \
- res = 0x1a; \
- else if (res == 0x7f) \
- res = 0x1c; \
- else if (res == 0xa5) \
+ if (res == 0xa5) \
res = 0x5c; \
else if (res == 0x203e) \
res = 0x7e; \
- else if (res == 0x1a) \
- res = 0x7f; \
return res; \
}
#include <iconv/loop.c>