Update.

	* string/bits/string2.h (__strtok_r_1c): Optimize a bit.

diff --git a/ChangeLog b/ChangeLog
index 5ffa57f..2d02070 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2001-09-14  Ulrich Drepper  <drepper@redhat.com>
 
+       * string/bits/string2.h (__strtok_r_1c): Optimize a bit.
+
        * sysdeps/unix/sysv/linux/net/ethernet.h: Correct references to
        ETHER_CRC_LEN.
 

diff --git a/string/bits/string2.h b/string/bits/string2.h
index 1caa81b..09a49b6 100644 (file)
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -1044,15 +1044,13 @@ __strtok_r_1c (char *__s, char __sep, char **__nextp)
   else
     {
       __result = __s;
-      while (*__s != '\0' && *__s != __sep)
-       ++__s;
-      if (*__s == '\0')
-       *__nextp = __s;
-      else
-       {
-         *__s = '\0';
-         *__nextp = __s + 1;
-       }
+      while (*__s != '\0')
+       if (*__s++ == __sep)
+         {
+           __s[-1] = '\0';
+           break;
+         }
+      *__nextp = __s;
     }
   return __result;
 }