mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 13:57:35 +00:00
Everywhere: Convert ByteBuffer factory methods from Optional -> ErrorOr
Apologies for the enormous commit, but I don't see a way to split this up nicely. In the vast majority of cases it's a simple change. A few extra places can use TRY instead of manual error checking though. :^)
This commit is contained in:
parent
140f1d9e55
commit
45cf40653a
79 changed files with 202 additions and 274 deletions
|
@ -361,25 +361,21 @@ ErrorOr<Parser> Parser::from_framebuffer_device(int framebuffer_fd, size_t head)
|
|||
int err = errno;
|
||||
if (err == EOVERFLOW) {
|
||||
// We need a bigger buffer with at least bytes_size bytes
|
||||
auto edid_byte_buffer = ByteBuffer::create_zeroed(edid_info.bytes_size);
|
||||
if (!edid_byte_buffer.has_value())
|
||||
return Error::from_errno(ENOMEM);
|
||||
edid_info.bytes = edid_byte_buffer.value().data();
|
||||
auto edid_byte_buffer = TRY(ByteBuffer::create_zeroed(edid_info.bytes_size));
|
||||
edid_info.bytes = edid_byte_buffer.data();
|
||||
if (fb_get_head_edid(framebuffer_fd, &edid_info) < 0) {
|
||||
err = errno;
|
||||
return Error::from_errno(err);
|
||||
}
|
||||
|
||||
return from_bytes(edid_byte_buffer.release_value());
|
||||
return from_bytes(move(edid_byte_buffer));
|
||||
}
|
||||
|
||||
return Error::from_errno(err);
|
||||
}
|
||||
|
||||
auto edid_byte_buffer = ByteBuffer::copy((void const*)edid_bytes, sizeof(edid_bytes));
|
||||
if (!edid_byte_buffer.has_value())
|
||||
return Error::from_errno(ENOMEM);
|
||||
return from_bytes(edid_byte_buffer.release_value());
|
||||
auto edid_byte_buffer = TRY(ByteBuffer::copy((void const*)edid_bytes, sizeof(edid_bytes)));
|
||||
return from_bytes(move(edid_byte_buffer));
|
||||
}
|
||||
|
||||
ErrorOr<Parser> Parser::from_framebuffer_device(String const& framebuffer_device, size_t head)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue