diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | iconv/gconv_simple.c | 18 |
2 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 2dc03d5b43..36d17a8094 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-05-14 Ulrich Drepper <drepper@redhat.com> + [BZ #6461] + * iconv/gconv_simple.c (BODY for __gconv_transform_ascii_internal): + Add missing braces. + (BODY for __gconv_transform_internal_ascii): Likewise. + [BZ #6472] * sysdeps/posix/getaddrinfo.c (get_scope): Loopback addresses have to be treated like link-local addresses. diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c index ec8f38a962..5cf3237abb 100644 --- a/iconv/gconv_simple.c +++ b/iconv/gconv_simple.c @@ -1,5 +1,5 @@ /* Simple transformations functions. - Copyright (C) 1997-2003, 2004, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 1997-2005, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -820,9 +820,11 @@ ucs4le_internal_loop_single (struct __gconv_step *step, STANDARD_FROM_LOOP_ERR_HANDLER (1); \ } \ else \ - /* It's an one byte sequence. */ \ - *((uint32_t *) outptr) = *inptr++; \ - outptr += sizeof (uint32_t); \ + { \ + /* It's an one byte sequence. */ \ + *((uint32_t *) outptr) = *inptr++; \ + outptr += sizeof (uint32_t); \ + } \ } #define LOOP_NEED_FLAGS #include <iconv/loop.c> @@ -851,9 +853,11 @@ ucs4le_internal_loop_single (struct __gconv_step *step, STANDARD_TO_LOOP_ERR_HANDLER (4); \ } \ else \ - /* It's an one byte sequence. */ \ - *outptr++ = *((const uint32_t *) inptr); \ - inptr += sizeof (uint32_t); \ + { \ + /* It's an one byte sequence. */ \ + *outptr++ = *((const uint32_t *) inptr); \ + inptr += sizeof (uint32_t); \ + } \ } #define LOOP_NEED_FLAGS #include <iconv/loop.c> |