From 6ef005ab26e220c85a28b6c7609984f1cf0c035b Mon Sep 17 00:00:00 2001
From: Andrew Jeffery <dev@jeffas.io>
Date: Tue, 8 Aug 2023 13:25:08 +0000
Subject: [PATCH] Fix shadowed variables

---
 src/app/app.cpp   |  4 ++--
 src/app/index.cpp | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 18b3e04e..311e7ee0 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -1132,8 +1132,8 @@ namespace app
       lstore.foreach([&response, &now_s](auto id, auto lease) {
         if (!lease.has_expired(now_s))
         {
-          auto* lease = response.add_leases();
-          lease->set_id(id);
+          auto* added_lease = response.add_leases();
+          added_lease->set_id(id);
         }
         return true;
       });
diff --git a/src/app/index.cpp b/src/app/index.cpp
index 8d15bfce..5ffcde06 100644
--- a/src/app/index.cpp
+++ b/src/app/index.cpp
@@ -203,14 +203,14 @@ namespace app::index
       auto& values = keys_to_values.at(key);
       // TODO(#204): Should be able to remove multiple values from a key's
       // vector at once to avoid multiple copyings of the elements.
-      auto it = values.begin();
-      while (it != values.end())
+      auto values_it = values.begin();
+      while (values_it != values.end())
       {
-        if (it->mod_revision < at)
+        if (values_it->mod_revision < at)
         {
           CCF_APP_DEBUG(
-            "Removing compacted value for key {} at {}", key, it->mod_revision);
-          it = values.erase(it);
+            "Removing compacted value for key {} at {}", key, values_it->mod_revision);
+          values_it = values.erase(values_it);
         }
         else
         {