From: Yuri Schaeffer <yuri@nlnetlabs.nl>
Date: Tue, 20 May 2014 07:51:07 +0000 (+0000)
Subject: remove some unused code
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12ee842327706a45ed0db7aeec793638d5947196;p=thirdparty%2Funbound.git

remove some unused code


git-svn-id: file:///svn/unbound/branches/edns-subnet@3132 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/edns-subnet/addrtree.c b/edns-subnet/addrtree.c
index fdbb0ac11..729a3f001 100644
--- a/edns-subnet/addrtree.c
+++ b/edns-subnet/addrtree.c
@@ -432,7 +432,7 @@ struct addrnode *
 addrtree_find(struct addrtree *tree, const addrkey_t *addr, 
 	addrlen_t sourcemask, time_t now)
 {
-	struct addrnode *parent_node = NULL, *node = tree->root;
+	struct addrnode *node = tree->root;
 	struct addredge *edge = NULL;
 	addrlen_t depth = 0;
 
@@ -463,7 +463,6 @@ addrtree_find(struct addrtree *tree, const addrkey_t *addr,
 		if (!issub(edge->str, edge->len, addr, sourcemask, depth))
 			return NULL;
 		log_assert(depth < edge->len);
-		parent_node = node;
 		depth = edge->len;
 		node = edge->node;
 	}
diff --git a/edns-subnet/subnetmod.c b/edns-subnet/subnetmod.c
index 8628a4c51..ba1384d07 100644
--- a/edns-subnet/subnetmod.c
+++ b/edns-subnet/subnetmod.c
@@ -275,7 +275,6 @@ common_prefix(uint8_t *a, uint8_t *b, uint8_t net)
 enum module_ext_state
 eval_response(struct module_qstate *qstate, int id)
 {
-	size_t sn_octs;
 	struct edns_data *c_in  = &qstate->edns_client_in; /* rcvd from client */
 	struct edns_data *c_out = &qstate->edns_client_out;/* will send to client */
 	struct edns_data *s_in  = &qstate->edns_server_in; /* rcvd from auth */
@@ -308,7 +307,6 @@ eval_response(struct module_qstate *qstate, int id)
 	 * anywhere. */
 	
 	/** can we accept response? */
-	assert(sn_octs <= INET6_SIZE); /** Enforced by msgparse */
 	if(s_out->subnet_addr_fam != s_in->subnet_addr_fam ||
 		s_out->subnet_source_mask != s_in->subnet_source_mask ||
 		!common_prefix(s_out->subnet_addr, s_in->subnet_addr, 
@@ -388,14 +386,15 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
 }
 
 void
-subnetmod_clear(struct module_qstate *qstate, int id)
+subnetmod_clear(struct module_qstate *ATTR_UNUSED(qstate),
+	int ATTR_UNUSED(id))
 {
 	/* qstate has no data outside region */
 }
 
 void
-subnetmod_inform_super(struct module_qstate *qstate, int id, 
-	struct module_qstate *super)
+subnetmod_inform_super(struct module_qstate *ATTR_UNUSED(qstate),
+	int ATTR_UNUSED(id), struct module_qstate *ATTR_UNUSED(super))
 {
 	/* Not used */
 }