mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 04:57:45 +00:00
Kernel: Use KResultOr<size_t> for the DoubleBuffer class
This commit is contained in:
parent
1c3346e3ce
commit
ca3cae81eb
4 changed files with 31 additions and 31 deletions
|
@ -270,17 +270,17 @@ KResultOr<size_t> IPv4Socket::receive_byte_buffered(FileDescription& description
|
|||
|
||||
VERIFY(!m_receive_buffer.is_empty());
|
||||
|
||||
int nreceived;
|
||||
KResultOr<size_t> nreceived_or_error { 0 };
|
||||
if (flags & MSG_PEEK)
|
||||
nreceived = m_receive_buffer.peek(buffer, buffer_length);
|
||||
nreceived_or_error = m_receive_buffer.peek(buffer, buffer_length);
|
||||
else
|
||||
nreceived = m_receive_buffer.read(buffer, buffer_length);
|
||||
nreceived_or_error = m_receive_buffer.read(buffer, buffer_length);
|
||||
|
||||
if (nreceived > 0 && !(flags & MSG_PEEK))
|
||||
Thread::current()->did_ipv4_socket_read((size_t)nreceived);
|
||||
if (!nreceived_or_error.is_error() && nreceived_or_error.value() > 0 && !(flags & MSG_PEEK))
|
||||
Thread::current()->did_ipv4_socket_read(nreceived_or_error.value());
|
||||
|
||||
set_can_read(!m_receive_buffer.is_empty());
|
||||
return nreceived;
|
||||
return nreceived_or_error;
|
||||
}
|
||||
|
||||
KResultOr<size_t> IPv4Socket::receive_packet_buffered(FileDescription& description, UserOrKernelBuffer& buffer, size_t buffer_length, int flags, Userspace<sockaddr*> addr, Userspace<socklen_t*> addr_length, Time& packet_timestamp)
|
||||
|
@ -418,8 +418,8 @@ bool IPv4Socket::did_receive(const IPv4Address& source_address, u16 source_port,
|
|||
auto nreceived_or_error = protocol_receive(ReadonlyBytes { packet.data(), packet.size() }, scratch_buffer, m_scratch_buffer.value().size(), 0);
|
||||
if (nreceived_or_error.is_error())
|
||||
return false;
|
||||
ssize_t nwritten = m_receive_buffer.write(scratch_buffer, nreceived_or_error.value());
|
||||
if (nwritten < 0)
|
||||
auto nwritten_or_error = m_receive_buffer.write(scratch_buffer, nreceived_or_error.value());
|
||||
if (nwritten_or_error.is_error())
|
||||
return false;
|
||||
set_can_read(!m_receive_buffer.is_empty());
|
||||
} else {
|
||||
|
|
|
@ -293,10 +293,10 @@ KResultOr<size_t> LocalSocket::sendto(FileDescription& description, const UserOr
|
|||
auto* socket_buffer = send_buffer_for(description);
|
||||
if (!socket_buffer)
|
||||
return EINVAL;
|
||||
ssize_t nwritten = socket_buffer->write(data, data_size);
|
||||
if (nwritten > 0)
|
||||
Thread::current()->did_unix_socket_write(nwritten);
|
||||
return nwritten;
|
||||
auto nwritten_or_error = socket_buffer->write(data, data_size);
|
||||
if (!nwritten_or_error.is_error() && nwritten_or_error.value() > 0)
|
||||
Thread::current()->did_unix_socket_write(nwritten_or_error.value());
|
||||
return nwritten_or_error;
|
||||
}
|
||||
|
||||
DoubleBuffer* LocalSocket::receive_buffer_for(FileDescription& description)
|
||||
|
@ -338,10 +338,10 @@ KResultOr<size_t> LocalSocket::recvfrom(FileDescription& description, UserOrKern
|
|||
if (!has_attached_peer(description) && socket_buffer->is_empty())
|
||||
return 0;
|
||||
VERIFY(!socket_buffer->is_empty());
|
||||
auto nread = socket_buffer->read(buffer, buffer_size);
|
||||
if (nread > 0)
|
||||
Thread::current()->did_unix_socket_read(nread);
|
||||
return nread;
|
||||
auto nread_or_error = socket_buffer->read(buffer, buffer_size);
|
||||
if (!nread_or_error.is_error() && nread_or_error.value() > 0)
|
||||
Thread::current()->did_unix_socket_read(nread_or_error.value());
|
||||
return nread_or_error;
|
||||
}
|
||||
|
||||
StringView LocalSocket::socket_path() const
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue