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: Ie029f7917035731dc2a3fd61c8bbd55685de6278
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/dump/dump_utils.cpp b/dump/dump_utils.cpp
index 18c1d3f..74ec563 100644
--- a/dump/dump_utils.cpp
+++ b/dump/dump_utils.cpp
@@ -23,25 +23,25 @@
sdbusplus::bus::match::rules::propertiesChanged(
path, "xyz.openbmc_project.Common.Progress"),
[&](sdbusplus::message_t& msg) {
- std::string interface;
- std::map<std::string, std::variant<std::string, uint8_t>> property;
- msg.read(interface, property);
+ std::string interface;
+ std::map<std::string, std::variant<std::string, uint8_t>> property;
+ msg.read(interface, property);
- const auto dumpStatus = property.find("Status");
- if (dumpStatus != property.end())
- {
- const std::string* status =
- std::get_if<std::string>(&(dumpStatus->second));
- if (status &&
- *status !=
- "xyz.openbmc_project.Common.Progress.OperationStatus.InProgress")
+ const auto dumpStatus = property.find("Status");
+ if (dumpStatus != property.end())
{
- lg2::info("Dump status({STATUS}) : path={PATH}", "STATUS",
- status->c_str(), "PATH", path.c_str());
- inProgress = false;
+ const std::string* status =
+ std::get_if<std::string>(&(dumpStatus->second));
+ if (status &&
+ *status !=
+ "xyz.openbmc_project.Common.Progress.OperationStatus.InProgress")
+ {
+ lg2::info("Dump status({STATUS}) : path={PATH}", "STATUS",
+ status->c_str(), "PATH", path.c_str());
+ inProgress = false;
+ }
}
- }
- });
+ });
// Timeout management
for (uint32_t secondsCount = 0; inProgress && secondsCount < timeout;
@@ -74,8 +74,8 @@
{
auto bus = sdbusplus::bus::new_default();
auto service = getService(bus, interface, path);
- auto method = bus.new_method_call(service.c_str(), path, interface,
- function);
+ auto method =
+ bus.new_method_call(service.c_str(), path, interface, function);
std::unordered_map<std::string, std::variant<std::string, uint64_t>>
createParams = {