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>

ubi/flash.cpp

diff --git a/ubi/flash.cpp b/ubi/flash.cpp
index 64c9ea5..cb3e045 100644
--- a/ubi/flash.cpp
+++ b/ubi/flash.cpp
@@ -41,8 +41,8 @@
     auto rwServiceFile = "obmc-flash-bmc-ubirw.service";
     auto roServiceFile = "obmc-flash-bmc-ubiro@" + versionId + ".service";
     auto flashId = parent.versions.find(versionId)->second->path();
-    auto ubootVarsServiceFile = "obmc-flash-bmc-updateubootvars@" + flashId +
-                                ".service";
+    auto ubootVarsServiceFile =
+        "obmc-flash-bmc-updateubootvars@" + flashId + ".service";
 
     if (newStateUnit == rwServiceFile && newStateResult == "done")
     {

ubi/item_updater_helper.cpp

diff --git a/ubi/item_updater_helper.cpp b/ubi/item_updater_helper.cpp
index 486577a..ae00ea5 100644
--- a/ubi/item_updater_helper.cpp
+++ b/ubi/item_updater_helper.cpp
@@ -66,8 +66,8 @@
 {
     auto method = bus.new_method_call(SYSTEMD_BUSNAME, SYSTEMD_PATH,
                                       SYSTEMD_INTERFACE, "StartUnit");
-    auto updateEnvVarsFile = "obmc-flash-bmc-updateubootvars@" + flashId +
-                             ".service";
+    auto updateEnvVarsFile =
+        "obmc-flash-bmc-updateubootvars@" + flashId + ".service";
     method.append(updateEnvVarsFile, "replace");
 
     try