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>

vpd-parser/ipz_parser.hpp

diff --git a/vpd-parser/ipz_parser.hpp b/vpd-parser/ipz_parser.hpp
index 1b1f034..c4a3e26 100644
--- a/vpd-parser/ipz_parser.hpp
+++ b/vpd-parser/ipz_parser.hpp
@@ -38,8 +38,7 @@
      */
     IpzVpdParser(const Binary& VpdVector, const std::string& path,
                  const std::string& vpdFilePath, uint32_t vpdStartOffset) :
-        vpd(VpdVector),
-        inventoryPath(path), vpdFilePath(vpdFilePath),
+        vpd(VpdVector), inventoryPath(path), vpdFilePath(vpdFilePath),
         vpdStartOffset(vpdStartOffset)
     {}
 

vpd-parser/memory_vpd_parser.cpp

diff --git a/vpd-parser/memory_vpd_parser.cpp b/vpd-parser/memory_vpd_parser.cpp
index c141da9..4a0ac7c 100644
--- a/vpd-parser/memory_vpd_parser.cpp
+++ b/vpd-parser/memory_vpd_parser.cpp
@@ -107,8 +107,8 @@
     }
     else
     {
-        l_DiePerPackage = pow(constants::VALUE_2,
-                              (l_ByteValue - constants::VALUE_1));
+        l_DiePerPackage =
+            pow(constants::VALUE_2, (l_ByteValue - constants::VALUE_1));
     }
     return l_DiePerPackage;
 }
@@ -143,13 +143,14 @@
                   ? constants::VALUE_1
                   : constants::VALUE_0));
 
-        uint8_t l_channelsPerDdimm = (((iterator[constants::SPD_BYTE_235] &
-                                        constants::MASK_BYTE_BITS_6) >>
-                                       constants::VALUE_6) +
-                                      ((iterator[constants::SPD_BYTE_235] &
-                                        constants::MASK_BYTE_BITS_7) >>
-                                       constants::VALUE_7)) *
-                                     l_channelsPerPhy;
+        uint8_t l_channelsPerDdimm =
+            (((iterator[constants::SPD_BYTE_235] &
+               constants::MASK_BYTE_BITS_6) >>
+              constants::VALUE_6) +
+             ((iterator[constants::SPD_BYTE_235] &
+               constants::MASK_BYTE_BITS_7) >>
+              constants::VALUE_7)) *
+            l_channelsPerPhy;
 
         if (!checkValidValue(iterator[constants::SPD_BYTE_235] &
                                  constants::MASK_BYTE_BITS_012,
@@ -167,10 +168,10 @@
                 ? PRIMARY_BUS_WIDTH_32_BITS
                 : PRIMARY_BUS_WIDTH_UNUSED;
 
-        if (!checkValidValue(iterator[constants::SPD_BYTE_4] &
-                                 constants::MASK_BYTE_BITS_567,
-                             constants::SHIFT_BITS_5, constants::VALUE_0,
-                             constants::VALUE_5))
+        if (!checkValidValue(
+                iterator[constants::SPD_BYTE_4] & constants::MASK_BYTE_BITS_567,
+                constants::SHIFT_BITS_5, constants::VALUE_0,
+                constants::VALUE_5))
         {
             std::cerr
                 << "Capacity calculation failed for die per package. DDIMM "
@@ -231,20 +232,20 @@
                                    constants::VALUE_6));
 #endif
 
-        if (!checkValidValue(iterator[constants::SPD_BYTE_6] &
-                                 constants::MASK_BYTE_BITS_567,
-                             constants::SHIFT_BITS_5, constants::VALUE_0,
-                             constants::VALUE_3))
+        if (!checkValidValue(
+                iterator[constants::SPD_BYTE_6] & constants::MASK_BYTE_BITS_567,
+                constants::SHIFT_BITS_5, constants::VALUE_0,
+                constants::VALUE_3))
         {
             std::cout
                 << "Capacity calculation failed for dram width DDIMM Byte 6 value ["
                 << iterator[constants::SPD_BYTE_6] << "]";
             break;
         }
-        uint8_t l_dramWidth = VALUE_4 *
-                              (VALUE_1 << ((iterator[constants::SPD_BYTE_6] &
-                                            constants::MASK_BYTE_BITS_567) >>
-                                           constants::VALUE_5));
+        uint8_t l_dramWidth =
+            VALUE_4 * (VALUE_1 << ((iterator[constants::SPD_BYTE_6] &
+                                    constants::MASK_BYTE_BITS_567) >>
+                                   constants::VALUE_5));
 
         dimmSize = (l_channelsPerDdimm * l_busWidthPerChannel *
                     l_diePerPackage * l_densityPerDie * l_ranksPerChannel) /