RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 02:27:44 +00:00
Code Issues Activity Actions

LibCore+Everywhere: Make Core::Stream read_line() return StringView

Browse source 
Similar reasoning to making Core::Stream::read() return Bytes, except
that every user of read_line() creates a StringView from the result, so
let's just return one right away.
This commit is contained in:
Sam Atkins 2022-04-15 14:52:33 +01:00 • committed by Tim Flynn
parent c4134e9794
commit d564cf1e89
9 changed files with 40 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Applications/Browser/main.cpp
View file

@ -43,8 +43,7 @@ static ErrorOr<void> load_content_filters()
auto ad_filter_list = TRY(Core::Stream::BufferedFile::create(move(file)));
auto buffer = TRY(ByteBuffer::create_uninitialized(4096));
while (TRY(ad_filter_list->can_read_line())) {
auto length = TRY(ad_filter_list->read_line(buffer));
StringView line { buffer.data(), length };
auto line = TRY(ad_filter_list->read_line(buffer));
if (!line.is_empty())
Browser::g_content_filters.append(line);
}

3
Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp
View file

@ -30,8 +30,7 @@ ErrorOr<void> DomainListModel::load()
auto content_filter_list = TRY(Core::Stream::BufferedFile::create(move(file)));
auto buffer = TRY(ByteBuffer::create_uninitialized(4096));
while (TRY(content_filter_list->can_read_line())) {
auto length = TRY(content_filter_list->read_line(buffer));
StringView line { buffer.data(), length };
auto line = TRY(content_filter_list->read_line(buffer));
dbgln("Content filter for {}", line);
if (!line.is_empty())
m_domain_list.append(line);

6
Userland/Applications/FileManager/FileOperationProgressWidget.cpp
View file

@ -72,13 +72,13 @@ FileOperationProgressWidget::FileOperationProgressWidget(FileOperation operation
m_notifier = Core::Notifier::construct(helper_pipe_fd, Core::Notifier::Read);
m_notifier->on_ready_to_read = [this] {
auto line_buffer = ByteBuffer::create_zeroed(1 * KiB).release_value_but_fixme_should_propagate_errors();
auto line_length_or_error = m_helper_pipe->read_line(line_buffer.bytes());
if (line_length_or_error.is_error() || line_length_or_error.value() == 0) {
auto line_or_error = m_helper_pipe->read_line(line_buffer.bytes());
if (line_or_error.is_error() || line_or_error.value().is_empty()) {
did_error("Read from pipe returned null."sv);
return;
}
StringView line { line_buffer.bytes().data(), line_length_or_error.value() };
auto line = line_or_error.release_value();
auto parts = line.split_view(' ');
VERIFY(!parts.is_empty());