From 3730212312584e805927460d82bb9a0ef9c10f68 Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Fri, 25 Aug 2023 16:49:09 +0300 Subject: qnetworkrequest: port parseMatchImpl to QBAV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to save allocations, and use tokenize to avoid temp container Change-Id: I2a43612b9d15538a93d4afd2c544714507141f0f Reviewed-by: Mårten Nordheim --- src/network/access/qnetworkrequest.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/network/access/qnetworkrequest.cpp') diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 8e666db2b0c..a7a5ca5e391 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -1220,31 +1220,29 @@ static QVariant parseETag(QByteArrayView raw) } template -static QVariant parseMatchImpl(const QByteArray &raw, T op) +static QVariant parseMatchImpl(QByteArrayView raw, T op) { - const QByteArray trimmedRaw = raw.trimmed(); + const QByteArrayView trimmedRaw = raw.trimmed(); if (trimmedRaw == "*") return QStringList(QStringLiteral("*")); QStringList tags; - const QList split = trimmedRaw.split(','); - for (const QByteArray &element : split) { - const QByteArray trimmed = element.trimmed(); - if (!op(trimmed)) - continue; - tags += QString::fromLatin1(trimmed); + for (auto &element : QLatin1StringView(trimmedRaw).tokenize(','_L1)) { + if (const auto trimmed = element.trimmed(); op(trimmed)) + tags += QString::fromLatin1(trimmed); } return tags; } -static QVariant parseIfMatch(const QByteArray &raw) + +static QVariant parseIfMatch(QByteArrayView raw) { return parseMatchImpl(raw, [](QByteArrayView element) { return element.startsWith('"') && element.endsWith('"'); }); } -static QVariant parseIfNoneMatch(const QByteArray &raw) +static QVariant parseIfNoneMatch(QByteArrayView raw) { return parseMatchImpl(raw, [](QByteArrayView element) { return (element.startsWith('"') || element.startsWith(R"(W/")")) && element.endsWith('"'); -- cgit v1.2.3