mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 22:17:44 +00:00
Everywhere: Rename {Deprecated => Byte}String
This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
parent
38d62563b3
commit
5e1499d104
1615 changed files with 10257 additions and 10257 deletions
|
@ -26,8 +26,8 @@ void ConnectionFromClient::die()
|
|||
Core::EventLoop::current().quit(0);
|
||||
}
|
||||
|
||||
Messages::WebSocketServer::ConnectResponse ConnectionFromClient::connect(URL const& url, DeprecatedString const& origin,
|
||||
Vector<DeprecatedString> const& protocols, Vector<DeprecatedString> const& extensions, HashMap<DeprecatedString, DeprecatedString> const& additional_request_headers)
|
||||
Messages::WebSocketServer::ConnectResponse ConnectionFromClient::connect(URL const& url, ByteString const& origin,
|
||||
Vector<ByteString> const& protocols, Vector<ByteString> const& extensions, HashMap<ByteString, ByteString> const& additional_request_headers)
|
||||
{
|
||||
if (!url.is_valid()) {
|
||||
dbgln("WebSocket::Connect: Invalid URL requested: '{}'", url);
|
||||
|
@ -57,7 +57,7 @@ Messages::WebSocketServer::ConnectResponse ConnectionFromClient::connect(URL con
|
|||
connection->on_error = [this, id](auto message) {
|
||||
did_error(id, (i32)message);
|
||||
};
|
||||
connection->on_close = [this, id](u16 code, DeprecatedString reason, bool was_clean) {
|
||||
connection->on_close = [this, id](u16 code, ByteString reason, bool was_clean) {
|
||||
did_close(id, code, move(reason), was_clean);
|
||||
};
|
||||
|
||||
|
@ -81,7 +81,7 @@ Messages::WebSocketServer::SubprotocolInUseResponse ConnectionFromClient::subpro
|
|||
if (connection) {
|
||||
return connection->subprotocol_in_use();
|
||||
}
|
||||
return DeprecatedString::empty();
|
||||
return ByteString::empty();
|
||||
}
|
||||
|
||||
void ConnectionFromClient::send(i32 connection_id, bool is_text, ByteBuffer const& data)
|
||||
|
@ -93,7 +93,7 @@ void ConnectionFromClient::send(i32 connection_id, bool is_text, ByteBuffer cons
|
|||
}
|
||||
}
|
||||
|
||||
void ConnectionFromClient::close(i32 connection_id, u16 code, DeprecatedString const& reason)
|
||||
void ConnectionFromClient::close(i32 connection_id, u16 code, ByteString const& reason)
|
||||
{
|
||||
RefPtr<WebSocket> connection = m_connections.get(connection_id).value_or({});
|
||||
if (connection && connection->ready_state() == ReadyState::Open)
|
||||
|
@ -101,7 +101,7 @@ void ConnectionFromClient::close(i32 connection_id, u16 code, DeprecatedString c
|
|||
}
|
||||
|
||||
Messages::WebSocketServer::SetCertificateResponse ConnectionFromClient::set_certificate(i32 connection_id,
|
||||
[[maybe_unused]] DeprecatedString const& certificate, [[maybe_unused]] DeprecatedString const& key)
|
||||
[[maybe_unused]] ByteString const& certificate, [[maybe_unused]] ByteString const& key)
|
||||
{
|
||||
RefPtr<WebSocket> connection = m_connections.get(connection_id).value_or({});
|
||||
bool success = false;
|
||||
|
@ -128,7 +128,7 @@ void ConnectionFromClient::did_error(i32 connection_id, i32 message)
|
|||
async_errored(connection_id, message);
|
||||
}
|
||||
|
||||
void ConnectionFromClient::did_close(i32 connection_id, u16 code, DeprecatedString reason, bool was_clean)
|
||||
void ConnectionFromClient::did_close(i32 connection_id, u16 code, ByteString reason, bool was_clean)
|
||||
{
|
||||
async_closed(connection_id, code, reason, was_clean);
|
||||
deferred_invoke([this, connection_id] {
|
||||
|
|
|
@ -26,17 +26,17 @@ public:
|
|||
private:
|
||||
explicit ConnectionFromClient(NonnullOwnPtr<Core::LocalSocket>);
|
||||
|
||||
virtual Messages::WebSocketServer::ConnectResponse connect(URL const&, DeprecatedString const&, Vector<DeprecatedString> const&, Vector<DeprecatedString> const&, HashMap<DeprecatedString, DeprecatedString> const&) override;
|
||||
virtual Messages::WebSocketServer::ConnectResponse connect(URL const&, ByteString const&, Vector<ByteString> const&, Vector<ByteString> const&, HashMap<ByteString, ByteString> const&) override;
|
||||
virtual Messages::WebSocketServer::ReadyStateResponse ready_state(i32) override;
|
||||
virtual Messages::WebSocketServer::SubprotocolInUseResponse subprotocol_in_use(i32) override;
|
||||
virtual void send(i32, bool, ByteBuffer const&) override;
|
||||
virtual void close(i32, u16, DeprecatedString const&) override;
|
||||
virtual Messages::WebSocketServer::SetCertificateResponse set_certificate(i32, DeprecatedString const&, DeprecatedString const&) override;
|
||||
virtual void close(i32, u16, ByteString const&) override;
|
||||
virtual Messages::WebSocketServer::SetCertificateResponse set_certificate(i32, ByteString const&, ByteString const&) override;
|
||||
|
||||
void did_connect(i32);
|
||||
void did_receive_message(i32, Message);
|
||||
void did_error(i32, i32 message);
|
||||
void did_close(i32, u16 code, DeprecatedString reason, bool was_clean);
|
||||
void did_close(i32, u16 code, ByteString reason, bool was_clean);
|
||||
void did_request_certificates(i32);
|
||||
|
||||
i32 m_connection_ids { 0 };
|
||||
|
|
|
@ -6,7 +6,7 @@ endpoint WebSocketClient
|
|||
connected(i32 connection_id) =|
|
||||
received(i32 connection_id, bool is_text, ByteBuffer data) =|
|
||||
errored(i32 connection_id, i32 message) =|
|
||||
closed(i32 connection_id, u16 code, DeprecatedString reason, bool clean) =|
|
||||
closed(i32 connection_id, u16 code, ByteString reason, bool clean) =|
|
||||
|
||||
// Certificate requests
|
||||
certificate_requested(i32 connection_id) =|
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
endpoint WebSocketServer
|
||||
{
|
||||
// Connection API
|
||||
connect(URL url, DeprecatedString origin, Vector<DeprecatedString> protocols, Vector<DeprecatedString> extensions, HashMap<DeprecatedString,DeprecatedString> additional_request_headers) => (i32 connection_id)
|
||||
connect(URL url, ByteString origin, Vector<ByteString> protocols, Vector<ByteString> extensions, HashMap<ByteString,ByteString> additional_request_headers) => (i32 connection_id)
|
||||
ready_state(i32 connection_id) => (u32 ready_state)
|
||||
subprotocol_in_use(i32 connection_id) => (DeprecatedString subprotocol_in_use)
|
||||
subprotocol_in_use(i32 connection_id) => (ByteString subprotocol_in_use)
|
||||
send(i32 connection_id, bool is_text, ByteBuffer data) =|
|
||||
close(i32 connection_id, u16 code, DeprecatedString reason) =|
|
||||
close(i32 connection_id, u16 code, ByteString reason) =|
|
||||
|
||||
set_certificate(i32 connection_id, DeprecatedString certificate, DeprecatedString key) => (bool success)
|
||||
set_certificate(i32 connection_id, ByteString certificate, ByteString key) => (bool success)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue