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

Merge branch '877-clang-scan-build-redundant-assignments-detected' into 'master'

Browse source 
Remove redundant assignments

Closes #877

See merge request isc-projects/bind9!1513
This commit is contained in:
Mark Andrews 2019-02-18 18:01:56 -05:00
commit d76e172480
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/dig/nslookup.c
View file

@ -901,7 +901,7 @@ parse_args(int argc, char **argv) {
bool have_lookup = false;
usesearch = true;
for (argc--, argv++; argc > 0; argc--, argv++) {
for (argc--, argv++; argc > 0 && argv[0] != NULL; argc--, argv++) {
debug("main parsing %s", argv[0]);
if (argv[0][0] == '-') {
if (strncasecmp(argv[0], "-ver", 4) == 0) {

2
bin/named/server.c
View file

@ -14712,7 +14712,7 @@ named_server_nta(named_server_t *server, isc_lex_t *lex,
CHECK(ISC_R_NOTFOUND);
}
CHECK(putnull(text));
(void) putnull(text);
cleanup:
if (msg != NULL) {

3
lib/dns/catz.c
View file

@ -837,8 +837,9 @@ dns_catz_zone_detach(dns_catz_zone_t **zonep) {
void
dns_catz_catzs_detach(dns_catz_zones_t **catzsp) {
dns_catz_zones_t *catzs;
REQUIRE(catzsp != NULL && *catzsp != NULL);
dns_catz_zones_t *catzs = *catzsp;
catzs = *catzsp;
*catzsp = NULL;

1
lib/dns/gssapictx.c
View file

@ -487,7 +487,6 @@ dst_gssapi_identitymatchesrealmms(const dns_name_t *signer,
*/
rname++;
*sname = '\0';
sname = sbuf;
if (strcmp(rname, rbuf) != 0) {
return (false);

8
lib/dns/zone.c
View file

@ -6946,8 +6946,7 @@ sign_a_node(dns_db_t *db, dns_name_t *name, dns_dbnode_t *node,
dns_rdata_t rdata = DNS_RDATA_INIT;
isc_buffer_t buffer;
unsigned char data[1024];
bool seen_soa, seen_ns, seen_rr, seen_dname, seen_nsec,
seen_nsec3, seen_ds;
bool seen_soa, seen_ns, seen_rr, seen_nsec, seen_nsec3, seen_ds;
result = dns_db_allrdatasets(db, node, version, 0, &iterator);
if (result != ISC_R_SUCCESS) {
@ -6958,8 +6957,7 @@ sign_a_node(dns_db_t *db, dns_name_t *name, dns_dbnode_t *node,
dns_rdataset_init(&rdataset);
isc_buffer_init(&buffer, data, sizeof(data));
seen_rr = seen_soa = seen_ns = seen_dname = seen_nsec =
seen_nsec3 = seen_ds = false;
seen_rr = seen_soa = seen_ns = seen_nsec = seen_nsec3 = seen_ds = false;
for (result = dns_rdatasetiter_first(iterator);
result == ISC_R_SUCCESS;
result = dns_rdatasetiter_next(iterator)) {
@ -6970,8 +6968,6 @@ sign_a_node(dns_db_t *db, dns_name_t *name, dns_dbnode_t *node,
seen_ns = true;
else if (rdataset.type == dns_rdatatype_ds)
seen_ds = true;
else if (rdataset.type == dns_rdatatype_dname)
seen_dname = true;
else if (rdataset.type == dns_rdatatype_nsec)
seen_nsec = true;
else if (rdataset.type == dns_rdatatype_nsec3)