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

fix shadowed global variables

Browse Source
This commit is contained in:
Evan Hunt
2018-03-19 17:31:53 +00:00
parent a08ba418ef
commit 9ca3ab1168
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/tools/mdig.c
View File

@@ -492,13 +492,13 @@ cleanup:
*/ */
static void static void
add_opt(dns_message_t *msg, isc_uint16_t udpsize, isc_uint16_t edns, add_opt(dns_message_t *msg, isc_uint16_t udpsize, isc_uint16_t edns,
unsigned int flags, dns_ednsopt_t *ednsopts, size_t count) unsigned int flags, dns_ednsopt_t *opts, size_t count)
{ {
dns_rdataset_t *rdataset = NULL; dns_rdataset_t *rdataset = NULL;
isc_result_t result; isc_result_t result;
result = dns_message_buildopt(msg, &rdataset, edns, udpsize, flags, result = dns_message_buildopt(msg, &rdataset, edns, udpsize, flags,
ednsopts, count); opts, count);
CHECK("dns_message_buildopt", result); CHECK("dns_message_buildopt", result);
result = dns_message_setopt(msg, rdataset); result = dns_message_setopt(msg, rdataset);
CHECK("dns_message_setopt", result); CHECK("dns_message_setopt", result);

6
lib/dns/sdb.c
View File

@@ -9,8 +9,6 @@
* information regarding copyright ownership. * information regarding copyright ownership.
*/ */
/* $Id$ */
/*! \file */ /*! \file */
#include <config.h> #include <config.h>
@@ -1410,7 +1408,7 @@ rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) {
source->private5 = tempdb; source->private5 = tempdb;
} }
static dns_rdatasetmethods_t methods = { static dns_rdatasetmethods_t sdb_rdataset_methods = {
disassociate, disassociate,
isc__rdatalist_first, isc__rdatalist_first,
isc__rdatalist_next, isc__rdatalist_next,
@@ -1445,7 +1443,7 @@ list_tordataset(dns_rdatalist_t *rdatalist,
RUNTIME_CHECK(dns_rdatalist_tordataset(rdatalist, rdataset) == RUNTIME_CHECK(dns_rdatalist_tordataset(rdatalist, rdataset) ==
ISC_R_SUCCESS); ISC_R_SUCCESS);
rdataset->methods = &methods; rdataset->methods = &sdb_rdataset_methods;
dns_db_attachnode(db, node, &rdataset->private5); dns_db_attachnode(db, node, &rdataset->private5);
} }