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: I94e2bfdc8fae9bc14e30c701a0e622709ee9b0fe
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/occ_manager.cpp b/occ_manager.cpp
index eede8d1..932b052 100644
--- a/occ_manager.cpp
+++ b/occ_manager.cpp
@@ -379,12 +379,13 @@
#endif
}
- passThroughObjects.emplace_back(std::make_unique<PassThrough>(path.c_str()
+ passThroughObjects.emplace_back(std::make_unique<PassThrough>(
+ path.c_str()
#ifdef POWER10
- ,
- pmode
+ ,
+ pmode
#endif
- ));
+ ));
}
void Manager::statusCallBack(instanceID instance, bool status)
@@ -513,8 +514,8 @@
{
auto obj = std::find_if(statusObjects.begin(), statusObjects.end(),
[instance](const auto& obj) {
- return instance == obj->getOccInstanceID();
- });
+ return instance == obj->getOccInstanceID();
+ });
if (obj != statusObjects.end() && (*obj)->occActive())
{
@@ -532,8 +533,8 @@
{
auto obj = std::find_if(statusObjects.begin(), statusObjects.end(),
[instance](const auto& obj) {
- return instance == obj->getOccInstanceID();
- });
+ return instance == obj->getOccInstanceID();
+ });
const bool hostRunning = open_power::occ::utils::isHostRunning();
if (obj != statusObjects.end())
@@ -649,8 +650,8 @@
constexpr auto interface = "xyz.openbmc_project.Dump.Create";
constexpr auto function = "CreateDump";
- std::string service = utils::getService(OP_DUMP_OBJ_PATH,
- interface);
+ std::string service =
+ utils::getService(OP_DUMP_OBJ_PATH, interface);
auto method = bus.new_method_call(service.c_str(), OP_DUMP_OBJ_PATH,
interface, function);
@@ -859,20 +860,20 @@
continue;
}
- std::string sensorPath = OCC_SENSORS_ROOT +
- std::string("/temperature/");
+ std::string sensorPath =
+ OCC_SENSORS_ROOT + std::string("/temperature/");
std::string dvfsTempPath;
if (fruTypeValue == VRMVdd)
{
- sensorPath.append("vrm_vdd" + std::to_string(occInstance) +
- "_temp");
+ sensorPath.append(
+ "vrm_vdd" + std::to_string(occInstance) + "_temp");
}
else if (fruTypeValue == processorIoRing)
{
- sensorPath.append("proc" + std::to_string(occInstance) +
- "_ioring_temp");
+ sensorPath.append(
+ "proc" + std::to_string(occInstance) + "_ioring_temp");
dvfsTempPath = std::string{OCC_SENSORS_ROOT} + "/temperature/proc" +
std::to_string(occInstance) + "_ioring_dvfs_temp";
}
@@ -900,8 +901,8 @@
continue;
}
- sensorPath.append("dimm" + std::to_string(instanceID) +
- iter->second);
+ sensorPath.append(
+ "dimm" + std::to_string(instanceID) + iter->second);
dvfsTempPath = std::string{OCC_SENSORS_ROOT} + "/temperature/" +
dimmDVFSSensorName.at(fruTypeValue);
@@ -1145,8 +1146,8 @@
dbus::OccDBusSensors::getOccDBus().setValue(
sensorPath, tempValue * std::pow(10, -3) * std::pow(10, -3));
- dbus::OccDBusSensors::getOccDBus().setOperationalStatus(sensorPath,
- true);
+ dbus::OccDBusSensors::getOccDBus().setOperationalStatus(
+ sensorPath, true);
if (existingSensors.find(sensorPath) == existingSensors.end())
{
@@ -1168,8 +1169,8 @@
dbus::OccDBusSensors::getOccDBus().setValue(
sensorPath, std::numeric_limits<double>::quiet_NaN());
- dbus::OccDBusSensors::getOccDBus().setOperationalStatus(sensorPath,
- true);
+ dbus::OccDBusSensors::getOccDBus().setOperationalStatus(
+ sensorPath, true);
}
}
return;
@@ -1184,8 +1185,8 @@
dbus::OccDBusSensors::getOccDBus().setValue(
sensorPath, std::numeric_limits<double>::quiet_NaN());
- dbus::OccDBusSensors::getOccDBus().setOperationalStatus(sensorPath,
- false);
+ dbus::OccDBusSensors::getOccDBus().setOperationalStatus(
+ sensorPath, false);
}
}
return;
@@ -1432,11 +1433,11 @@
static constexpr auto loggingObjectPath =
"/xyz/openbmc_project/logging";
static constexpr auto opLoggingInterface = "org.open_power.Logging.PEL";
- std::string service = utils::getService(loggingObjectPath,
- opLoggingInterface);
- auto method = bus.new_method_call(service.c_str(), loggingObjectPath,
- opLoggingInterface,
- "CreatePELWithFFDCFiles");
+ std::string service =
+ utils::getService(loggingObjectPath, opLoggingInterface);
+ auto method =
+ bus.new_method_call(service.c_str(), loggingObjectPath,
+ opLoggingInterface, "CreatePELWithFFDCFiles");
// Set level to Warning (Predictive).
auto level =