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/manufacturingcommands.cpp b/src/manufacturingcommands.cpp
index 2bcb348..865b3a1 100644
--- a/src/manufacturingcommands.cpp
+++ b/src/manufacturingcommands.cpp
@@ -223,11 +223,10 @@
initData();
}
-int8_t Manufacturing::getProperty(const std::string& service,
- const std::string& path,
- const std::string& interface,
- const std::string& propertyName,
- ipmi::Value* reply)
+int8_t Manufacturing::getProperty(
+ const std::string& service, const std::string& path,
+ const std::string& interface, const std::string& propertyName,
+ ipmi::Value* reply)
{
try
{
@@ -243,11 +242,10 @@
return 0;
}
-int8_t Manufacturing::setProperty(const std::string& service,
- const std::string& path,
- const std::string& interface,
- const std::string& propertyName,
- ipmi::Value value)
+int8_t Manufacturing::setProperty(
+ const std::string& service, const std::string& path,
+ const std::string& interface, const std::string& propertyName,
+ ipmi::Value value)
{
try
{
@@ -536,8 +534,8 @@
{
constexpr const char* netBasePath = "/sys/class/net/eth";
constexpr const char* carrierSuffix = "/carrier";
- std::ifstream netIfs(netBasePath + std::to_string(instance) +
- carrierSuffix);
+ std::ifstream netIfs(
+ netBasePath + std::to_string(instance) + carrierSuffix);
if (!netIfs.good())
{
return ipmi::responseInvalidFieldRequest();
@@ -672,9 +670,9 @@
pwmName = "Pwm_" + std::to_string(instance + 1);
}
fanPwmInstancePath = fanPwmPath + pwmName;
- ret = mtm.setProperty(fanService, fanPwmInstancePath,
- fanIntf, "Value",
- static_cast<double>(pwmValue));
+ ret =
+ mtm.setProperty(fanService, fanPwmInstancePath, fanIntf,
+ "Value", static_cast<double>(pwmValue));
if (ret < 0)
{
return ipmi::responseUnspecifiedError();
@@ -704,8 +702,8 @@
return ipmi::response(retCode);
}
- if ((mtm.mtmTestBeepFd = ::open(beepDevName,
- O_RDWR | O_CLOEXEC)) < 0)
+ if ((mtm.mtmTestBeepFd =
+ ::open(beepDevName, O_RDWR | O_CLOEXEC)) < 0)
{
lg2::error("Failed to open input device");
return ipmi::responseUnspecifiedError();
@@ -766,8 +764,8 @@
lg2::error("Failed to query HSBP drive sub tree objects");
return ipmi::responseUnspecifiedError();
}
- std::string driveObjPath = driveBasePath + "Drive_" +
- std::to_string(instance + 1);
+ std::string driveObjPath =
+ driveBasePath + "Drive_" + std::to_string(instance + 1);
if (std::find(driveList.begin(), driveList.end(), driveObjPath) ==
driveList.end())
{
@@ -981,8 +979,8 @@
writeData.push_back(static_cast<uint8_t>(macOffset));
std::vector<uint8_t> readBuf(macRecordSize);
std::string i2cBus = "/dev/i2c-" + std::to_string(fruBus);
- ipmi::Cc retI2C = ipmi::i2cWriteRead(i2cBus, fruAddress, writeData,
- readBuf);
+ ipmi::Cc retI2C =
+ ipmi::i2cWriteRead(i2cBus, fruAddress, writeData, readBuf);
if (retI2C == ipmi::ccSuccess)
{
uint8_t cs = calculateChecksum(readBuf.cbegin(), readBuf.cend());
@@ -1025,14 +1023,14 @@
writeData.push_back(macHeader);
std::for_each(ethData.cbegin(), ethData.cend(),
[&](uint8_t i) { writeData.push_back(i); });
- uint8_t macCheckSum = calculateChecksum(++writeData.cbegin(),
- writeData.cend());
+ uint8_t macCheckSum =
+ calculateChecksum(++writeData.cbegin(), writeData.cend());
writeData.push_back(macCheckSum);
std::string i2cBus = "/dev/i2c-" + std::to_string(fruBus);
std::vector<uint8_t> readBuf;
- ipmi::Cc ret = ipmi::i2cWriteRead(i2cBus, fruAddress, writeData,
- readBuf);
+ ipmi::Cc ret =
+ ipmi::i2cWriteRead(i2cBus, fruAddress, writeData, readBuf);
// prepare for read to detect chip is write protected
writeData.resize(1);
@@ -1108,9 +1106,9 @@
"%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n", ethData.at(0),
ethData.at(1), ethData.at(2), ethData.at(3), ethData.at(4),
ethData.at(5));
- std::ofstream oEthFile(factoryEthAddrBaseFileName +
- std::to_string(dataType),
- std::ofstream::out);
+ std::ofstream oEthFile(
+ factoryEthAddrBaseFileName + std::to_string(dataType),
+ std::ofstream::out);
if (!oEthFile.good())
{
return ipmi::responseUnspecifiedError();
@@ -1137,9 +1135,9 @@
constexpr uint8_t invalidData = 0;
constexpr uint8_t validData = 1;
- std::ifstream iEthFile(factoryEthAddrBaseFileName +
- std::to_string(dataType),
- std::ifstream::in);
+ std::ifstream iEthFile(
+ factoryEthAddrBaseFileName + std::to_string(dataType),
+ std::ifstream::in);
if (!iEthFile.good())
{
if (readMacFromFru(ctx, dataType, ethData))
@@ -1263,8 +1261,8 @@
std::vector<uint8_t> readBuf(readCount);
- ipmi::Cc retI2C = ipmi::i2cWriteRead(i2cBus, targetAddr, writeData,
- readBuf);
+ ipmi::Cc retI2C =
+ ipmi::i2cWriteRead(i2cBus, targetAddr, writeData, readBuf);
if (retI2C != ipmi::ccSuccess)
{
return ipmi::response(retI2C);
@@ -1283,8 +1281,8 @@
std::vector<uint8_t> writeData = {0x61, 0x1};
std::vector<uint8_t> readBuf(0);
- ipmi::Cc retI2C = ipmi::i2cWriteRead(i2cBus, targetAddr, writeData,
- readBuf);
+ ipmi::Cc retI2C =
+ ipmi::i2cWriteRead(i2cBus, targetAddr, writeData, readBuf);
return ipmi::response(retI2C);
}
@@ -1334,10 +1332,9 @@
return configPaths;
}
-static ipmi::RspType<> startOrStopService(ipmi::Context::ptr& ctx,
- const uint8_t enable,
- const std::string& serviceName,
- bool disableOrEnableUnitFiles = true)
+static ipmi::RspType<> startOrStopService(
+ ipmi::Context::ptr& ctx, const uint8_t enable,
+ const std::string& serviceName, bool disableOrEnableUnitFiles = true)
{
constexpr bool runtimeOnly = false;
constexpr bool force = false;
@@ -1404,14 +1401,13 @@
boost::algorithm::replace_first_copy(
objectPath, "/xyz/openbmc_project/inventory/system/board/", ""),
"/", "_2f");
- std::string unitName = "xyz.openbmc_project.mctpd@" + serviceArgument +
- ".service";
+ std::string unitName =
+ "xyz.openbmc_project.mctpd@" + serviceArgument + ".service";
return unitName;
}
-static ipmi::RspType<> handleMCTPFeature(ipmi::Context::ptr& ctx,
- const uint8_t enable,
- const std::string& binding)
+static ipmi::RspType<> handleMCTPFeature(
+ ipmi::Context::ptr& ctx, const uint8_t enable, const std::string& binding)
{
std::vector<std::string> configPaths;
try
@@ -1501,9 +1497,8 @@
return ipmi::responseSuccess();
}
-static ipmi::RspType<> handleMCTPSlotFeature(ipmi::Context::ptr& ctx,
- const uint8_t enable,
- const uint8_t featureArg)
+static ipmi::RspType<> handleMCTPSlotFeature(
+ ipmi::Context::ptr& ctx, const uint8_t enable, const uint8_t featureArg)
{
uint8_t slotNum = (featureArg & slotNumMask);
switch ((featureArg & muxTypeMask) >> muxTypeShift)
@@ -1549,11 +1544,9 @@
*
* @returns IPMI completion code
*/
-ipmi::RspType<> mtmBMCFeatureControl(ipmi::Context::ptr ctx,
- const uint8_t feature,
- const uint8_t enable,
- const uint8_t featureArg,
- const uint16_t reserved)
+ipmi::RspType<> mtmBMCFeatureControl(
+ ipmi::Context::ptr ctx, const uint8_t feature, const uint8_t enable,
+ const uint8_t featureArg, const uint16_t reserved)
{
if (reserved != 0)
{
@@ -1636,6 +1629,6 @@
ipmi::registerFilter(ipmi::prioOemBase,
[](ipmi::message::Request::ptr request) {
- return ipmi::mfgFilterMessage(request);
- });
+ return ipmi::mfgFilterMessage(request);
+ });
}