commit 6e22c877de8d60e48578c84fe23b3e1dc235302f
author Ed Tanous <edtanous@google.com> Thu Feb 16 15:19:28 2023 -0800
committer Ed Tanous <ed@tanous.net> Wed Mar 08 00:33:09 2023 +0000
tree 62c3bbcde7af99bb716277bf5481821d1df884e0
parent 49a888c20c916069ed63504c01dc861f9e4bfd90

Make fru-device-resize option compile

This option hasn't compiled for a while since a few transitions.  This
commit makes it compile again, and takes a best guess.  If there's bugs,
we can close on them in another review, but at least it compiles now :)

Change-Id: Icfa928fa50e9f8c1fde3be516604317694800f3b
Signed-off-by: Ed Tanous <edtanous@google.com>

src/fru_device.cpp

diff --git a/src/fru_device.cpp b/src/fru_device.cpp
index dbb0c8f..9cd46b2 100644
--- a/src/fru_device.cpp
+++ b/src/fru_device.cpp
@@ -1146,12 +1146,13 @@
         std::copy(restFRUAreasData.begin(), restFRUAreasData.end(),
                   fruData.begin() + nextFRUAreaNewLoc);
         // Update Common Header
-        for (int fruArea = fruAreaInternal; fruArea <= fruAreaMultirecord;
-             fruArea++)
+        for (fruAreas nextFRUArea = fruAreas::fruAreaInternal;
+             nextFRUArea <= fruAreas::fruAreaMultirecord; ++nextFRUArea)
         {
-            unsigned int fruAreaOffsetField = getHeaderAreaFieldOffset(fruArea);
+            unsigned int fruAreaOffsetField =
+                getHeaderAreaFieldOffset(nextFRUArea);
             size_t curFRUAreaOffset = fruData[fruAreaOffsetField];
-            if (curFRUAreaOffset > fruAreaOffsetFieldValue)
+            if (curFRUAreaOffset > fruAreaParams.end)
             {
                 fruData[fruAreaOffsetField] = static_cast<int8_t>(
                     curFRUAreaOffset + nextFRUAreaOffsetDiff);