commit ba3c50cf0269e4a8caef7d64ab5aa8ddba5df12d
author Andrew Jeffery <andrew@aj.id.au> Thu Apr 14 15:34:38 2022 +0930
committer Ed Tanous <ed@tanous.net> Fri May 06 21:29:37 2022 +0000
tree d8574726f23f54718f243bff6b99485a4e9db548
parent 6890ae2cd92564397690e9f9f00f5f7d4ef94fcc

PerformScan: Use early returns in extractExposeActionRecordNames()

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

src/PerformScan.cpp

diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp
index 38ec5ac..7799596 100644
--- a/src/PerformScan.cpp
+++ b/src/PerformScan.cpp
@@ -304,8 +304,10 @@
     if (keyPair.value().type() == nlohmann::json::value_t::string)
     {
         matches.emplace_back(keyPair.value());
+        return true;
     }
-    else if (keyPair.value().type() == nlohmann::json::value_t::array)
+
+    if (keyPair.value().type() == nlohmann::json::value_t::array)
     {
         for (const auto& value : keyPair.value())
         {
@@ -316,15 +318,13 @@
             }
             matches.emplace_back(value);
         }
-    }
-    else
-    {
-        std::cerr << "Value is invalid type " << keyPair.key() << "\n";
 
-        return false;
+        return true;
     }
 
-    return true;
+    std::cerr << "Value is invalid type " << keyPair.key() << "\n";
+
+    return false;
 }
 
 void PerformScan::run()