Revert "use chrchr() in q_toPercentEncoding()"

This reverts commit 53c24ec0ba.
This commit is contained in:
Ivailo Monev 2021-02-18 00:37:16 +02:00
parent f4edceb336
commit 3155cb6703

View file

@ -4094,6 +4094,18 @@ QByteArray QByteArray::fromPercentEncoding(const QByteArray &input, char percent
return tmp;
}
static inline bool q_strchr(const char str[], char chr)
{
if (!str) return false;
const char *ptr = str;
char c;
while ((c = *ptr++))
if (c == chr)
return true;
return false;
}
static inline char toHexHelper(char c)
{
static const char hexnumbers[] = "0123456789ABCDEF";
@ -4120,8 +4132,8 @@ static void q_toPercentEncoding(QByteArray *ba, const char *dontEncode, const ch
|| c == 0x2E // .
|| c == 0x5F // _
|| c == 0x7E // ~
|| ::strchr(dontEncode, c))
&& !::strchr(alsoEncode, c)) {
|| q_strchr(dontEncode, c))
&& !q_strchr(alsoEncode, c)) {
if (output)
output[length] = c;
++length;