Move comments from strtok_r.c to strtok_r.h.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index a31078e3c0f187b373ca48fdaebf801061be98ec..1cce5054bf55b8559d4935dd0484a80ea63635f8 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-19  Bruno Haible  <bruno@clisp.org>
+
+       * strtok_r.c: Move comments from here...
+       * strtok_r.h: ... to here.
+
 2004-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        * realloc.c (rpl_realloc): Call 'free' if n==0, since realloc

diff --git a/lib/strtok_r.c b/lib/strtok_r.c
index e9c143e5887df731a2051668d7e47ede5979b6ec..6b380832ad082c110425f5de26c4833683c8c3df 100644 (file)
--- a/lib/strtok_r.c
+++ b/lib/strtok_r.c
@@ -41,17 +41,6 @@
        x = strtok_r(NULL, "-=", &sp);  // x = "def", sp = NULL
        x = strtok_r(NULL, "=", &sp);   // x = NULL
                // s = "abc\0-def\0"
-
-   For the POSIX documentation for this function, see:
-   http://www.opengroup.org/onlinepubs/009695399/functions/strtok.html
-
-   Caveat: It modifies the original string.
-   Caveat: These functions cannot be used on constant strings.
-   Caveat: The identity of the delimiting character is lost.
-   Caveat: It doesn't work with multibyte strings unless all of the delimiter
-           characters are ASCII characters < 0x30.
-
-   See also strsep().
 */
 char *
 __strtok_r (char *s, const char *delim, char **save_ptr)

diff --git a/lib/strtok_r.h b/lib/strtok_r.h
index 1535209283fea7c3b78d16f6662e0c7770bf7030..36ae7dbc42f764d67e0cab58a90c96b4f85e436b 100644 (file)
--- a/lib/strtok_r.h
+++ b/lib/strtok_r.h
@@ -22,9 +22,32 @@
 /* Get strtok_r declaration, if available.  */
 #include <string.h>
 
+/* Parse S into tokens separated by characters in DELIM.
+   If S is NULL, the saved pointer in SAVE_PTR is used as
+   the next starting point.  For example:
+       char s[] = "-abc-=-def";
+       char *sp;
+       x = strtok_r(s, "-", &sp);      // x = "abc", sp = "=-def"
+       x = strtok_r(NULL, "-=", &sp);  // x = "def", sp = NULL
+       x = strtok_r(NULL, "=", &sp);   // x = NULL
+               // s = "abc\0-def\0"
+
+   This is a variant of strtok() that is multithread-safe.
+
+   For the POSIX documentation for this function, see:
+   http://www.opengroup.org/onlinepubs/009695399/functions/strtok.html
+
+   Caveat: It modifies the original string.
+   Caveat: These functions cannot be used on constant strings.
+   Caveat: The identity of the delimiting character is lost.
+   Caveat: It doesn't work with multibyte strings unless all of the delimiter
+           characters are ASCII characters < 0x30.
+
+   See also strsep().
+*/
 #if defined HAVE_DECL_STRTOK_R && !HAVE_DECL_STRTOK_R
-char *strtok_r(char *restrict s, const char *restrict sep,
-              char **restrict lasts);
+extern char *strtok_r(char *restrict s, const char *restrict sep,
+                     char **restrict lasts);
 #endif
 
 #endif /* STRTOK_R_H */