[PATCH] Remove last remaining bits of strtok.

4 files changed, 2 insertions, 27 deletions

diff --git a/include/asm-i386/string-486.h b/include/asm-i386/string-486.h
index 51bfd051bc00..4104ab9bc9f9 100644
--- a/include/asm-i386/string-486.h
+++ b/include/asm-i386/string-486.h
@@ -5,7 +5,7 @@
  * This string-include defines all string functions as inline
  * functions. Use gcc. It also assumes ds=es=data space, this should be
  * normal. Most of the string-functions are rather heavily hand-optimized,
- * see especially strtok,strstr,str[c]spn. They should work, but are not
+ * see especially strsep,strstr,str[c]spn. They should work, but are not
  * very easy to understand. Everything is done entirely within the register
  * set, making the functions fast and clean. 
  *
diff --git a/include/asm-i386/string.h b/include/asm-i386/string.h
index d4d7899dc1aa..96f4e52fc7f7 100644
--- a/include/asm-i386/string.h
+++ b/include/asm-i386/string.h
@@ -20,7 +20,7 @@
  * This string-include defines all string functions as inline
  * functions. Use gcc. It also assumes ds=es=data space, this should be
  * normal. Most of the string-functions are rather heavily hand-optimized,
- * see especially strtok,strstr,str[c]spn. They should work, but are not
+ * see especially strsep,strstr,str[c]spn. They should work, but are not
  * very easy to understand. Everything is done entirely within the register
  * set, making the functions fast and clean. String instructions have been
  * used through-out, making for "slightly" unclear code :-)
diff --git a/include/asm-m68k/string.h b/include/asm-m68k/string.h
index 5183aa0096d8..5604739225b3 100644
--- a/include/asm-m68k/string.h
+++ b/include/asm-m68k/string.h
@@ -117,29 +117,6 @@ static inline size_t strspn(const char *s, const char *accept)
 }
 #endif
 
-#if 0
-#define __HAVE_ARCH_STRTOK
-extern inline char * strtok(char * s,const char * ct)
-{
-  char *sbegin, *send;
-  
-  sbegin  = s ? s : ___strtok;
-  if (!sbegin) {
-	  return NULL;
-  }
-  sbegin += strspn(sbegin,ct);
-  if (*sbegin == '\0') {
-    ___strtok = NULL;
-    return( NULL );
-  }
-  send = strpbrk( sbegin, ct);
-  if (send && *send != '\0')
-    *send++ = '\0';
-  ___strtok = send;
-  return (sbegin);
-}
-#endif
-
 /* strstr !! */
 
 #define __HAVE_ARCH_STRLEN
diff --git a/include/linux/string.h b/include/linux/string.h
index b5497d139d28..3d344c0190d8 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -12,9 +12,7 @@
 extern "C" {
 #endif
 
-extern char * ___strtok;
 extern char * strpbrk(const char *,const char *);
-extern char * strtok(char *,const char *);
 extern char * strsep(char **,const char *);
 extern __kernel_size_t strspn(const char *,const char *);