chmode: Move add_id() to a boolean

[solanum.git] / include / hash.h

diff --git a/include/hash.h b/include/hash.h
index 0c4083718d9a53a6ee118c07e34cd43a79373830..c2d220dbb18776e42560d516285db2f7cc6b3a4e 100644 (file)
--- a/include/hash.h
+++ b/include/hash.h
@@ -20,23 +20,17 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: hash.h 3177 2007-02-01 00:19:14Z jilles $
  */
 
 #ifndef INCLUDED_hash_h
 #define INCLUDED_hash_h
 
-struct Dictionary;
-
-extern rb_dlink_list *clientTable;
-extern rb_dlink_list *channelTable;
-extern rb_dlink_list *idTable;
-extern rb_dlink_list *resvTable;
-extern rb_dlink_list *hostTable;
-extern rb_dlink_list *helpTable;
+#include "rb_dictionary.h"
+#include "rb_radixtree.h"
 
-extern struct Dictionary *nd_dict;
+extern rb_dictionary *nd_dict;
+extern rb_radixtree *resv_tree;
+extern rb_radixtree *channel_tree;
 
 /* Magic value for FNV hash functions */
 #define FNV1_32_INIT 0x811c9dc5UL
@@ -71,10 +65,10 @@ struct ConfItem;
 struct cachefile;
 struct nd_entry;
 
-extern u_int32_t fnv_hash_upper(const unsigned char *s, int bits);
-extern u_int32_t fnv_hash(const unsigned char *s, int bits);
-extern u_int32_t fnv_hash_len(const unsigned char *s, int bits, int len);
-extern u_int32_t fnv_hash_upper_len(const unsigned char *s, int bits, int len);
+extern uint32_t fnv_hash_upper(const unsigned char *s, int bits);
+extern uint32_t fnv_hash(const unsigned char *s, int bits);
+extern uint32_t fnv_hash_len(const unsigned char *s, int bits, int len);
+extern uint32_t fnv_hash_upper_len(const unsigned char *s, int bits, int len);
 
 extern void init_hash(void);
 
@@ -108,6 +102,4 @@ struct Client *find_cli_connid_hash(uint32_t connid);
 void add_to_zconnid_hash(struct Client *client_p);
 void del_from_zconnid_hash(struct Client *client_p);
 
-extern void hash_stats(struct Client *);
-
 #endif /* INCLUDED_hash_h */