From fa2e9760f9c9a4c8d7079d68f9995b25a7183c8a Mon Sep 17 00:00:00 2001
From: stskeeps <devnull@localhost>
Date: Tue, 29 Jan 2002 13:48:00 +0000
Subject: [PATCH] - Changed some m_ functions into CMD_FUNC(m_*)

---
 Changes       |  1 +
 include/h.h   |  1 +
 src/channel.c | 29 ++++++++--------
 src/s_serv.c  | 91 +++++++++++++++++++++++++++------------------------
 src/s_user.c  | 26 +++++++--------
 5 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/Changes b/Changes
index 59ffde0fc..d6dfd9c4a 100644
--- a/Changes
+++ b/Changes
@@ -1156,3 +1156,4 @@ v- Fixed some bugreport stuff
 - Moved set::socks::ban-time to set::scan::bantime, and remove the other set::socks::* (not used)
   also added set::scan::timeout to specify how long the scanner should wait for a response before giving up
 - Added HOOKTYPE_STATS - allows modules to respond to certain /stats (so far only S is supported)
+- Changed some m_ functions into CMD_FUNC(m_*)
diff --git a/include/h.h b/include/h.h
index bb6a0b15d..e3cecffb5 100644
--- a/include/h.h
+++ b/include/h.h
@@ -51,6 +51,7 @@ extern time_t timeofday;
 /* newconf */
 #define get_sendq(x) ((x)->class ? (x)->class->sendq : MAXSENDQLENGTH) 
 
+#define CMD_FUNC(x) int (x) (aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 #ifndef NO_FDLIST
 extern float currentrate;
diff --git a/src/channel.c b/src/channel.c
index 0c3cffd79..7643e57c5 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1000,9 +1000,9 @@ void send_channel_modes(aClient *cptr, aChannel *chptr)
  * parv[0] = sender
  * parv[1] = channel
  * parv[2] = modes
- * -taz
+ * -t
  */
