summaryrefslogtreecommitdiff
path: root/iconvdata
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2004-02-07 15:57:44 +0000
committerAndreas Jaeger <aj@suse.de>2004-02-07 15:57:44 +0000
commit33ed6903d39b23f1bb5dfd9793fc244244f7b241 (patch)
tree00245a9ed3d96862216e7049b47a52d31af2794a /iconvdata
parentcdda3d7dea4a3772dbe61b74aa49f83d98082689 (diff)
downloadglibc-33ed6903d39b23f1bb5dfd9793fc244244f7b241.tar.gz
Update.
2004-02-07 Andreas Jaeger <aj@suse.de> * iconv/gconv_simple.c (ucs4le_internal_loop): Remove cast used as lvalue. (internal_ucs4le_loop_single): Likewise. (ucs4_internal_loop): Likewise. (BODY): Likewise. (internal_ucs4_loop_single): Likewise. * iconvdata/iso8859-1.c (BODY): Likewise. * iconvdata/cp1255.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/cp1258.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/gb18030.c (BODY): Likewise. * iconvdata/armscii-8.c (BODY): Likewise. * stdlib/msort.c (msort_with_tmp): Likewise. * iconv/gconv_open.c (__gconv_open): Remove conditional expression as lvalue.
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/armscii-8.c16
-rw-r--r--iconvdata/cp1255.c5
-rw-r--r--iconvdata/cp1258.c5
-rw-r--r--iconvdata/gb18030.c5
-rw-r--r--iconvdata/iso8859-1.c5
5 files changed, 23 insertions, 13 deletions
diff --git a/iconvdata/armscii-8.c b/iconvdata/armscii-8.c
index dbaf8be2ee..013202d9dc 100644
--- a/iconvdata/armscii-8.c
+++ b/iconvdata/armscii-8.c
@@ -1,5 +1,5 @@
/* Conversion to and from ARMSCII-8
- Copyright (C) 1997-1999, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1997-1999, 2000-2002, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -57,11 +57,17 @@ static const uint16_t map_from_armscii_8[0xfe - 0xa2 + 1] =
uint_fast8_t ch = *inptr; \
\
if (ch <= 0xa0) \
- /* Upto and including 0xa0 the ARMSCII-8 corresponds to Unicode. */ \
- *((uint32_t *) outptr)++ = ch; \
+ { \
+ /* Upto and including 0xa0 the ARMSCII-8 corresponds to Unicode. */ \
+ *((uint32_t *) outptr) = ch; \
+ outptr += sizeof (uint32_t); \
+ } \
else if (ch >= 0xa2 && ch <= 0xfe) \
- /* Use the table. */ \
- *((uint32_t *) outptr)++ = map_from_armscii_8[ch - 0xa2]; \
+ { \
+ /* Use the table. */ \
+ *((uint32_t *) outptr) = map_from_armscii_8[ch - 0xa2]; \
+ outptr += sizeof (uint32_t); \
+ } \
else \
{ \
/* This is an illegal character. */ \
diff --git a/iconvdata/cp1255.c b/iconvdata/cp1255.c
index 6cccf526e6..b5f0b784d6 100644
--- a/iconvdata/cp1255.c
+++ b/iconvdata/cp1255.c
@@ -1,5 +1,5 @@
/* Conversion from and to CP1255.
- Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998,
and Bruno Haible <haible@clisp.cons.org>, 2001.
@@ -69,7 +69,8 @@
if (__builtin_expect (outbuf + 4 <= outend, 1)) \
{ \
/* Write out the last character. */ \
- *((uint32_t *) outbuf)++ = data->__statep->__count >> 3; \
+ *((uint32_t *) outbuf) = data->__statep->__count >> 3; \
+ outbuf += sizeof (uint32_t); \
data->__statep->__count = 0; \
} \
else \
diff --git a/iconvdata/cp1258.c b/iconvdata/cp1258.c
index 553d50b443..d1b2be4125 100644
--- a/iconvdata/cp1258.c
+++ b/iconvdata/cp1258.c
@@ -1,5 +1,5 @@
/* Conversion from and to CP1258.
- Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998,
and Bruno Haible <haible@clisp.cons.org>, 2001.
@@ -70,7 +70,8 @@
if (__builtin_expect (outbuf + 4 <= outend, 1)) \
{ \
/* Write out the last character. */ \
- *((uint32_t *) outbuf)++ = data->__statep->__count >> 3; \
+ *((uint32_t *) outbuf) = data->__statep->__count >> 3; \
+ outbuf += sizeof (uint32_t); \
data->__statep->__count = 0; \
} \
else \
diff --git a/iconvdata/gb18030.c b/iconvdata/gb18030.c
index 31f3c20939..807ef67739 100644
--- a/iconvdata/gb18030.c
+++ b/iconvdata/gb18030.c
@@ -1,5 +1,5 @@
/* Mapping tables for GBK handling.
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Sean Chen <seanc@turbolinux.com.cn>, 1999.
@@ -25769,7 +25769,8 @@ static const unsigned char __ucs_to_gb18030_tab2[8192][2] =
} \
} \
\
- *((uint32_t *) outptr)++ = ch; \
+ *((uint32_t *) outptr) = ch; \
+ outptr += sizeof (uint32_t); \
}
#define LOOP_NEED_FLAGS
#define ONEBYTE_BODY \
diff --git a/iconvdata/iso8859-1.c b/iconvdata/iso8859-1.c
index 60ab29d56f..632ebd6176 100644
--- a/iconvdata/iso8859-1.c
+++ b/iconvdata/iso8859-1.c
@@ -1,5 +1,5 @@
/* Conversion to and from ISO 8859-1.
- Copyright (C) 1997-1999, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1997-1999, 2000-2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -35,7 +35,8 @@
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
#define LOOPFCT FROM_LOOP
#define BODY \
- *((uint32_t *) outptr)++ = *inptr++;
+ *((uint32_t *) outptr) = *inptr++; \
+ outptr += sizeof (uint32_t);
#define ONEBYTE_BODY \
{ \
return c; \