diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-09-09 11:53:19 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-09-09 11:53:19 +0000 |
| commit | 6e4c40baacfd7eaf1578f707759d79b5d95d626c (patch) | |
| tree | ebea3ca25b71a1f21e657b7ab8a506f640197d79 /string/strcoll.c | |
| parent | 7fd18ea2de82bb4f0e393aee1dc412cd025f3be8 (diff) | |
| download | glibc-6e4c40baacfd7eaf1578f707759d79b5d95d626c.tar.gz | |
Update.
1998-09-09 09:32 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/powerpc/dl-machine.h (elf_machine_rela): Make function
inline.
1998-09-07 Paul Eggert <eggert@twinsun.com>
* time/mktime.c (__EXTENSIONS__): Define if not defined.
(_REENTRANT): Remove. It has undesirable consequences in
Solaris 2.6 (e.g. it turns off the putc macro). Defining
__EXTENSIONS__ makes localtime_r and gmtime_r visible, which
is what we want.
* time/strftime.c: Likewise.
1998-09-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/dl-error.c: Fix spelling.
1998-09-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* stdlib/strfmon.c: Quiet -Wparentheses warnings.
* stdio-common/_itoa.c: Likewise.
* stdio-common/printf_fp.c: Likewise.
* stdio-common/vfscanf.c: Likewise.
* wcsmbs/wcstok.c: Likewise.
* sysdeps/generic/glob.c: Likewise.
* posix/getopt.c: Likewise.
* sysdeps/posix/getaddrinfo.c: Likewise.
* posix/wordexp.c: Likewise.
* io/ftw.c: Likewise.
* io/fts.c: Likewise.
* misc/getpass.c: Likewise.
* iconv/gconv_conf.c: Likewise.
* argp/argp-fmtstream.c: Likewise.
* argp/argp-help.c: Likewise.
* elf/dl-load.c: Likewise.
* locale/programs/stringtrans.c: Likewise.
* catgets/gencat.c: Likewise.
* posix/getconf.c: Likewise.
* iconv/gconv_conf.c: Likewise.
* iconv/iconv_prog.c: Likewise.
* string/strcoll.c: Optimize a few expressions.
* string/strxfrm.c: Likewise.
1998-09-08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/dl-open.c (dl_open_worker): Move decl of new_global up one
level to avoid uninit variable warning.
1998-09-09 10:34 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
instead of _dl_default_scope[2] as argument to _dl_init_next.
Fix compatibility problems introduced in last change.
Diffstat (limited to 'string/strcoll.c')
| -rw-r--r-- | string/strcoll.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/string/strcoll.c b/string/strcoll.c index 08ffd63563..f44f6c1f6d 100644 --- a/string/strcoll.c +++ b/string/strcoll.c @@ -117,8 +117,9 @@ STRCOLL (s1, s2, l) == (uint32_t) IGNORE_CHAR)) { ++s1ignore; - if ((forward && ++s1idx >= s1run->data[pass].number) - || (!forward && --s1idx < 0)) + if (forward + ? ++s1idx >= s1run->data[pass].number + : --s1idx < 0) { weight_t *nextp = forward ? s1run->next : s1run->prev; if (nextp == NULL) @@ -139,8 +140,9 @@ STRCOLL (s1, s2, l) == (uint32_t) IGNORE_CHAR)) { ++s2ignore; - if ((forward && ++s2idx >= s2run->data[pass].number) - || (!forward && --s2idx < 0)) + if (forward + ? ++s2idx >= s2run->data[pass].number + : --s2idx < 0) { weight_t *nextp = forward ? s2run->next : s2run->prev; if (nextp == NULL) |