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: I09e19a126d456dc184fd70e82d4e4e4217fa8ee7
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/tools/helper.cpp b/tools/helper.cpp
index f419410..34fab4f 100644
--- a/tools/helper.cpp
+++ b/tools/helper.cpp
@@ -80,8 +80,8 @@
}
catch (const ipmiblob::BlobException& b)
{
- throw ToolException("blob exception received: " +
- std::string(b.what()));
+ throw ToolException(
+ "blob exception received: " + std::string(b.what()));
}
}
@@ -92,24 +92,25 @@
{
pollStat(session, blob,
[](const ipmiblob::StatResponse& resp) -> std::optional<bool> {
- if (resp.metadata.size() != 1)
- {
- throw ToolException("Invalid stat metadata");
- }
- auto result = static_cast<ipmi_flash::ActionStatus>(resp.metadata[0]);
- switch (result)
- {
- case ipmi_flash::ActionStatus::failed:
- throw ToolException("BMC reported failure");
- case ipmi_flash::ActionStatus::unknown:
- case ipmi_flash::ActionStatus::running:
- return std::nullopt;
- case ipmi_flash::ActionStatus::success:
- return true;
- default:
- throw ToolException("Unrecognized action status");
- }
- });
+ if (resp.metadata.size() != 1)
+ {
+ throw ToolException("Invalid stat metadata");
+ }
+ auto result =
+ static_cast<ipmi_flash::ActionStatus>(resp.metadata[0]);
+ switch (result)
+ {
+ case ipmi_flash::ActionStatus::failed:
+ throw ToolException("BMC reported failure");
+ case ipmi_flash::ActionStatus::unknown:
+ case ipmi_flash::ActionStatus::running:
+ return std::nullopt;
+ case ipmi_flash::ActionStatus::success:
+ return true;
+ default:
+ throw ToolException("Unrecognized action status");
+ }
+ });
}
/* Poll an open blob session for reading.
@@ -131,16 +132,16 @@
return pollStat(
session, blob,
[](const ipmiblob::StatResponse& resp) -> std::optional<uint32_t> {
- if (resp.blob_state & ipmiblob::StateFlags::open_read)
- {
- return resp.size;
- }
- if (resp.blob_state & ipmiblob::StateFlags::committing)
- {
- return std::nullopt;
- }
- throw ToolException("BMC blob failed to become ready");
- });
+ if (resp.blob_state & ipmiblob::StateFlags::open_read)
+ {
+ return resp.size;
+ }
+ if (resp.blob_state & ipmiblob::StateFlags::committing)
+ {
+ return std::nullopt;
+ }
+ throw ToolException("BMC blob failed to become ready");
+ });
}
void* memcpyAligned(void* destination, const void* source, std::size_t size)