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/biosconfigcommands.cpp b/src/biosconfigcommands.cpp
index c444112..8f3baa2 100644
--- a/src/biosconfigcommands.cpp
+++ b/src/biosconfigcommands.cpp
@@ -199,8 +199,8 @@
return false;
}
- std::string service =
- getService(*dbus, biosConfigIntf, biosConfigBaseMgrPath);
+ std::string service = getService(*dbus, biosConfigIntf,
+ biosConfigBaseMgrPath);
try
{
@@ -404,19 +404,19 @@
{
pSdBusPlus->async_method_call(
[](const boost::system::error_code ec) {
- /* No more need to keep attributes data in memory */
- attributesData.clear();
+ /* No more need to keep attributes data in memory */
+ attributesData.clear();
- if (ec)
- {
- phosphor::logging::log<phosphor::logging::level::ERR>(
- "sendAllAttributes error: send all attributes - "
- "failed");
- return;
- }
+ if (ec)
+ {
+ phosphor::logging::log<phosphor::logging::level::ERR>(
+ "sendAllAttributes error: send all attributes - "
+ "failed");
+ return;
+ }
- phosphor::logging::log<phosphor::logging::level::INFO>(
- "sendAllAttributes: send all attributes - done");
+ phosphor::logging::log<phosphor::logging::level::INFO>(
+ "sendAllAttributes: send all attributes - done");
},
service, biosConfigBaseMgrPath,
"org.freedesktop.DBus.Properties", "Set", biosConfigIntf,
@@ -496,12 +496,11 @@
*/
static int getResetBIOSSettings(uint8_t& ResetFlag)
{
-
try
{
std::shared_ptr<sdbusplus::asio::connection> dbus = getSdBus();
- std::string service =
- getService(*dbus, biosConfigIntf, biosConfigBaseMgrPath);
+ std::string service = getService(*dbus, biosConfigIntf,
+ biosConfigBaseMgrPath);
Value variant = getDbusProperty(*dbus, service, biosConfigBaseMgrPath,
biosConfigIntf, resetBIOSSettingsProp);
@@ -604,7 +603,6 @@
template <typename... ArgTypes>
static int generateBIOSXMLFile(const char* path, ArgTypes&&... tArgs)
{
-
boost::process::child execProg(path, const_cast<char*>(tArgs)...,
boost::process::std_out > biosXMLFilePath);
execProg.wait();
@@ -644,7 +642,6 @@
if (ifs.good())
{
-
ifs.seekg(std::ios_base::beg);
ifs.read(reinterpret_cast<char*>(&gNVOOBdata),
sizeof(struct NVOOBdata));
@@ -785,8 +782,8 @@
return ipmi::response(ipmiCCPayloadChecksumFailed);
}
// store the data in temp file
- std::string FilePath =
- "/var/oob/temp" + std::to_string(payloadType);
+ std::string FilePath = "/var/oob/temp" +
+ std::to_string(payloadType);
std::ofstream outFile(FilePath, std::ios::binary | std::ios::app);
outFile.seekp(pPayloadInProgress->payloadOffset);
@@ -823,12 +820,12 @@
{
return ipmi::response(ipmiCCPayloadPayloadInComplete);
}
- std::string tempFilePath =
- "/var/oob/temp" + std::to_string(payloadType);
- std::string payloadFilePath =
- "/var/oob/Payload" + std::to_string(payloadType);
- auto renamestatus =
- std::rename(tempFilePath.c_str(), payloadFilePath.c_str());
+ std::string tempFilePath = "/var/oob/temp" +
+ std::to_string(payloadType);
+ std::string payloadFilePath = "/var/oob/Payload" +
+ std::to_string(payloadType);
+ auto renamestatus = std::rename(tempFilePath.c_str(),
+ payloadFilePath.c_str());
if (renamestatus)
{
phosphor::logging::log<phosphor::logging::level::ERR>(
@@ -842,7 +839,6 @@
payloadFilePath.c_str());
if (response)
{
-
phosphor::logging::log<phosphor::logging::level::ERR>(
"ipmiOEMSetPayload: generateBIOSXMLFile - failed");
gNVOOBdata.payloadInfo[payloadType].payloadStatus =
@@ -907,8 +903,8 @@
gNVOOBdata.payloadInfo[payloadType].payloadType = 0;
gNVOOBdata.payloadInfo[payloadType].payloadTotalSize = 0;
// Delete the temp file
- std::string tempFilePath =
- "/var/oob/temp" + std::to_string(payloadType);
+ std::string tempFilePath = "/var/oob/temp" +
+ std::to_string(payloadType);
unlink(tempFilePath.c_str());
flushNVOOBdata();
return ipmi::responseSuccess();
@@ -960,8 +956,8 @@
{
case ipmi::GetPayloadParameter::GetPayloadInfo:
{
- std::string payloadFilePath =
- "/var/oob/Payload" + std::to_string(payloadType);
+ std::string payloadFilePath = "/var/oob/Payload" +
+ std::to_string(payloadType);
std::ifstream ifs(payloadFilePath,
std::ios::in | std::ios::binary | std::ios::ate);
@@ -999,8 +995,8 @@
}
uint32_t offset = reqData.at(0);
uint32_t length = reqData.at(1);
- std::string payloadFilePath =
- "/var/oob/Payload" + std::to_string(payloadType);
+ std::string payloadFilePath = "/var/oob/Payload" +
+ std::to_string(payloadType);
if (length > static_cast<uint32_t>(maxGetPayloadDataSize))
{
@@ -1165,7 +1161,6 @@
uint8_t adminPwdChangedFlag = 0;
if (!data.is_discarded())
{
-
adminPwdChangedFlag = data["IsAdminPwdChanged"];
newAdminHash = data["AdminPwdHash"];
seed = data["Seed"];