2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 00:25:29 +00:00

rename-shadowed-variable

This commit is contained in:
Mark Andrews
2019-03-15 11:13:05 +11:00
parent ef12cdc653
commit 15bfe4f2e1

View File

@@ -14690,13 +14690,13 @@ named_server_nta(named_server_t *server, isc_lex_t *lex,
"added NTA '%s' (%d sec) in view '%s'", "added NTA '%s' (%d sec) in view '%s'",
namebuf, ntattl, view->name); namebuf, ntattl, view->name);
} else { } else {
bool removed; bool wasremoved;
result = dns_ntatable_delete(ntatable, ntaname); result = dns_ntatable_delete(ntatable, ntaname);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
removed = true; wasremoved = true;
} else if (result == ISC_R_NOTFOUND) { } else if (result == ISC_R_NOTFOUND) {
removed = false; wasremoved = false;
} else { } else {
goto cleanup; goto cleanup;
} }
@@ -14707,13 +14707,13 @@ named_server_nta(named_server_t *server, isc_lex_t *lex,
first = false; first = false;
CHECK(putstr(text, "Negative trust anchor ")); CHECK(putstr(text, "Negative trust anchor "));
CHECK(putstr(text, removed ? "removed: " CHECK(putstr(text, wasremoved ? "removed: "
: "not found: ")); : "not found: "));
CHECK(putstr(text, namebuf)); CHECK(putstr(text, namebuf));
CHECK(putstr(text, "/")); CHECK(putstr(text, "/"));
CHECK(putstr(text, view->name)); CHECK(putstr(text, view->name));
if (removed) { if (wasremoved) {
isc_log_write(named_g_lctx, isc_log_write(named_g_lctx,
NAMED_LOGCATEGORY_GENERAL, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, NAMED_LOGMODULE_SERVER,