upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-08 19:02:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

address shadowed warning

Browse source
This commit is contained in:
Mark Andrews 2017-10-04 07:29:13 +11:00
parent 9510de7849
commit 57c04ec865
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/named/server.c
View file

@ -14081,7 +14081,7 @@ mkey_destroy(named_server_t *server, dns_view_t *view, isc_buffer_t **text) {
const char *file = NULL;
dns_db_t *dbp = NULL;
dns_zone_t *mkzone = NULL;
isc_boolean_t removed = ISC_FALSE;
isc_boolean_t removed_a_file = ISC_FALSE;
if (view->managed_keys == NULL) {
CHECK(ISC_R_NOTFOUND);
@ -14110,7 +14110,7 @@ mkey_destroy(named_server_t *server, dns_view_t *view, isc_buffer_t **text) {
file = dns_zone_getfile(mkzone);
result = isc_file_remove(file);
if (result == ISC_R_SUCCESS) {
removed = ISC_TRUE;
removed_a_file = ISC_TRUE;
} else {
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,
@ -14121,7 +14121,7 @@ mkey_destroy(named_server_t *server, dns_view_t *view, isc_buffer_t **text) {
file = dns_zone_getjournal(mkzone);
result = isc_file_remove(file);
if (result == ISC_R_SUCCESS) {
removed = ISC_TRUE;
removed_a_file = ISC_TRUE;
} else {
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, ISC_LOG_WARNING,
@ -14129,7 +14129,7 @@ mkey_destroy(named_server_t *server, dns_view_t *view, isc_buffer_t **text) {
file, isc_result_totext(result));
}
if (!removed) {
if (!removed_a_file) {
CHECK(putstr(text, "error: no files could be removed"));
CHECK(ISC_R_FAILURE);
}