X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..7bab07d4d30245bf5ba272b236dc7b1c1e309c4d:/src/ircd_state.c

diff --git a/src/ircd_state.c b/src/ircd_state.c
index d424e94..0776461 100644
--- a/src/ircd_state.c
+++ b/src/ircd_state.c
@@ -38,14 +38,11 @@
 #include "config.h"
 
 #include "client.h"
-#include "tools.h"
-#include "tools.h"
 #include "ircd.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "ircd_signal.h"
@@ -58,9 +55,8 @@
 #include "res.h"
 #include "restart.h"
 #include "s_auth.h"
-#include "commio.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"
@@ -68,42 +64,26 @@
 #include "send.h"
 #include "whowas.h"
 #include "modules.h"
-#include "memory.h"
 #include "hook.h"
 #include "ircd_getopt.h"
-#include "balloc.h"
 #include "newconf.h"
-#include "patricia.h"
 #include "reject.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "cache.h"
 #include "monitor.h"
-#include "libcharybdis.h"
 #include "patchlevel.h"
 #include "serno.h"
 
-dlink_list lclient_list = { NULL, NULL, 0 };
-dlink_list global_client_list = { NULL, NULL, 0 };
-dlink_list global_channel_list = { NULL, NULL, 0 };
+rb_dlink_list lclient_list = { NULL, NULL, 0 };
+rb_dlink_list global_client_list = { NULL, NULL, 0 };
+rb_dlink_list global_channel_list = { NULL, NULL, 0 };
 
-dlink_list unknown_list;        /* unknown clients ON this server only */
-dlink_list serv_list;           /* local servers to this server ONLY */
-dlink_list global_serv_list;    /* global servers on the network */
-dlink_list local_oper_list;     /* our opers, duplicated in lclient_list */
-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;
+rb_dlink_list unknown_list;        /* unknown clients ON this server only */
+rb_dlink_list serv_list;           /* local servers to this server ONLY */
+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 */
 
 struct timeval SystemTime;
 int ServerRunning;              /* GLOBAL - server execution state */
@@ -135,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