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/appcommands.cpp b/src/appcommands.cpp
index ab032c7..b3b3ed2 100644
--- a/src/appcommands.cpp
+++ b/src/appcommands.cpp
@@ -50,8 +50,8 @@
int initBMCDeviceState(ipmi::Context::ptr ctx)
{
DbusObjectInfo objInfo;
- boost::system::error_code ec = ipmi::getDbusObject(ctx, bmcStateIntf, "/",
- "bmc0", objInfo);
+ boost::system::error_code ec =
+ ipmi::getDbusObject(ctx, bmcStateIntf, "/", "bmc0", objInfo);
if (ec)
{
phosphor::logging::log<phosphor::logging::level::ERR>(
@@ -84,32 +84,32 @@
sdbusplus::bus::match::rules::propertiesChanged(objInfo.first,
bmcStateIntf),
[](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 CurrentBMCState");
- return;
- }
-
- auto it = props.find(currentBmcStateProp);
- if (it != props.end())
- {
- std::string* state = std::get_if<std::string>(&it->second);
- if (state)
+ std::map<std::string, ipmi::DbusVariant> props;
+ std::vector<std::string> inVal;
+ std::string iface;
+ try
{
- bmcDeviceBusy = (*state != bmcStateReadyStr);
- phosphor::logging::log<phosphor::logging::level::INFO>(
- "BMC device state updated");
+ msg.read(iface, props, inVal);
}
- }
- });
+ catch (const std::exception& e)
+ {
+ phosphor::logging::log<phosphor::logging::level::ERR>(
+ "Exception caught in Get CurrentBMCState");
+ return;
+ }
+
+ auto it = props.find(currentBmcStateProp);
+ if (it != props.end())
+ {
+ std::string* state = std::get_if<std::string>(&it->second);
+ if (state)
+ {
+ bmcDeviceBusy = (*state != bmcStateReadyStr);
+ phosphor::logging::log<phosphor::logging::level::INFO>(
+ "BMC device state updated");
+ }
+ }
+ });
return 0;
}
@@ -381,10 +381,10 @@
}
}
- return ipmi::responseSuccess(devId.id, devId.revision, devId.fwMajor,
- bmcDeviceBusy, devId.fwMinor, devId.ipmiVer,
- devId.addnDevSupport, devId.manufId,
- devId.prodId, devId.aux);
+ return ipmi::responseSuccess(
+ devId.id, devId.revision, devId.fwMajor, bmcDeviceBusy, devId.fwMinor,
+ devId.ipmiVer, devId.addnDevSupport, devId.manufId, devId.prodId,
+ devId.aux);
}
static void registerAPPFunctions(void)