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: Id77d01d036ba05e52cdda0e6c6fbc47842e9baf8
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/service/src/pfr_mgr.cpp b/service/src/pfr_mgr.cpp
index 57e121b..d31c14f 100644
--- a/service/src/pfr_mgr.cpp
+++ b/service/src/pfr_mgr.cpp
@@ -39,8 +39,7 @@
std::shared_ptr<sdbusplus::asio::connection>& conn_,
const std::string& path_, const ImageType& imgType_,
const std::string& purpose_) :
- server(srv_),
- conn(conn_), path(path_), imgType(imgType_), purpose(purpose_)
+ server(srv_), conn(conn_), path(path_), imgType(imgType_), purpose(purpose_)
{
version = getFirmwareVersion(imgType);
@@ -50,8 +49,8 @@
}
std::string objPath = "/xyz/openbmc_project/software/" + path;
- versionIface = server.add_interface(objPath,
- "xyz.openbmc_project.Software.Version");
+ versionIface =
+ server.add_interface(objPath, "xyz.openbmc_project.Software.Version");
if (versionIface != nullptr)
{
@@ -60,17 +59,17 @@
versionStr, version,
// Override set
[this](const std::string& req, std::string& propertyValue) {
- if (internalSet)
- {
- if (req != propertyValue)
+ if (internalSet)
{
- version = req;
- propertyValue = req;
- return 1;
+ if (req != propertyValue)
+ {
+ version = req;
+ propertyValue = req;
+ return 1;
+ }
}
- }
- return 0;
- });
+ return 0;
+ });
versionIface->initialize();
}
@@ -135,8 +134,7 @@
PfrConfig::PfrConfig(sdbusplus::asio::object_server& srv_,
std::shared_ptr<sdbusplus::asio::connection>& conn_) :
- server(srv_),
- conn(conn_)
+ server(srv_), conn(conn_)
{
pfrCfgIface = server.add_interface("/xyz/openbmc_project/pfr",
"xyz.openbmc_project.PFR.Attributes");
@@ -149,47 +147,47 @@
pfrCfgIface->register_property(ufmProvisionedStr, ufmProvisioned,
// Override set
[this](const bool req, bool propertyValue) {
- if (internalSet)
- {
- if (req != propertyValue)
- {
- ufmProvisioned = req;
- propertyValue = req;
- return 1;
- }
- }
- return 0;
- });
+ if (internalSet)
+ {
+ if (req != propertyValue)
+ {
+ ufmProvisioned = req;
+ propertyValue = req;
+ return 1;
+ }
+ }
+ return 0;
+ });
pfrCfgIface->register_property(ufmLockedStr, ufmLocked,
// Override set
[this](const bool req, bool propertyValue) {
- if (internalSet)
- {
- if (req != propertyValue)
- {
- ufmLocked = req;
- propertyValue = req;
- return 1;
- }
- }
- return 0;
- });
+ if (internalSet)
+ {
+ if (req != propertyValue)
+ {
+ ufmLocked = req;
+ propertyValue = req;
+ return 1;
+ }
+ }
+ return 0;
+ });
pfrCfgIface->register_property(ufmSupportStr, ufmSupport,
// Override set
[this](const bool req, bool propertyValue) {
- if (internalSet)
- {
- if (req != propertyValue)
- {
- ufmSupport = req;
- propertyValue = req;
- return 1;
- }
- }
- return 0;
- });
+ if (internalSet)
+ {
+ if (req != propertyValue)
+ {
+ ufmSupport = req;
+ propertyValue = req;
+ return 1;
+ }
+ }
+ return 0;
+ });
pfrCfgIface->initialize();
@@ -251,16 +249,15 @@
PfrPostcode::PfrPostcode(sdbusplus::asio::object_server& srv_,
std::shared_ptr<sdbusplus::asio::connection>& conn_) :
- server(srv_),
- conn(conn_)
+ server(srv_), conn(conn_)
{
if (getPlatformState(postcode) < 0)
{
postcode = 0;
}
- pfrPostcodeIface = server.add_interface("/xyz/openbmc_project/pfr",
- postcodeIface);
+ pfrPostcodeIface =
+ server.add_interface("/xyz/openbmc_project/pfr", postcodeIface);
if (pfrPostcodeIface != nullptr)
{
@@ -268,22 +265,22 @@
postcodeDataProp, postcode,
// Override set
[this](const uint8_t req, uint8_t& propertyValue) {
- if (internalSet)
- {
- if (req != propertyValue)
+ if (internalSet)
{
- postcode = req;
- propertyValue = req;
- return 1;
+ if (req != propertyValue)
+ {
+ postcode = req;
+ propertyValue = req;
+ return 1;
+ }
}
- }
- return 0;
- },
+ return 0;
+ },
[this](uint8_t& propertyValue) {
- updatePostcode();
- propertyValue = postcode;
- return propertyValue;
- });
+ updatePostcode();
+ propertyValue = postcode;
+ return propertyValue;
+ });
pfrPostcodeIface->register_property(postcodeStrProp,
std::string(postcodeStrDefault));