diff options
-rw-r--r-- | Applications/IRCClient/IRCClient.cpp | 2 | ||||
-rw-r--r-- | Libraries/LibCore/Socket.cpp | 6 | ||||
-rw-r--r-- | Libraries/LibCore/Socket.h | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Applications/IRCClient/IRCClient.cpp b/Applications/IRCClient/IRCClient.cpp index 6b078e281f..31f4e01a10 100644 --- a/Applications/IRCClient/IRCClient.cpp +++ b/Applications/IRCClient/IRCClient.cpp @@ -215,7 +215,7 @@ void IRCClient::process_line(ByteBuffer&& line) void IRCClient::send(const String& text) { - if (!m_socket->send(ByteBuffer::wrap(text.characters(), text.length()))) { + if (!m_socket->send(text.bytes())) { perror("send"); exit(1); } diff --git a/Libraries/LibCore/Socket.cpp b/Libraries/LibCore/Socket.cpp index c8f07672f2..a12c57993a 100644 --- a/Libraries/LibCore/Socket.cpp +++ b/Libraries/LibCore/Socket.cpp @@ -167,7 +167,7 @@ ByteBuffer Socket::receive(int max_size) return buffer; } -bool Socket::send(const ByteBuffer& data) +bool Socket::send(ReadonlyBytes data) { ssize_t nsent = ::send(fd(), data.data(), data.size(), 0); if (nsent < 0) { @@ -182,8 +182,8 @@ void Socket::did_update_fd(int fd) { if (fd < 0) { if (m_read_notifier) { - m_read_notifier->remove_from_parent(); - m_read_notifier = nullptr; + m_read_notifier->remove_from_parent(); + m_read_notifier = nullptr; } if (m_notifier) { m_notifier->remove_from_parent(); diff --git a/Libraries/LibCore/Socket.h b/Libraries/LibCore/Socket.h index e6803fbb40..fcbd2af31d 100644 --- a/Libraries/LibCore/Socket.h +++ b/Libraries/LibCore/Socket.h @@ -27,6 +27,7 @@ #pragma once #include <AK/Function.h> +#include <AK/Span.h> #include <LibCore/IODevice.h> #include <LibCore/SocketAddress.h> @@ -50,7 +51,7 @@ public: bool connect(const SocketAddress&); ByteBuffer receive(int max_size); - bool send(const ByteBuffer&); + bool send(ReadonlyBytes); bool is_connected() const { return m_connected; } void set_blocking(bool blocking); |