commit d53ee41fe19531075b6b380bd7baace04808d5fa
author Andrew Jeffery <andrew@aj.id.au> Tue Apr 12 23:11:59 2022 +0930
committer Ed Tanous <ed@tanous.net> Wed May 04 15:31:45 2022 +0000
tree 364704720b75ced3c986c617f522db9d4928ade6
parent f898ea1ad37a0fa96c025dc94abab6c76871ab9f

PerformScan: Lift name key update out of the for-loop

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

src/PerformScan.cpp

diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp
index 88f1bd0..851d9fd 100644
--- a/src/PerformScan.cpp
+++ b/src/PerformScan.cpp
@@ -426,18 +426,17 @@
                                      "fixing template to not have duplicates\n";
                     }
 
+                    getName.value() = copyIt.value();
+                    usedNames.insert(copyIt.value());
+
                     for (auto keyPair = record.begin(); keyPair != record.end();
                          keyPair++)
                     {
-                        if (keyPair.key() == "Name")
+                        if (keyPair.key() != "Name")
                         {
-                            keyPair.value() = copyIt.value();
-                            usedNames.insert(copyIt.value());
-
-                            continue; // already covered above
+                            templateCharReplace(keyPair, dbusObject,
+                                                foundDeviceIdx, replaceStr);
                         }
-                        templateCharReplace(keyPair, dbusObject, foundDeviceIdx,
-                                            replaceStr);
                     }
 
                     // insert into configuration temporarily to be able to