From b1c3f9bbc4052244770df90885f0b7b6ef7f7dc6 Mon Sep 17 00:00:00 2001
From: Yuri Schaeffer <yuri@nlnetlabs.nl>
Date: Fri, 20 Sep 2013 12:29:34 +0000
Subject: [PATCH] please pass more tests

git-svn-id: file:///svn/unbound/branches/edns-subnet@2967 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 edns-subnet/addrtree.c     | 2 +-
 edns-subnet/subnetmod.c    | 2 +-
 testcode/unitmain.c        | 2 ++
 testcode/unitvandergaast.c | 5 +++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/edns-subnet/addrtree.c b/edns-subnet/addrtree.c
index 6a7ebb599..a082cdbb0 100644
--- a/edns-subnet/addrtree.c
+++ b/edns-subnet/addrtree.c
@@ -29,7 +29,7 @@ edge_create(struct addrnode* node, const addrkey_t* addr, addrlen_t addrlen)
 		return NULL;
 	edge->node = node;
 	edge->len = addrlen;
-	n = (addrlen / KEYWIDTH) + ((addrlen % KEYWIDTH)!=0)?1:0; /*ceil()*/
+	n = (size_t)((addrlen / KEYWIDTH) + ((addrlen % KEYWIDTH)!=0)?1:0); /*ceil()*/
 	edge->str = (addrkey_t*)calloc(n, sizeof(addrkey_t));
 	if (!edge->str) {
 		free(edge);
diff --git a/edns-subnet/subnetmod.c b/edns-subnet/subnetmod.c
index 83d6d7d97..f746e8be4 100644
--- a/edns-subnet/subnetmod.c
+++ b/edns-subnet/subnetmod.c
@@ -245,7 +245,7 @@ int lookup_and_reply(struct module_qstate* qstate, int id)
 static int 
 common_prefix(uint8_t *a, uint8_t *b, uint8_t net)
 {
-	int n = net / 8;
+	size_t n = (size_t)net / 8;
 	return !memcmp(a, b, n) && ((net % 8) == 0 || a[n] == b[n]);
 }
 
diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index 514895ded..3c373f087 100644
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -588,7 +588,9 @@ main(int argc, char* argv[])
 	slabhash_test();
 	infra_test();
 	msgparse_test();
+#ifdef CLIENT_SUBNET
 	vandergaast_test();
+#endif /* CLIENT_SUBNET */
 	checklock_stop();
 	printf("%d checks ok.\n", testcount);
 #ifdef HAVE_SSL
diff --git a/testcode/unitvandergaast.c b/testcode/unitvandergaast.c
index e885de22b..ec73f69f8 100644
--- a/testcode/unitvandergaast.c
+++ b/testcode/unitvandergaast.c
@@ -40,6 +40,9 @@
  */
 
 #include "config.h"
+
+#ifdef CLIENT_SUBNET
+
 #include "util/log.h"
 #include "testcode/unitmain.h"
 #include "edns-subnet/addrtree.h"
@@ -114,3 +117,5 @@ void vandergaast_test(void)
 	getbit_test();
 	issub_test();
 }
+#endif /* CLIENT_SUBNET */
+
-- 
2.47.2