From 239c2bf93e32e147dab3e6cde99078d1ad5a1ef5 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Fri, 28 Oct 2005 21:21:08 +0000 Subject: 2005-10-28 Bob Wilson * libc/misc/unctrl.c: Replace FUNCTION description. * libc/signal/signal.c: Remove documentation for raise and _raise_r. * libc/stdio/getdelim.c: Fix spelling errors. * libc/stdio/getw.c: Put RETURNS on a separate line. Fix punctuation. * libc/stdio/putw.c: Likewise. * libc/stdlib/a64l.c: Fix formatting, spelling and punctuation in documentation. * libc/stdlib/assert.c: Do not capitalize FUNCTION description. * libc/stdlib/efgcvt.c: Add spaces to FUNCTION description. * libc/stdlib/envlock.c: Use em-dash in FUNCTION description. * libc/stdlib/mlock.c: Likewise. * libc/stdlib/mstats.c: Likewise. * libc/time/tzlock.c: Likewise. * libc/stdlib/rand.c: Use "multi-threaded" and "thread-safe" in NOTES. * libc/stdlib/rand48.c: Remove extra space in FUNCTION description and hyphenate "pseudo-random". * libc/string/bcmp.c: Remove extra blank lines in documentation. * libc/string/strncat.c: Likewise. * libc/string/memchr.c: Remove extra ">" character in documentation. * libc/string/strcspn.c: Use "characters" instead of "chars". * libc/string/strpbrk.c: Likewise. * libc/string/strerror_r.c: Capitalize "GNU". * libc/string/strnlen.c: Likewise. * libc/string/strtok.c: Fix formatting, spelling and punctuation in documentation. Use "multi-threaded" and "thread-safe" in NOTES. * libc/string/wcscat.c: Split PORTABILITY into two paragraphs. * libc/string/wcschr.c: Likewise. * libc/string/wcscmp.c: Likewise. * libc/string/wcscpy.c: Likewise. * libc/string/wcscspn.c: Likewise. * libc/string/wcslen.c: Likewise. * libc/string/wcsncat.c: Likewise. * libc/string/wcsncmp.c: Likewise. * libc/string/wcsncpy.c: Likewise. * libc/string/wcsnlen.c: Likewise. * libc/string/wcspbrk.c: Likewise. * libc/string/wcsrchr.c: Likewise. * libc/string/wcsspn.c: Likewise. * libc/string/wmemchr.c: Likewise. * libc/string/wmemcmp.c: Likewise. * libc/string/wmemcpy.c: Likewise. * libc/string/wmemset.c: Likewise. * libc/string/wmemmove.c: Likewise. Also fix FUNCTION description. * libc/string/wcswidth.c: Formatting and punctuation in documentation. * libc/string/wcwidth.c: Likewise. * libm/common/s_modf.c: Remove extra period from documentation. * libm/math/s_isnan.c: Fix formatting, grammar and punctuation in documentation. * libm/mathfp/s_isnan.c: Likewise. * libm/math/s_ldexp.c: Fix punctuation. * libm/mathfp/s_ldexp.c: Likewise. * libm/math/w_log.c: Likewise. * libm/mathfp/s_logarithm.c: Likewise. * libm/math/w_j0.c: Add spaces to FUNCTION description. * libm/mathfp/w_jn.c: Likewise. --- newlib/libc/string/strtok.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'newlib/libc/string/strtok.c') diff --git a/newlib/libc/string/strtok.c b/newlib/libc/string/strtok.c index 8d53290c7..7640fb73d 100644 --- a/newlib/libc/string/strtok.c +++ b/newlib/libc/string/strtok.c @@ -1,6 +1,6 @@ /* FUNCTION - <>,<>,<>---get next token from a string + <>, <>, <>---get next token from a string INDEX strtok @@ -40,25 +40,25 @@ DESCRIPTION The first time that <> is called, <<*<[source]>>> should be specified; subsequent calls, wishing to obtain further tokens from the same string, should pass a null pointer instead. The separator - string, <<*<[delimiters]>>>, must be supplied each time, and may + string, <<*<[delimiters]>>>, must be supplied each time and may change between calls. The <> function returns a pointer to the beginning of each subsequent token in the string, after replacing the separator - character itself with a NUL character. When no more tokens remain, + character itself with a null character. When no more tokens remain, a null pointer is returned. The <> function has the same behavior as <>, except - a pointer to placeholder <<*[lasts]>> must be supplied by the caller. + a pointer to placeholder <<*<[lasts]>>> must be supplied by the caller. The <> function is similar in behavior to <>, except - a pointer to the string pointer must be supplied <<[source_ptr]>> and - the function does not skip leading delimeters. When the string starts - with a delimeter, the delimeter is changed to the NUL character and + a pointer to the string pointer must be supplied <<<[source_ptr]>>> and + the function does not skip leading delimiters. When the string starts + with a delimiter, the delimiter is changed to the null character and the empty string is returned. Like <> and <>, the - <<*[source_ptr]>> is updated to the next character following the - last delimeter found or NULL if the end of string is reached with - no more delimeters. + <<*<[source_ptr]>>> is updated to the next character following the + last delimiter found or NULL if the end of string is reached with + no more delimiters. RETURNS <>, <>, and <> all return a pointer to the @@ -66,13 +66,13 @@ RETURNS <>, a token may be the empty string. NOTES - <> is unsafe for multi-thread applications. <> - and <> are MT-Safe and should be used instead. + <> is unsafe for multi-threaded applications. <> + and <> are thread-safe and should be used instead. PORTABILITY <> is ANSI C. <> is POSIX. -<> is a BSD-extension. +<> is a BSD extension. <>, <>, and <> require no supporting OS subroutines. -- cgit v1.2.3