commit f8ae2ba5c82f15320176cb15a8598927b2bca6f3
author Andrew Jeffery <andrew@aj.id.au> Fri Mar 25 15:13:55 2022 +1030
committer Andrew Jeffery <andrew@aj.id.au> Mon Mar 28 21:10:05 2022 +1030
tree 604ccbdec97bdbb6ea348959339054b8d0a20ec5
parent 0710828f44f31645c5dc864111bea797ad97516f

FruUtils: Fix code formatting

format-code didn't include an invocation of clang-format, and as the
in-repo format-code script overrides the default script in
openbmc-build-scripts there was no code-formatting being applied in CI.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I68bd7d2c930b752da4045412e7e286b303ac8ff6

src/FruUtils.cpp

diff --git a/src/FruUtils.cpp b/src/FruUtils.cpp
index 7296aa8..9a7c519 100644
--- a/src/FruUtils.cpp
+++ b/src/FruUtils.cpp
@@ -588,15 +588,14 @@
 }
 
 bool findFRUHeader(int flag, int file, uint16_t address,
-                   const ReadBlockFunc& readBlock,
-                   const std::string& errorHelp,
+                   const ReadBlockFunc& readBlock, const std::string& errorHelp,
                    std::array<uint8_t, I2C_SMBUS_BLOCK_MAX>& blockData,
                    uint16_t& baseOffset)
 {
     if (readBlock(flag, file, address, baseOffset, 0x8, blockData.data()) < 0)
     {
         std::cerr << "failed to read " << errorHelp << " base offset "
-            << baseOffset << "\n";
+                  << baseOffset << "\n";
         return false;
     }
 
@@ -607,7 +606,8 @@
     }
 
     // only continue the search if we just looked at 0x0.
-    if (baseOffset != 0) {
+    if (baseOffset != 0)
+    {
         return false;
     }
 
@@ -621,13 +621,13 @@
         // look for the FRU header at offset 0x6000
         baseOffset = 0x6000;
         return findFRUHeader(flag, file, address, readBlock, errorHelp,
-            blockData, baseOffset);
+                             blockData, baseOffset);
     }
 
     if (debug)
     {
         std::cerr << "Illegal header " << errorHelp << " base offset "
-            << baseOffset << "\n";
+                  << baseOffset << "\n";
     }
 
     return false;
@@ -640,8 +640,9 @@
     std::array<uint8_t, I2C_SMBUS_BLOCK_MAX> blockData;
     uint16_t baseOffset = 0x0;
 
-    if (!findFRUHeader(flag, file, address, readBlock, errorHelp,
-            blockData, baseOffset)) {
+    if (!findFRUHeader(flag, file, address, readBlock, errorHelp, blockData,
+                       baseOffset))
+    {
         return {};
     }
 
@@ -685,11 +686,11 @@
         areaOffset *= fruBlockSize;
 
         if (readBlock(flag, file, address,
-                      baseOffset + static_cast<uint16_t>(areaOffset),
-                      0x2, blockData.data()) < 0)
+                      baseOffset + static_cast<uint16_t>(areaOffset), 0x2,
+                      blockData.data()) < 0)
         {
             std::cerr << "failed to read " << errorHelp << " base offset "
-                << baseOffset << "\n";
+                      << baseOffset << "\n";
             return {};
         }
 
@@ -721,7 +722,7 @@
                           blockData.data()) < 0)
             {
                 std::cerr << "failed to read " << errorHelp << " base offset "
-                    << baseOffset << "\n";
+                          << baseOffset << "\n";
                 return {};
             }
 
@@ -755,7 +756,7 @@
                       blockData.data()) < 0)
         {
             std::cerr << "failed to read " << errorHelp << " base offset "
-                << baseOffset << "\n";
+                      << baseOffset << "\n";
             return {};
         }