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: Ia968a74764d3bda33160a8a9890629ed3cc94d0e
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/getConfig.cpp b/src/getConfig.cpp
index 1046416..79579b1 100644
--- a/src/getConfig.cpp
+++ b/src/getConfig.cpp
@@ -34,15 +34,15 @@
[self, path, owner](
const boost::system::error_code ec,
boost::container::flat_map<std::string, BasicVariantType>& data) {
- if (ec)
- {
- lg2::error("Error getting properties for {PATH}", "PATH", path,
- "REDFISH_MESSAGE_ID",
- std::string("OpenBMC.0.1.GetStorageInfoFail"));
- return;
- }
+ if (ec)
+ {
+ lg2::error("Error getting properties for {PATH}", "PATH", path,
+ "REDFISH_MESSAGE_ID",
+ std::string("OpenBMC.0.1.GetStorageInfoFail"));
+ return;
+ }
- self->respData[path] = std::move(data);
+ self->respData[path] = std::move(data);
},
owner, path, "org.freedesktop.DBus.Properties", "GetAll",
emmcConfigInterface);
@@ -53,28 +53,28 @@
std::shared_ptr<GetStorageConfiguration> self = shared_from_this();
dbusConnection->async_method_call(
[self](const boost::system::error_code ec, const GetSubTreeType& ret) {
- if (ec)
+ if (ec)
+ {
+ lg2::error("Error calling mapper");
+ return;
+ }
+ for (const auto& [objPath, objDict] : ret)
+ {
+ if (objDict.empty())
{
- lg2::error("Error calling mapper");
return;
}
- for (const auto& [objPath, objDict] : ret)
+ const std::string& objOwner = objDict.begin()->first;
+ /* Look for the config interface exposed by this object. */
+ for (const std::string& interface : objDict.begin()->second)
{
- if (objDict.empty())
+ if (interface.compare(emmcConfigInterface) == 0)
{
- return;
- }
- const std::string& objOwner = objDict.begin()->first;
- /* Look for the config interface exposed by this object. */
- for (const std::string& interface : objDict.begin()->second)
- {
- if (interface.compare(emmcConfigInterface) == 0)
- {
- /* Get the properties exposed by this interface. */
- self->getStorageInfo(objPath, objOwner);
- }
+ /* Get the properties exposed by this interface. */
+ self->getStorageInfo(objPath, objOwner);
}
}
+ }
},
mapper::busName, mapper::path, mapper::interface, mapper::subtree, "/",
0, std::vector<const char*>(1, emmcConfigInterface));