9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Valery Yatsko 2008-04-05 22:02:59 +04:00
parent 480e37b7ba
commit 2af8c7ff8b
2 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/ircd.c
View file

@ -24,10 +24,10 @@
* $Id: ircd.c 3380 2007-04-03 22:25:11Z jilles $ * $Id: ircd.c 3380 2007-04-03 22:25:11Z jilles $
*/ */
#include "ratbox_lib.h"
#include "stdinc.h" #include "stdinc.h"
#include "setup.h" #include "setup.h"
#include "config.h" #include "config.h"
#include "ircd.h" #include "ircd.h"
#include "channel.h" #include "channel.h"
#include "class.h" #include "class.h"
@ -66,8 +66,6 @@
#include "patchlevel.h" #include "patchlevel.h"
#include "serno.h" #include "serno.h"
#include "ratbox_lib.h"
/* /*
* Try and find the correct name to use with getrlimit() for setting the max. * Try and find the correct name to use with getrlimit() for setting the max.
* number of files allowed to be open by this process. * number of files allowed to be open by this process.
@ -80,6 +78,17 @@ extern char **myargv;
int maxconnections; /* XXX */ int maxconnections; /* XXX */
/* /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 ServerStatistics ServerStats; struct ServerStatistics ServerStats;
/* /*
@ -450,10 +459,10 @@ main(int argc, char *argv[])
rb_dlinkAddTail(&me, &me.node, &global_client_list); rb_dlinkAddTail(&me, &me.node, &global_client_list);
memset((void *) &Count, 0, sizeof(Count)); memset(&Count, 0, sizeof(Count));
memset((void *) &ServerInfo, 0, sizeof(ServerInfo)); memset(&ServerInfo, 0, sizeof(ServerInfo));
memset((void *) &AdminInfo, 0, sizeof(AdminInfo)); memset(&AdminInfo, 0, sizeof(AdminInfo));
memset((void *) &ServerStats, 0, sizeof(struct ServerStatistics)); memset(&ServerStats, 0, sizeof(struct ServerStatistics));
/* Initialise the channel capability usage counts... */ /* Initialise the channel capability usage counts... */
init_chcap_usage_counts(); init_chcap_usage_counts();

12
src/ircd_state.c
View file

@ -85,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 local_oper_list; /* our opers, duplicated in lclient_list */
rb_dlink_list oper_list; /* network opers */ 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; struct timeval SystemTime;
int ServerRunning; /* GLOBAL - server execution state */ int ServerRunning; /* GLOBAL - server execution state */
struct Client me; /* That's me */ struct Client me; /* That's me */