clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: Ica590f8613f1fb89ab1ca676ac51c1cc7e38d67f
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/control/json/utils/pcie_card_metadata.cpp b/control/json/utils/pcie_card_metadata.cpp
index ec6452c..c8c1b37 100644
--- a/control/json/utils/pcie_card_metadata.cpp
+++ b/control/json/utils/pcie_card_metadata.cpp
@@ -112,10 +112,10 @@
}
Metadata data;
- data.vendorID = std::stoul(card.at("vendor_id").get<std::string>(),
- nullptr, 16);
- data.deviceID = std::stoul(card.at("device_id").get<std::string>(),
- nullptr, 16);
+ data.vendorID =
+ std::stoul(card.at("vendor_id").get<std::string>(), nullptr, 16);
+ data.deviceID =
+ std::stoul(card.at("device_id").get<std::string>(), nullptr, 16);
data.subsystemVendorID = std::stoul(
card.at("subsystem_vendor_id").get<std::string>(), nullptr, 16);
data.subsystemID =
@@ -157,21 +157,21 @@
}
}
-std::optional<std::variant<int32_t, bool>>
- PCIeCardMetadata::lookup(uint16_t deviceID, uint16_t vendorID,
- uint16_t subsystemID,
- uint16_t subsystemVendorID) const
+std::optional<std::variant<int32_t, bool>> PCIeCardMetadata::lookup(
+ uint16_t deviceID, uint16_t vendorID, uint16_t subsystemID,
+ uint16_t subsystemVendorID) const
{
log<level::DEBUG>(std::format("Lookup {:#x} ${:#x} {:#x} {:#x}", deviceID,
vendorID, subsystemID, subsystemVendorID)
.c_str());
- auto card = std::find_if(_cards.begin(), _cards.end(),
- [&deviceID, &vendorID, &subsystemID,
- &subsystemVendorID](const auto& card) {
- return (deviceID == card.deviceID) && (vendorID == card.vendorID) &&
- (subsystemID == card.subsystemID) &&
- (subsystemVendorID == card.subsystemVendorID);
- });
+ auto card = std::find_if(
+ _cards.begin(), _cards.end(),
+ [&deviceID, &vendorID, &subsystemID,
+ &subsystemVendorID](const auto& card) {
+ return (deviceID == card.deviceID) && (vendorID == card.vendorID) &&
+ (subsystemID == card.subsystemID) &&
+ (subsystemVendorID == card.subsystemVendorID);
+ });
if (card != _cards.end())
{