mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

cleanup isc_symtab_define with isc_symexists_replace

Browse Source
This commit is contained in:
Mark Andrews
2024-02-07 13:52:10 +11:00
parent 1fb61494a8
commit 2f87c429a2
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/isccfg/check.c
View File

@@ -3303,10 +3303,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
symvalue.as_cpointer = NULL; symvalue.as_cpointer = NULL;
tresult = isc_symtab_define(inview, tmp, 1, symvalue, tresult = isc_symtab_define(inview, tmp, 1, symvalue,
isc_symexists_replace); isc_symexists_replace);
if (result == ISC_R_SUCCESS && tresult != ISC_R_SUCCESS) RUNTIME_CHECK(tresult == ISC_R_SUCCESS);
{
result = tresult;
}
} break; } break;
default: default:
@@ -5879,9 +5876,7 @@ check_logging(const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
for (i = 0; default_channels[i] != NULL; i++) { for (i = 0; default_channels[i] != NULL; i++) {
tresult = isc_symtab_define(symtab, default_channels[i], 1, tresult = isc_symtab_define(symtab, default_channels[i], 1,
symvalue, isc_symexists_replace); symvalue, isc_symexists_replace);
if (tresult != ISC_R_SUCCESS) { RUNTIME_CHECK(tresult == ISC_R_SUCCESS);
result = tresult;
}
} }
cfg_map_get(logobj, "channel", &channels); cfg_map_get(logobj, "channel", &channels);
@@ -5919,9 +5914,7 @@ check_logging(const cfg_obj_t *config, isc_log_t *logctx, isc_mem_t *mctx) {
} }
tresult = isc_symtab_define(symtab, channelname, 1, symvalue, tresult = isc_symtab_define(symtab, channelname, 1, symvalue,
isc_symexists_replace); isc_symexists_replace);
if (tresult != ISC_R_SUCCESS) { RUNTIME_CHECK(tresult == ISC_R_SUCCESS);
result = tresult;
}
} }
cfg_map_get(logobj, "category", &categories); cfg_map_get(logobj, "category", &categories);