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: I917f3a65c985f3df3bb4d7a1bef0a13da54ab7bd
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/vpd-manager/manager.cpp b/vpd-manager/manager.cpp
index 072fe99..62220db 100644
--- a/vpd-manager/manager.cpp
+++ b/vpd-manager/manager.cpp
@@ -38,49 +38,50 @@
Manager::Manager(std::shared_ptr<boost::asio::io_context>& ioCon,
std::shared_ptr<sdbusplus::asio::dbus_interface>& iFace,
std::shared_ptr<sdbusplus::asio::connection>& conn) :
- ioContext(ioCon),
- interface(iFace), conn(conn)
+ ioContext(ioCon), interface(iFace), conn(conn)
{
interface->register_method(
"WriteKeyword",
[this](const sdbusplus::message::object_path& path,
const std::string& recordName, const std::string& keyword,
const Binary& value) {
- this->writeKeyword(path, recordName, keyword, value);
- });
+ this->writeKeyword(path, recordName, keyword, value);
+ });
interface->register_method(
"GetFRUsByUnexpandedLocationCode",
[this](const std::string& locationCode,
const uint16_t nodeNumber) -> inventory::ListOfPaths {
- return this->getFRUsByUnexpandedLocationCode(locationCode, nodeNumber);
- });
+ return this->getFRUsByUnexpandedLocationCode(locationCode,
+ nodeNumber);
+ });
interface->register_method(
"GetFRUsByExpandedLocationCode",
[this](const std::string& locationCode) -> inventory::ListOfPaths {
- return this->getFRUsByExpandedLocationCode(locationCode);
- });
+ return this->getFRUsByExpandedLocationCode(locationCode);
+ });
interface->register_method(
"GetExpandedLocationCode",
[this](const std::string& locationCode,
const uint16_t nodeNumber) -> std::string {
- return this->getExpandedLocationCode(locationCode, nodeNumber);
- });
+ return this->getExpandedLocationCode(locationCode, nodeNumber);
+ });
- interface->register_method("PerformVPDRecollection",
- [this]() { this->performVPDRecollection(); });
+ interface->register_method("PerformVPDRecollection", [this]() {
+ this->performVPDRecollection();
+ });
interface->register_method(
"deleteFRUVPD", [this](const sdbusplus::message::object_path& path) {
- this->deleteFRUVPD(path);
- });
+ this->deleteFRUVPD(path);
+ });
interface->register_method(
"CollectFRUVPD", [this](const sdbusplus::message::object_path& path) {
- this->collectFRUVPD(path);
- });
+ this->collectFRUVPD(path);
+ });
sd_bus_default(&sdBus);
initManager();
@@ -408,11 +409,11 @@
if (itr != svpdKwdMap.end())
{
auto systemKwdInfoList = itr->second;
- const auto& itrToKwd = find_if(systemKwdInfoList.begin(),
- systemKwdInfoList.end(),
- [&keyword](const auto& kwdInfo) {
- return (keyword == std::get<0>(kwdInfo));
- });
+ const auto& itrToKwd =
+ find_if(systemKwdInfoList.begin(), systemKwdInfoList.end(),
+ [&keyword](const auto& kwdInfo) {
+ return (keyword == std::get<0>(kwdInfo));
+ });
if (itrToKwd != systemKwdInfoList.end())
{
@@ -525,9 +526,8 @@
}
}
-ListOfPaths
- Manager::getFRUsByUnexpandedLocationCode(const LocationCode& locationCode,
- const NodeNumber nodeNumber)
+ListOfPaths Manager::getFRUsByUnexpandedLocationCode(
+ const LocationCode& locationCode, const NodeNumber nodeNumber)
{
ReaderImpl read;
return read.getFrusAtLocation(locationCode, nodeNumber, fruLocationCode);
@@ -790,14 +790,14 @@
string busNum = deviceAddress.substr(0, pos);
deviceAddress = "0x" + deviceAddress.substr(pos + 1, string::npos);
- string deleteDevice = "echo" + deviceAddress + " > /sys/bus/" +
- busType + "/devices/" + busType + "-" +
- busNum + "/delete_device";
+ string deleteDevice =
+ "echo" + deviceAddress + " > /sys/bus/" + busType +
+ "/devices/" + busType + "-" + busNum + "/delete_device";
executeCmd(deleteDevice);
- string addDevice = "echo" + driverType + " " + deviceAddress +
- " > /sys/bus/" + busType + "/devices/" +
- busType + "-" + busNum + "/new_device";
+ string addDevice =
+ "echo" + driverType + " " + deviceAddress + " > /sys/bus/" +
+ busType + "/devices/" + busType + "-" + busNum + "/new_device";
executeCmd(addDevice);
}
else
@@ -862,8 +862,8 @@
// check if we have cxp-port populated for the given object path.
std::vector<std::string> interfaceList{
"xyz.openbmc_project.State.Decorator.OperationalStatus"};
- MapperResponse subTree = getObjectSubtreeForInterfaces(path, 0,
- interfaceList);
+ MapperResponse subTree =
+ getObjectSubtreeForInterfaces(path, 0, interfaceList);
if (subTree.size() != 0)
{