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>

ibm_vpd_app.cpp

diff --git a/ibm_vpd_app.cpp b/ibm_vpd_app.cpp
index 55a01ff..476d802 100644
--- a/ibm_vpd_app.cpp
+++ b/ibm_vpd_app.cpp
@@ -240,9 +240,8 @@
  * @param[out] interfaces - Reference to interface map.
  */
 template <typename T>
-static void populateFruSpecificInterfaces(const T& map,
-                                          const string& preIntrStr,
-                                          inventory::InterfaceMap& interfaces)
+static void populateFruSpecificInterfaces(
+    const T& map, const string& preIntrStr, inventory::InterfaceMap& interfaces)
 {
     inventory::PropertyMap prop;
 
@@ -376,8 +375,8 @@
                     if (!rec.empty() && !kw.empty() && vpdMap.count(rec) &&
                         vpdMap.at(rec).count(kw))
                     {
-                        auto encoded = encodeKeyword(vpdMap.at(rec).at(kw),
-                                                     encoding);
+                        auto encoded =
+                            encodeKeyword(vpdMap.at(rec).at(kw), encoding);
                         props.emplace(busProp, encoded);
                     }
                 }
@@ -387,8 +386,8 @@
                     {
                         if (auto kwValue = get_if<Binary>(&vpdMap.at(kw)))
                         {
-                            auto prop = string((*kwValue).begin(),
-                                               (*kwValue).end());
+                            auto prop =
+                                string((*kwValue).begin(), (*kwValue).end());
 
                             auto encoded = encodeKeyword(prop, encoding);
 
@@ -397,8 +396,8 @@
                         else if (auto kwValue =
                                      get_if<std::string>(&vpdMap.at(kw)))
                         {
-                            auto prop = string((*kwValue).begin(),
-                                               (*kwValue).end());
+                            auto prop =
+                                string((*kwValue).begin(), (*kwValue).end());
 
                             auto encoded = encodeKeyword(prop, encoding);
 
@@ -537,9 +536,9 @@
                 // Check if device showed up (test for file)
                 if (!fs::exists(file))
                 {
-                    std::cerr << "EEPROM " << file
-                              << " does not exist. Take failure action"
-                              << std::endl;
+                    std::cerr
+                        << "EEPROM " << file
+                        << " does not exist. Take failure action" << std::endl;
                     // If not, then take failure postAction
                     executePostFailAction(json, file);
                 }
@@ -681,8 +680,8 @@
  * @returns Map of items in extraInterface.
  */
 template <typename T>
-inventory::ObjectMap primeInventory(const nlohmann::json& jsObject,
-                                    const T& vpdMap)
+inventory::ObjectMap
+    primeInventory(const nlohmann::json& jsObject, const T& vpdMap)
 {
     inventory::ObjectMap objects;
 
@@ -1110,17 +1109,17 @@
                                 std::ostringstream busStream;
                                 for (uint16_t byte : backupValue)
                                 {
-                                    busStream << std::setfill('0')
-                                              << std::setw(2) << std::hex
-                                              << "0x" << byte << " ";
+                                    busStream
+                                        << std::setfill('0') << std::setw(2)
+                                        << std::hex << "0x" << byte << " ";
                                 }
 
                                 std::ostringstream vpdStream;
                                 for (uint16_t byte : kwdValue)
                                 {
-                                    vpdStream << std::setfill('0')
-                                              << std::setw(2) << std::hex
-                                              << "0x" << byte << " ";
+                                    vpdStream
+                                        << std::setfill('0') << std::setw(2)
+                                        << std::hex << "0x" << byte << " ";
                                 }
 
                                 // data mismatch