bugfix #796: Fix -Wshadow issues. Thanks Ngie Cooper

diff --git a/Changelog b/Changelog
index a91839cf0b9744d3820fbfbc64feeca135b2cca3..c60be2e694b53fb9200f99557f84fc113d06fddc 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -75,6 +75,8 @@ TBD
        * Fix for openssl 1.1.0 API changes.
        * Remove commented out macro.  Thanks Thiago Farina
        * bugfix #641: Include install-sh in .gitignore
+       * bugfix #796: Fix -Wshadow issues
+         Thanks Ngie Cooper
 
 1.6.17 2014-01-10
        * Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a

diff --git a/drill/chasetrace.c b/drill/chasetrace.c
index 13778c15a8664f923a30f9625aef6b66e633f92c..525eed27985fb8fdd3f0fe7bcfaac4d0ae1e9184 100644 (file)
--- a/drill/chasetrace.c
+++ b/drill/chasetrace.c
@@ -312,8 +312,7 @@ do_chase(ldns_resolver *res,
            ldns_rr_list *trusted_keys,
            ldns_pkt *pkt_o,
            uint16_t qflags,
-           ldns_rr_list * ATTR_UNUSED(prev_key_list),
-           int verbosity)
+           ldns_rr_list * ATTR_UNUSED(prev_key_list))
 {
        ldns_rr_list *rrset = NULL;
        ldns_status result;

diff --git a/drill/drill.c b/drill/drill.c
index a9e7e8a435fc2250b6a661c7baa37754f86d4e6b..d59c6743a2efd7fa02300ccc41ffd8d855ae048e 100644 (file)
--- a/drill/drill.c
+++ b/drill/drill.c
@@ -693,8 +693,7 @@ main(int argc, char *argv[])
                                        ldns_resolver_set_dnssec_anchors(res, ldns_rr_list_clone(key_list));
                                        result = do_chase(res, qname, type,
                                                          clas, key_list, 
-                                                         pkt, qflags, NULL,
-                                                                  verbosity);
+                                                         pkt, qflags, NULL);
                                        if (result == LDNS_STATUS_OK) {
                                                if (verbosity != -1) {
                                                        mesg("Chase successful");

diff --git a/drill/drill.h b/drill/drill.h
index 0746fe7bff23bf88b903ff73aecccc3ab2e98f76..3cdd6f588c883cf990007f186982232be7cf43d2 100644 (file)
--- a/drill/drill.h
+++ b/drill/drill.h
@@ -30,7 +30,6 @@
 (VAR) = (VAR) & ~(BIT)
 
 extern ldns_rr_list *global_dns_root;
-extern bool qds;
 extern int verbosity;
 
 ldns_pkt *do_trace(ldns_resolver *res,
@@ -44,8 +43,7 @@ ldns_status do_chase(ldns_resolver *res,
                                 ldns_rr_list *trusted_keys, 
                                 ldns_pkt *pkt_o,
                                 uint16_t qflags,
-                                ldns_rr_list *prev_key_list,
-                                int verbosity);
+                                ldns_rr_list *prev_key_list);
 int do_secure_trace(ldns_resolver *res,
                                ldns_rdf *name,
                                ldns_rr_type type, 

diff --git a/examples/ldns-notify.c b/examples/ldns-notify.c
index 50da6e606af8385057a581a6b566d00f08c7a0bf..12f7da44c58320e2ed97fbda4073050e20eee20d 100644 (file)
--- a/examples/ldns-notify.c
+++ b/examples/ldns-notify.c
@@ -306,7 +306,7 @@ main(int argc, char **argv)
 
        for(i=0; i<argc; i++)
        {
-               struct addrinfo hints, *res0, *res;
+               struct addrinfo hints, *res0, *ai_res;
                int error;
                int default_family = AF_INET;
 
@@ -322,13 +322,13 @@ main(int argc, char **argv)
                                gai_strerror(error));
                        continue;
                }
-               for (res = res0; res; res = res->ai_next) {
-                       int s = socket(res->ai_family, res->ai_socktype, 
-                               res->ai_protocol);
+               for (ai_res = res0; ai_res; ai_res = ai_res->ai_next) {
+                       int s = socket(ai_res->ai_family, ai_res->ai_socktype, 
+                               ai_res->ai_protocol);
                        if(s == -1)
                                continue;
                        /* send the notify */
-                       notify_host(s, res, wire, wiresize, argv[i]);
+                       notify_host(s, ai_res, wire, wiresize, argv[i]);
                }
                freeaddrinfo(res0);
        }

diff --git a/host2wire.c b/host2wire.c
index 06f45bace915bacfb2766aed66829273dab74f89..6c6f11584c3c3898a2775b38d28fc2be4d50ed96 100644 (file)
--- a/host2wire.c
+++ b/host2wire.c
@@ -67,7 +67,7 @@ ldns_dname2buffer_wire_compress(ldns_buffer *buffer, const ldns_rdf *name, ldns_
        {
                /* Not found. Write cache entry, take off first label, write it, */
                /* try again with the rest of the name. */
-               ldns_rbnode_t *node = LDNS_MALLOC(ldns_rbnode_t);
+               node = LDNS_MALLOC(ldns_rbnode_t);
                if(!node)
                {
                        return LDNS_STATUS_MEM_ERR;