From 6cc1a8400520e1c840d076ceca00dfd538da5d46 Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Thu, 24 Aug 2023 17:28:46 +0300 Subject: [PATCH] qnetworkrequest: reduce branches in loop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unconditionally append separator and then chop last one Change-Id: I33d004df07ce0c3c0076dc374ae7a2f8c413aeba Reviewed-by: MÃ¥rten Nordheim --- src/network/access/qnetworkrequest.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index a7a5ca5e391..0272ff18999 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -1096,14 +1096,14 @@ static QByteArray headerValue(QNetworkRequest::KnownHeaders header, const QVaria if (cookies.isEmpty() && value.userType() == qMetaTypeId()) cookies << qvariant_cast(value); + constexpr QByteArrayView separator = "; "; QByteArray result; - bool first = true; for (const QNetworkCookie &cookie : std::as_const(cookies)) { - if (!first) - result += "; "; - first = false; result += cookie.toRawForm(QNetworkCookie::NameAndValueOnly); + result += separator; } + if (!result.isEmpty()) + result.chop(separator.size()); return result; } @@ -1111,15 +1111,15 @@ static QByteArray headerValue(QNetworkRequest::KnownHeaders header, const QVaria QList cookies = qvariant_cast >(value); if (cookies.isEmpty() && value.userType() == qMetaTypeId()) cookies << qvariant_cast(value); - +\ + constexpr QByteArrayView separator = ", "; QByteArray result; - bool first = true; for (const QNetworkCookie &cookie : std::as_const(cookies)) { - if (!first) - result += ", "; - first = false; result += cookie.toRawForm(QNetworkCookie::Full); + result += separator; } + if (!result.isEmpty()) + result.chop(separator.size()); return result; } }