Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 15:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Close #15534: Fix a typo in the fast search function of the string library (_s => s)

Browse source 
Replace _s with ptr to avoid future confusion. Add also non regression tests.
This commit is contained in:
Victor Stinner 2012-08-02 23:05:01 +02:00
parent 77821b68a7
commit b3f5501250
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/stringlib/fastsearch.h
View file

@ -48,16 +48,16 @@ STRINGLIB(fastsearch_memchr_1char)(const STRINGLIB_CHAR* s, Py_ssize_t n,
} while (0)
if (mode == FAST_SEARCH) {
const STRINGLIB_CHAR *_s = s;
const STRINGLIB_CHAR *ptr = s;
const STRINGLIB_CHAR *e = s + n;
while (_s < e) {
DO_MEMCHR(memchr, _s, needle, e - _s);
while (ptr < e) {
DO_MEMCHR(memchr, ptr, needle, e - ptr);
if (found == NULL)
return -1;
if (sizeof(STRINGLIB_CHAR) == 1 || *found == ch)
return (found - _s);
return (found - s);
/* False positive */
_s = found + 1;
ptr = found + 1;
}
return -1;
}