AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-10 19:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BZ #542]

Browse Source 
2004-11-11  Simon Josefsson  <jas@extundo.com>
	[BZ #542]
	* sysdeps/generic/strtok_r.c [HAVE_CONFIG_H]: Include config.h.
	[!_LIBC]: Include strtok_r.h (in gnulib), map __strtok_r to
	strtok_r and __rawmemchr to strch.
	(__strtok_r): Use C89 prototype.
	[weak_alias]: Move calls to libc_hidden_def and weak_alias into
	this #ifdef.
This commit is contained in:
Roland McGrath 2004-11-11 22:15:51 +00:00
parent a579c7f543
commit 37b1a15401
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2004-11-11 Simon Josefsson <jas@extundo.com>
[BZ #542]
* sysdeps/generic/strtok_r.c [HAVE_CONFIG_H]: Include config.h.
[!_LIBC]: Include strtok_r.h (in gnulib), map __strtok_r to
strtok_r and __rawmemchr to strch.
(__strtok_r): Use C89 prototype.
[weak_alias]: Move calls to libc_hidden_def and weak_alias into
this #ifdef.
2004-11-10 Paul Eggert <eggert@cs.ucla.edu> 2004-11-10 Paul Eggert <eggert@cs.ucla.edu>
[BZ #541] [BZ #541]

18
sysdeps/generic/strtok_r.c
View File

@ -17,11 +17,22 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <string.h> #include <string.h>
#undef strtok_r #undef strtok_r
#undef __strtok_r #undef __strtok_r
#ifndef _LIBC
/* Get specification. */
# include "strtok_r.h"
# define __strtok_r strtok_r
# define __rawmemchr strchr
#endif
/* Parse S into tokens separated by characters in DELIM. /* Parse S into tokens separated by characters in DELIM.
If S is NULL, the saved pointer in SAVE_PTR is used as If S is NULL, the saved pointer in SAVE_PTR is used as
the next starting point. For example: the next starting point. For example:
@ -33,10 +44,7 @@
// s = "abc\0-def\0" // s = "abc\0-def\0"
*/ */
char * char *
__strtok_r (s, delim, save_ptr) __strtok_r (char *s, const char *delim, char **save_ptr)
char *s;
const char *delim;
char **save_ptr;
{ {
char *token; char *token;
@ -65,5 +73,7 @@ __strtok_r (s, delim, save_ptr)
} }
return token; return token;
} }
#ifdef weak_alias
libc_hidden_def (__strtok_r) libc_hidden_def (__strtok_r)
weak_alias (__strtok_r, strtok_r) weak_alias (__strtok_r, strtok_r)
#endif