whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QByteArray: de-duplicate the find-one-char function 

We have a public, inlineable one, so use that one instead of the private
copy. They do the same thing.

Task-number: QTBUG-125283
Change-Id: If05cb740b64f42eba21efffd17cf2ded689e0691
Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
bb10
Thiago Macieira 2024-05-13 15:48:00 -07:00
parent 112e554cbf
commit eeb6f0337e
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/corelib/text/qbytearraymatcher.cpp
View File

@ -212,23 +212,6 @@ qsizetype QByteArrayMatcher::indexIn(QByteArrayView data, qsizetype from) const
\sa setPattern()
*/
static qsizetype findChar(const char *str, qsizetype len, char ch, qsizetype from)
{
const uchar *s = (const uchar *)str;
uchar c = (uchar)ch;
if (from < 0)
from = qMax(from + len, qsizetype(0));
if (from < len) {
const uchar *n = s + from - 1;
const uchar *e = s + len;
while (++n != e)
if (*n == c)
return n - s;
}
return -1;
}
/*!
\internal
*/
@ -268,7 +251,7 @@ qsizetype qFindByteArray(
return -1;
if (sl == 1)
return findChar(haystack0, haystackLen, needle[0], from);
return QtPrivate::findByteArray({ haystack0, haystackLen }, from, needle[0]);
/*
We use the Boyer-Moore algorithm in cases where the overhead