From 5954e1791e4757285f8236ebcd79d1e168547b29 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Wed, 25 Nov 2020 09:17:42 +0100
Subject: [PATCH] [sonar] Rename local parameters.

---
 src/mc/compare.cpp                   |  2 +-
 src/mc/inspect/ObjectInformation.cpp | 14 +++++++-------
 src/mc/remote/RemoteSimulation.cpp   |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index d72827bdc9..82c157ce10 100644
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -137,7 +137,7 @@ static ssize_t heap_comparison_ignore_size(const std::vector<simgrid::mc::Ignore
                                            const void* address)
 {
   auto pos = std::lower_bound(ignore_list->begin(), ignore_list->end(), address,
-                              [](auto const& reg, const void* address) { return reg.address < address; });
+                              [](auto const& reg, auto const* addr) { return reg.address < addr; });
   return (pos != ignore_list->end() && pos->address == address) ? pos->size : -1;
 }
 
diff --git a/src/mc/inspect/ObjectInformation.cpp b/src/mc/inspect/ObjectInformation.cpp
index ce6d4db754..85f3df4a75 100644
--- a/src/mc/inspect/ObjectInformation.cpp
+++ b/src/mc/inspect/ObjectInformation.cpp
@@ -88,14 +88,14 @@ const Variable* ObjectInformation::find_variable(const char* name) const
   return nullptr;
 }
 
-void ObjectInformation::remove_global_variable(const char* name)
+void ObjectInformation::remove_global_variable(const char* var_name)
 {
   // Binary search:
-  auto pos1 = std::lower_bound(this->global_variables.begin(), this->global_variables.end(), name,
-                               [](auto const& var, const char* var_name) { return var.name.compare(var_name) < 0; });
+  auto pos1 = std::lower_bound(this->global_variables.begin(), this->global_variables.end(), var_name,
+                               [](auto const& var, const char* name) { return var.name < name; });
   // Find the whole range:
-  auto pos2 = std::upper_bound(pos1, this->global_variables.end(), name,
-                               [](const char* var_name, auto const& var) { return var.name.compare(var_name) > 0; });
+  auto pos2 = std::upper_bound(pos1, this->global_variables.end(), var_name,
+                               [](const char* name, auto const& var) { return name < var.name; });
   // Remove the whole range:
   this->global_variables.erase(pos1, pos2);
 }
@@ -119,8 +119,8 @@ static void remove_local_variable(Frame& scope, const char* var_name, const char
 
     // Binary search:
     auto pos = std::lower_bound(scope.variables.begin(), scope.variables.end(), var_name,
-                                [](auto const& var, const char* var_name) { return var.name.compare(var_name) < 0; });
-    if (pos != scope.variables.end() && pos->name.compare(var_name) == 0) {
+                                [](auto const& var, const char* name) { return var.name < name; });
+    if (pos != scope.variables.end() && pos->name == var_name) {
       // Variable found, remove it:
       scope.variables.erase(pos);
     }
diff --git a/src/mc/remote/RemoteSimulation.cpp b/src/mc/remote/RemoteSimulation.cpp
index f50f60f4f8..9bfe36aa56 100644
--- a/src/mc/remote/RemoteSimulation.cpp
+++ b/src/mc/remote/RemoteSimulation.cpp
@@ -493,7 +493,7 @@ void RemoteSimulation::ignore_heap(IgnoredHeapRegion const& region)
 {
   // Binary search the position of insertion:
   auto pos = std::lower_bound(ignored_heap_.begin(), ignored_heap_.end(), region.address,
-                              [](auto const& reg, const void* address) { return reg.address < address; });
+                              [](auto const& reg, auto const* addr) { return reg.address < addr; });
   if (pos == ignored_heap_.end() || pos->address != region.address) {
     // Insert it:
     ignored_heap_.insert(pos, region);
@@ -504,7 +504,7 @@ void RemoteSimulation::unignore_heap(void* address, size_t size)
 {
   // Binary search:
   auto pos = std::lower_bound(ignored_heap_.begin(), ignored_heap_.end(), address,
-                              [](auto const& reg, const void* address) { return reg.address < address; });
+                              [](auto const& reg, auto const* addr) { return reg.address < addr; });
   if (pos != ignored_heap_.end() && static_cast<char*>(pos->address) <= static_cast<char*>(address) + size)
     ignored_heap_.erase(pos);
 }
-- 
2.20.1