rename-shadowed-variable

(cherry picked from commit 15bfe4f2e169495ae13feae9d9c63a392a9f8edf)

diff --git a/bin/named/server.c b/bin/named/server.c
index 939e9069987f1e3d1f8c10d0b29d546976f1368e..6c77f779d4fcdaefd7103e2a7988621e7aa463c6 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -14692,13 +14692,13 @@ named_server_nta(named_server_t *server, isc_lex_t *lex,
                                      "added NTA '%s' (%d sec) in view '%s'",
                                      namebuf, ntattl, view->name);
                } else {
-                       bool removed;
+                       bool wasremoved;
 
                        result = dns_ntatable_delete(ntatable, ntaname);
                        if (result == ISC_R_SUCCESS) {
-                               removed = true;
+                               wasremoved = true;
                        } else if (result == ISC_R_NOTFOUND) {
-                               removed = false;
+                               wasremoved = false;
                        } else {
                                goto cleanup;
                        }
@@ -14709,13 +14709,13 @@ named_server_nta(named_server_t *server, isc_lex_t *lex,
                        first = false;
 
                        CHECK(putstr(text, "Negative trust anchor "));
-                       CHECK(putstr(text, removed ? "removed: "
-                                                  : "not found: "));
+                       CHECK(putstr(text, wasremoved ? "removed: "
+                                                     : "not found: "));
                        CHECK(putstr(text, namebuf));
                        CHECK(putstr(text, "/"));
                        CHECK(putstr(text, view->name));
 
-                       if (removed) {
+                       if (wasremoved) {
                                isc_log_write(named_g_lctx,
                                              NAMED_LOGCATEGORY_GENERAL,
                                              NAMED_LOGMODULE_SERVER,