diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-05-03 23:49:46 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-05-03 23:49:46 +0000 |
| commit | 9f509acb28ecbebb1bf25069fd60219bc85971ac (patch) | |
| tree | 03785f5c9c9d3665a686a6c12343a0d5a70ffce3 | |
| parent | e0faeea74fc885c53f03b1cc3a3b90aef51185ce (diff) | |
| download | glibc-9f509acb28ecbebb1bf25069fd60219bc85971ac.tar.gz glibc-9f509acb28ecbebb1bf25069fd60219bc85971ac.tar.xz glibc-9f509acb28ecbebb1bf25069fd60219bc85971ac.zip | |
Update.
* sysdeps/generic/strtok_r.c: Use rawmemchr instead of strchr. * sysdeps/generic/strtok.c: Likewise.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/generic/strtok.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/strtok_r.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 99bbb67fd7..1c6bf3eb64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1999-05-03 Ulrich Drepper <drepper@cygnus.com> + * sysdeps/generic/strtok_r.c: Use rawmemchr instead of strchr. + * sysdeps/generic/strtok.c: Likewise. + * string/tester.c: Add test of rawmemchr. * sysdeps/i386/bits/select.h (__FD_ZERO): Remove memory output diff --git a/sysdeps/generic/strtok.c b/sysdeps/generic/strtok.c index b366653cb3..6aeeb5a646 100644 --- a/sysdeps/generic/strtok.c +++ b/sysdeps/generic/strtok.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996, 1997, 1999 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 @@ -52,7 +52,7 @@ strtok (s, delim) s = strpbrk (token, delim); if (s == NULL) /* This token finishes the string. */ - olds = strchr (token, '\0'); + olds = __rawmemchr (token, '\0'); else { /* Terminate the token and make OLDS point past it. */ diff --git a/sysdeps/generic/strtok_r.c b/sysdeps/generic/strtok_r.c index 3105e6a568..4acda149b6 100644 --- a/sysdeps/generic/strtok_r.c +++ b/sysdeps/generic/strtok_r.c @@ -1,5 +1,5 @@ /* Reentrant string tokenizer. Generic version. - Copyright (C) 1991, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1991, 1996, 1997, 1998, 1999 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 @@ -53,7 +53,7 @@ __strtok_r (s, delim, save_ptr) s = strpbrk (token, delim); if (s == NULL) /* This token finishes the string. */ - *save_ptr = strchr (token, '\0'); + *save_ptr = __rawmemchr (token, '\0'); else { /* Terminate the token and make *SAVE_PTR point past it. */ |