diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-09-07 13:47:26 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-09-07 13:47:26 +0000 |
| commit | 94b78bb204a9606254c1088a4bb6fa00859a9d82 (patch) | |
| tree | b674ea60e2de891aeaeaf66a9f487c98f9de79a5 /string | |
| parent | cf9f9a168619810ef2bd1b67f9f1db53bd235dc4 (diff) | |
| download | glibc-94b78bb204a9606254c1088a4bb6fa00859a9d82.tar glibc-94b78bb204a9606254c1088a4bb6fa00859a9d82.tar.gz glibc-94b78bb204a9606254c1088a4bb6fa00859a9d82.tar.bz2 glibc-94b78bb204a9606254c1088a4bb6fa00859a9d82.zip | |
Update.
* argp/argp-help.c: Likewise.
* argp/argp-parse.c: Likewise.
Diffstat (limited to 'string')
| -rw-r--r-- | string/strcoll.c | 49 | ||||
| -rw-r--r-- | string/strxfrm.c | 24 |
2 files changed, 39 insertions, 34 deletions
diff --git a/string/strcoll.c b/string/strcoll.c index 8457ef8df1..08ffd63563 100644 --- a/string/strcoll.c +++ b/string/strcoll.c @@ -172,32 +172,35 @@ STRCOLL (s1, s2, l) /* We have to increment the index counters. */ if ((forward && ++s1idx >= s1run->data[pass].number) || (!forward && --s1idx < 0)) - if (forward) - { - s1run = s1run->next; - s1idx = 0; - } - else - { - s1run = s1run->prev; - if (s1run != NULL) - s1idx = s1run->data[pass].number - 1; - } + { + if (forward) + { + s1run = s1run->next; + s1idx = 0; + } + else + { + s1run = s1run->prev; + if (s1run != NULL) + s1idx = s1run->data[pass].number - 1; + } + } if ((forward && ++s2idx >= s2run->data[pass].number) || (!forward && --s2idx < 0)) - if (forward) - { - s2run = s2run->next; - s2idx = 0; - } - else - { - s2run = s2run->prev; - if (s2run != NULL) - s2idx = s2run->data[pass].number - 1; - } - + { + if (forward) + { + s2run = s2run->next; + s2idx = 0; + } + else + { + s2run = s2run->prev; + if (s2run != NULL) + s2idx = s2run->data[pass].number - 1; + } + } } if (s1run != s2run) diff --git a/string/strxfrm.c b/string/strxfrm.c index 795e8e4a73..b3e99fb094 100644 --- a/string/strxfrm.c +++ b/string/strxfrm.c @@ -250,17 +250,19 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) /* We have to increment the index counters. */ if ((forward && ++idx >= run->data[pass].number) || (!forward && --idx < 0)) - if (forward) - { - run = run->next; - idx = 0; - } - else - { - run = run->prev; - if (run != NULL) - idx = run->data[pass].number - 1; - } + { + if (forward) + { + run = run->next; + idx = 0; + } + else + { + run = run->prev; + if (run != NULL) + idx = run->data[pass].number - 1; + } + } } /* Write marker for end of word. */ |