Reverting some changed related not to moving on libratbox3 but using ratbox3 source!

[irc/rqf/shadowircd.git] / include / hash.h

diff --git a/include/hash.h b/include/hash.h
index 4a6e72e79482f8469297de21bcdaa501ca6a5253..9766022152728d0a85b349ce2857f36d13936692 100644 (file)
--- a/include/hash.h
+++ b/include/hash.h
@@ -27,16 +27,14 @@
 #ifndef INCLUDED_hash_h
 #define INCLUDED_hash_h
 
-#include "tools.h"
-
 struct Dictionary;
 
-extern dlink_list *clientTable;
-extern dlink_list *channelTable;
-extern dlink_list *idTable;
-extern dlink_list *resvTable;
-extern dlink_list *hostTable;
-extern dlink_list *helpTable;
+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;
 
 extern struct Dictionary *nd_dict;
 
@@ -60,8 +58,8 @@ extern struct Dictionary *nd_dict;
 #define R_MAX 1024 /* 2^10 */
 
 
-#define HASH_WALK(i, max, ptr, table) for (i = 0; i < max; i++) { DLINK_FOREACH(ptr, table[i].head)
-#define HASH_WALK_SAFE(i, max, ptr, nptr, table) for (i = 0; i < max; i++) { DLINK_FOREACH_SAFE(ptr, nptr, table[i].head)
+#define HASH_WALK(i, max, ptr, table) for (i = 0; i < max; i++) { RB_DLINK_FOREACH(ptr, table[i].head)
+#define HASH_WALK_SAFE(i, max, ptr, nptr, table) for (i = 0; i < max; i++) { RB_DLINK_FOREACH_SAFE(ptr, nptr, table[i].head)
 #define HASH_WALK_END }
 
 struct Client;
@@ -93,17 +91,13 @@ extern struct Channel *find_channel(const char *name);
 
 extern void add_to_hostname_hash(const char *, struct Client *);
 extern void del_from_hostname_hash(const char *, struct Client *);
-extern dlink_node *find_hostname(const char *);
+extern rb_dlink_node *find_hostname(const char *);
 
 extern void add_to_resv_hash(const char *name, struct ConfItem *aconf);
 extern void del_from_resv_hash(const char *name, struct ConfItem *aconf);
 extern struct ConfItem *hash_find_resv(const char *name);
 extern void clear_resv_hash(void);
 
-extern void add_to_help_hash(const char *name, struct cachefile *hptr);
-extern void clear_help_hash(void);
-extern struct cachefile *hash_find_help(const char *name, int flags);
-
 extern void hash_stats(struct Client *);
 
 #endif /* INCLUDED_hash_h */