diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-01-26 03:11:19 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-01-26 03:11:19 +0000 |
| commit | d6f7f7bdf014b2c80424c496b51d339a4db0f827 (patch) | |
| tree | 52a3c78798c015b4cd37a860241f344edf9cc0d0 | |
| parent | 9de4e2034072a876f16d9c1d7368cee533d91a6b (diff) | |
| download | glibc-d6f7f7bdf014b2c80424c496b51d339a4db0f827.tar.gz glibc-d6f7f7bdf014b2c80424c496b51d339a4db0f827.tar.xz glibc-d6f7f7bdf014b2c80424c496b51d339a4db0f827.zip | |
Update.
2000-01-25 Ulrich Drepper <drepper@cygnus.com> * string/strxfrm.c: Don't count in the terminating NUL byte/word.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | string/strxfrm.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index b23f60f2be..7308622185 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2000-01-25 Ulrich Drepper <drepper@cygnus.com> + + * string/strxfrm.c: Don't count in the terminating NUL byte/word. + 2000-01-24 Paul Eggert <eggert@twinsun.com> * posix/fnmatch_loop.c (FCT): Use locale's collating sequence when diff --git a/string/strxfrm.c b/string/strxfrm.c index 9fd9526008..7ddc5f3f81 100644 --- a/string/strxfrm.c +++ b/string/strxfrm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Ulrich Drepper <drepper@cygnus.com>, 1995. @@ -478,5 +478,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) if (use_malloc) free (idxarr); - return needed; + /* Return the number of bytes/words we need, but don't count the NUL + byte/word at the end. */ + return needed - 1; } |