diff options
author | Jakub Jelinek <jakub@redhat.com> | 2007-09-29 19:10:50 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2007-09-29 19:10:50 +0000 |
commit | 441097af93882803bbb3296dd1fdbdd4a7773deb (patch) | |
tree | a221d657b763bcf793ea407fcd8b81d91ac06a5a /wcsmbs/wcsnlen.c | |
parent | 62beba6902f315a14113c26ed3e068342e101399 (diff) |
Updated to fedora-glibc-20070929T1859cvs/fedora-glibc-2_6_90-16
Diffstat (limited to 'wcsmbs/wcsnlen.c')
-rw-r--r-- | wcsmbs/wcsnlen.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/wcsmbs/wcsnlen.c b/wcsmbs/wcsnlen.c index 3cfbccad91..94abf1e574 100644 --- a/wcsmbs/wcsnlen.c +++ b/wcsmbs/wcsnlen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -28,13 +28,16 @@ __wcsnlen (s, maxlen) { size_t len = 0; - while (s[len] != L'\0' && maxlen > 0) + while (maxlen > 0 && s[len] != L'\0') { - if (s[++len] == L'\0' || --maxlen == 0) + ++len; + if (--maxlen == 0 || s[len] == L'\0') return len; - if (s[++len] == L'\0' || --maxlen == 0) + ++len; + if (--maxlen == 0 || s[len] == L'\0') return len; - if (s[++len] == L'\0' || --maxlen == 0) + ++len; + if (--maxlen == 0 || s[len] == L'\0') return len; ++len; --maxlen; |