aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-05-14 22:53:12 +0000
committerUlrich Drepper <drepper@redhat.com>2008-05-14 22:53:12 +0000
commit5deca9bbff362cff0f348cbfa13e26439e240cf2 (patch)
tree7afb47f820d4e9e34ab86abd124e1de119ea54ea
parent5846c4e2692a18a922cf07ab6c3ec20efa61b4d3 (diff)
downloadglibc-5deca9bbff362cff0f348cbfa13e26439e240cf2.zip
glibc-5deca9bbff362cff0f348cbfa13e26439e240cf2.tar.gz
glibc-5deca9bbff362cff0f348cbfa13e26439e240cf2.tar.bz2
[BZ #6461]
* iconv/gconv_simple.c (BODY for __gconv_transform_ascii_internal): Add missing braces. (BODY for __gconv_transform_internal_ascii): Likewise.
-rw-r--r--ChangeLog5
-rw-r--r--iconv/gconv_simple.c18
2 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 2dc03d5..36d17a8 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 ec8f38a..5cf3237 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>