-int m_samode(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_samode)
 {
 	aChannel *chptr;
 
@@ -1041,7 +1041,7 @@ int m_samode(aClient *cptr, aClient *sptr, int parc, char *parv[])
  * parv[0] - sender
  * parv[1] - channel
  */
-int m_mode(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_mode)
 {
 	static char mode_buf[MODEBUFLEN], parabuf[MODEBUFLEN];
 	long unsigned sendts = 0;
@@ -2645,7 +2645,8 @@ static void sub1_from_channel(aChannel *chptr)
 /*
  * Channel Link
  */
-int channel_link(aClient *cptr, aClient *sptr, int parc, char *parv[])
+
+CMD_FUNC(channel_link)
 {
 	static char jbuf[BUFSIZE];
 	Membership *lp;
@@ -2858,7 +2859,7 @@ int channel_link(aClient *cptr, aClient *sptr, int parc, char *parv[])
  * parv[1] = channels
 */
 
-int  m_cycle(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_cycle)
 {
 	char	channels[1024];
 	
@@ -2879,7 +2880,7 @@ int  m_cycle(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[1] = channel
 **	parv[2] = channel password (key)
 */
-int m_join(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_join)
 {
 	static char jbuf[BUFSIZE];
 	Membership *lp;
@@ -3139,7 +3140,7 @@ int m_join(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[1] = channel
 **	parv[2] = comment (added by Lefler)
 */
-int m_part(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_part)
 {
 	aChannel *chptr;
 	Membership *lp;
@@ -3341,7 +3342,7 @@ int m_part(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[2] = client to kick
 **	parv[3] = kick comment
 */
-int m_kick(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_kick)
 {
 	aClient *who;
 	aChannel *chptr;
@@ -3535,7 +3536,7 @@ int m_kick(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[3] = topic time
 **	parv[4] = topic text
 */
-int m_topic(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_topic)
 {
 	aChannel *chptr = NullChn;
 	char *topic = NULL, *name, *tnick = NULL;
@@ -3712,7 +3713,7 @@ int m_topic(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[1] - user to invite
 **	parv[2] - channel number
 */
-int m_invite(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_invite)
 {
 	aClient *acptr;
 	aChannel *chptr;
@@ -4030,7 +4031,7 @@ int  check_for_chan_flood(aClient *cptr, aClient *sptr, aChannel *chptr)
 /*
  * * m_list *      parv[0] = sender prefix *      parv[1] = channel
  */
-int  m_list(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_list)
 {
 	aChannel *chptr;
 	TS   currenttime = TStime();
@@ -4281,7 +4282,7 @@ int  m_list(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[1] = channel
 */
 #define TRUNCATED_NAMES 64
-int m_names(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_names)
 {
 	int  mlen = strlen(me.name) + NICKLEN + 7;
 	aChannel *chptr;
@@ -4453,7 +4454,7 @@ void send_user_joins(aClient *cptr, aClient *user)
 ** (C) codemastr & Stskeeps
 ** 
 */
-int m_knock(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_knock)
 {
 	aChannel *chptr;
 
@@ -4634,7 +4635,7 @@ else if (b == MAXMODEPARAMS) {\
 #define AddEx(x) strcat(exbuf, x); strcat(exbuf, " ");
 
 
-int m_sjoin(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_sjoin)
 {
 	unsigned short nopara;
 	unsigned short nomode;
diff --git a/src/s_serv.c b/src/s_serv.c
index 870513ec5..a9efb2fea 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -63,6 +63,10 @@ aMotd *read_rules(char *filename);
 extern aMotd *Find_file(char *, short);
 /*
 ** m_functions execute protocol messages on this server:
+**      CMD_FUNC(functionname) causes it to use the header
+**            int functionname (aClient *cptr,
+**  	      	aClient *sptr, int parc, char *parv[])
+**
 **
 **	cptr	is always NON-NULL, pointing to a *LOCAL* client
 **		structure (with an open socket connected!). This
@@ -126,7 +130,7 @@ extern fdlist serv_fdlist;
 **	parv[0] = sender prefix
 **	parv[1] = remote server
 */
-int  m_version(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_version)
 {
 	extern char serveropts[];
 
@@ -153,7 +157,7 @@ int  m_version(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[1] = server name
 **	parv[parc-1] = comment
 */
-int  m_squit(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_squit)
 {
 	aConfItem *aconf;
 	char *server;
@@ -305,7 +309,7 @@ int  m_squit(aClient *cptr, aClient *sptr, int parc, char *parv[])
  *	parv[0] = Sender prefix
  *	parv[1+] = Options
  */
-int  m_protoctl(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_protoctl)
 {
 	int  i;
 #ifndef PROTOCTL_MADNESS
@@ -528,7 +532,7 @@ int  m_protoctl(aClient *cptr, aClient *sptr, int parc, char *parv[])
 }
 
 char *num = NULL;
-int	m_server_synch(aClient *cptr, long numeric, ConfigItem_link *conf);
+int m_server_synch(aClient *cptr, long numeric, ConfigItem_link *conf);
 
 /*
 ** m_server
@@ -542,7 +546,7 @@ int	m_server_synch(aClient *cptr, long numeric, ConfigItem_link *conf);
 **
 **  Recode 2001 by Stskeeps
 */
-int  m_server(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_server)
 {
 	char *servername = NULL;	/* Pointer for servername */
  /*	char *password = NULL; */
@@ -826,7 +830,7 @@ int  m_server(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	}
 }
 
-int	m_server_remote(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_server_remote)
 {
 	aClient *acptr, *ocptr, *bcptr;
 	ConfigItem_link	*aconf;
@@ -1287,7 +1291,7 @@ int	m_server_synch(aClient *cptr, long numeric, ConfigItem_link *aconf)
 **
 ** Recoded by Stskeeps
 */
-int  m_links(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_links)
 {
 	Link *lp;
 	aClient *acptr;
@@ -1324,7 +1328,7 @@ int  m_links(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **  parv[8] = ircnet
 **/
 
-int  m_netinfo(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_netinfo)
 {
 	long 		lmax;
 	time_t	 	xx;
@@ -1504,7 +1508,7 @@ void m_info_send(aClient *sptr)
 **  Modified for hardcode by Stskeeps
 */
 
-int  m_info(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_info)
 {
 
 	if (hunt_server_token(cptr, sptr, MSG_INFO, TOK_INFO, ":%s", 1, parc,
@@ -1521,7 +1525,7 @@ int  m_info(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **      parv[0] = sender prefix
 **      parv[1] = servername
 */
-int  m_dalinfo(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_dalinfo)
 {
 	char **text = dalinfotext;
 
@@ -1549,7 +1553,7 @@ int  m_dalinfo(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **      parv[0] = sender prefix
 **      parv[1] = servername
 */
-int  m_license(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_license)
 {
 	char **text = gnulicense;
 
@@ -1572,7 +1576,7 @@ int  m_license(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **      parv[0] = sender prefix
 **      parv[1] = servername
 */
-int  m_credits(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_credits)
 {
 	char **text = unrealcredits;
 
@@ -1622,7 +1626,7 @@ static void show_watch(aClient *cptr, char *name, int rpl1, int rpl2)
 /*
  * m_watch
  */
-int  m_watch(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_watch)
 {
 	aClient *acptr;
 	char *s, **pav = parv, *user;
@@ -1865,7 +1869,7 @@ char *get_client_name2(aClient *acptr, int showports)
 **            it--not reversed as in ircd.conf!
 */
 
-int  m_stats(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_stats)
 {
 #ifndef DEBUGMODE
 	static char Sformat[] =
@@ -2472,7 +2476,7 @@ int  m_stats(aClient *cptr, aClient *sptr, int parc, char *parv[])
 ** m_summon
 ** parv[0] = sender prefix
 */
-int  m_summon(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_summon)
 {
 	/* /summon is old and out dated, we just return an error as
 	 * required by RFC1459 -- codemastr
@@ -2483,7 +2487,8 @@ int  m_summon(aClient *cptr, aClient *sptr, int parc, char *parv[])
 ** m_users
 **	parv[0] = sender prefix
 **	parv[1] = servername
-*/ int m_users(aClient *cptr, aClient *sptr, int parc, char *parv[])
+*/ 
+CMD_FUNC(m_users)
 {
 	/* /users is out of date, just return an error as  required by
 	 * RFC1459 -- codemastr
@@ -2497,7 +2502,8 @@ int  m_summon(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **
 **	parv[0] = sender prefix
 **	parv[*] = parameters
-*/ int m_error(aClient *cptr, aClient *sptr, int parc, char *parv[])
+*/ 
+CMD_FUNC(m_error)
 {
 	char *para;
 
@@ -2548,7 +2554,7 @@ void reset_help(void)
 **	parv[0] = sender prefix
 **	parv[1] = optional message text
 */
-int  m_help(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_help)
 {
 	char *message, *s;
 	Link *tmpl;
@@ -2631,7 +2637,7 @@ int  m_help(aClient *cptr, aClient *sptr, int parc, char *parv[])
  * parv[1] = host/server mask.
  * parv[2] = server to query
  */
-int  m_lusers(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_lusers)
 {
 
 	/* Just to correct results ---Stskeeps */
@@ -2713,7 +2719,8 @@ void load_tunefile(void)
    **  parv[1] = servername
    **  parv[2] = port number
    **  parv[3] = remote server
- */ int m_connect(aClient *cptr, aClient *sptr, int parc, char *parv[])
+ */
+CMD_FUNC(m_connect)
 {
 	int  port, tmpport, retval;
 	ConfigItem_link	*aconf;
@@ -2848,7 +2855,7 @@ void load_tunefile(void)
 **	parv[0] = sender prefix
 **	parv[1] = message text
 */
-int  m_wallops(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_wallops)
 {
 	char *message;
 	message = parc > 1 ? parv[1] : NULL;
@@ -2875,7 +2882,7 @@ int  m_wallops(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[0] = sender prefix
 **	parv[1] = message text
 */
-int  m_gnotice(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_gnotice)
 {
 	char *message;
 
@@ -2904,7 +2911,7 @@ int  m_gnotice(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **
 ** De-Potvinized by codemastr
 */
-int  m_addline(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_addline)
 {
 	FILE *conf;
 	char *text;
@@ -2952,7 +2959,7 @@ int  m_addline(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **
 ** De-Potvinized by codemastr
 */
-int  m_addmotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_addmotd)
 {
 	FILE *conf;
 	char *text;
@@ -2999,7 +3006,7 @@ int  m_addmotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **
 ** De-Potvinized by codemastr
 */
-int  m_addomotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_addomotd)
 {
 	FILE *conf;
 	char *text;
@@ -3046,7 +3053,7 @@ int  m_addomotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **      parv[0] = sender prefix
 **      parv[1] = message text
 */
-int  m_globops(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_globops)
 {
 	char *message;
 
@@ -3074,7 +3081,7 @@ int  m_globops(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **      parv[0] = sender prefix
 **      parv[1] = message text
 */
-int  m_locops(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_locops)
 {
 	char *message;
 
@@ -3100,7 +3107,7 @@ int  m_locops(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **      parv[0] = sender prefix
 **      parv[1] = message text
 */
-int  m_chatops(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_chatops)
 {
 	char *message;
 
@@ -3134,7 +3141,7 @@ int  m_chatops(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **      parv[0] = sender prefix
 **      parv[1] = message text
 */
-int  m_goper(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_goper)
 {
 	char *message;
 
@@ -3163,7 +3170,7 @@ int  m_goper(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[0] = sender prefix
 **	parv[1] = servername
 */
-int  m_time(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_time)
 {
 	if (hunt_server_token(cptr, sptr, MSG_TIME, TOK_TIME, ":%s", 1, parc,
 	    parv) == HUNTED_ISME)
@@ -3178,7 +3185,7 @@ int  m_time(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[1] = client
 **	parv[2] = kill message
 */
-int  m_svskill(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_svskill)
 {
 	aClient *acptr;
 	/* this is very wierd ? */
@@ -3214,7 +3221,7 @@ int  m_svskill(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[0] = sender prefix
 **	parv[1] = servername
 */
-int  m_admin(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_admin)
 {
 	ConfigItem_admin *admin;
 	/* Users may want to get the address in case k-lined, etc. -- Barubary
@@ -3259,7 +3266,7 @@ int  m_admin(aClient *cptr, aClient *sptr, int parc, char *parv[])
 ** ugly code but it seems to work :) -- codemastr
 ** added -all and fixed up a few lines -- niquil (niquil@programmer.net)
 */
-int  m_rehash(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_rehash)
 {
 	int  x;
 
@@ -3442,7 +3449,7 @@ int  m_rehash(aClient *cptr, aClient *sptr, int parc, char *parv[])
 ** The password is only valid if there is a matching X line in the
 ** config file. If it is not,  then it becomes the
 */
-int  m_restart(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_restart)
 {
 	char *pass = NULL, *encr;
 	int  x;
@@ -3534,7 +3541,7 @@ int  m_restart(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[0] = sender prefix
 **	parv[1] = servername
 */
-int  m_trace(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_trace)
 {
 	int  i;
 	aClient *acptr;
@@ -3724,7 +3731,7 @@ int  m_trace(aClient *cptr, aClient *sptr, int parc, char *parv[])
  * Heavily modified from the ircu m_motd by codemastr
  * Also svsmotd support added
  */
-int  m_motd(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_motd)
 {
 	ConfigItem_tld *ptr;
 	aMotd *temp, *temp2;
@@ -3796,7 +3803,7 @@ HUNTED_ISME)
 /*
  * Modified from comstud by codemastr
  */
-int  m_opermotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_opermotd)
 {
 	aMotd *temp;
 
@@ -3989,7 +3996,7 @@ aMotd *read_file(char *filename, aMotd **list)
 /*
  * Modified from comstud by codemastr
  */
-int  m_botmotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_botmotd)
 {
 	aMotd *temp;
 	if (hunt_server_token(cptr, sptr, MSG_BOTMOTD, TOK_BOTMOTD, ":%s", 1, parc,
@@ -4019,7 +4026,7 @@ int  m_botmotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
  * Heavily modified from the ircu m_motd by codemastr
  * Also svsmotd support added
  */
-int  m_rules(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_rules)
 {
 	ConfigItem_tld *ptr;
 	aMotd *temp;
@@ -4072,7 +4079,7 @@ int  m_rules(aClient *cptr, aClient *sptr, int parc, char *parv[])
 /*
 ** m_close - added by Darren Reed Jul 13 1992.
 */
-int  m_close(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_close)
 {
 	aClient *acptr;
 	int  i;
@@ -4110,7 +4117,7 @@ int  m_close(aClient *cptr, aClient *sptr, int parc, char *parv[])
  * have a reason. If you use it you should first do a GLOBOPS and
  * then a server notice to let everyone know what is going down...
  */
-int  m_die(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_die)
 {
 	aClient *acptr;
 	int  i;
@@ -4243,7 +4250,7 @@ void dump_map(aClient *cptr, aClient *server, char *mask, int prompt_length, int
 **      parv[0] = sender prefix
 **      parv[1] = server mask
 **/
-int  m_map(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_map)
 {
 	Link *lp;
 	aClient *acptr;
diff --git a/src/s_user.c b/src/s_user.c
index 1a8d82c1b..4d6210ed9 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -645,7 +645,7 @@ extern char *canonize(char *buffer)
 
 extern char cmodestring[512];
 
-int  m_post(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_post)
 {
 	char *tkllayer[9] = {
 		me.name,	/*0  server.name */
@@ -1090,7 +1090,7 @@ extern int register_user(aClient *cptr, aClient *sptr, char *nick, char *usernam
 **	parv[9] = virthost, * if none
 **	parv[10] = info
 */
-int  m_nick(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_nick)
 {
 	ConfigItem_ban *aconf;
 	aClient *acptr, *serv = NULL;
@@ -1772,7 +1772,7 @@ char *get_modestr(long umodes)
 **	parv[3] = server host name (used only from other servers)
 **	parv[4] = users real name info
 */
-int  m_user(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_user)
 {
 #define	UFLAGS	(UMODE_INVISIBLE|UMODE_WALLOP|UMODE_SERVNOTICE)
 	char *username, *host, *server, *realname, *umodex = NULL, *virthost =
@@ -1899,7 +1899,7 @@ int  m_user(aClient *cptr, aClient *sptr, int parc, char *parv[])
 **	parv[0] = sender prefix
 **	parv[1] = password
 */
-int  m_pass(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_pass)
 {
 	char *password = parc > 1 ? parv[1] : NULL;
 	int  PassLen = 0;
@@ -1931,7 +1931,7 @@ int  m_pass(aClient *cptr, aClient *sptr, int parc, char *parv[])
  * information only (no spurious AWAY labels or channels).
  * Re-written by Dianora 1999
  */
-int  m_userhost(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_userhost)
 {
 
 	char *p;		/* scratch end pointer */
@@ -1998,7 +1998,7 @@ int  m_userhost(aClient *cptr, aClient *sptr, int parc, char *parv[])
  * ISON :nicklist
  */
 
-int  m_ison(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_ison)
 {
 	char namebuf[USERLEN + HOSTLEN + 4];
 	aClient *acptr;
@@ -2084,7 +2084,7 @@ void set_snomask(aClient *sptr, char *snomask) {
  * parv[1] - username to change mode for
  * parv[2] - modes to change
  */
-int  m_umode(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_umode)
 {
 	int  flag = 0;
 	int  i;
@@ -2414,7 +2414,7 @@ int  m_umode(aClient *cptr, aClient *sptr, int parc, char *parv[])
     Small wrapper to bandwidth save
 */
 
-int  m_umode2(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_umode2)
 {
 	char *xparv[5] = {
 		parv[0],
@@ -2596,7 +2596,7 @@ static int add_silence(aClient *sptr, char *mask)
 **      parv[2] = mask
 */
 
-int  m_silence(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_silence)
 {
 	Link *lp;
 	aClient *acptr;
@@ -2679,7 +2679,7 @@ int  m_silence(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	parv[1] - nick to make join
 	parv[2] - channel(s) to join
 */
-int  m_svsjoin(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_svsjoin)
 {
 	aClient *acptr;
 	if (!IsULine(sptr))
@@ -2709,7 +2709,7 @@ int  m_svsjoin(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	parv[1] - nick to make join
 	parv[2] - channel(s) to join
 */
-int  m_sajoin(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_sajoin)
 {
 	aClient *acptr;
 	if (!IsSAdmin(sptr) && !IsULine(sptr))
@@ -2755,7 +2755,7 @@ int  m_sajoin(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	parv[1] - nick to make part
 	parv[2] - channel(s) to part
 */
-int  m_svspart(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_svspart)
 {
 	aClient *acptr;
 	if (!IsULine(sptr))
@@ -2784,7 +2784,7 @@ int  m_svspart(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	parv[1] - nick to make part
 	parv[2] - channel(s) to part
 */
-int  m_sapart(aClient *cptr, aClient *sptr, int parc, char *parv[])
+CMD_FUNC(m_sapart)
 {
 	aClient *acptr;
 	if (!IsSAdmin(sptr) && !IsULine(sptr))