ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '286-new-cppcheck-detected-errors-v9_12' into 'v9_12'

Browse Source 
Resolve "New cppcheck-detected errors"

See merge request isc-projects/bind9!324
This commit is contained in:
Mark Andrews
2018-05-29 09:44:48 +10:00
parent 35488bec21 9fc2eb9554
commit bb7c075cbe
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+3
View File
@@ -1,3 +1,6 @@
4955. [cleanup] Silence cppcheck warnings in lib/dns/master.c.
[GL #286]
4951. [protocol] Add "HOME.ARPA" to list of built in empty zones as
per RFC 8375. [GL #273]
lib/dns/master.c
+15 -12
View File
@@ -1009,6 +1009,19 @@ openfile_text(dns_loadctx_t *lctx, const char *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
load_text(dns_loadctx_t *lctx) {
dns_rdataclass_t rdclass;
@@ -1378,13 +1391,8 @@ load_text(dns_loadctx_t *lctx) {
/*
* Normal processing resumes.
*
* Find a free name buffer.
*/
for (new_in_use = 0; new_in_use < NBUFS; new_in_use++)
if (!ictx->in_use[new_in_use])
break;
INSIST(new_in_use < NBUFS);
new_in_use = find_free_name(ictx);
new_name =
dns_fixedname_initname(&ictx->fixed[new_in_use]);
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 *newctx = NULL;
isc_region_t r;
int new_in_use;
REQUIRE(master_file != NULL);
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. */
if (ictx->glue != NULL || ictx->current != NULL) {
for (new_in_use = 0; new_in_use < NBUFS; new_in_use++)
if (!newctx->in_use[new_in_use])
break;
INSIST(new_in_use < NBUFS);
newctx->current_in_use = new_in_use;
newctx->current_in_use = find_free_name(newctx);
newctx->current =
dns_fixedname_name(&newctx->fixed[newctx->current_in_use]);
newctx->in_use[newctx->current_in_use] = ISC_TRUE;