clang-format: copy latest and re-format
clang-format-16 has some backwards incompatible changes that require
additional settings for best compatibility and re-running the formatter.
Copy the latest .clang-format from the docs repository and reformat the
repository.
Change-Id: I59c0a8c4b89131ecd3e9a841ed37ef3b8dcf8e9d
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/appcommands.cpp b/src/appcommands.cpp
index 722c471..315b581 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,31 +84,31 @@
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;
- }
+ 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())
+ auto it = props.find(currentBmcStateProp);
+ if (it != props.end())
+ {
+ std::string* state = std::get_if<std::string>(&it->second);
+ if (state)
{
- 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");
- }
+ bmcDeviceBusy = (*state != bmcStateReadyStr);
+ phosphor::logging::log<phosphor::logging::level::INFO>(
+ "BMC device state updated");
}
+ }
});
return 0;
@@ -302,8 +302,8 @@
devId.fwMajor = static_cast<uint7_t>(revision.major);
revision.minor = (revision.minor > 99 ? 99 : revision.minor);
- devId.fwMinor =
- revision.minor % 10 + (revision.minor / 10) * 16;
+ devId.fwMinor = revision.minor % 10 +
+ (revision.minor / 10) * 16;
try
{
uint32_t hash = std::stoul(revision.metaHash, 0, 16);