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: Id2036ab746164981596b3ee36259f3ca5d3f1334
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/firmware-update.cpp b/src/firmware-update.cpp
index 1e8b480..8a8a53d 100644
--- a/src/firmware-update.cpp
+++ b/src/firmware-update.cpp
@@ -380,30 +380,30 @@
sdbusplus::bus::match::rules::propertiesChanged(
objPath, "xyz.openbmc_project.Software.ActivationProgress"),
[&](sdbusplus::message_t& msg) {
- std::map<std::string, ipmi::DbusVariant> props;
- std::vector<std::string> inVal;
- std::string iface;
- try
- {
- msg.read(iface, props, inVal);
- }
- catch (const std::exception& e)
- {
- phosphor::logging::log<phosphor::logging::level::ERR>(
- "Exception caught in get ActivationProgress");
- return;
- }
-
- auto it = props.find("Progress");
- if (it != props.end())
- {
- progressPercent = std::get<uint8_t>(it->second);
- if (progressPercent == 100)
+ std::map<std::string, ipmi::DbusVariant> props;
+ std::vector<std::string> inVal;
+ std::string iface;
+ try
{
- fwUpdateState = fwStateUpdateSuccess;
+ msg.read(iface, props, inVal);
}
- }
- });
+ catch (const std::exception& e)
+ {
+ phosphor::logging::log<phosphor::logging::level::ERR>(
+ "Exception caught in get ActivationProgress");
+ return;
+ }
+
+ auto it = props.find("Progress");
+ if (it != props.end())
+ {
+ progressPercent = std::get<uint8_t>(it->second);
+ if (progressPercent == 100)
+ {
+ fwUpdateState = fwStateUpdateSuccess;
+ }
+ }
+ });
}
uint8_t activationTimerTimeout()
{
@@ -465,13 +465,13 @@
std::shared_ptr<sdbusplus::asio::connection> bus = getSdBus();
bus->async_method_call(
[](const boost::system::error_code ec) {
- if (ec)
- {
- phosphor::logging::log<phosphor::logging::level::ERR>(
- "async_method_call error: activateImage failed");
- return;
- }
- },
+ if (ec)
+ {
+ phosphor::logging::log<phosphor::logging::level::ERR>(
+ "async_method_call error: activateImage failed");
+ return;
+ }
+ },
"xyz.openbmc_project.Software.BMC.Updater", objPath,
"org.freedesktop.DBus.Properties", "Set",
"xyz.openbmc_project.Software.Activation", "RequestedActivation",
@@ -562,8 +562,9 @@
std::unique_ptr<sdbusplus::bus::match_t>& fwUpdateMatchSignal)
{
// Setup timer for watching signal
- static sdbusplus::Timer timer(
- [&fwUpdateMatchSignal]() { fwUpdateMatchSignal = nullptr; });
+ static sdbusplus::Timer timer([&fwUpdateMatchSignal]() {
+ fwUpdateMatchSignal = nullptr;
+ });
static sdbusplus::Timer activationStatusTimer([]() {
if (fwUpdateStatus.activationTimerTimeout() > 95)
@@ -831,12 +832,13 @@
}
#ifdef INTEL_PFR_ENABLED
-using fwVersionInfoType = std::tuple<uint8_t, // ID Tag
- uint8_t, // Major Version Number
- uint8_t, // Minor Version Number
- uint32_t, // Build Number
- uint32_t, // Build Timestamp
- uint32_t>; // Update Timestamp
+using fwVersionInfoType =
+ std::tuple<uint8_t, // ID Tag
+ uint8_t, // Major Version Number
+ uint8_t, // Minor Version Number
+ uint32_t, // Build Number
+ uint32_t, // Build Timestamp
+ uint32_t>; // Update Timestamp
ipmi::RspType<uint8_t, std::vector<fwVersionInfoType>> ipmiGetFwVersionInfo()
{
// Byte 1 - Count (N) Number of devices data is being returned for.
@@ -926,9 +928,8 @@
return ipmi::responseSuccess(fwVerInfoList.size(), fwVerInfoList);
}
-std::array<uint8_t, imageCount> getSecurityVersionInfo(const char* mtdDevBuf,
- size_t svnVerOffsetInPfm,
- size_t bkcVerOffsetInPfm)
+std::array<uint8_t, imageCount> getSecurityVersionInfo(
+ const char* mtdDevBuf, size_t svnVerOffsetInPfm, size_t bkcVerOffsetInPfm)
{
constexpr size_t bufLength = 1;
std::array<uint8_t, imageCount> fwSecurityVersionBuf = {0}, temp;
@@ -1301,10 +1302,9 @@
* @returns IPMI completion code plus response data
* - Byte 2: Current control status
**/
-ipmi::RspType<bool, bool, bool, bool, uint4_t>
- ipmiGetSetFirmwareUpdateControl(const ipmi::Context::ptr& ctx,
- const uint8_t controlReq,
- const std::optional<std::string>& fileName)
+ipmi::RspType<bool, bool, bool, bool, uint4_t> ipmiGetSetFirmwareUpdateControl(
+ const ipmi::Context::ptr& ctx, const uint8_t controlReq,
+ const std::optional<std::string>& fileName)
{
bool isIPMBChannel = false;
@@ -1687,8 +1687,8 @@
static void registerFirmwareFunctions()
{
// guarantee that we start with an already timed out timestamp
- fwRandomNumGenTs = std::chrono::steady_clock::now() -
- fwRandomNumExpirySeconds;
+ fwRandomNumGenTs =
+ std::chrono::steady_clock::now() - fwRandomNumExpirySeconds;
fwUpdateStatus.setState(
static_cast<uint8_t>(FwUpdateStatusCache::fwStateInit));