commit fc33ba86773d2f02cee1093bea3e5da405028220
author Patrick Williams <patrick@stwcx.xyz> Fri Aug 16 15:19:54 2024 -0400
committer Patrick Williams <patrick@stwcx.xyz> Mon Aug 19 15:36:13 2024 -0400
tree c83b45dcb12798228a5cc78f59837f503cf1d1ce
parent b114f62b7c88e5f44491747d6564874aa5b51558

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: I2b9626d95674508bb090745de6471fe2755c89fd
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

image_manager.cpp

diff --git a/image_manager.cpp b/image_manager.cpp
index c9a958d..a7687c6 100644
--- a/image_manager.cpp
+++ b/image_manager.cpp
@@ -147,8 +147,8 @@
     }
 
     // Get machine name for image to be upgraded
-    std::string machineStr = Version::getValue(manifestPath.string(),
-                                               "MachineName");
+    std::string machineStr =
+        Version::getValue(manifestPath.string(), "MachineName");
     if (!machineStr.empty())
     {
         if (machineStr != currMachine)
@@ -193,8 +193,8 @@
     auto purpose = convertedPurpose.value_or(Version::VersionPurpose::Unknown);
 
     // Get ExtendedVersion
-    std::string extendedVersion = Version::getValue(manifestPath.string(),
-                                                    "ExtendedVersion");
+    std::string extendedVersion =
+        Version::getValue(manifestPath.string(), "ExtendedVersion");
 
     // Get CompatibleNames
     std::vector<std::string> compatibleNames =
@@ -213,8 +213,8 @@
     // active versions on D-Bus that is not managed by this service.
     // So check D-Bus if there is an existing version.
     auto allSoftwareObjs = getSoftwareObjects(bus);
-    auto it = std::find(allSoftwareObjs.begin(), allSoftwareObjs.end(),
-                        objPath);
+    auto it =
+        std::find(allSoftwareObjs.begin(), allSoftwareObjs.end(), objPath);
     if (versions.find(id) == versions.end() && it == allSoftwareObjs.end())
     {
         // Rename the temp dir to image dir
@@ -228,8 +228,8 @@
             imageDirPath.string(), compatibleNames,
             std::bind(&Manager::erase, this, std::placeholders::_1), id);
         versionPtr->deleteObject =
-            std::make_unique<phosphor::software::manager::Delete>(bus, objPath,
-                                                                  *versionPtr);
+            std::make_unique<phosphor::software::manager::Delete>(
+                bus, objPath, *versionPtr);
         versions.insert(std::make_pair(id, std::move(versionPtr)));
     }
     else