Some global structs cleaned up a bit in their initalization and declarations.

[irc/rqf/shadowircd.git] / src / ircd_state.c

diff --git a/src/ircd_state.c b/src/ircd_state.c
index 973f1abafbbd920a0af3b3ede494f5514f3b04ab..077646133a5abd23ef57a0e6d15ffff059bf01ea 100644 (file)
--- a/src/ircd_state.c
+++ b/src/ircd_state.c
@@ -56,7 +56,7 @@
 #include "restart.h"
 #include "s_auth.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"             /* try_connections */
 #include "s_user.h"
 #include "s_stats.h"
@@ -67,7 +67,6 @@
 #include "hook.h"
 #include "ircd_getopt.h"
 #include "newconf.h"
-#include "patricia.h"
 #include "reject.h"
 #include "s_conf.h"
 #include "s_newconf.h"
@@ -86,18 +85,6 @@ rb_dlink_list global_serv_list;    /* global servers on the network */
 rb_dlink_list local_oper_list;     /* our opers, duplicated in lclient_list */
 rb_dlink_list oper_list;           /* network opers */
 
-/* /quote set variables */
-struct SetOptions GlobalSetOptions;
-
-/* configuration set from ircd.conf */
-struct config_file_entry ConfigFileEntry;
-/* server info set from ircd.conf */
-struct server_info ServerInfo;
-/* admin info set from ircd.conf */
-struct admin_info AdminInfo;
-
-struct Counter Count;
-
 struct timeval SystemTime;
 int ServerRunning;              /* GLOBAL - server execution state */
 struct Client me;               /* That's me */
@@ -128,25 +115,25 @@ int opers_see_all_users = 0;
 int testing_conf = 0;
 
 struct config_channel_entry ConfigChannel;
-BlockHeap *channel_heap;
-BlockHeap *ban_heap;
-BlockHeap *topic_heap;
-BlockHeap *member_heap;
+rb_bh *channel_heap;
+rb_bh *ban_heap;
+rb_bh *topic_heap;
+rb_bh *member_heap;
 
-BlockHeap *client_heap = NULL;
-BlockHeap *lclient_heap = NULL;
-BlockHeap *pclient_heap = NULL;
+rb_bh *client_heap = NULL;
+rb_bh *lclient_heap = NULL;
+rb_bh *pclient_heap = NULL;
 
 char current_uid[IDLEN];
 
 /* patricia */
-BlockHeap *prefix_heap;
-BlockHeap *node_heap;
-BlockHeap *patricia_heap;
+rb_bh *prefix_heap;
+rb_bh *node_heap;
+rb_bh *patricia_heap;
 
-BlockHeap *linebuf_heap;
+rb_bh *linebuf_heap;
 
-BlockHeap *dnode_heap;
+rb_bh *dnode_heap;
 
 #ifdef NOTYET