1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 15:15:07 +00:00

LibCore: Make IODevice::read_line() return a String

Almost everyone using this API actually wanted String instead of a
ByteBuffer anyway, and there were a bunch of slightly different ways
clients would convert to String.

Let's just cut out all the confusion and make it return String. :^)
This commit is contained in:
Andreas Kling 2020-12-13 11:44:53 +01:00
parent 4da327d650
commit b9b7b2b28a
22 changed files with 50 additions and 66 deletions

View file

@ -131,7 +131,7 @@ bool IRCClient::connect()
void IRCClient::receive_from_server()
{
while (m_socket->can_read_line()) {
auto line = m_socket->read_line(PAGE_SIZE);
auto line = m_socket->read_line();
if (line.is_null()) {
if (!m_socket->is_connected()) {
outln("IRCClient: Connection closed!");
@ -139,11 +139,11 @@ void IRCClient::receive_from_server()
}
ASSERT_NOT_REACHED();
}
process_line(move(line));
process_line(line);
}
}
void IRCClient::process_line(ByteBuffer&& line)
void IRCClient::process_line(const String& line)
{
Message msg;
Vector<char, 32> prefix;
@ -159,7 +159,7 @@ void IRCClient::process_line(ByteBuffer&& line)
} state
= Start;
for (size_t i = 0; i < line.size(); ++i) {
for (size_t i = 0; i < line.length(); ++i) {
char ch = line[i];
if (ch == '\r')
continue;