RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 04:17:35 +00:00
Code Issues Activity Actions

Everywhere: Add sv suffix to strings relying on StringView(char const*)

Browse source 
Each of these strings would previously rely on StringView's char const*
constructor overload, which would call __builtin_strlen on the string.
Since we now have operator ""sv, we can replace these with much simpler
versions. This opens the door to being able to remove
StringView(char const*).

No functional changes.
This commit is contained in:
sin-ack 2022-07-11 17:32:29 +00:00 • committed by Andreas Kling
parent e5f09ea170
commit 3f3f45580a
762 changed files with 8315 additions and 8316 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Userland/Libraries/LibWebSocket/WebSocket.cpp
View file

@ -147,11 +147,11 @@ void WebSocket::send_client_handshake()
builder.appendff(":{}", url.port_or_default());
else if (m_connection.is_secure() && url.port_or_default() != 443)
builder.appendff(":{}", url.port_or_default());
builder.append("\r\n");
builder.append("\r\n"sv);
// 5. and 6. Connection Upgrade
builder.append("Upgrade: websocket\r\n");
builder.append("Connection: Upgrade\r\n");
builder.append("Upgrade: websocket\r\n"sv);
builder.append("Connection: Upgrade\r\n"sv);
// 7. 16-byte nonce encoded as Base64
u8 nonce_data[16];
@ -165,20 +165,20 @@ void WebSocket::send_client_handshake()
}
// 9. Websocket version
builder.append("Sec-WebSocket-Version: 13\r\n");
builder.append("Sec-WebSocket-Version: 13\r\n"sv);
// 10. Websocket protocol (optional field)
if (!m_connection.protocols().is_empty()) {
builder.append("Sec-WebSocket-Protocol: ");
builder.join(",", m_connection.protocols());
builder.append("\r\n");
builder.append("Sec-WebSocket-Protocol: "sv);
builder.join(',', m_connection.protocols());
builder.append("\r\n"sv);
}
// 11. Websocket extensions (optional field)
if (!m_connection.extensions().is_empty()) {
builder.append("Sec-WebSocket-Extensions: ");
builder.join(",", m_connection.extensions());
builder.append("\r\n");
builder.append("Sec-WebSocket-Extensions: "sv);
builder.join(',', m_connection.extensions());
builder.append("\r\n"sv);
}
// 12. Additional headers
@ -186,7 +186,7 @@ void WebSocket::send_client_handshake()
builder.appendff("{}: {}\r\n", header.name, header.value);
}
builder.append("\r\n");
builder.append("\r\n"sv);
m_state = WebSocket::InternalState::WaitingForServerHandshake;
auto success = m_impl->send(builder.to_string().bytes());
@ -267,9 +267,9 @@ void WebSocket::read_server_handshake()
auto header_name = parts[0];
if (header_name.equals_ignoring_case("Upgrade")) {
if (header_name.equals_ignoring_case("Upgrade"sv)) {
// 2. |Upgrade| should be case-insensitive "websocket"
if (!parts[1].trim_whitespace().equals_ignoring_case("websocket")) {
if (!parts[1].trim_whitespace().equals_ignoring_case("websocket"sv)) {
dbgln("WebSocket: Server HTTP Handshake Header |Upgrade| should be 'websocket', got '{}'. Failing connection.", parts[1]);
fatal_error(WebSocket::Error::ConnectionUpgradeFailed);
return;
@ -279,9 +279,9 @@ void WebSocket::read_server_handshake()
continue;
}
if (header_name.equals_ignoring_case("Connection")) {
if (header_name.equals_ignoring_case("Connection"sv)) {
// 3. |Connection| should be case-insensitive "Upgrade"
if (!parts[1].trim_whitespace().equals_ignoring_case("Upgrade")) {
if (!parts[1].trim_whitespace().equals_ignoring_case("Upgrade"sv)) {
dbgln("WebSocket: Server HTTP Handshake Header |Connection| should be 'Upgrade', got '{}'. Failing connection.", parts[1]);
return;
}
@ -290,7 +290,7 @@ void WebSocket::read_server_handshake()
continue;
}
if (header_name.equals_ignoring_case("Sec-WebSocket-Accept")) {
if (header_name.equals_ignoring_case("Sec-WebSocket-Accept"sv)) {
// 4. |Sec-WebSocket-Accept| should be base64(SHA1(|Sec-WebSocket-Key| + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"))
auto expected_content = String::formatted("{}258EAFA5-E914-47DA-95CA-C5AB0DC85B11", m_websocket_key);
@ -309,7 +309,7 @@ void WebSocket::read_server_handshake()
continue;
}
if (header_name.equals_ignoring_case("Sec-WebSocket-Extensions")) {
if (header_name.equals_ignoring_case("Sec-WebSocket-Extensions"sv)) {
// 5. |Sec-WebSocket-Extensions| should not contain an extension that doesn't appear in m_connection->extensions()
auto server_extensions = parts[1].split(',');
for (auto const& extension : server_extensions) {
@ -329,7 +329,7 @@ void WebSocket::read_server_handshake()
continue;
}
if (header_name.equals_ignoring_case("Sec-WebSocket-Protocol")) {
if (header_name.equals_ignoring_case("Sec-WebSocket-Protocol"sv)) {
// 6. |Sec-WebSocket-Protocol| should not contain an extension that doesn't appear in m_connection->protocols()
auto server_protocols = parts[1].split(',');
for (auto const& protocol : server_protocols) {