commit d966f27f27359500f1dbd04470764e432facb430
author Anupama B R <anupama.b.r1@ibm.com> Mon Jul 21 02:40:16 2025 -0500
committer Anupama B R <anupama.b.r1@ibm.com> Mon Jul 21 05:06:36 2025 -0500
tree a732672f7f88209bd72bf5f822080c62e8a82548
parent b6787bf9994b188a8e92aa3688d6100c2f1884d2

Following coding guideline in backup and restore

This commit adds the changes to address coding guidelines issue in
backup and restore.

Change-Id: Ic56e1b538dfc8866bb677102ba08f525eb1276d9
Signed-off-by: Anupama B R <anupama.b.r1@ibm.com>

vpd-manager/src/backup_restore.cpp

diff --git a/vpd-manager/src/backup_restore.cpp b/vpd-manager/src/backup_restore.cpp
index 87cbdc2..6c31eac 100644
--- a/vpd-manager/src/backup_restore.cpp
+++ b/vpd-manager/src/backup_restore.cpp
@@ -407,9 +407,8 @@
         return constants::FAILURE;
     }
 
-    bool l_isInputPathIsSourcePath = false;
-    bool l_isInputPathIsDestinationPath = false;
-    types::IpzData l_paramsToWrite;
+    bool l_inputPathIsSourcePath = false;
+    bool l_inputPathIsDestinationPath = false;
 
     if (m_backupAndRestoreCfgJsonObj.contains("source") &&
         m_backupAndRestoreCfgJsonObj["source"].value("hardwarePath", "") ==
@@ -419,7 +418,7 @@
              .value("hardwarePath", "")
              .empty())
     {
-        l_isInputPathIsSourcePath = true;
+        l_inputPathIsSourcePath = true;
     }
     else if (m_backupAndRestoreCfgJsonObj.contains("destination") &&
              m_backupAndRestoreCfgJsonObj["destination"].value(
@@ -429,31 +428,31 @@
                   .value("hardwarePath", "")
                   .empty())
     {
-        l_isInputPathIsDestinationPath = true;
+        l_inputPathIsDestinationPath = true;
     }
     else
     {
         // Input path is neither source or destination path of the
-        // backup&restore JSON.
+        // backup&restore JSON or source and destination paths are not hardware
+        // paths in the config JSON.
         return constants::SUCCESS;
     }
 
-    if (m_backupAndRestoreCfgJsonObj.contains("backupMap") &&
-        m_backupAndRestoreCfgJsonObj["backupMap"].is_array())
+    if (m_backupAndRestoreCfgJsonObj["backupMap"].is_array())
     {
         std::string l_inpRecordName;
         std::string l_inpKeywordName;
-        types::BinaryVector l_keywordValue;
+        types::BinaryVector l_inpKeywordValue;
 
         if (const types::IpzData* l_ipzData =
                 std::get_if<types::IpzData>(&i_paramsToWriteData))
         {
             l_inpRecordName = std::get<0>(*l_ipzData);
             l_inpKeywordName = std::get<1>(*l_ipzData);
-            l_keywordValue = std::get<2>(*l_ipzData);
+            l_inpKeywordValue = std::get<2>(*l_ipzData);
 
             if (l_inpRecordName.empty() || l_inpKeywordName.empty() ||
-                l_keywordValue.empty())
+                l_inpKeywordValue.empty())
             {
                 logging::logMessage("Invalid input received");
                 return constants::FAILURE;
@@ -486,7 +485,7 @@
                 continue;
             }
 
-            if (l_isInputPathIsSourcePath &&
+            if (l_inputPathIsSourcePath &&
                 (l_aRecordKwInfo["sourceRecord"] == l_inpRecordName) &&
                 (l_aRecordKwInfo["sourceKeyword"] == l_inpKeywordName))
             {
@@ -497,9 +496,9 @@
 
                 return l_parserObj.updateVpdKeyword(std::make_tuple(
                     l_aRecordKwInfo["destinationRecord"],
-                    l_aRecordKwInfo["destinationKeyword"], l_keywordValue));
+                    l_aRecordKwInfo["destinationKeyword"], l_inpKeywordValue));
             }
-            else if (l_isInputPathIsDestinationPath &&
+            else if (l_inputPathIsDestinationPath &&
                      (l_aRecordKwInfo["destinationRecord"] ==
                       l_inpRecordName) &&
                      (l_aRecordKwInfo["destinationKeyword"] ==
@@ -511,7 +510,7 @@
 
                 return l_parserObj.updateVpdKeyword(std::make_tuple(
                     l_aRecordKwInfo["sourceRecord"],
-                    l_aRecordKwInfo["sourceKeyword"], l_keywordValue));
+                    l_aRecordKwInfo["sourceKeyword"], l_inpKeywordValue));
             }
         }
     }