diff options
| author | Andreas Jaeger <aj@suse.de> | 2004-02-07 15:57:44 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2004-02-07 15:57:44 +0000 |
| commit | 33ed6903d39b23f1bb5dfd9793fc244244f7b241 (patch) | |
| tree | 00245a9ed3d96862216e7049b47a52d31af2794a /stdlib/msort.c | |
| parent | cdda3d7dea4a3772dbe61b74aa49f83d98082689 (diff) | |
| download | glibc-33ed6903d39b23f1bb5dfd9793fc244244f7b241.tar.gz glibc-33ed6903d39b23f1bb5dfd9793fc244244f7b241.tar.xz glibc-33ed6903d39b23f1bb5dfd9793fc244244f7b241.zip | |
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 'stdlib/msort.c')
| -rw-r--r-- | stdlib/msort.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/stdlib/msort.c b/stdlib/msort.c index 45d6a99b83..e69b4011c4 100644 --- a/stdlib/msort.c +++ b/stdlib/msort.c @@ -1,6 +1,6 @@ /* An alternative to qsort, with an identical interface. This file is part of the GNU C Library. - Copyright (C) 1992,95-97,99,2000,01,02 Free Software Foundation, Inc. + Copyright (C) 1992,95-97,99,2000,01,02,04 Free Software Foundation, Inc. Written by Mike Haertel, September 1988. The GNU C Library is free software; you can redistribute it and/or @@ -56,12 +56,16 @@ msort_with_tmp (void *b, size_t n, size_t s, __compar_fn_t cmp, if ((*cmp) (b1, b2) <= 0) { --n1; - *((op_t *) tmp)++ = *((op_t *) b1)++; + *((op_t *) tmp) = *((op_t *) b1); + tmp += sizeof (op_t); + b1 += sizeof (op_t); } else { --n2; - *((op_t *) tmp)++ = *((op_t *) b2)++; + *((op_t *) tmp) = *((op_t *) b2); + tmp += sizeof (op_t); + b2 += sizeof (op_t); } } else |