mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 14:07:46 +00:00
LibCore+LibIPC: Make Core::Stream read_without_waiting() return Bytes
For the reasoning, see the earlier commit about Core::Stream::read().
This commit is contained in:
parent
d564cf1e89
commit
fe5fdb200b
3 changed files with 9 additions and 9 deletions
|
@ -121,9 +121,9 @@ ErrorOr<Vector<u8>> ConnectionBase::read_as_much_as_possible_from_socket_without
|
|||
|
||||
u8 buffer[4096];
|
||||
while (m_socket->is_open()) {
|
||||
auto maybe_nread = m_socket->read_without_waiting({ buffer, 4096 });
|
||||
if (maybe_nread.is_error()) {
|
||||
auto error = maybe_nread.release_error();
|
||||
auto maybe_bytes_read = m_socket->read_without_waiting({ buffer, 4096 });
|
||||
if (maybe_bytes_read.is_error()) {
|
||||
auto error = maybe_bytes_read.release_error();
|
||||
if (error.is_syscall() && error.code() == EAGAIN) {
|
||||
break;
|
||||
}
|
||||
|
@ -133,13 +133,13 @@ ErrorOr<Vector<u8>> ConnectionBase::read_as_much_as_possible_from_socket_without
|
|||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
||||
auto nread = maybe_nread.release_value();
|
||||
if (nread == 0) {
|
||||
auto bytes_read = maybe_bytes_read.release_value();
|
||||
if (bytes_read.is_empty()) {
|
||||
deferred_invoke([this] { shutdown(); });
|
||||
return Error::from_string_literal("IPC connection EOF"sv);
|
||||
}
|
||||
|
||||
bytes.append(buffer, nread);
|
||||
bytes.append(bytes_read.data(), bytes_read.size());
|
||||
}
|
||||
|
||||
if (!bytes.is_empty()) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue