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

work around cppcheck false positive

Browse Source
This commit is contained in:
Mark Andrews
2018-05-28 17:26:39 +10:00
parent d71ee81676
commit cb5802e854
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/dns/master.c
View File

@@ -1009,6 +1009,19 @@ openfile_text(dns_loadctx_t *lctx, const char *master_file) {
return (isc_lex_openfile(lctx->lex, master_file)); return (isc_lex_openfile(lctx->lex, master_file));
} }
static int
find_free_name(dns_incctx_t *incctx) {
int i;
for (i = 0; i < (NBUFS - 1); i++) {
if (!incctx->in_use[i]) {
break;
}
}
INSIST(!incctx->in_use[i]);
return (i);
}
static isc_result_t static isc_result_t
load_text(dns_loadctx_t *lctx) { load_text(dns_loadctx_t *lctx) {
dns_rdataclass_t rdclass; dns_rdataclass_t rdclass;
@@ -1378,13 +1391,8 @@ load_text(dns_loadctx_t *lctx) {
/* /*
* Normal processing resumes. * Normal processing resumes.
*
* Find a free name buffer.
*/ */
for (new_in_use = 0; new_in_use < NBUFS; new_in_use++) new_in_use = find_free_name(ictx);
if (!ictx->in_use[new_in_use])
break;
INSIST(new_in_use < NBUFS);
new_name = new_name =
dns_fixedname_initname(&ictx->fixed[new_in_use]); dns_fixedname_initname(&ictx->fixed[new_in_use]);
isc_buffer_init(&buffer, token.value.as_region.base, isc_buffer_init(&buffer, token.value.as_region.base,
@@ -2088,7 +2096,6 @@ pushfile(const char *master_file, dns_name_t *origin, dns_loadctx_t *lctx) {
dns_incctx_t *ictx; dns_incctx_t *ictx;
dns_incctx_t *newctx = NULL; dns_incctx_t *newctx = NULL;
isc_region_t r; isc_region_t r;
int new_in_use;
REQUIRE(master_file != NULL); REQUIRE(master_file != NULL);
REQUIRE(DNS_LCTX_VALID(lctx)); REQUIRE(DNS_LCTX_VALID(lctx));
@@ -2107,11 +2114,7 @@ pushfile(const char *master_file, dns_name_t *origin, dns_loadctx_t *lctx) {
/* Set current domain. */ /* Set current domain. */
if (ictx->glue != NULL || ictx->current != NULL) { if (ictx->glue != NULL || ictx->current != NULL) {
for (new_in_use = 0; new_in_use < NBUFS; new_in_use++) newctx->current_in_use = find_free_name(newctx);
if (!newctx->in_use[new_in_use])
break;
INSIST(new_in_use < NBUFS);
newctx->current_in_use = new_in_use;
newctx->current = newctx->current =
dns_fixedname_name(&newctx->fixed[newctx->current_in_use]); dns_fixedname_name(&newctx->fixed[newctx->current_in_use]);
newctx->in_use[newctx->current_in_use] = ISC_TRUE; newctx->in_use[newctx->current_in_use] = ISC_TRUE;