- Moved configuration related code from ircd.c to conf.c

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2873 82007160-df01-0410-b94d-b575c5fd34c7

2 files changed, 8 insertions, 10 deletions

diff --git a/src/conf.c b/src/conf.c
index 1f8acce..5e91a51 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -55,7 +55,12 @@
 #include "conf_class.h"
 #include "motd.h"
 
+
 struct config_server_hide ConfigServerHide;
+struct config_file_entry ConfigFileEntry;
+struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
+struct server_info ServerInfo;
+struct admin_info AdminInfo;
 
 /* general conf items link list root, other than k lines etc. */
 dlink_list service_items = { NULL, NULL, 0 };
diff --git a/src/ircd.c b/src/ircd.c
index 2dd2ddf..1148821 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -65,18 +65,11 @@
 #ifdef HAVE_LIBGEOIP
 GeoIP *geoip_ctx;
 #endif
+
 /* /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 = { NULL, NULL, NULL };
-struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-struct ServerState_t server_state = { 0 };
-struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
+struct Counter Count;
+struct ServerState_t server_state;
 struct ServerStatistics ServerStats;
 struct timeval SystemTime;
 struct Client me;             /* That's me */