summaryrefslogtreecommitdiff
path: root/Userland/Utilities/lspci.cpp
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2021-11-15 01:46:51 +0100
committerAndreas Kling <kling@serenityos.org>2021-11-17 00:21:10 +0100
commit587f9af960daa9f003ec9e41751cdc4ce50b87dd (patch)
tree41bc5b51741dffcc23e3e4b63d4c17a37e2e03d7 /Userland/Utilities/lspci.cpp
parent304c03f457e294a3d756860325d93b809f50f7a6 (diff)
downloadserenity-587f9af960daa9f003ec9e41751cdc4ce50b87dd.zip
AK: Make JSON parser return ErrorOr<JsonValue> (instead of Optional)
Also add slightly richer parse errors now that we can include a string literal with returned errors. This will allow us to use TRY() when working with JSON data.
Diffstat (limited to 'Userland/Utilities/lspci.cpp')
-rw-r--r--Userland/Utilities/lspci.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/Userland/Utilities/lspci.cpp b/Userland/Utilities/lspci.cpp
index 67bd6adc80..b01dee6c3e 100644
--- a/Userland/Utilities/lspci.cpp
+++ b/Userland/Utilities/lspci.cpp
@@ -66,9 +66,8 @@ int main(int argc, char** argv)
}
auto file_contents = proc_pci->read_all();
- auto json = JsonValue::from_string(file_contents);
- VERIFY(json.has_value());
- json.value().as_array().for_each([db, format](auto& value) {
+ auto json = JsonValue::from_string(file_contents).release_value_but_fixme_should_propagate_errors();
+ json.as_array().for_each([db, format](auto& value) {
auto& dev = value.as_object();
auto domain = dev.get("domain").to_u32();
auto bus = dev.get("bus").to_u32();