diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | iconv/gconv_simple.c | 14 | ||||
| -rw-r--r-- | iconvdata/Makefile | 4 |
3 files changed, 19 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 9e5ed4233b..8e8926022c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +1998-04-29 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * iconv/gconv_simple.c: Fix endian bug. Don't put side effects in + argument of bswap_XX macro. + +1998-04-28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * iconvdata/Makefile (EBCDIC-DK-NO-A-routines): Fix typo in + variable name. + 1998-04-28 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/semctl.c (semctl): Define own union diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c index c491c97ccd..c71c5ed0a4 100644 --- a/iconv/gconv_simple.c +++ b/iconv/gconv_simple.c @@ -107,8 +107,8 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend, /* Sigh, we have to do some real work. */ size_t cnt; - for (cnt = 0; cnt < n_convert; ++cnt) - *((uint32_t *) outptr)++ = bswap_32 (*((uint32_t *) inptr)++); + for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) + *((uint32_t *) outptr)++ = bswap_32 (*(uint32_t *) inptr); *inptrp = inptr; *outptrp = outptr; @@ -370,7 +370,8 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend, #define LOOPFCT FROM_LOOP #if __BYTE_ORDER == __LITTLE_ENDIAN # define BODY \ - *((uint32_t *) outptr)++ = bswap_16 (*((uint16_t *) inptr)++); + *((uint32_t *) outptr)++ = bswap_16 (*(uint16_t *) inptr); \ + inptr += 2; #else # define BODY \ *((uint32_t *) outptr)++ = *((uint16_t *) inptr)++; @@ -438,7 +439,8 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend, *((uint32_t *) outptr)++ = *((uint16_t *) inptr)++; #else # define BODY \ - *((uint32_t *) outptr)++ = bswap_16 (*((uint16_t *) inptr)++); + *((uint32_t *) outptr)++ = bswap_16 (*(uint16_t *) inptr); \ + inptr += 2; #endif #include <iconv/loop.c> #include <iconv/skeleton.c> @@ -475,9 +477,7 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend, result = GCONV_ILLEGAL_INPUT; \ break; \ } \ - /* Please note that we use the `uint32_t' from-pointer as an `uint16_t' \ - pointer which works since we are on a little endian machine. */ \ - *((uint16_t *) outptr)++ = bswap_16 (*((uint16_t *) inptr)); \ + *((uint16_t *) outptr)++ = bswap_16 (((uint16_t *) inptr)[1]); \ inptr += 4; \ } #endif diff --git a/iconvdata/Makefile b/iconvdata/Makefile index 56cef22705..dcbb36375f 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -68,7 +68,7 @@ EBCDIC-AT-DE-routines := ebcdic-at-de EBCDIC-AT-DE-A-routines := ebcdic-at-de-a EBCDIC-CA-FR-routines := ebcdic-ca-fr EBCDIC-DK-NO-routines := ebcdic-dk-no -EBCDIC-DK-NO-A_routines := ebcdic-dk-no-a +EBCDIC-DK-NO-A-routines := ebcdic-dk-no-a EBCDIC-ES-routines := ebcdic-es EBCDIC-ES-A-routines := ebcdic-es-a EBCDIC-ES-S-routines := ebcdic-es-s @@ -479,7 +479,7 @@ tests: $(objpfx)iconv-test.out $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) \ - $(common-objdir)/iconv/iconv_prog + $(common-objdir)/iconv/iconv_prog $(SHELL) -e $< $(common-objdir) > $@ ifdef objpfx |