RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 09:17:35 +00:00
Code Issues Activity Actions

LibCore: Use Error::from_errno in Stream APIs

Browse source 
This makes Stream APIs work with Lagom and is overall cleaner.
This commit is contained in:
sin-ack 2021-12-29 23:13:11 +00:00 • committed by Ali Mohammad Pur
parent dbd25916a3
commit 5f645e84d8
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibCore/Stream.cpp
View file

@ -164,7 +164,7 @@ ErrorOr<size_t> File::read(Bytes buffer)
// NOTE: POSIX says that if the fd is not open for reading, the call // NOTE: POSIX says that if the fd is not open for reading, the call
// will return EBADF. Since we already know whether we can or // will return EBADF. Since we already know whether we can or
// can't read the file, let's avoid a syscall. // can't read the file, let's avoid a syscall.
return EBADF; return Error::from_errno(EBADF);
} }
ssize_t rc = ::read(m_fd, buffer.data(), buffer.size()); ssize_t rc = ::read(m_fd, buffer.data(), buffer.size());
@ -180,7 +180,7 @@ ErrorOr<size_t> File::write(ReadonlyBytes buffer)
{ {
if (!has_flag(m_mode, OpenMode::Write)) { if (!has_flag(m_mode, OpenMode::Write)) {
// NOTE: Same deal as Read. // NOTE: Same deal as Read.
return EBADF; return Error::from_errno(EBADF);
} }
ssize_t rc = ::write(m_fd, buffer.data(), buffer.size()); ssize_t rc = ::write(m_fd, buffer.data(), buffer.size());
@ -343,7 +343,7 @@ ErrorOr<void> Socket::connect_inet(int fd, SocketAddress const& address)
ErrorOr<size_t> PosixSocketHelper::read(Bytes buffer) ErrorOr<size_t> PosixSocketHelper::read(Bytes buffer)
{ {
if (!is_open()) { if (!is_open()) {
return ENOTCONN; return Error::from_errno(ENOTCONN);
} }
ssize_t rc = ::recv(m_fd, buffer.data(), buffer.size(), 0); ssize_t rc = ::recv(m_fd, buffer.data(), buffer.size(), 0);
@ -364,7 +364,7 @@ ErrorOr<size_t> PosixSocketHelper::read(Bytes buffer)
ErrorOr<size_t> PosixSocketHelper::write(ReadonlyBytes buffer) ErrorOr<size_t> PosixSocketHelper::write(ReadonlyBytes buffer)
{ {
if (!is_open()) { if (!is_open()) {
return ENOTCONN; return Error::from_errno(ENOTCONN);
} }
ssize_t rc = ::send(m_fd, buffer.data(), buffer.size(), 0); ssize_t rc = ::send(m_fd, buffer.data(), buffer.size(), 0);
@ -483,7 +483,7 @@ ErrorOr<NonnullOwnPtr<TCPSocket>> TCPSocket::adopt_fd(int fd)
ErrorOr<size_t> PosixSocketHelper::pending_bytes() const ErrorOr<size_t> PosixSocketHelper::pending_bytes() const
{ {
if (!is_open()) { if (!is_open()) {
return ENOTCONN; return Error::from_errno(ENOTCONN);
} }
int value; int value;

18
Userland/Libraries/LibCore/Stream.h
View file

@ -340,7 +340,7 @@ public:
// datagram to be discarded. That's not very nice, so let's bail // datagram to be discarded. That's not very nice, so let's bail
// early, telling the caller that he should allocate a bigger // early, telling the caller that he should allocate a bigger
// buffer. // buffer.
return EMSGSIZE; return Error::from_errno(EMSGSIZE);
} }
return m_helper.read(buffer); return m_helper.read(buffer);
@ -469,13 +469,13 @@ public:
static ErrorOr<NonnullOwnPtr<BufferedType<T>>> create_buffered(NonnullOwnPtr<T> stream, size_t buffer_size) static ErrorOr<NonnullOwnPtr<BufferedType<T>>> create_buffered(NonnullOwnPtr<T> stream, size_t buffer_size)
{ {
if (!buffer_size) if (!buffer_size)
return EINVAL; return Error::from_errno(EINVAL);
if (!stream->is_open()) if (!stream->is_open())
return ENOTCONN; return Error::from_errno(ENOTCONN);
auto maybe_buffer = ByteBuffer::create_uninitialized(buffer_size); auto maybe_buffer = ByteBuffer::create_uninitialized(buffer_size);
if (!maybe_buffer.has_value()) if (!maybe_buffer.has_value())
return ENOMEM; return Error::from_errno(ENOMEM);
return adopt_nonnull_own_or_enomem(new BufferedType<T>(move(stream), maybe_buffer.release_value())); return adopt_nonnull_own_or_enomem(new BufferedType<T>(move(stream), maybe_buffer.release_value()));
} }
@ -486,9 +486,9 @@ public:
ErrorOr<size_t> read(Bytes buffer) ErrorOr<size_t> read(Bytes buffer)
{ {
if (!stream().is_open()) if (!stream().is_open())
return ENOTCONN; return Error::from_errno(ENOTCONN);
if (!buffer.size()) if (!buffer.size())
return ENOBUFS; return Error::from_errno(ENOBUFS);
// Let's try to take all we can from the buffer first. // Let's try to take all we can from the buffer first.
size_t buffer_nread = 0; size_t buffer_nread = 0;
@ -536,10 +536,10 @@ public:
ErrorOr<size_t> read_until_any_of(Bytes buffer, Array<StringView, N> candidates) ErrorOr<size_t> read_until_any_of(Bytes buffer, Array<StringView, N> candidates)
{ {
if (!stream().is_open()) if (!stream().is_open())
return ENOTCONN; return Error::from_errno(ENOTCONN);
if (buffer.is_empty()) if (buffer.is_empty())
return ENOBUFS; return Error::from_errno(ENOBUFS);
// We fill the buffer through can_read_line. // We fill the buffer through can_read_line.
if (!TRY(can_read_line())) if (!TRY(can_read_line()))
@ -557,7 +557,7 @@ public:
// violating the invariant twice the next time the user attempts // violating the invariant twice the next time the user attempts
// to read, which is No Good. So let's give a descriptive error // to read, which is No Good. So let's give a descriptive error
// to the caller about why it can't read. // to the caller about why it can't read.
return EMSGSIZE; return Error::from_errno(EMSGSIZE);
} }
m_buffer.span().slice(0, m_buffered_size).copy_to(buffer); m_buffer.span().slice(0, m_buffered_size).copy_to(buffer);