RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-24 18:25:07 +00:00
Code Issues Activity Actions

SystemMonitor: Handle PCIDB::Database::open() failure gracefully

Browse source 
No need to dereference the nullptr, let's just show raw IDs instead.
This commit is contained in:
Linus Groh 2021-01-30 13:00:59 +01:00 • committed by Andreas Kling
parent 9b0ca75f84
commit 5b43419a63
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Applications/SystemMonitor/main.cpp
View file

@ -498,6 +498,8 @@ NonnullRefPtr<GUI::Widget> build_pci_devices_tab()
auto& pci_table_view = self.add<GUI::TableView>(); auto& pci_table_view = self.add<GUI::TableView>();
auto db = PCIDB::Database::open(); auto db = PCIDB::Database::open();
if (!db)
warnln("Couldn't open PCI ID database!");
Vector<GUI::JsonArrayModel::FieldSpec> pci_fields; Vector<GUI::JsonArrayModel::FieldSpec> pci_fields;
pci_fields.empend( pci_fields.empend(
@ -513,23 +515,23 @@ NonnullRefPtr<GUI::Widget> build_pci_devices_tab()
"Class", Gfx::TextAlignment::CenterLeft, "Class", Gfx::TextAlignment::CenterLeft,
[db](const JsonObject& object) { [db](const JsonObject& object) {
auto class_id = object.get("class").to_u32(); auto class_id = object.get("class").to_u32();
String class_name = db->get_class(class_id); String class_name = db ? db->get_class(class_id) : nullptr;
return class_name == "" ? String::formatted("{:04x}", class_id) : class_name; return class_name.is_empty() ? String::formatted("{:04x}", class_id) : class_name;
}); });
pci_fields.empend( pci_fields.empend(
"Vendor", Gfx::TextAlignment::CenterLeft, "Vendor", Gfx::TextAlignment::CenterLeft,
[db](const JsonObject& object) { [db](const JsonObject& object) {
auto vendor_id = object.get("vendor_id").to_u32(); auto vendor_id = object.get("vendor_id").to_u32();
String vendor_name = db->get_vendor(vendor_id); String vendor_name = db ? db->get_vendor(vendor_id) : nullptr;
return vendor_name == "" ? String::formatted("{:02x}", vendor_id) : vendor_name; return vendor_name.is_empty() ? String::formatted("{:02x}", vendor_id) : vendor_name;
}); });
pci_fields.empend( pci_fields.empend(
"Device", Gfx::TextAlignment::CenterLeft, "Device", Gfx::TextAlignment::CenterLeft,
[db](const JsonObject& object) { [db](const JsonObject& object) {
auto vendor_id = object.get("vendor_id").to_u32(); auto vendor_id = object.get("vendor_id").to_u32();
auto device_id = object.get("device_id").to_u32(); auto device_id = object.get("device_id").to_u32();
String device_name = db->get_device(vendor_id, device_id); String device_name = db ? db->get_device(vendor_id, device_id) : nullptr;
return device_name == "" ? String::formatted("{:02x}", device_id) : device_name; return device_name.is_empty() ? String::formatted("{:02x}", device_id) : device_name;
}); });
pci_fields.empend( pci_fields.empend(
"Revision", Gfx::TextAlignment::CenterRight, "Revision", Gfx::TextAlignment::CenterRight,