Replace x=x lines with the ATTR_UNUSED macro, to suppress clang warnings.

diff --git a/dnssec.c b/dnssec.c
index c41943709bb8e3398ad6385b778c75d91b0a5580..6d75c67791db94385e768c10c6bf07d45a50ab1e 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -116,7 +116,6 @@ ldns_dnssec_nsec3_closest_encloser(ldns_rdf *qname,
        size_t nsec_i;
        ldns_rr *nsec;
        ldns_rdf *result = NULL;
-       qtype = qtype;
 
        if (!qname || !nsec3s || ldns_rr_list_rr_count(nsec3s) < 1) {
                return NULL;
@@ -839,8 +838,6 @@ ldns_dnssec_create_nsec3(ldns_dnssec_name *from,
        ldns_status status;
        int on_delegation_point;
 
-       flags = flags;
-
        if (!from) {
                return NULL;
        }
@@ -1568,34 +1565,34 @@ ldns_rr_list_sort_nsec3(ldns_rr_list *unsorted)
 }
 
 int
-ldns_dnssec_default_add_to_signatures(ldns_rr *sig, void *n)
+ldns_dnssec_default_add_to_signatures( ATTR_UNUSED(ldns_rr *sig)
+                                    , ATTR_UNUSED(void *n)
+                                    )
 {
-       sig = sig;
-       n = n;
        return LDNS_SIGNATURE_LEAVE_ADD_NEW;
 }
 
 int
-ldns_dnssec_default_leave_signatures(ldns_rr *sig, void *n)
+ldns_dnssec_default_leave_signatures( ATTR_UNUSED(ldns_rr *sig)
+                                   , ATTR_UNUSED(void *n)
+                                   )
 {
-       sig = sig;
-       n = n;
        return LDNS_SIGNATURE_LEAVE_NO_ADD;
 }
 
 int
-ldns_dnssec_default_delete_signatures(ldns_rr *sig, void *n)
+ldns_dnssec_default_delete_signatures( ATTR_UNUSED(ldns_rr *sig)
+                                    , ATTR_UNUSED(void *n)
+                                    )
 {
-       sig = sig;
-       n = n;
        return LDNS_SIGNATURE_REMOVE_NO_ADD;
 }
 
 int
-ldns_dnssec_default_replace_signatures(ldns_rr *sig, void *n)
+ldns_dnssec_default_replace_signatures( ATTR_UNUSED(ldns_rr *sig)
+                                     , ATTR_UNUSED(void *n)
+                                     )
 {
-       sig = sig;
-       n = n;
        return LDNS_SIGNATURE_REMOVE_ADD_NEW;
 }
 

diff --git a/dnssec_sign.c b/dnssec_sign.c
index 1d283bcc68b09f7dac81a6cdbb8be494e6f3802c..73f9d43bbf762fb6e7f4fdca2f6f620a452cda54 100644 (file)
--- a/dnssec_sign.c
+++ b/dnssec_sign.c
@@ -888,10 +888,11 @@ ldns_dnssec_zone_create_nsec3s(ldns_dnssec_zone *zone,
 #endif /* HAVE_SSL */
 
 ldns_dnssec_rrs *
-ldns_dnssec_remove_signatures(ldns_dnssec_rrs *signatures,
-                                               ldns_key_list *key_list,
-                                               int (*func)(ldns_rr *, void *),
-                                               void *arg)
+ldns_dnssec_remove_signatures( ldns_dnssec_rrs *signatures
+                            , ATTR_UNUSED(ldns_key_list *key_list)
+                            , int (*func)(ldns_rr *, void *)
+                            , void *arg
+                            )
 {
        ldns_dnssec_rrs *base_rrs = signatures;
        ldns_dnssec_rrs *cur_rr = base_rrs;
@@ -901,8 +902,6 @@ ldns_dnssec_remove_signatures(ldns_dnssec_rrs *signatures,
        uint16_t keytag;
        size_t i;
 
-       key_list = key_list;
-
        if (!cur_rr) {
                switch(func(NULL, arg)) {
                case LDNS_SIGNATURE_LEAVE_ADD_NEW:
@@ -1024,12 +1023,13 @@ ldns_key_list_filter_for_non_dnskey(ldns_key_list *key_list)
 }
 
 ldns_status
-ldns_dnssec_zone_create_rrsigs_flg(ldns_dnssec_zone *zone,
-                               ldns_rr_list *new_rrs,
-                               ldns_key_list *key_list,
-                               int (*func)(ldns_rr *, void*),
-                               void *arg,
-                              int flags)
+ldns_dnssec_zone_create_rrsigs_flg( ATTR_UNUSED(ldns_dnssec_zone *zone)
+                                 , ATTR_UNUSED(ldns_rr_list *new_rrs)
+                                 , ATTR_UNUSED(ldns_key_list *key_list)
+                                 , int (*func)(ldns_rr *, void*)
+                                 , void *arg
+                                 , int flags
+                                 )
 {
        ldns_status result = LDNS_STATUS_OK;
 
@@ -1047,12 +1047,11 @@ ldns_dnssec_zone_create_rrsigs_flg(ldns_dnssec_zone *zone,
        int on_delegation_point = 0; /* handle partially occluded names */
 
        ldns_rr_list *pubkey_list = ldns_rr_list_new();
-       zone = zone;
-       new_rrs = new_rrs;
-       key_list = key_list;
        for (i = 0; i<ldns_key_list_key_count(key_list); i++) {
-               ldns_rr_list_push_rr(pubkey_list,
-                                                ldns_key2rr(ldns_key_list_key(key_list, i)));
+               ldns_rr_list_push_rr( pubkey_list
+                                   , ldns_key2rr(ldns_key_list_key(
+                                                       key_list, i))
+                                   );
        }
        /* TODO: callback to see is list should be signed */
        /* TODO: remove 'old' signatures from signature list */

diff --git a/dnssec_verify.c b/dnssec_verify.c
index 503fdd30289e67fb4180b37d07bffcf2e41226aa..aeb20712e93472bdf3c3152f920ce54a62d5497b 100644 (file)
--- a/dnssec_verify.c
+++ b/dnssec_verify.c
@@ -1578,13 +1578,14 @@ ldns_dnssec_verify_denial(ldns_rr *rr,
 
 #ifdef HAVE_SSL
 ldns_status
-ldns_dnssec_verify_denial_nsec3_match(ldns_rr *rr,
-                                                 ldns_rr_list *nsecs,
-                                                 ldns_rr_list *rrsigs,
-                                                 ldns_pkt_rcode packet_rcode,
-                                                 ldns_rr_type packet_qtype,
-                                                 bool packet_nodata,
-                                                 ldns_rr **match)
+ldns_dnssec_verify_denial_nsec3_match( ldns_rr *rr
+                                    , ldns_rr_list *nsecs
+                                    , ATTR_UNUSED(ldns_rr_list *rrsigs)
+                                    , ldns_pkt_rcode packet_rcode
+                                    , ldns_rr_type packet_qtype
+                                    , bool packet_nodata
+                                    , ldns_rr **match
+                                    )
 {
        ldns_rdf *closest_encloser;
        ldns_rdf *wildcard;
@@ -1595,8 +1596,6 @@ ldns_dnssec_verify_denial_nsec3_match(ldns_rr *rr,
        size_t i;
        ldns_status result = LDNS_STATUS_DNSSEC_NSEC_RR_NOT_COVERED;
 
-       rrsigs = rrsigs;
-
        if (match) {
                *match = NULL;
        }

diff --git a/keys.c b/keys.c
index 3772122afddd7dc56b9fdf34ef7b5fce95dcfd7e..0e82a102bd3a4404918d66d3bb760fa08e94afb8 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -651,15 +651,13 @@ ldns_key_new_frm_fp_dsa(FILE *f)
 }
 
 DSA *
-ldns_key_new_frm_fp_dsa_l(FILE *f, int *line_nr)
+ldns_key_new_frm_fp_dsa_l(FILE *f, ATTR_UNUSED(int *line_nr))
 {
        int i;
        char *d;
        DSA *dsa;
        uint8_t *buf;
 
-       line_nr = line_nr;
-
        d = LDNS_XMALLOC(char, LDNS_MAX_LINELEN);
        buf = LDNS_XMALLOC(uint8_t, LDNS_MAX_LINELEN);
        dsa = DSA_new();
@@ -740,14 +738,15 @@ ldns_key_new_frm_fp_hmac(FILE *f, size_t *hmac_size)
 }
 
 unsigned char *
-ldns_key_new_frm_fp_hmac_l(FILE *f, int *line_nr, size_t *hmac_size)
+ldns_key_new_frm_fp_hmac_l( FILE *f
+                         , ATTR_UNUSED(int *line_nr)
+                         , size_t *hmac_size
+                         )
 {
        size_t i;
        char *d;
        unsigned char *buf;
 
-       line_nr = line_nr;
-
        d = LDNS_XMALLOC(char, LDNS_MAX_LINELEN);
        buf = LDNS_XMALLOC(unsigned char, LDNS_MAX_LINELEN);
         if(!d || !buf) {

diff --git a/parse.c b/parse.c
index 15cc300f90c711d03d4ef4231d8e557fcd958d10..ac9bdbdd556461cab23f73c7c818e974d1251c6c 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -377,10 +377,8 @@ ldns_bskipcs(ldns_buffer *buffer, const char *s)
 }
 
 void
-ldns_fskipc(FILE *fp, char c)
+ldns_fskipc(ATTR_UNUSED(FILE *fp), ATTR_UNUSED(char c))
 {
-       fp = fp;
-       c = c;
 }
 
 

diff --git a/str2host.c b/str2host.c
index 95fbe7a59dd9addc437db8e000b26668fba98da9..c1f4b13aebdb912ab8ec26b7250cbc4e795665d9 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -780,30 +780,30 @@ ldns_str2rdf_alg(ldns_rdf **rd, const char *str)
 }
 
 ldns_status
-ldns_str2rdf_unknown(ldns_rdf **rd, const char *str)
+ldns_str2rdf_unknown( ATTR_UNUSED(ldns_rdf **rd)
+                   , ATTR_UNUSED(const char *str)
+                   )
 {
        /* this should be caught in an earlier time (general str2host for
           rr's */
-       rd = rd;
-       str = str;
        return LDNS_STATUS_NOT_IMPL;
 }
 
 ldns_status
-ldns_str2rdf_tsig(ldns_rdf **rd, const char *str)
+ldns_str2rdf_tsig( ATTR_UNUSED(ldns_rdf **rd)
+                , ATTR_UNUSED(const char *str)
+                )
 {
        /* there is no strign representation for TSIG rrs */
-       rd = rd;
-       str = str;
        return LDNS_STATUS_NOT_IMPL;
 }
 
 ldns_status
-ldns_str2rdf_service(ldns_rdf **rd, const char *str)
+ldns_str2rdf_service( ATTR_UNUSED(ldns_rdf **rd)
+                   , ATTR_UNUSED(const char *str)
+                   )
 {
        /* is this used? is this actually WKS? or SRV? */
-       rd = rd;
-       str = str;
        return LDNS_STATUS_NOT_IMPL;
 }