Userland: Use read_until_eof() more

No intended behavior change.
This commit is contained in:
Nico Weber authored and Tim Schumacher committed 2024-09-09 23:25:08 +02:00
1 parent 36b7cac605
commit 32720f3a2d
8 files changed
+12 -27

No files matched your search

+1 -4
View File
@@ -967,10 +967,7 @@ ErrorOr<ByteBuffer> DeflateCompressor::compress_all(ReadonlyBytes bytes, Compres
TRY(deflate_stream->write_until_depleted(bytes));
TRY(deflate_stream->final_flush());
auto buffer = TRY(ByteBuffer::create_uninitialized(output_stream->used_buffer_size()));
TRY(output_stream->read_until_filled(buffer));
return buffer;
return output_stream->read_until_eof();
}
}
+2 -6
View File
@@ -177,9 +177,7 @@ ErrorOr<ByteBuffer> GzipDecompressor::decompress_all(ReadonlyBytes bytes)
TRY(output_stream.write_until_depleted(data));
}
auto output_buffer = TRY(ByteBuffer::create_uninitialized(output_stream.used_buffer_size()));
TRY(output_stream.read_until_filled(output_buffer));
return output_buffer;
return output_stream.read_until_eof();
}
bool GzipDecompressor::is_eof() const { return m_input_stream->is_eof(); }
@@ -241,9 +239,7 @@ ErrorOr<ByteBuffer> GzipCompressor::compress_all(ReadonlyBytes bytes)
TRY(gzip_stream.write_until_depleted(bytes));
auto buffer = TRY(ByteBuffer::create_uninitialized(output_stream->used_buffer_size()));
TRY(output_stream->read_until_filled(buffer.bytes()));
return buffer;
return output_stream->read_until_eof();
}
}
+1 -4
View File
@@ -165,10 +165,7 @@ ErrorOr<ByteBuffer> ZlibCompressor::compress_all(ReadonlyBytes bytes, ZlibCompre
TRY(zlib_stream->finish());
auto buffer = TRY(ByteBuffer::create_uninitialized(output_stream->used_buffer_size()));
TRY(output_stream->read_until_filled(buffer.bytes()));
return buffer;
return output_stream->read_until_eof();
}
}
@@ -181,8 +181,8 @@ Coroutine<ErrorOr<Reply>> send_connect_request_message(Core::Socket& socket, Cor
CO_TRY(stream.write_value(trailer));
auto buffer = CO_TRY(ByteBuffer::create_uninitialized(stream.used_buffer_size()));
CO_TRY(stream.read_until_filled(buffer.bytes()));
// FIXME: Why does this read the whole stream into memory, instead of streaming blocks to the socket?
auto buffer = CO_TRY(stream.read_until_eof());
CO_TRY(socket.write_until_depleted(buffer));
auto response_header = CO_TRY(socket.read_value<Socks5ConnectResponseHeader>());
@@ -231,9 +231,8 @@ Coroutine<ErrorOr<u8>> send_username_password_authentication_message(Core::Socke
CO_TRY(stream.write_until_depleted({ auth_data.password.characters(), auth_data.password.length() }));
auto buffer = CO_TRY(ByteBuffer::create_uninitialized(stream.used_buffer_size()));
CO_TRY(stream.read_until_filled(buffer.bytes()));
// FIXME: Why does this read the whole stream into memory, instead of streaming blocks to the socket?
auto buffer = CO_TRY(stream.read_until_eof());
CO_TRY(socket.write_until_depleted(buffer));
auto response = CO_TRY(socket.read_value<Socks5UsernamePasswordResponse>());
+1 -2
View File
@@ -1380,8 +1380,7 @@ ErrorOr<void> Editor::refresh_display()
if (output_stream.used_buffer_size() == 0)
return;
auto buffer = ByteBuffer::create_uninitialized(output_stream.used_buffer_size()).release_value_but_fixme_should_propagate_errors();
output_stream.read_until_filled(buffer).release_value_but_fixme_should_propagate_errors();
auto buffer = output_stream.read_until_eof().release_value_but_fixme_should_propagate_errors();
fwrite(buffer.data(), sizeof(char), buffer.size(), stderr);
}
};
+1 -2
View File
@@ -54,8 +54,7 @@ void Request::set_buffered_request_finished_callback(BufferedRequestFinished on_
};
on_finish = [this, on_buffered_request_finished = move(on_buffered_request_finished)](auto success, auto total_size) {
auto output_buffer = ByteBuffer::create_uninitialized(m_internal_buffered_data->payload_stream.used_buffer_size()).release_value_but_fixme_should_propagate_errors();
m_internal_buffered_data->payload_stream.read_until_filled(output_buffer).release_value_but_fixme_should_propagate_errors();
auto output_buffer = m_internal_buffered_data->payload_stream.read_until_eof().release_value_but_fixme_should_propagate_errors();
on_buffered_request_finished(
success,
@@ -90,8 +90,7 @@ void Configuration::dump_stack()
auto print_value = []<typename... Ts>(CheckedFormatString<Ts...> format, Ts... vs) {
AllocatingMemoryStream memory_stream;
Printer { memory_stream }.print(vs...);
auto buffer = ByteBuffer::create_uninitialized(memory_stream.used_buffer_size()).release_value_but_fixme_should_propagate_errors();
memory_stream.read_until_filled(buffer).release_value_but_fixme_should_propagate_errors();
auto buffer = memory_stream.read_until_eof().release_value_but_fixme_should_propagate_errors();
dbgln(format.view(), StringView(buffer).trim_whitespace());
};
for (auto const& entry : stack().entries()) {
+1 -2
View File
@@ -684,8 +684,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
first = false;
else
argument_builder.append(", "sv);
auto buffer = ByteBuffer::create_uninitialized(stream.used_buffer_size()).release_value_but_fixme_should_propagate_errors();
stream.read_until_filled(buffer).release_value_but_fixme_should_propagate_errors();
auto buffer = stream.read_until_eof().release_value_but_fixme_should_propagate_errors();
argument_builder.append(StringView(buffer).trim_whitespace());
}
dbgln("[wasm runtime] Stub function {} was called with the following arguments: {}", name, argument_builder.to_byte_string());