qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* sysdeps/generic/strtok_r.c: Use rawmemchr instead of strchr.
	* sysdeps/generic/strtok.c: Likewise.
This commit is contained in:
Ulrich Drepper 1999-05-03 23:49:46 +00:00
parent e0faeea74f
commit 9f509acb28
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
1999-05-03 Ulrich Drepper <drepper@cygnus.com> 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. * string/tester.c: Add test of rawmemchr.
* sysdeps/i386/bits/select.h (__FD_ZERO): Remove memory output * sysdeps/i386/bits/select.h (__FD_ZERO): Remove memory output

4
sysdeps/generic/strtok.c
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -52,7 +52,7 @@ strtok (s, delim)
s = strpbrk (token, delim); s = strpbrk (token, delim);
if (s == NULL) if (s == NULL)
/* This token finishes the string. */ /* This token finishes the string. */
olds = strchr (token, '\0'); olds = __rawmemchr (token, '\0');
else else
{ {
/* Terminate the token and make OLDS point past it. */ /* Terminate the token and make OLDS point past it. */

4
sysdeps/generic/strtok_r.c
View File

@ -1,5 +1,5 @@
/* Reentrant string tokenizer. Generic version. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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); s = strpbrk (token, delim);
if (s == NULL) if (s == NULL)
/* This token finishes the string. */ /* This token finishes the string. */
*save_ptr = strchr (token, '\0'); *save_ptr = __rawmemchr (token, '\0');
else else
{ {
/* Terminate the token and make *SAVE_PTR point past it. */ /* Terminate the token and make *SAVE_PTR point past it. */