mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

silence warnings about unnecessary comparisons

Browse Source 
- these are cases where result has been explicitly set, so
  if (result != ISC_R_SUCCESS) is unnecessary
This commit is contained in:
Evan Hunt 2018-03-20 09:22:57 +00:00
parent 4247477b61
commit e00eb55cd2
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/dns/master.c
View File

@ -9,8 +9,6 @@
* information regarding copyright ownership.
*/
/* $Id$ */
/*! \file */
#include <config.h>
@ -1340,8 +1338,9 @@ load_text(dns_loadctx_t *lctx) {
if (MANYERRS(lctx, result)) {
SETRESULT(lctx, result);
lctx->ttl = 0;
} else if (result != ISC_R_SUCCESS)
} else {
goto insist_and_cleanup;
}
} else if (!explicit_ttl &&
lctx->default_ttl_known) {
lctx->ttl = lctx->default_ttl;
@ -1372,9 +1371,10 @@ load_text(dns_loadctx_t *lctx) {
result = DNS_R_SYNTAX;
if (MANYERRS(lctx, result)) {
SETRESULT(lctx, result);
} else if (result != ISC_R_SUCCESS)
} else {
goto insist_and_cleanup;
}
}
/*
* Normal processing resumes.
@ -1544,9 +1544,10 @@ load_text(dns_loadctx_t *lctx) {
SETRESULT(lctx, result);
LOGIT(result);
continue;
} else if (result != ISC_R_SUCCESS)
} else {
goto insist_and_cleanup;
}
}
/*
* Find TTL, class and type. Both TTL and class are optional
@ -1584,9 +1585,10 @@ load_text(dns_loadctx_t *lctx) {
SETRESULT(lctx, result);
read_till_eol = ISC_TRUE;
continue;
} else if (result != ISC_R_SUCCESS)
} else {
goto insist_and_cleanup;
}
}
if (ictx->origin_changed) {
char cbuf[DNS_NAME_FORMATSIZE];
@ -1628,9 +1630,10 @@ load_text(dns_loadctx_t *lctx) {
SETRESULT(lctx, result);
read_till_eol = ISC_TRUE;
continue;
} else if (result != ISC_R_SUCCESS)
} else {
goto insist_and_cleanup;
}
}
if (rdclass == 0 &&
dns_rdataclass_fromtext(&rdclass,
@ -1646,9 +1649,10 @@ load_text(dns_loadctx_t *lctx) {
SETRESULT(lctx, result);
read_till_eol = ISC_TRUE;
continue;
} else if (result != ISC_R_SUCCESS)
} else {
goto insist_and_cleanup;
}
}
result = dns_rdatatype_fromtext(&type,
&token.value.as_textregion);
@ -1687,9 +1691,10 @@ load_text(dns_loadctx_t *lctx) {
SETRESULT(lctx, result);
read_till_eol = ISC_TRUE;
continue;
} else if (result != ISC_R_SUCCESS)
} else {
goto insist_and_cleanup;
}
}
if (type == dns_rdatatype_ns && ictx->glue == NULL)
current_has_delegation = ISC_TRUE;
@ -1800,8 +1805,9 @@ load_text(dns_loadctx_t *lctx) {
namebuf, desc);
if (MANYERRS(lctx, result)) {
SETRESULT(lctx, result);
} else if (result != ISC_R_SUCCESS)
} else {
goto cleanup;
}
} else {
(*callbacks->warn)(callbacks,
"%s:%lu: %s: %s",
@ -1852,9 +1858,10 @@ load_text(dns_loadctx_t *lctx) {
read_till_eol = ISC_TRUE;
target = target_ft;
continue;
} else if (result != ISC_R_SUCCESS)
} else {
goto insist_and_cleanup;
}
}
if (type == dns_rdatatype_rrsig ||
type == dns_rdatatype_sig)