From e49251fc604bc03a61b782c0cd598e722e85f3fe Mon Sep 17 00:00:00 2001
From: Yuri Schaeffer <yuri@nlnetlabs.nl>
Date: Fri, 20 Sep 2013 13:59:38 +0000
Subject: [PATCH] nits

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

diff --git a/edns-subnet/addrtree.c b/edns-subnet/addrtree.c
index a082cdbb0..d6a6a71f7 100644
--- a/edns-subnet/addrtree.c
+++ b/edns-subnet/addrtree.c
@@ -75,7 +75,10 @@ struct addrtree* addrtree_create(addrlen_t max_depth, struct module_env* env)
 	return tree;
 }
 
-size_t tree_size(const struct addrnode* node)
+/**
+ *  Recursively calculate size of tree from this node on downwards.
+ * */
+static size_t tree_size(const struct addrnode* node)
 {
 	int i;
 	size_t s = 0;
diff --git a/edns-subnet/addrtree.h b/edns-subnet/addrtree.h
index 39f619dac..0f148c5a9 100644
--- a/edns-subnet/addrtree.h
+++ b/edns-subnet/addrtree.h
@@ -62,6 +62,11 @@ struct addredge {
 	struct addrnode* node;
 };
 
+/**
+ *  Size of tree in bytes
+ */
+size_t addrtree_size(const struct addrtree* tree);
+
 /** 
  * Create a new tree
  * @param max_depth: Tree will cap keys to this length.
diff --git a/edns-subnet/subnetmod.c b/edns-subnet/subnetmod.c
index f746e8be4..e12dbfbb2 100644
--- a/edns-subnet/subnetmod.c
+++ b/edns-subnet/subnetmod.c
@@ -78,7 +78,6 @@ int subnetmod_init(struct module_env* env, int id)
 	sn_env->subnet_msg_cache = slabhash_create(env->cfg->msg_cache_slabs,
 			HASH_DEFAULT_STARTARRAY, env->cfg->msg_cache_size,
 			msg_cache_sizefunc, query_info_compare,
-			//~ msgreply_sizefunc, query_info_compare,
 			query_entry_delete, subnet_data_delete, NULL);
 	if(!sn_env->subnet_msg_cache) {
 		log_err("subnet: could not create cache");
diff --git a/testcode/unitvandergaast.c b/testcode/unitvandergaast.c
index ec73f69f8..4881fe097 100644
--- a/testcode/unitvandergaast.c
+++ b/testcode/unitvandergaast.c
@@ -1,5 +1,5 @@
 /*
- * testcode/unitvandergaast.c - unit test for msg parse routines.
+ * testcode/unitvandergaast.c - unit test for vandergaast routines.
  *
  * Copyright (c) 2013, NLnet Labs. All rights reserved.
  *
diff --git a/util/module.h b/util/module.h
index 3725edea3..9e99cfb0f 100644
--- a/util/module.h
+++ b/util/module.h
@@ -44,7 +44,6 @@
 #include "util/storage/lruhash.h"
 #include "util/data/msgreply.h"
 #include "util/data/msgparse.h"
-#include <sys/socket.h>
 struct alloc_cache;
 struct rrset_cache;
 struct key_cache;
-- 
2.47.2