qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BZ #6461] 

* iconv/gconv_simple.c (BODY for __gconv_transform_ascii_internal):
	Add missing braces.
	(BODY for __gconv_transform_internal_ascii): Likewise.
This commit is contained in:
Ulrich Drepper 2008-05-14 22:53:12 +00:00
parent 5846c4e269
commit 5deca9bbff
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2008-05-14 Ulrich Drepper <drepper@redhat.com> 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] [BZ #6472]
* sysdeps/posix/getaddrinfo.c (get_scope): Loopback addresses have * sysdeps/posix/getaddrinfo.c (get_scope): Loopback addresses have
to be treated like link-local addresses. to be treated like link-local addresses.

18
iconv/gconv_simple.c
View File

@ -1,5 +1,5 @@
/* Simple transformations functions. /* 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. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. 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); \ STANDARD_FROM_LOOP_ERR_HANDLER (1); \
} \ } \
else \ else \
/* It's an one byte sequence. */ \ { \
*((uint32_t *) outptr) = *inptr++; \ /* It's an one byte sequence. */ \
outptr += sizeof (uint32_t); \ *((uint32_t *) outptr) = *inptr++; \
outptr += sizeof (uint32_t); \
} \
} }
#define LOOP_NEED_FLAGS #define LOOP_NEED_FLAGS
#include <iconv/loop.c> #include <iconv/loop.c>
@ -851,9 +853,11 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
STANDARD_TO_LOOP_ERR_HANDLER (4); \ STANDARD_TO_LOOP_ERR_HANDLER (4); \
} \ } \
else \ else \
/* It's an one byte sequence. */ \ { \
*outptr++ = *((const uint32_t *) inptr); \ /* It's an one byte sequence. */ \
inptr += sizeof (uint32_t); \ *outptr++ = *((const uint32_t *) inptr); \
inptr += sizeof (uint32_t); \
} \
} }
#define LOOP_NEED_FLAGS #define LOOP_NEED_FLAGS
#include <iconv/loop.c> #include <iconv/loop.c>