diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-07-15 06:14:56 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-15 06:14:56 +0000 |
| commit | 7888313d3c00975b1f5a0b8e624b85c1b520b134 (patch) | |
| tree | a6511083de1adcf96c11f2f50e2935dc9557d834 /iconvdata/iso646.c | |
| parent | ea1efc6f4974e8daaa9ea9ac84636ba333ce1ef0 (diff) | |
| download | glibc-7888313d3c00975b1f5a0b8e624b85c1b520b134.zip glibc-7888313d3c00975b1f5a0b8e624b85c1b520b134.tar.gz glibc-7888313d3c00975b1f5a0b8e624b85c1b520b134.tar.bz2 | |
Update.
2000-07-14 Ulrich Drepper <drepper@redhat.com>
* iconv/loop.c (STANDARD_ERR_HANDLER): If one of the
transliteration function did its job, continue, don't stop.
* iconvdata/iso646.c: Little optimizations in body for conversion
from UCS4.
Diffstat (limited to 'iconvdata/iso646.c')
| -rw-r--r-- | iconvdata/iso646.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c index 99dc025..d26ed5e 100644 --- a/iconvdata/iso646.c +++ b/iconvdata/iso646.c @@ -434,11 +434,11 @@ gconv_end (struct __gconv_step *data) #define LOOPFCT TO_LOOP #define BODY \ { \ - unsigned char ch; \ + unsigned int ch; \ int failure = __GCONV_OK; \ \ ch = get32 (inptr); \ - switch (*((uint32_t *) inptr)) \ + switch (ch) \ { \ case 0x23: \ if (var == GB || var == ES || var == IT || var == FR || var == FR1 \ @@ -878,7 +878,7 @@ gconv_end (struct __gconv_step *data) ch = 0x5d; \ break; \ default: \ - if (*((uint32_t *) inptr) > 0x7f) \ + if (__builtin_expect (ch, 0) > 0x7f) \ failure = __GCONV_ILLEGAL_INPUT; \ break; \ } \ |