2012-08-21 Maxim Kuvyrkov <maxim@codesourcery.com>
+ * string/str-two-way.h (AVAILABLE1_USES_J): New macro, define default.
+ (two_way_short_needle): Use it.
+ * string/{strstr.c, strcasestr.c} (AVAILABLE1_USES_J): Define.
+
+2012-08-21 Maxim Kuvyrkov <maxim@codesourcery.com>
+
* string/str-two-way.h (two_way_short_needle): Use pointers instead of
array references.
* string/strcasestr.c (TOLOWER): Make side-effect safe.
#ifndef RET0_IF_0
# define RET0_IF_0(a) /* nothing */
#endif
+#ifndef AVAILABLE1_USES_J
+# define AVAILABLE1_USES_J (1)
+#endif
/* Perform a critical factorization of NEEDLE, of length NEEDLE_LEN.
Return the index of the first byte in the right half, and set
!= (haystack_char = CANON_ELEMENT (*phaystack++)))
{
RET0_IF_0 (haystack_char);
+#if AVAILABLE1_USES_J
++j;
+#endif
continue;
}
- /* Calculate J. */
+#if !AVAILABLE1_USES_J
+ /* Calculate J if it wasn't kept up-to-date in the first-character
+ loop. */
j = phaystack - &haystack[suffix] - 1;
+#endif
/* Scan for matches in right half. */
i = suffix + 1;
#undef AVAILABLE
#undef AVAILABLE1
#undef AVAILABLE2
+#undef AVAILABLE1_USES_J
#undef CANON_ELEMENT
#undef CMP_FUNC
#undef RET0_IF_0
#define AVAILABLE1(h, h_l, j, n_l) (true)
#define AVAILABLE2(h, h_l, j, n_l) AVAILABLE (h, h_l, j, n_l)
#define RET0_IF_0(a) if (!a) goto ret0
+#define AVAILABLE1_USES_J (0)
#define CANON_ELEMENT(c) TOLOWER (c)
#define CMP_FUNC(p1, p2, l) \
__strncasecmp ((const char *) (p1), (const char *) (p2), l)
#define AVAILABLE1(h, h_l, j, n_l) (true)
#define AVAILABLE2(h, h_l, j, n_l) AVAILABLE (h, h_l, j, n_l)
#define RET0_IF_0(a) if (!a) goto ret0
+#define AVAILABLE1_USES_J (0)
#include "str-two-way.h"
#undef strstr