diff options
| author | Jim Meyering <jim@meyering.net> | 2001-02-17 16:53:33 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2001-02-17 16:53:33 +0000 |
| commit | ff7797f6e2bdd27009c770732a1ebbae6e8aa9b2 (patch) | |
| tree | 4eccecc4a0139aac303e5f9e8e2bd81f037b57bb /lib | |
| parent | d81e0e6f97a7569cb7c85ed18802f8003d8fe227 (diff) | |
| download | coreutils-ff7797f6e2bdd27009c770732a1ebbae6e8aa9b2.tar.xz | |
(__strnlen): Merge in a change from GNU libc.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/strnlen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/strnlen.c b/lib/strnlen.c index 556d2d55c..15b65d84a 100644 --- a/lib/strnlen.c +++ b/lib/strnlen.c @@ -1,5 +1,5 @@ /* Find the length of STRING, but scan at most MAXLEN characters. - Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -51,7 +51,7 @@ size_t __strnlen (const char *string, size_t maxlen) { const char *end = memchr (string, '\0', maxlen); - return end ? end - string : maxlen; + return end ? (size_t) (end - string) : maxlen; } #ifdef weak_alias weak_alias (__strnlen, strnlen) |