(__strtsep): Help gcc optimizing string access.

diff --git a/string/bits/string2.h b/string/bits/string2.h
index 82a1d9984f93f3f8024ba9da68bad4bcfa374ffd..c1c27bb17a2e10aa30b7f0d6c35596beb5e193d3 100644 (file)
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -118,7 +118,7 @@ __STRING2_COPY_TYPE (8);
      __uint8_t __c = (__uint8_t) (c);                                        \
                                                                              \
      /* This `switch' statement will be removed at compile-time.  */         \
-     switch ((unsigned int) n)                                               \
+     switch ((unsigned int) (n))                                             \
        {                                                                     \
        case 15:                                                                      \
         __u->__ui = __c * 0x01010101;                                        \
@@ -1079,8 +1079,10 @@ __strtok_r_1c (char *__s, char __sep, char **__nextp)
   __extension__                                                                      \
   ({ char __r0, __r1, __r2;                                                  \
      (__builtin_constant_p (reject) && __string2_1bptr_p (reject)            \
-      && (__r0 = ((__const char *) (reject))[0], __r0 != '\0')               \
-      ? ((__r1 = ((__const char *) (reject))[1], __r1 == '\0')               \
+      && (__r0 = ((__const char *) (reject))[0],                             \
+         ((__const char *) (reject))[0] != '\0')                             \
+      ? ((__r1 = ((__const char *) (reject))[1],                             \
+        ((__const char *) (reject))[1] == '\0')                              \
         ? __strsep_1c (s, __r0)                                              \
         : ((__r2 = ((__const char *) (reject))[2], __r2 == '\0')             \
            ? __strsep_2c (s, __r0, __r1)                                     \