diff --git a/Userland/Libraries/LibEDID/EDID.cpp b/Userland/Libraries/LibEDID/EDID.cpp index 820e5bd768..a3f930b2fa 100644 --- a/Userland/Libraries/LibEDID/EDID.cpp +++ b/Userland/Libraries/LibEDID/EDID.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #ifndef KERNEL @@ -185,16 +186,14 @@ T Parser::read_be(T const* field) const ErrorOr Parser::from_bytes(ReadonlyBytes bytes) { Parser edid(bytes); - if (auto parse_result = edid.parse(); parse_result.is_error()) - return parse_result.error(); + TRY(edid.parse()); return edid; } ErrorOr Parser::from_bytes(ByteBuffer&& bytes) { Parser edid(move(bytes)); - if (auto parse_result = edid.parse(); parse_result.is_error()) - return parse_result.error(); + TRY(edid.parse()); return edid; } @@ -683,7 +682,7 @@ ErrorOr Parser::for_each_established_timing(Function Parser::for_each_established_timing(Function Parser::for_each_detailed_timing(Function extension_error; - auto result = for_each_extension_block([&](u8 block_id, u8 tag, u8, ReadonlyBytes bytes) { + auto result = TRY(for_each_extension_block([&](u8 block_id, u8 tag, u8, ReadonlyBytes bytes) { if (tag != (u8)Definitions::ExtensionBlockTag::CEA_861) return IterationDecision::Continue; @@ -913,11 +910,9 @@ ErrorOr Parser::for_each_detailed_timing(Function Parser::for_each_display_descriptor(Function extension_error; - auto result = for_each_extension_block([&](u8, u8 tag, u8, ReadonlyBytes bytes) { + auto result = TRY(for_each_extension_block([&](u8, u8 tag, u8, ReadonlyBytes bytes) { if (tag != (u8)Definitions::ExtensionBlockTag::CEA_861) return IterationDecision::Continue; @@ -993,11 +988,9 @@ ErrorOr Parser::for_each_display_descriptor(Function ErrorOrhorizontal_pixels, dmt->vertical_lines, dmt->vertical_frequency_hz()); } else { @@ -1115,7 +1100,7 @@ auto Parser::supported_resolutions() const -> ErrorOr