fix shadowed global variables

(cherry picked from commit 9ca3ab1168b4167bb5fd6bdbaa56bcc5e11d7c9a)
(cherry picked from commit 694a1486cab2cd912446b5d408c82b07caa93883)

diff --git a/bin/tests/mdig.c b/bin/tests/mdig.c
index 237282b2ad2c93811e704ea5dfb98d919612a13b..d00b09062c21aec48e6a386816debb197939c26e 100644 (file)
--- a/bin/tests/mdig.c
+++ b/bin/tests/mdig.c
@@ -482,13 +482,13 @@ cleanup:
  */
 static void
 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;
        isc_result_t result;
 
        result = dns_message_buildopt(msg, &rdataset, edns, udpsize, flags,
-                                     ednsopts, count);
+                                     opts, count);
        CHECK("dns_message_buildopt", result);
        result = dns_message_setopt(msg, rdataset);
        CHECK("dns_message_setopt", result);

diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 10b6079a5ca28e2aeb32af39467044836909450d..64cbd7d831b15e7c34b6552bd7df56642ad74d63 100644 (file)
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -14,8 +14,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id$ */
-
 /*! \file */
 
 #include <config.h>
@@ -1412,7 +1410,7 @@ rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) {
        source->private5 = tempdb;
 }
 
-static dns_rdatasetmethods_t methods = {
+static dns_rdatasetmethods_t sdb_rdataset_methods = {
        disassociate,
        isc__rdatalist_first,
        isc__rdatalist_next,
@@ -1447,7 +1445,7 @@ list_tordataset(dns_rdatalist_t *rdatalist,
        RUNTIME_CHECK(dns_rdatalist_tordataset(rdatalist, rdataset) ==
                      ISC_R_SUCCESS);
 
-       rdataset->methods = &methods;
+       rdataset->methods = &sdb_rdataset_methods;
        dns_db_attachnode(db, node, &rdataset->private5);
 }