summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2022-12-12 13:45:35 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2022-12-15 10:48:44 +0100
commitd9d01da5e053a4b603bbcfe3daa069371a573a07 (patch)
treeced0f4e69d383d41b03de5725d33bf5548d6d28b
parent7efdec16d9f6116fc6c13bc3ae7c9b9e229e5a49 (diff)
downloadqtwebsockets-d9d01da5e053a4b603bbcfe3daa069371a573a07.tar.gz
Turn if..else if..else into a switch
Makes it a little nicer when adding new branches Change-Id: I1075c00c5bfc83d868adbc98d8c086f6065e9688 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-rw-r--r--src/websockets/qwebsocket_p.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 8b18818..570dcca 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -1032,7 +1032,8 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
QByteArrayLiteral("sec-websocket-version")));
bool ok = false;
QString errorDescription;
- if (Q_LIKELY(parser.getStatusCode() == 101)) {
+ switch (parser.getStatusCode()) {
+ case 101: {
//HTTP/x.y 101 Switching Protocols
//TODO: do not check the httpStatusText right now
ok = (acceptKey.size() > 0
@@ -1056,7 +1057,9 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
errorDescription = QWebSocket::tr(
"Invalid parameter(s) presented during protocol upgrade: %1").arg(upgradeParms);
}
- } else if (parser.getStatusCode() == 400) {
+ break;
+ }
+ case 400: {
//HTTP/1.1 400 Bad Request
if (!version.isEmpty()) {
const QStringList versions = version.split(QStringLiteral(", "), Qt::SkipEmptyParts);
@@ -1075,11 +1078,14 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
errorDescription =
QWebSocket::tr("QWebSocketPrivate::processHandshake: Unknown error condition encountered. Aborting connection.");
}
- } else {
+ break;
+ }
+ default: {
errorDescription =
QWebSocket::tr("QWebSocketPrivate::processHandshake: Unhandled http status code: %1 (%2).")
.arg(parser.getStatusCode()).arg(parser.getReasonPhrase());
}
+ }
if (ok) {
// handshake succeeded