commit f8e024296d02170b360c894349d900acfd940a4d
author Patrick Williams <patrick@stwcx.xyz> Fri Aug 16 15:19:59 2024 -0400
committer Patrick Williams <patrick@stwcx.xyz> Fri Aug 16 15:19:59 2024 -0400
tree c626d6c59c7285c02f72aa38133f4468531658c7
parent 282d578a6f2ec96fe9d63b76787d30f2eb33f88e

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

mmc/item_updater_mmc.cpp

diff --git a/mmc/item_updater_mmc.cpp b/mmc/item_updater_mmc.cpp
index 0c47efa..5a37041 100644
--- a/mmc/item_updater_mmc.cpp
+++ b/mmc/item_updater_mmc.cpp
@@ -62,9 +62,9 @@
 void ItemUpdaterMMC::reset()
 {
     // Do not reset read-only files needed for reset or ext4 default files
-    const std::vector<std::string> exclusionList = {"alternate", "hostfw-a",
-                                                    "hostfw-b",  "lost+found",
-                                                    "nvram",     "running-ro"};
+    const std::vector<std::string> exclusionList = {
+        "alternate",  "hostfw-a", "hostfw-b",
+        "lost+found", "nvram",    "running-ro"};
     std::filesystem::path dirPath(std::string(MEDIA_DIR "hostfw/"));
     // Delete all files in /media/hostfw/ except for those on exclusionList
     for (const auto& p : std::filesystem::directory_iterator(dirPath))
@@ -177,9 +177,9 @@
         response.read(objs);
         for (auto& obj : objs)
         {
-            auto method = bus.new_method_call(service.c_str(), obj.c_str(),
-                                              "org.freedesktop.DBus.Properties",
-                                              "Set");
+            auto method =
+                bus.new_method_call(service.c_str(), obj.c_str(),
+                                    "org.freedesktop.DBus.Properties", "Set");
             std::variant<bool> propertyVal{true};
             method.append("xyz.openbmc_project.Object.Enable", "Enabled",
                           propertyVal);

mmc/item_updater_mmc.hpp

diff --git a/mmc/item_updater_mmc.hpp b/mmc/item_updater_mmc.hpp
index 2ef77e4..fc2b6a4 100644
--- a/mmc/item_updater_mmc.hpp
+++ b/mmc/item_updater_mmc.hpp
@@ -83,13 +83,12 @@
         AssociationList& assocs) override;
 
     /** @brief Create Version object */
-    std::unique_ptr<Version>
-        createVersionObject(const std::string& objPath,
-                            const std::string& versionId,
-                            const std::string& versionString,
-                            sdbusplus::xyz::openbmc_project::Software::server::
-                                Version::VersionPurpose versionPurpose,
-                            const std::string& filePath) override;
+    std::unique_ptr<Version> createVersionObject(
+        const std::string& objPath, const std::string& versionId,
+        const std::string& versionString,
+        sdbusplus::xyz::openbmc_project::Software::server::Version::
+            VersionPurpose versionPurpose,
+        const std::string& filePath) override;
 
     /** @brief Validate if image is valid or not */
     bool validateImage(const std::string& path);