cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m_set: get rid of function pointers with unspecified parameter lists

This commit is contained in:
Jilles Tjoelker 2008-06-11 00:39:01 +02:00
parent 6d18bf1a12
commit 4cb8529c19
1 changed files with 27 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
modules/m_set.c
View File

@ -55,7 +55,7 @@ DECLARE_MODULE_AV1(set, NULL, NULL, set_clist, NULL, NULL, "$Revision: 3406 $");
struct SetStruct struct SetStruct
{ {
const char *name; const char *name;
void (*handler) (); void (*handler)(struct Client *source_p, const char *chararg, int intarg);
int wants_char; /* 1 if it expects (char *, [int]) */ int wants_char; /* 1 if it expects (char *, [int]) */
int wants_int; /* 1 if it expects ([char *], int) */ int wants_int; /* 1 if it expects ([char *], int) */
@ -64,18 +64,19 @@ struct SetStruct
}; };
static void quote_adminstring(struct Client *, const char *); static void quote_adminstring(struct Client *, const char *, int);
static void quote_autoconn(struct Client *, const char *, int); static void quote_autoconn(struct Client *, const char *, int);
static void quote_autoconnall(struct Client *, int); static void quote_autoconnall(struct Client *, const char *, int);
static void quote_floodcount(struct Client *, int); static void quote_floodcount(struct Client *, const char *, int);
static void quote_identtimeout(struct Client *, int); static void quote_identtimeout(struct Client *, const char *, int);
static void quote_max(struct Client *, int); static void quote_max(struct Client *, const char *, int);
static void quote_operstring(struct Client *, const char *); static void quote_operstring(struct Client *, const char *, int);
static void quote_spamnum(struct Client *, int); static void quote_spamnum(struct Client *, const char *, int);
static void quote_spamtime(struct Client *, int); static void quote_spamtime(struct Client *, const char *, int);
static void quote_splitmode(struct Client *, const char *); static void quote_splitmode(struct Client *, const char *, int);
static void quote_splitnum(struct Client *, int); static void quote_splitnum(struct Client *, const char *, int);
static void quote_splitusers(struct Client *, int); static void quote_splitusers(struct Client *, const char *, int);
static void list_quote_commands(struct Client *); static void list_quote_commands(struct Client *);
@ -104,7 +105,7 @@ static struct SetStruct set_cmd_table[] = {
{"SPLITNUM", quote_splitnum, 0, 1 }, {"SPLITNUM", quote_splitnum, 0, 1 },
{"SPLITUSERS", quote_splitusers, 0, 1 }, {"SPLITUSERS", quote_splitusers, 0, 1 },
/* -------------------------------------------------------- */ /* -------------------------------------------------------- */
{(char *) 0, (void (*)()) 0, 0, 0} {(char *) 0, (void (*)(struct Client *, const char *, int)) 0, 0, 0}
}; };
@ -150,7 +151,7 @@ quote_autoconn(struct Client *source_p, const char *arg, int newval)
/* SET AUTOCONNALL */ /* SET AUTOCONNALL */
static void static void
quote_autoconnall(struct Client *source_p, int newval) quote_autoconnall(struct Client *source_p, const char *arg, int newval)
{ {
if(newval >= 0) if(newval >= 0)
{ {
@ -169,7 +170,7 @@ quote_autoconnall(struct Client *source_p, int newval)
/* SET FLOODCOUNT */ /* SET FLOODCOUNT */
static void static void
quote_floodcount(struct Client *source_p, int newval) quote_floodcount(struct Client *source_p, const char *arg, int newval)
{ {
if(newval >= 0) if(newval >= 0)
{ {
@ -187,7 +188,7 @@ quote_floodcount(struct Client *source_p, int newval)
/* SET IDENTTIMEOUT */ /* SET IDENTTIMEOUT */
static void static void
quote_identtimeout(struct Client *source_p, int newval) quote_identtimeout(struct Client *source_p, const char *arg, int newval)
{ {
if(!IsOperAdmin(source_p)) if(!IsOperAdmin(source_p))
{ {
@ -210,7 +211,7 @@ quote_identtimeout(struct Client *source_p, int newval)
/* SET MAX */ /* SET MAX */
static void static void
quote_max(struct Client *source_p, int newval) quote_max(struct Client *source_p, const char *arg, int newval)
{ {
if(newval > 0) if(newval > 0)
{ {
@ -248,7 +249,7 @@ quote_max(struct Client *source_p, int newval)
/* SET OPERSTRING */ /* SET OPERSTRING */
static void static void
quote_operstring(struct Client *source_p, const char *arg) quote_operstring(struct Client *source_p, const char *arg, int newval)
{ {
if(EmptyString(arg)) if(EmptyString(arg))
{ {
@ -267,7 +268,7 @@ quote_operstring(struct Client *source_p, const char *arg)
/* SET ADMINSTRING */ /* SET ADMINSTRING */
static void static void
quote_adminstring(struct Client *source_p, const char *arg) quote_adminstring(struct Client *source_p, const char *arg, int newval)
{ {
if(EmptyString(arg)) if(EmptyString(arg))
{ {
@ -286,7 +287,7 @@ quote_adminstring(struct Client *source_p, const char *arg)
/* SET SPAMNUM */ /* SET SPAMNUM */
static void static void
quote_spamnum(struct Client *source_p, int newval) quote_spamnum(struct Client *source_p, const char *arg, int newval)
{ {
if(newval > 0) if(newval > 0)
{ {
@ -316,7 +317,7 @@ quote_spamnum(struct Client *source_p, int newval)
/* SET SPAMTIME */ /* SET SPAMTIME */
static void static void
quote_spamtime(struct Client *source_p, int newval) quote_spamtime(struct Client *source_p, const char *arg, int newval)
{ {
if(newval > 0) if(newval > 0)
{ {
@ -356,7 +357,7 @@ static const char *splitmode_status[] = {
/* SET SPLITMODE */ /* SET SPLITMODE */
static void static void
quote_splitmode(struct Client *source_p, const char *charval) quote_splitmode(struct Client *source_p, const char *charval, int intval)
{ {
if(charval) if(charval)
{ {
@ -416,7 +417,7 @@ quote_splitmode(struct Client *source_p, const char *charval)
/* SET SPLITNUM */ /* SET SPLITNUM */
static void static void
quote_splitnum(struct Client *source_p, int newval) quote_splitnum(struct Client *source_p, const char *arg, int newval)
{ {
if(newval >= 0) if(newval >= 0)
{ {
@ -433,7 +434,7 @@ quote_splitnum(struct Client *source_p, int newval)
/* SET SPLITUSERS */ /* SET SPLITUSERS */
static void static void
quote_splitusers(struct Client *source_p, int newval) quote_splitusers(struct Client *source_p, const char *arg, int newval)
{ {
if(newval >= 0) if(newval >= 0)
{ {
@ -534,24 +535,8 @@ mo_set(struct Client *client_p, struct Client *source_p, int parc, const char *p
else else
newval = -1; newval = -1;
if(set_cmd_table[i].wants_char) set_cmd_table[i].handler(source_p, arg, newval);
{ return 0;
if(set_cmd_table[i].wants_int)
set_cmd_table[i].handler(source_p, arg, newval);
else
set_cmd_table[i].handler(source_p, arg);
return 0;
}
else
{
if(set_cmd_table[i].wants_int)
set_cmd_table[i].handler(source_p, newval);
else
/* Just in case someone actually wants a
* set function that takes no args.. *shrug* */
set_cmd_table[i].handler(source_p);
return 0;
}
} }
} }