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: I7b90380845efee6bf6a1fe342a793d71aa9ff181
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/phosphor-power-supply/psu_manager.cpp b/phosphor-power-supply/psu_manager.cpp
index 32da768..3195a58 100644
--- a/phosphor-power-supply/psu_manager.cpp
+++ b/phosphor-power-supply/psu_manager.cpp
@@ -167,8 +167,8 @@
// For each object in the array of objects, I want to get properties
// from the service, path, and interface.
- auto properties = getAllProperties(bus, path, IBMCFFPSInterface,
- service);
+ auto properties =
+ getAllProperties(bus, path, IBMCFFPSInterface, service);
getPSUProperties(properties);
}
@@ -232,10 +232,10 @@
presline = *preslineptr;
}
- auto invMatch = std::find_if(psus.begin(), psus.end(),
- [&invpath](auto& psu) {
- return psu->getInventoryPath() == invpath;
- });
+ auto invMatch =
+ std::find_if(psus.begin(), psus.end(), [&invpath](auto& psu) {
+ return psu->getInventoryPath() == invpath;
+ });
if (invMatch != psus.end())
{
// This power supply has the same inventory path as the one with
@@ -348,8 +348,8 @@
{
try
{
- util::DbusSubtree subtree = util::getSubTree(bus, INVENTORY_OBJ_PATH,
- supportedConfIntf, 0);
+ util::DbusSubtree subtree =
+ util::getSubTree(bus, INVENTORY_OBJ_PATH, supportedConfIntf, 0);
if (subtree.empty())
{
throw std::runtime_error("Supported Configuration Not Found");
@@ -520,8 +520,8 @@
{
additionalData["_PID"] = std::to_string(getpid());
- auto service = util::getService(loggingObjectPath,
- loggingCreateInterface, bus);
+ auto service =
+ util::getService(loggingObjectPath, loggingCreateInterface, bus);
if (service.empty())
{
@@ -583,9 +583,10 @@
void PSUManager::analyze()
{
- auto syncHistoryRequired = std::any_of(
- psus.begin(), psus.end(),
- [](const auto& psu) { return psu->isSyncHistoryRequired(); });
+ auto syncHistoryRequired =
+ std::any_of(psus.begin(), psus.end(), [](const auto& psu) {
+ return psu->isSyncHistoryRequired();
+ });
if (syncHistoryRequired)
{
syncHistory();
@@ -630,8 +631,8 @@
// hexadecimal format.
additionalData["STATUS_WORD"] =
std::format("{:#04x}", psu->getStatusWord());
- additionalData["STATUS_MFR"] = std::format("{:#02x}",
- psu->getMFRFault());
+ additionalData["STATUS_MFR"] =
+ std::format("{:#02x}", psu->getMFRFault());
// If there are faults being reported, they possibly could be
// related to a bug in the firmware version running on the power
// supply. Capture that data into the error as well.
@@ -1082,8 +1083,8 @@
psu->getInputVoltage(actualInputVoltage, inputVoltage);
if (std::find(config.second.inputVoltage.begin(),
- config.second.inputVoltage.end(),
- inputVoltage) == config.second.inputVoltage.end())
+ config.second.inputVoltage.end(), inputVoltage) ==
+ config.second.inputVoltage.end())
{
tmpAdditionalData.clear();
tmpAdditionalData["ACTUAL_VOLTAGE"] =
@@ -1315,8 +1316,8 @@
namespace fs = std::filesystem;
std::stringstream ss;
ss << std::hex << std::setw(4) << std::setfill('0') << i2caddr;
- std::string symLinkPath = deviceDirPath + std::to_string(i2cbus) + "-" +
- ss.str() + driverDirName;
+ std::string symLinkPath =
+ deviceDirPath + std::to_string(i2cbus) + "-" + ss.str() + driverDirName;
try
{
fs::path linkStrPath = fs::read_symlink(symLinkPath);