Fix various compiler warnings from the clang llvm compiler.

git-svn-id: file:///svn/unbound/trunk@2111 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/cachedump.c b/daemon/cachedump.c
index 35f0fe446cea2b55d84620fff09ed9d9f371fa47..b92a969593e85a9e8bc641a89790afc5feb3e958 100644 (file)
--- a/daemon/cachedump.c
+++ b/daemon/cachedump.c
@@ -444,6 +444,12 @@ load_rr(SSL* ssl, ldns_buffer* buf, struct regional* region,
                rk->rk.rrset_class = htons(ldns_rr_get_class(rr));
                ldns_buffer_clear(buf);
                status = ldns_dname2buffer_wire(buf, ldns_rr_owner(rr));
+               if(status != LDNS_STATUS_OK) {
+                       log_warn("error cannot dname2buffer :%s",
+                               ldns_get_errorstr_by_id(status));
+                       ldns_rr_free(rr);
+                       return 0;
+               }
                ldns_buffer_flip(buf);
                rk->rk.dname_len = ldns_buffer_limit(buf);
                rk->rk.dname = regional_alloc_init(region, 

diff --git a/daemon/remote.c b/daemon/remote.c
index 1b415f0244bc4cb6533bd03e55de6f8e7c6dab54..2d770d497c050b4cb844812c11f18dc7a4bffc03 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -317,7 +317,7 @@ struct listen_port* daemon_remote_open_ports(struct config_file* cfg)
        struct listen_port* l = NULL;
        log_assert(cfg->remote_control_enable && cfg->control_port);
        if(cfg->control_ifs) {
-               struct config_strlist* p = cfg->control_ifs;
+               struct config_strlist* p;
                for(p = cfg->control_ifs; p; p = p->next) {
                        if(!add_open(p->str, cfg->control_port, &l, 1)) {
                                listening_ports_free(l);
@@ -877,6 +877,7 @@ do_stats(SSL* ssl, struct daemon_remote* rc, int reset)
        struct stats_info total;
        struct stats_info s;
        int i;
+       log_assert(daemon->num > 0);
        /* gather all thread statistics in one place */
        for(i=0; i<daemon->num; i++) {
                server_stats_obtain(rc->worker, daemon->workers[i], &s, reset);

diff --git a/daemon/unbound.c b/daemon/unbound.c
index afa6a47dc6073f9c4346fd407ef24fd31ca51430..88ef98f89c9a171b79c3f1722da39d54ab82f4b0 100644 (file)
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -610,7 +610,9 @@ main(int argc, char* argv[])
        const char* winopt = NULL;
        int cmdline_verbose = 0;
        int debug_mode = 0;
+#ifdef UB_ON_WINDOWS
        int cmdline_cfg = 0;
+#endif
 
 #ifdef HAVE_SBRK
        /* take debug snapshot of heap */
@@ -623,7 +625,9 @@ main(int argc, char* argv[])
                switch(c) {
                case 'c':
                        cfgfile = optarg;
+#ifdef UB_ON_WINDOWS
                        cmdline_cfg = 1;
+#endif
                        break;
                case 'v':
                        cmdline_verbose ++;

diff --git a/doc/Changelog b/doc/Changelog
index d7adf51b469a776c54df799e4cb236fc254987a0..ee08e15e551d85f185e1480b8a146f51ac63a934 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+18 May 2010: Wouter
+       - Fix various compiler warnings from the clang llvm compiler.
+
 6 May 2010: Wouter
        - Fix bug#308: spelling error in variable name in parser and lexer.
 

diff --git a/iterator/iter_resptype.c b/iterator/iter_resptype.c
index b7d022dbe2b003224eea0d6830fea11a39ae2b2b..2c5da3dce0f8adc0e0165c04d7dd2905d0f83f7d 100644 (file)
--- a/iterator/iter_resptype.c
+++ b/iterator/iter_resptype.c
@@ -106,7 +106,6 @@ response_type_from_server(int rdset,
 {
        uint8_t* origzone = (uint8_t*)"\000"; /* the default */
        struct ub_packed_rrset_key* s;
-       size_t origzonelen = 1;
        size_t i;
 
        if(!msg || !request)
@@ -130,7 +129,6 @@ response_type_from_server(int rdset,
 
        if(dp) {
                origzone = dp->name;
-               origzonelen = dp->namelen;
        }
 
        /* First we look at the answer section. This can tell us if this is a

diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c
index 4866793d4394ab47fc3e7948bb9a304bbde35b1a..4e2d496a1cd73c408204aa419afd75f4ec236afd 100644 (file)
--- a/iterator/iter_scrub.c
+++ b/iterator/iter_scrub.c
@@ -561,7 +561,7 @@ static int sanitize_nsec_is_overreach(struct rrset_parse* rrset,
        for(rr = rrset->rr_first; rr; rr = rr->next) {
                rhs = rr->ttl_data+4+2;
                len = ldns_read_uint16(rr->ttl_data+4);
-               if(!(len=dname_valid(rhs, len))) {
+               if(!dname_valid(rhs, len)) {
                        /* malformed domain name in rdata */
                        return 1;
                }

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 6f486bf1df6857b9d6c68aa1a27ebdcbb1a5f61f..0ed946bd32b761f68d310b68cc6bc46169cd4ece 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1266,7 +1266,7 @@ query_for_targets(struct module_qstate* qstate, struct iter_qstate* iq,
         struct iter_env* ie, int id, int maxtargets, int* num)
 {
        int query_count = 0;
-       struct delegpt_ns* ns = iq->dp->nslist;
+       struct delegpt_ns* ns;
        int missing;
        int toget = 0;
 

diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index 4fffccb26bdee3740e1e8f0b8fd508c4b3f6475b..4e5eb59becc1bd22810ffb2a190442455767a072 100644 (file)
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -347,7 +347,6 @@ answer_check_it(struct replay_runtime* runtime)
                        &runtime->now->addr, runtime->now->addrlen,
                        &ans->repinfo.addr, ans->repinfo.addrlen) == 0) &&
                        find_match(runtime->now->match, ans->pkt, tr)) {
-                       struct replay_answer *n = ans->next;
                        log_info("testbound matched event entry from line %d",
                                runtime->now->match->lineno);
                        log_info("testbound: do STEP %d %s", 
@@ -359,7 +358,6 @@ answer_check_it(struct replay_runtime* runtime)
                        if(!ans->next)
                                runtime->answer_last = prev;
                        delete_replay_answer(ans);
-                       ans = n;
                        return;
                } else {
                        prev = ans;

diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c
index bf1b597a705ee388a4b192d275b5984c7cb8c2c3..7dbac38fa313b650e502e3a3d528dc991a43e3c5 100644 (file)
--- a/testcode/streamtcp.c
+++ b/testcode/streamtcp.c
@@ -110,7 +110,6 @@ write_q(int fd, int udp, ldns_buffer* buf, int id,
 {
        struct query_info qinfo;
        ldns_rdf* rdf;
-       int labs;
        uint16_t len;
        /* qname */
        rdf = ldns_dname_new_frm_str(strname);
@@ -119,7 +118,7 @@ write_q(int fd, int udp, ldns_buffer* buf, int id,
                exit(1);
        }
        qinfo.qname = memdup(ldns_rdf_data(rdf), ldns_rdf_size(rdf));
-       labs = dname_count_size_labels(qinfo.qname, &qinfo.qname_len);
+       (void)dname_count_size_labels(qinfo.qname, &qinfo.qname_len);
        ldns_rdf_deep_free(rdf);
        if(!qinfo.qname) fatal_exit("out of memory");
 

diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index 8ac20119834a9f0f1a6ff7f806ebd560e4ee5184..9d5a68b1b3d7beb3bcf4382074f9051fcc201d8a 100644 (file)
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -4936,6 +4936,8 @@
 10116,
 10128,
 10160,
+10161,
+10162,
 10200,
 10201,
 10252,

diff --git a/util/locks.c b/util/locks.c
index 8a90bc08953ae6d31c1cf56521044f23845742a6..f82fded051ce46dcf3d4db09ec34ee36fb540042 100644 (file)
--- a/util/locks.c
+++ b/util/locks.c
@@ -63,7 +63,7 @@ ub_thread_blocksigs()
                fatal_exit("thr_sigsetmask: %s", strerror(err));
 #  else 
        /* have nothing, do single process signal mask */
-       if((err=sigprocmask(SIG_SETMASK, &sigset, NULL)))
+       if(sigprocmask(SIG_SETMASK, &sigset, NULL))
                fatal_exit("sigprocmask: %s", strerror(errno));
 #  endif /* HAVE_SOLARIS_THREADS */
 #endif /* HAVE_PTHREAD */
@@ -87,7 +87,7 @@ void ub_thread_sig_unblock(int sig)
                fatal_exit("thr_sigsetmask: %s", strerror(err));
 #  else 
        /* have nothing, do single thread case */
-       if((err=sigprocmask(SIG_UNBLOCK, &sigset, NULL)))
+       if(sigprocmask(SIG_UNBLOCK, &sigset, NULL))
                fatal_exit("sigprocmask: %s", strerror(errno));
 #  endif /* HAVE_SOLARIS_THREADS */
 #endif /* HAVE_PTHREAD */

diff --git a/validator/autotrust.c b/validator/autotrust.c
index 0574b74b10fa6e401b968f6038dba4f28a11f33b..b1170ed7f248039602df5a309efa445a1cdee1de 100644 (file)
--- a/validator/autotrust.c
+++ b/validator/autotrust.c
@@ -600,8 +600,7 @@ static struct trust_anchor*
 parse_id(struct val_anchors* anchors, char* line)
 {
        struct trust_anchor *tp;
-       size_t len;
-       int labs, r;
+       int r;
        ldns_rdf* rdf;
        uint16_t dclass;
        /* read the owner name */
@@ -612,8 +611,6 @@ parse_id(struct val_anchors* anchors, char* line)
        rdf = ldns_dname_new_frm_str(line);
        if(!rdf)
                return NULL;
-       labs = dname_count_size_labels(ldns_rdf_data(rdf), &len);
-       log_assert(len == ldns_rdf_size(rdf));
 
        /* read the class */
        dclass = parse_int(next+1, &r);

diff --git a/validator/val_sigcrypt.c b/validator/val_sigcrypt.c
index 49eeacf0d6317d1cf58aa96f773d98579924392e..2a3e8a5ff4e2efb6891d3c0b5c143f1a4b23940f 100644 (file)
--- a/validator/val_sigcrypt.c
+++ b/validator/val_sigcrypt.c
@@ -1253,15 +1253,12 @@ setup_dsa_sig(unsigned char** sig, unsigned int* len)
        unsigned char* orig = *sig;
        unsigned int origlen = *len;
        int newlen;
-
-       uint8_t t;
        BIGNUM *R, *S;
        DSA_SIG *dsasig;
 
        /* extract the R and S field from the sig buffer */
        if(origlen < 1 + 2*SHA_DIGEST_LENGTH)
                return 0;
-       t = orig[0];
        R = BN_new();
        if(!R) return 0;
        (void) BN_bin2bn(orig + 1, SHA_DIGEST_LENGTH, R);

diff --git a/validator/validator.c b/validator/validator.c
index fe762b79830d2b241f888643076b1931efd10936..f46656df694a9a313bc5f6b4abe23492aa7c0bbf 100644 (file)
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -1376,7 +1376,7 @@ static int
 processFindKey(struct module_qstate* qstate, struct val_qstate* vq, int id)
 {
        uint8_t* target_key_name, *current_key_name;
-       size_t target_key_len, current_key_len;
+       size_t target_key_len;
        int strip_lab;
 
        log_query_info(VERB_ALGO, "validator: FindKey", &vq->qchase);
@@ -1405,7 +1405,6 @@ processFindKey(struct module_qstate* qstate, struct val_qstate* vq, int id)
        }
 
        current_key_name = vq->key_entry->name;
-       current_key_len = vq->key_entry->namelen;
 
        /* If our current key entry matches our target, then we are done. */
        if(query_dname_compare(target_key_name, current_key_name) == 0) {
@@ -1428,7 +1427,6 @@ processFindKey(struct module_qstate* qstate, struct val_qstate* vq, int id)
                        return 1;
                }
                current_key_name = vq->empty_DS_name;
-               current_key_len = vq->empty_DS_len;
        }
 
        log_nametypeclass(VERB_ALGO, "current keyname", current_key_name,
@@ -1735,7 +1733,7 @@ val_dlv_init(struct module_qstate* qstate, struct val_qstate* vq,
        }
        log_nametypeclass(VERB_ALGO, "DLV init look", nm, LDNS_RR_TYPE_DS,
                vq->qchase.qclass);
-       log_assert(nm && nm_len)
+       log_assert(nm && nm_len);
        /* sanity check: no DLV lookups below the DLV anchor itself.
         * Like, an securely insecure delegation there makes no sense. */
        if(dname_subdomain_c(nm, qstate->env->anchors->dlv_anchor->name)) {