From 45cf40653a03dab11c0739783446ff696a9a5b0a Mon Sep 17 00:00:00 2001
From: Sam Atkins <atkinssj@serenityos.org>
Date: Thu, 20 Jan 2022 17:47:39 +0000
Subject: 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. :^)
---
 Kernel/Graphics/Bochs/GraphicsAdapter.cpp       |  5 +----
 Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp |  8 ++------
 Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp   | 15 ++++-----------
 3 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'Kernel/Graphics')

diff --git a/Kernel/Graphics/Bochs/GraphicsAdapter.cpp b/Kernel/Graphics/Bochs/GraphicsAdapter.cpp
index aee5db05ff..166806d7cb 100644
--- a/Kernel/Graphics/Bochs/GraphicsAdapter.cpp
+++ b/Kernel/Graphics/Bochs/GraphicsAdapter.cpp
@@ -281,10 +281,7 @@ ErrorOr<ByteBuffer> BochsGraphicsAdapter::get_edid(size_t output_port_index) con
     if (output_port_index != 0)
         return Error::from_errno(ENODEV);
 
-    auto bytes = ByteBuffer::copy(const_cast<u8 const*>(m_registers->edid_data), sizeof(m_registers->edid_data));
-    if (!bytes.has_value())
-        return Error::from_errno(ENOMEM);
-    return bytes.release_value();
+    return ByteBuffer::copy(const_cast<u8 const*>(m_registers->edid_data), sizeof(m_registers->edid_data));
 }
 
 }
diff --git a/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp b/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp
index 51489e46eb..ba803226b2 100644
--- a/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp
+++ b/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp
@@ -661,12 +661,8 @@ ErrorOr<ByteBuffer> IntelNativeGraphicsAdapter::get_edid(size_t output_port_inde
         return Error::from_errno(ENODEV);
     }
 
-    if (m_crt_edid.has_value()) {
-        auto bytes = ByteBuffer::copy(m_crt_edid_bytes, sizeof(m_crt_edid_bytes));
-        if (!bytes.has_value())
-            return Error::from_errno(ENOMEM);
-        return bytes.release_value();
-    }
+    if (m_crt_edid.has_value())
+        return ByteBuffer::copy(m_crt_edid_bytes, sizeof(m_crt_edid_bytes));
 
     return ByteBuffer {};
 }
diff --git a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp b/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp
index 6264396d33..27212ff2ed 100644
--- a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp
+++ b/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp
@@ -214,12 +214,8 @@ ErrorOr<ByteBuffer> GraphicsAdapter::get_edid(size_t output_port_index) const
     if (output_port_index >= VIRTIO_GPU_MAX_SCANOUTS)
         return Error::from_errno(ENODEV);
     auto& edid = m_scanouts[output_port_index].edid;
-    if (edid.has_value()) {
-        auto bytes = ByteBuffer::copy(edid.value().bytes());
-        if (!bytes.has_value())
-            return Error::from_errno(ENOMEM);
-        return bytes.release_value();
-    }
+    if (edid.has_value())
+        return ByteBuffer::copy(edid.value().bytes());
     return ByteBuffer {};
 }
 
@@ -243,11 +239,8 @@ auto GraphicsAdapter::query_edid(u32 scanout_id) -> ErrorOr<Optional<EDID::Parse
     if (response.size == 0)
         return Error::from_string_literal("VirtIO::GraphicsAdapter: Failed to get EDID, empty buffer");
 
-    auto edid_buffer = ByteBuffer::copy(response.edid, response.size);
-    if (!edid_buffer.has_value())
-        return Error::from_errno(ENOMEM);
-
-    auto edid = TRY(EDID::Parser::from_bytes(edid_buffer.release_value()));
+    auto edid_buffer = TRY(ByteBuffer::copy(response.edid, response.size));
+    auto edid = TRY(EDID::Parser::from_bytes(move(edid_buffer)));
     return edid;
 }
 
-- 
cgit v1.2.3