- Fix compile without threads, and remove unused variable.

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

diff --git a/doc/Changelog b/doc/Changelog
index 4c569d983197e2f48d8cbcb91f296bf31660ff02..74ae69f628cec3172ded2a9fcd4e64971c01508c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 27 February 2018: Wouter
        - Fixup contrib/fastrpz.patch so that it applies.
+       - Fix compile without threads, and remove unused variable.
 
 22 February 2018: Ralph
        - Save wildcard RRset from answer with original owner for use in

diff --git a/util/log.c b/util/log.c
index 7ac06cdbefe0a28fcd37177a77260e3b93ae7d65..75a58f9de3dba3d2e3de511b8214cbc1b3abf7c3 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -195,7 +195,11 @@ void* log_get_lock(void)
 {
        if(!key_created)
                return NULL;
+#ifndef THREADS_DISABLED
        return (void*)&log_lock;
+#else
+       return NULL;
+#endif
 }
 
 void

diff --git a/validator/val_neg.c b/validator/val_neg.c
index d8e19ee7917fbccac8a1e5da07b00a2d38a0139a..54123814830757cbe3105b6dc2ad537f5e3ba6de 100644 (file)
--- a/validator/val_neg.c
+++ b/validator/val_neg.c
@@ -874,8 +874,7 @@ static uint8_t* reply_nsec_signer(struct reply_info* rep, size_t* signer_len,
        return 0;
 }
 
-void val_neg_addreply(struct val_neg_cache* neg, struct reply_info* rep,
-       uint8_t* qname)
+void val_neg_addreply(struct val_neg_cache* neg, struct reply_info* rep)
 {
        size_t i, need;
        struct ub_packed_rrset_key* soa;

diff --git a/validator/val_neg.h b/validator/val_neg.h
index 1d8128c41c91038cb751dab3a5283ca7b282b84b..00dad6df1f5c277abadd3a4337d60e69375fdde4 100644 (file)
--- a/validator/val_neg.h
+++ b/validator/val_neg.h
@@ -198,12 +198,9 @@ int val_neg_zone_compare(const void* a, const void* b);
  * Insert NSECs from this message into the negative cache for reference.
  * @param neg: negative cache
  * @param rep: reply with NSECs.
- * @param qname: used to find correct signer, needed when rep does not contain
- *     a SOA record.
  * Errors are ignored, means that storage is omitted.
  */
-void val_neg_addreply(struct val_neg_cache* neg, struct reply_info* rep,
-       uint8_t* qname);
+void val_neg_addreply(struct val_neg_cache* neg, struct reply_info* rep);
 
 /**
  * Insert NSECs from this referral into the negative cache for reference.

diff --git a/validator/validator.c b/validator/validator.c
index d717c30e7688e55986eca2e81665a13134db6f5b..715ea31712c080372998e58ba7f62570ede8c00b 100644 (file)
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -2189,7 +2189,7 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
                                &qstate->qinfo);
                        if(!qstate->no_cache_store) {
                                val_neg_addreply(qstate->env->neg_cache,
-                                       vq->orig_msg->rep, qstate->qinfo.qname);
+                                       vq->orig_msg->rep);
                        }
                }
        }
@@ -3120,7 +3120,7 @@ process_dlv_response(struct module_qstate* qstate, struct val_qstate* vq,
                return;
        }
        /* store NSECs into negative cache */
-       val_neg_addreply(ve->neg_cache, msg->rep, NULL);
+       val_neg_addreply(ve->neg_cache, msg->rep);
 
        /* was the lookup a failure? 
         *   if we have to go up into the DLV for a higher DLV anchor