nits

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

diff --git a/edns-subnet/addrtree.c b/edns-subnet/addrtree.c
index a082cdbb0d2727a1a599044999ddb8ce45e4b29d..d6a6a71f7c48893d0a641dcceefdc6438c04109d 100644 (file)
--- 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 39f619dacc98afb8f3d535f1403b6f495ac11876..0f148c5a92c12e9e9bd36e3d949800308707966f 100644 (file)
--- 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 f746e8be42396d261fcab5164d0f5afeecc048af..e12dbfbb2dc16d0724e58a67428d79df5232cda7 100644 (file)
--- 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 ec73f69f87d06df3101408e9b63e36e943494601..4881fe097c588f548defc7542dd964be98e838c2 100644 (file)
--- 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 3725edea336d1eec74067ebe2563ca83bee84bb7..9e99cfb0f5ad0655fee06de00c02e055af0e7328 100644 (file)
--- 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;