AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-18 06:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2001-01-06  Ulrich Drepper  <drepper@redhat.com>

	* iconvdata/ibm937.c (BODY to IBM937): Correct several mistakes in
	buffer and table handling.
This commit is contained in:
Ulrich Drepper 2001-01-07 04:34:56 +00:00
parent e4a5f77de6
commit 531950cebd
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2001-01-06 Ulrich Drepper <drepper@redhat.com>
* iconvdata/ibm937.c (BODY to IBM937): Correct several mistakes in
buffer and table handling.
2001-01-05 H.J. Lu <hjl@gnu.org> 2001-01-05 H.J. Lu <hjl@gnu.org>
* elf/dl-support.c (non_dynamic_init): Move the auxiliary * elf/dl-support.c (non_dynamic_init): Move the auxiliary

16
iconvdata/ibm937.c
View File

@ -188,13 +188,15 @@ enum
\ \
/* Use the UCS4 table for single byte. */ \ /* Use the UCS4 table for single byte. */ \
cp = __ucs4_to_ibm937sb[ch]; \ cp = __ucs4_to_ibm937sb[ch]; \
if (__builtin_expect (ch >= sizeof (__ucs4_to_ibm937sb) \ if (__builtin_expect (ch >= (sizeof (__ucs4_to_ibm937sb) \
/ sizeof (__ucs4_to_ibm937sb[0]), 0) \ / sizeof (__ucs4_to_ibm937sb[0])), 0) \
|| (__builtin_expect (cp[0], '\1') == '\0' && ch != 0)) \ || (__builtin_expect (cp[0], '\1') == '\0' && ch != 0)) \
{ \ { \
/* Use the UCS4 table for double byte. */ \ /* Use the UCS4 table for double byte. */ \
cp = __ucs4_to_ibm937db[ch]; \ cp = __ucs4_to_ibm937db[ch]; \
if (__builtin_expect (cp[0], '\1') == '\0' && ch != 0) \ if (__builtin_expect (ch >= (sizeof (__ucs4_to_ibm937db) \
/ sizeof (__ucs4_to_ibm937db[0])), 0) \
|| __builtin_expect (cp[0], '\1') == '\0') \
{ \ { \
/* This is an illegal character. */ \ /* This is an illegal character. */ \
if (! ignore_errors_p ()) \ if (! ignore_errors_p ()) \
@ -209,13 +211,13 @@ enum
if (curcs == sb) \ if (curcs == sb) \
{ \ { \
*outptr++ = SO; \ *outptr++ = SO; \
if (__builtin_expect (outptr == outend, 0)) \ curcs = db; \
} \
if (__builtin_expect (outptr + 1 >= outend, 0)) \
{ \ { \
result = __GCONV_FULL_OUTPUT; \ result = __GCONV_FULL_OUTPUT; \
break; \ break; \
} \ } \
curcs = db; \
} \
*outptr++ = cp[0]; \ *outptr++ = cp[0]; \
*outptr++ = cp[1]; \ *outptr++ = cp[1]; \
} \ } \
@ -225,13 +227,13 @@ enum
if (curcs == db) \ if (curcs == db) \
{ \ { \
*outptr++ = SI; \ *outptr++ = SI; \
curcs = sb; \
if (__builtin_expect (outptr == outend, 0)) \ if (__builtin_expect (outptr == outend, 0)) \
{ \ { \
result = __GCONV_FULL_OUTPUT; \ result = __GCONV_FULL_OUTPUT; \
break; \ break; \
} \ } \
} \ } \
curcs = sb; \
*outptr++ = cp[0]; \ *outptr++ = cp[0]; \
} \ } \
\ \