diff options
author | Sam Atkins <atkinssj@serenityos.org> | 2022-01-20 17:47:39 +0000 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-01-24 22:36:09 +0100 |
commit | 45cf40653a03dab11c0739783446ff696a9a5b0a (patch) | |
tree | 1611c797d1a43a106cf7220fcbdbba907f19d037 /Userland/Libraries/LibPDF | |
parent | 140f1d9e55bfacb6f784bee591a6938714ed95b3 (diff) | |
download | serenity-45cf40653a03dab11c0739783446ff696a9a5b0a.zip |
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. :^)
Diffstat (limited to 'Userland/Libraries/LibPDF')
-rw-r--r-- | Userland/Libraries/LibPDF/Filter.cpp | 9 | ||||
-rw-r--r-- | Userland/Libraries/LibPDF/Parser.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Userland/Libraries/LibPDF/Filter.cpp b/Userland/Libraries/LibPDF/Filter.cpp index d521c3f210..f5c15fa326 100644 --- a/Userland/Libraries/LibPDF/Filter.cpp +++ b/Userland/Libraries/LibPDF/Filter.cpp @@ -45,8 +45,8 @@ Optional<ByteBuffer> Filter::decode_ascii_hex(ReadonlyBytes bytes) // FIXME: Integrate this padding into AK/Hex? auto output_result = ByteBuffer::create_zeroed(bytes.size() / 2 + 1); - if (!output_result.has_value()) - return output_result; + if (output_result.is_error()) + return {}; auto output = output_result.release_value(); @@ -120,7 +120,10 @@ Optional<ByteBuffer> Filter::decode_ascii85(ReadonlyBytes bytes) buff.append(reinterpret_cast<u8*>(&number)[3 - i]); } - return ByteBuffer::copy(buff.span()); + auto result = ByteBuffer::copy(buff.span()); + if (result.is_error()) + return {}; + return result.release_value(); }; Optional<ByteBuffer> Filter::decode_lzw(ReadonlyBytes) diff --git a/Userland/Libraries/LibPDF/Parser.cpp b/Userland/Libraries/LibPDF/Parser.cpp index 20bc36fd00..24e8b03c4a 100644 --- a/Userland/Libraries/LibPDF/Parser.cpp +++ b/Userland/Libraries/LibPDF/Parser.cpp @@ -270,7 +270,7 @@ bool Parser::initialize_hint_tables() auto total_size = primary_size + overflow_size; auto buffer_result = ByteBuffer::create_uninitialized(total_size); - if (!buffer_result.has_value()) + if (buffer_result.is_error()) return false; possible_merged_stream_buffer = buffer_result.release_value(); auto ok = !possible_merged_stream_buffer.try_append(primary_hint_stream->bytes()).is_error(); |