summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Wiederhake <BenWiederhake.GitHub@gmx.de>2021-11-28 22:13:28 +0100
committerBrian Gianforcaro <b.gianfo@gmail.com>2021-12-08 09:46:13 -0800
commitf3e496d99547f2b282d3df327672919280066493 (patch)
treef1606502b3a5088c79bdf515e7f4e093d67ccf48
parentf59f7674c8dd875cd364c2d278f3fc9f235aabba (diff)
downloadserenity-f3e496d99547f2b282d3df327672919280066493.zip
LibSQL: Avoid implicitly copying ByteBuffer
-rw-r--r--Userland/Libraries/LibSQL/Heap.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/Userland/Libraries/LibSQL/Heap.cpp b/Userland/Libraries/LibSQL/Heap.cpp
index 0929d4d05b..8b39adfab3 100644
--- a/Userland/Libraries/LibSQL/Heap.cpp
+++ b/Userland/Libraries/LibSQL/Heap.cpp
@@ -72,7 +72,7 @@ ErrorOr<ByteBuffer> Heap::read_block(u32 block)
}
auto buffer_or_empty = m_write_ahead_log.get(block);
if (buffer_or_empty.has_value())
- return buffer_or_empty.value();
+ return buffer_or_empty.release_value();
if (block >= m_next_block) {
warnln("Heap({})::read_block({}): block # out of range (>= {})"sv, name(), block, m_next_block);
@@ -203,10 +203,7 @@ constexpr static int USER_VALUES_OFFSET = 32;
ErrorOr<void> Heap::read_zero_block()
{
- auto bytes_or_error = read_block(0);
- if (bytes_or_error.is_error())
- return bytes_or_error.error();
- auto buffer = bytes_or_error.value();
+ auto buffer = TRY(read_block(0));
auto file_id_buffer = buffer.slice(0, FILE_ID.length());
auto file_id = StringView(file_id_buffer);
if (file_id != FILE_ID) {