[NeoStats-Devel] [Commits] r2743 - in trunk: . include modules/connectserv modules/extauth modules/hostserv modules/ircdauth modules/limitserv modules/operlog modules/quoteserv modules/statserv modules/template modules/textserv src
[email protected] Thu, 18 Aug 2005 06:56:01 +1000
| Newsgroups | gmane.comp.neostats.devel |
|---|---|
| Message-ID | <[email protected]> |
Author: Mark
Date: Thu Aug 18 04:55:58 2005
New Revision: 2743
Modified:
trunk/ChangeLog
trunk/include/neostats.h
trunk/modules/connectserv/cs.c
trunk/modules/extauth/extauth.c
trunk/modules/hostserv/hostserv.c
trunk/modules/ircdauth/ircdauth.c
trunk/modules/limitserv/main.c
trunk/modules/operlog/main.c
trunk/modules/quoteserv/main.c
trunk/modules/statserv/statserv.c
trunk/modules/template/main.c
trunk/modules/textserv/main.c
trunk/src/botinfo.c
trunk/src/commands.c
trunk/src/exclude.c
trunk/src/services.c
Log:
New macros NS_CMD_END() and NS_SETTING_END() for terminating command and setting lists
Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Thu Aug 18 04:55:58 2005
@@ -4,6 +4,8 @@
Fish (F), Mark (M), DeadNotBuried (D)
===============================================================================
* NeoStats * Version 3.0.a3-dev
+ - New macros NS_CMD_END() and NS_SETTING_END() for terminating command and set
+ lists. (M)
- ConnectServ colour logging is now settable via IRC (F)
- First round of memory cleanups with Valgrind (F)
- Create a runvalgrind.sh file with NeoStats suppressions for memory
Modified: trunk/include/neostats.h
==============================================================================
--- trunk/include/neostats.h (original)
+++ trunk/include/neostats.h Thu Aug 18 04:55:58 2005
@@ -747,6 +747,8 @@
Module *modptr; /* NeoStats internal use only */
}_bot_cmd;
+#define NS_CMD_END() { NULL, NULL, 0, 0, NULL, 0, NULL, NULL }
+
/** @brief flags for bots
* flags to influence how bots are managed
* e.g. restrict to opers
@@ -822,6 +824,7 @@
void *defaultval;/* default value for setting */
}bot_setting;
+#define NS_SETTING_END() { NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL }
/** @brief Message function types
*
Modified: trunk/modules/connectserv/cs.c
==============================================================================
--- trunk/modules/connectserv/cs.c (original)
+++ trunk/modules/connectserv/cs.c Thu Aug 18 04:55:58 2005
@@ -144,7 +144,7 @@
{"EXCLUSIONS", &cs_cfg.exclusions, SET_TYPE_BOOLEAN, 0, 0, NS_ULEVEL_ADMIN, NULL, cs_help_set_exclusions, cs_set_exclusions_cb,( void* )1 },
{"LOGGING", &cs_cfg.logging, SET_TYPE_BOOLEAN, 0, 0, NS_ULEVEL_ADMIN, NULL, cs_help_set_logging, NULL,( void* )1 },
{"COLOUR", &cs_cfg.colour, SET_TYPE_BOOLEAN, 0, 0, NS_ULEVEL_ADMIN, NULL, cs_help_set_colour, NULL,( void* )1 },
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL },
+ NS_SETTING_END()
};
/** BotInfo */
Modified: trunk/modules/extauth/extauth.c
==============================================================================
--- trunk/modules/extauth/extauth.c (original)
+++ trunk/modules/extauth/extauth.c Thu Aug 18 04:55:58 2005
@@ -90,7 +90,7 @@
bot_cmd extauth_commands[] =
{
{"ACCESS", ea_cmd_access, 1, NS_ULEVEL_ROOT, ea_help_access},
- {NULL, NULL, 0, 0, NULL}
+ NS_CMD_END()
};
/** @brief dbaccesslisthandler
Modified: trunk/modules/hostserv/hostserv.c
==============================================================================
--- trunk/modules/hostserv/hostserv.c (original)
+++ trunk/modules/hostserv/hostserv.c Thu Aug 18 04:55:58 2005
@@ -105,7 +105,7 @@
{"VIEW", hs_cmd_view, 1, NS_ULEVEL_OPER, hs_help_view},
{"LOGIN", hs_cmd_login, 2, 0, hs_help_login},
{"CHPASS", hs_cmd_chpass, 3, 0, hs_help_chpass},
- {NULL, NULL, 0, 0, NULL}
+ NS_CMD_END()
};
/** Bot setting table */
@@ -117,7 +117,7 @@
{"OPERHOSTS", &hs_cfg.operhosts, SET_TYPE_BOOLEAN, 0, 0, NS_ULEVEL_ADMIN, NULL, hs_help_set_operhosts, NULL, ( void* )0 },
{"VERBOSE", &hs_cfg.verbose, SET_TYPE_BOOLEAN, 0, 0, NS_ULEVEL_ADMIN, NULL, hs_help_set_verbose, NULL, ( void* )1 },
{"ADDLEVEL", &hs_cfg.addlevel, SET_TYPE_INT, 0, 0, NS_ULEVEL_ADMIN, NULL, hs_help_set_addlevel, NULL, ( void* )NS_ULEVEL_LOCOPER },
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL },
+ NS_SETTING_END()
};
/** BotInfo */
Modified: trunk/modules/ircdauth/ircdauth.c
==============================================================================
--- trunk/modules/ircdauth/ircdauth.c (original)
+++ trunk/modules/ircdauth/ircdauth.c Thu Aug 18 04:55:58 2005
@@ -139,7 +139,7 @@
bot_cmd ircdauth_commands[] =
{
{"AUTHMODELIST", auth_cmd_authmodelist, 0, NS_ULEVEL_OPER, auth_help_authmodelist},
- {NULL, NULL, 0, 0, NULL}
+ NS_CMD_END()
};
/** @brief ModInit
Modified: trunk/modules/limitserv/main.c
==============================================================================
--- trunk/modules/limitserv/main.c (original)
+++ trunk/modules/limitserv/main.c Thu Aug 18 04:55:58 2005
@@ -78,7 +78,7 @@
{"ADD", cmd_add, 1, NS_ULEVEL_ADMIN, help_add},
{"DEL", cmd_del, 1, NS_ULEVEL_ADMIN, help_del},
{"LIST", cmd_list, 0, NS_ULEVEL_ADMIN, help_list},
- {NULL, NULL, 0, 0, NULL}
+ NS_CMD_END()
};
/** Bot setting table */
@@ -86,7 +86,7 @@
{
{"JOIN", &joinchannels, SET_TYPE_BOOLEAN, 0, 0, NS_ULEVEL_ADMIN, NULL, help_set_join, set_join_cb, ( void* )0 },
{"LIMITBUFFER", &limitbuffer, SET_TYPE_INT, 0, 100, NS_ULEVEL_ADMIN, NULL, help_set_limitbuffer, set_limitbuffer_cb, (void *)1 },
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL },
+ NS_SETTING_END()
};
/** Bot info */
Modified: trunk/modules/operlog/main.c
==============================================================================
--- trunk/modules/operlog/main.c (original)
+++ trunk/modules/operlog/main.c Thu Aug 18 04:55:58 2005
@@ -63,7 +63,7 @@
/** Bot setting table */
static bot_setting operlog_settings[] =
{
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL },
+ NS_SETTING_END()
};
/** BotInfo */
Modified: trunk/modules/quoteserv/main.c
==============================================================================
--- trunk/modules/quoteserv/main.c (original)
+++ trunk/modules/quoteserv/main.c Thu Aug 18 04:55:58 2005
@@ -88,7 +88,7 @@
{"DEL", qs_cmd_del, 1, NS_ULEVEL_ADMIN, qs_help_del},
{"LIST", qs_cmd_list, 0, NS_ULEVEL_ADMIN, qs_help_list},
{"QUOTE", qs_cmd_quote, 0, 0, qs_help_quote},
- {NULL, NULL, 0, 0, NULL}
+ NS_CMD_END()
};
/** Bot setting table */
@@ -96,7 +96,7 @@
{
{ "SIGNONQUOTE", &signonquote, SET_TYPE_BOOLEAN, 0, 0, NS_ULEVEL_ADMIN, NULL, help_set_signonquote, qs_set_signonquote_cb, ( void* )0 },
{ "EXCLUSIONS", &useexclusions, SET_TYPE_BOOLEAN, 0, 0, NS_ULEVEL_ADMIN, NULL, help_set_exclusions, qs_set_exclusions_cb, ( void* )0 },
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL },
+ NS_SETTING_END()
};
/** BotInfo */
Modified: trunk/modules/statserv/statserv.c
==============================================================================
--- trunk/modules/statserv/statserv.c (original)
+++ trunk/modules/statserv/statserv.c Thu Aug 18 04:55:58 2005
@@ -102,7 +102,7 @@
{"BOTLIST", ss_cmd_botlist, 0, 0, ss_help_botlist},
{"USERVERSION", ss_cmd_userversion, 0, 0, ss_help_userversion},
{"FORCEHTML", ss_cmd_forcehtml, 0, NS_ULEVEL_ADMIN, ss_help_forcehtml},
- {NULL, NULL, 0, 0, NULL}
+ NS_CMD_END()
};
/** Bot setting table */
@@ -119,7 +119,7 @@
{"RECORDALERT", &StatServ.recordalert, SET_TYPE_INT, 0, 3, NS_ULEVEL_ADMIN, NULL, ss_help_set_recordalert, NULL, (void *)1},
{"EXCLUSIONS", &StatServ.exclusions, SET_TYPE_BOOLEAN, 0, 0, NS_ULEVEL_ADMIN, NULL, ss_help_set_exclusions, ss_set_exclusions_cb, (void *)0},
{"FLATMAP", &StatServ.flatmap, SET_TYPE_BOOLEAN, 0, 0, NS_ULEVEL_ADMIN, NULL, ss_help_set_flatmap, NULL, (void *)0},
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, (void *)0},
+ NS_SETTING_END()
};
/** BotInfo */
Modified: trunk/modules/template/main.c
==============================================================================
--- trunk/modules/template/main.c (original)
+++ trunk/modules/template/main.c Thu Aug 18 04:55:58 2005
@@ -167,7 +167,7 @@
template_help_hello_world,
},
/* End command list with a NULL entry */
- {NULL, NULL, 0, 0, NULL, NULL}
+ NS_CMD_END()
};
static int example_setting = 0;
@@ -201,7 +201,7 @@
( void* )1
},
/* End setting list with a NULL entry */
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL },
+ NS_SETTING_END()
};
/** Define information about our bot
Modified: trunk/modules/textserv/main.c
==============================================================================
--- trunk/modules/textserv/main.c (original)
+++ trunk/modules/textserv/main.c Thu Aug 18 04:55:58 2005
@@ -106,13 +106,13 @@
{"ADD", ts_cmd_add, 3, NS_ULEVEL_ADMIN, ts_help_add},
{"DEL", ts_cmd_del, 1, NS_ULEVEL_ADMIN, ts_help_del},
{"LIST", ts_cmd_list, 0, 0, ts_help_list},
- {NULL, NULL, 0, 0, NULL}
+ NS_CMD_END()
};
/** Bot setting table */
static bot_setting ts_settings[]=
{
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL},
+ NS_SETTING_END()
};
/** Sub bot comand table template */
@@ -199,7 +199,7 @@
/** Sub bot setting table template */
static bot_setting ts_settingstemplate[]=
{
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL },
+ NS_SETTING_END()
};
/** TextServ BotInfo */
Modified: trunk/src/botinfo.c
==============================================================================
--- trunk/src/botinfo.c (original)
+++ trunk/src/botinfo.c Thu Aug 18 04:55:58 2005
@@ -38,7 +38,7 @@
{"USER", NULL, SET_TYPE_USER, 0, MAXUSER, NS_ULEVEL_ADMIN, NULL, ns_help_set_user, bot_set_user_cb, NULL },
{"HOST", NULL, SET_TYPE_HOST, 0, MAXHOST, NS_ULEVEL_ADMIN, NULL, ns_help_set_host, bot_set_host_cb, NULL },
{"REALNAME",NULL, SET_TYPE_REALNAME, 0, MAXREALNAME, NS_ULEVEL_ADMIN, NULL, ns_help_set_realname, bot_set_realname_cb, NULL },
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL, NULL },
+ NS_SETTING_END()
};
/** @brief bot_set_nick_cb
Modified: trunk/src/commands.c
==============================================================================
--- trunk/src/commands.c (original)
+++ trunk/src/commands.c Thu Aug 18 04:55:58 2005
@@ -65,7 +65,7 @@
{"ABOUT", bot_cmd_about, 0, 0, cmd_help_about},
{"CREDITS", bot_cmd_credits,0, 0, cmd_help_credits},
{"LEVELS", bot_cmd_levels, 0, 0, cmd_help_levels},
- {NULL, NULL, 0, 0, NULL}
+ NS_CMD_END()
};
/** @brief calc_cmd_ulevel calculate cmd ulevel
Modified: trunk/src/exclude.c
==============================================================================
--- trunk/src/exclude.c (original)
+++ trunk/src/exclude.c Thu Aug 18 04:55:58 2005
@@ -83,7 +83,7 @@
bot_cmd mod_exclude_commands[] =
{
{"EXCLUDE", mod_cmd_exclude,1, NS_ULEVEL_ADMIN,ns_help_exclude},
- {NULL, NULL, 0, 0, NULL}
+ NS_CMD_END()
};
/** @brief new_exclude
Modified: trunk/src/services.c
==============================================================================
--- trunk/src/services.c (original)
+++ trunk/src/services.c Thu Aug 18 04:55:58 2005
@@ -116,7 +116,7 @@
{"CHANNELLIST", ns_cmd_channellist, 0, NS_ULEVEL_ROOT, ns_help_channellist},
{"SERVERLIST", ns_cmd_serverlist, 0, NS_ULEVEL_ROOT, ns_help_serverlist},
{"BANLIST", ns_cmd_banlist, 0, NS_ULEVEL_ROOT, ns_help_banlist},
- {NULL, NULL, 0, 0, NULL}
+ NS_CMD_END()
};
/** Bot setting table */
@@ -135,7 +135,7 @@
{"LOGLEVEL", &nsconfig.loglevel, SET_TYPE_INT, 1, 6, NS_ULEVEL_ADMIN, NULL, ns_help_set_loglevel, NULL,( void* )5 },
{"RECVQ", &nsconfig.recvq, SET_TYPE_INT, 1024,10240000, NS_ULEVEL_ADMIN, NULL, ns_help_set_recvq, NULL, ( void*)2048},
{"DEBUGCHAN", nsconfig.debugchan, SET_TYPE_STRING, 0, MAXCHANLEN, NS_ULEVEL_ADMIN, NULL, ns_help_set_debugchan, NULL,( void* )"#debug" },
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL },
+ NS_SETTING_END()
};
static bot_setting ns_debugsettings[]=
@@ -146,7 +146,7 @@
{"DEBUGMODULE", nsconfig.debugmodule, SET_TYPE_STRING, 0, MAX_MOD_NAME,NS_ULEVEL_ADMIN, NULL, ns_help_set_debugmodule, NULL,( void* )"all" },
{"DEBUGLEVEL", &nsconfig.debuglevel, SET_TYPE_INT, 1, 10, NS_ULEVEL_ADMIN, NULL, ns_help_set_debuglevel, NULL,( void* )0 },
{"DEBUGTOCHAN", &nsconfig.debugtochan, SET_TYPE_BOOLEAN, 0, 0, NS_ULEVEL_ADMIN, NULL, ns_help_set_debugtochan, NULL,( void* )0 },
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL },
+ NS_SETTING_END()
};
/** Bot pointer */