commit 08dc31cd99172460b86e7552d0eeb21eb4197446
author Patrick Williams <patrick@stwcx.xyz> Fri Aug 16 15:21:06 2024 -0400
committer Patrick Williams <patrick@stwcx.xyz> Fri Aug 16 15:21:06 2024 -0400
tree 0a35e9817a49087ac0f412e1270fbdec9e39b1bd
parent 32958361a04734ef65f9df8744c14503bf713c37

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

test/keyword_vpd_parser_test/kw_vpd_test.cpp

diff --git a/test/keyword_vpd_parser_test/kw_vpd_test.cpp b/test/keyword_vpd_parser_test/kw_vpd_test.cpp
index becdd56..dc05358 100644
--- a/test/keyword_vpd_parser_test/kw_vpd_test.cpp
+++ b/test/keyword_vpd_parser_test/kw_vpd_test.cpp
@@ -49,10 +49,10 @@
              0x50, 0x32, 0x2d, 0x44, 0x37, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
              0x32, 0x53, 0x53, 0x43, 0x83, 0x50, 0x32, 0x2d, 0x44, 0x38, 0x20,
              0x20, 0x20, 0x20, 0x20, 0x20, 0x32, 0x53, 0x53, 0x43}},
-        pair<std::string, Binary>{"B2",
-                                  {0x50, 0x05, 0x07, 0x60, 0x73, 0x00, 0x72,
-                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                   0x01, 0x00}},
+        pair<std::string, Binary>{
+            "B2",
+            {0x50, 0x05, 0x07, 0x60, 0x73, 0x00, 0x72, 0x00, 0x00, 0x00, 0x00,
+             0x00, 0x00, 0x00, 0x01, 0x00}},
         pair<std::string, Binary>{"MF", {0x00, 0x10}},
         pair<std::string, Binary>{"VZ", {0x30, 0x33}},
         pair<std::string, Binary>{"PN",

test/vpd-manager-test/reader_test.cpp

diff --git a/test/vpd-manager-test/reader_test.cpp b/test/vpd-manager-test/reader_test.cpp
index 54c98f0..dd576e6 100644
--- a/test/vpd-manager-test/reader_test.cpp
+++ b/test/vpd-manager-test/reader_test.cpp
@@ -152,8 +152,8 @@
 
     MockUtilCalls uCalls;
     ReaderImpl read(uCalls);
-    ListOfPaths paths = read.getFrusAtLocation(LocationCode, nodeNumber,
-                                               fruLocationCode);
+    ListOfPaths paths =
+        read.getFrusAtLocation(LocationCode, nodeNumber, fruLocationCode);
     std::string expected =
         "/xyz/openbmc_project/inventory/system/chassis/motherboard";
     EXPECT_EQ(paths.at(0), expected);
@@ -168,8 +168,8 @@
     ReaderImpl read(uCalls);
     ListOfPaths paths;
     EXPECT_ANY_THROW({
-        paths = read.getFRUsByExpandedLocationCode(locationCode,
-                                                   fruLocationCode);
+        paths =
+            read.getFRUsByExpandedLocationCode(locationCode, fruLocationCode);
     });
 
     // unused variable warning
@@ -178,8 +178,8 @@
     // length is les sthan 17 for expanded location code
     locationCode = "U9105.22A.SIMP10";
     EXPECT_ANY_THROW({
-        paths = read.getFRUsByExpandedLocationCode(locationCode,
-                                                   fruLocationCode);
+        paths =
+            read.getFRUsByExpandedLocationCode(locationCode, fruLocationCode);
     });
 
     // Invalid location code. No "."
@@ -195,8 +195,8 @@
     // unused variable warning
     (void)paths;
     EXPECT_ANY_THROW({
-        paths = read.getFRUsByExpandedLocationCode(locationCode,
-                                                   fruLocationCode);
+        paths =
+            read.getFRUsByExpandedLocationCode(locationCode, fruLocationCode);
     });
 }
 
@@ -213,8 +213,8 @@
             testing::Return("78DAPQRS")); // return a dummy value for FC keyword
 
     ReaderImpl read(uCalls);
-    ListOfPaths paths = read.getFRUsByExpandedLocationCode(validLocationCode,
-                                                           fruLocationCode);
+    ListOfPaths paths =
+        read.getFRUsByExpandedLocationCode(validLocationCode, fruLocationCode);
 
     std::string expected =
         "/xyz/openbmc_project/inventory/system/chassis/motherboard";
@@ -241,8 +241,8 @@
             testing::Return("9105PQRS")); // return a dummy value for TM keyword
 
     ReaderImpl read(uCalls);
-    ListOfPaths paths = read.getFRUsByExpandedLocationCode(validLocationCode,
-                                                           fruLocationCode);
+    ListOfPaths paths =
+        read.getFRUsByExpandedLocationCode(validLocationCode, fruLocationCode);
 
     std::string expected = "/xyz/openbmc_project/inventory/system";
     EXPECT_EQ(paths.at(0), expected);