From dda339e6d22778f5c4bdeb6f588d341ce131acbb Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 13 Oct 2011 17:58:11 +0200 Subject: Simplify heuristic for when to use memchr --- Objects/stringlib/fastsearch.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h index 085ec6a..0f7aea7 100644 --- a/Objects/stringlib/fastsearch.h +++ b/Objects/stringlib/fastsearch.h @@ -113,20 +113,10 @@ FASTSEARCH(const STRINGLIB_CHAR* s, Py_ssize_t n, /* use memchr if we can choose a needle without two many likely false positives */ unsigned char needle; - int use_needle = 1; needle = p[0] & 0xff; #if STRINGLIB_SIZEOF_CHAR > 1 - if (needle == 0) { - needle = (p[0] >> 8) & 0xff; -#if STRINGLIB_SIZEOF_CHAR > 2 - if (needle == 0) - needle = (p[0] >> 16) & 0xff; + if (needle != 0) #endif - if (needle >= 32 || needle == 0) - use_needle = 0; - } -#endif - if (use_needle) return STRINGLIB(fastsearch_memchr_1char) (s, n, p[0], needle, maxcount, mode); } -- cgit v0.12