From 760bafdac31c91e7f86d40a29349e26623f49d8b Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Wed, 10 Feb 2016 20:14:22 -0600
Subject: [PATCH] extensions: update for API change

---
 extensions/example_module.c | 20 +++++++++----------
 extensions/helpops.c        |  8 ++++----
 extensions/hurt.c           | 16 ++++++++--------
 extensions/m_42.c           |  4 ++--
 extensions/m_adminwall.c    |  8 ++++----
 extensions/m_extendchans.c  |  8 ++++----
 extensions/m_findforwards.c |  4 ++--
 extensions/m_identify.c     |  4 ++--
 extensions/m_mkpasswd.c     |  8 ++++----
 extensions/m_ojoin.c        |  4 ++--
 extensions/m_okick.c        |  4 ++--
 extensions/m_omode.c        |  4 ++--
 extensions/m_opme.c         |  4 ++--
 extensions/m_remove.c       |  4 ++--
 extensions/m_roleplay.c     | 38 ++++++++++++++++++-------------------
 extensions/m_sendbans.c     |  4 ++--
 extensions/m_webirc.c       |  4 ++--
 17 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/extensions/example_module.c b/extensions/example_module.c
index f30bac30..4d88f390 100644
--- a/extensions/example_module.c
+++ b/extensions/example_module.c
@@ -37,11 +37,11 @@
  * parv     == an array of the parameters
  */
 
-static int munreg_test(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int mclient_test(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int mserver_test(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int mrclient_test(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int moper_test(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int munreg_test(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int mclient_test(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int mserver_test(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int mrclient_test(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int moper_test(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 /* Show the commands this module can handle in a msgtab
  * and give the msgtab a name, here its test_msgtab
@@ -158,7 +158,7 @@ DECLARE_MODULE_AV1(
  * and the fairly normal C coding
  */
 static int
-munreg_test(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+munreg_test(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	if(parc < 2)
 	{
@@ -180,7 +180,7 @@ munreg_test(struct Client *client_p, struct Client *source_p, int parc, const ch
  *      parv[1] = parameter
  */
 static int
-mclient_test(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mclient_test(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	if(parc < 2)
 	{
@@ -202,7 +202,7 @@ mclient_test(struct Client *client_p, struct Client *source_p, int parc, const c
  *      parv[1] = parameter
  */
 static int
-mrclient_test(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mrclient_test(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	if(parc < 2)
 	{
@@ -220,7 +220,7 @@ mrclient_test(struct Client *client_p, struct Client *source_p, int parc, const
  *      parv[1] = parameter
  */
 static int
-mserver_test(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mserver_test(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	if(parc < 2)
 	{
@@ -238,7 +238,7 @@ mserver_test(struct Client *client_p, struct Client *source_p, int parc, const c
  *      parv[1] = parameter
  */
 static int
-moper_test(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+moper_test(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	if(parc < 2)
 	{
diff --git a/extensions/helpops.c b/extensions/helpops.c
index 316fa957..6238adef 100644
--- a/extensions/helpops.c
+++ b/extensions/helpops.c
@@ -20,8 +20,8 @@ static void h_hdl_new_remote_user(struct Client *client_p);
 static void h_hdl_client_exit(hook_data_client_exit *hdata);
 static void h_hdl_umode_changed(hook_data_umode_changed *hdata);
 static void h_hdl_whois(hook_data_client *hdata);
-static int mo_dehelper(struct Client *, struct Client *, int, const char **);
-static int me_dehelper(struct Client *, struct Client *, int, const char **);
+static int mo_dehelper(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int me_dehelper(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static int do_dehelper(struct Client *source_p, struct Client *target_p);
 
 mapi_hfn_list_av1 helpops_hfnlist[] = {
@@ -43,7 +43,7 @@ struct Message dehelper_msgtab = {
 
 mapi_clist_av1 helpops_clist[] = { &dehelper_msgtab, NULL };
 
-static int mo_dehelper(struct Client *client_p, struct Client *source_p, int parc, const char **parv)
+static int mo_dehelper(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv)
 {
 	struct Client *target_p;
 
@@ -68,7 +68,7 @@ static int mo_dehelper(struct Client *client_p, struct Client *source_p, int par
 	return 0;
 }
 
-static int me_dehelper(struct Client *client_p, struct Client *source_p, int parc, const char **parv)
+static int me_dehelper(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv)
 {
 	struct Client *target_p = find_person(parv[1]);
 	if(!target_p)
diff --git a/extensions/hurt.c b/extensions/hurt.c
index ca187346..a12041f1 100644
--- a/extensions/hurt.c
+++ b/extensions/hurt.c
@@ -49,10 +49,10 @@ typedef struct _hurt {
 /* }}} */
 
 /* {{{ Prototypes */
-static int mo_hurt(struct Client *, struct Client *, int, const char **);
-static int me_hurt(struct Client *, struct Client *, int, const char **);
-static int mo_heal(struct Client *, struct Client *, int, const char **);
-static int me_heal(struct Client *, struct Client *, int, const char **);
+static int mo_hurt(struct MsgBuf *msgbuf_p, struct Client *, struct Client *, int, const char **);
+static int me_hurt(struct MsgBuf *msgbuf_p, struct Client *, struct Client *, int, const char **);
+static int mo_heal(struct MsgBuf *msgbuf_p, struct Client *, struct Client *, int, const char **);
+static int me_heal(struct MsgBuf *msgbuf_p, struct Client *, struct Client *, int, const char **);
 
 static int modinit(void);
 static void modfini(void);
@@ -178,7 +178,7 @@ modfini(void)
  * parv[3] - reason or NULL
  */
 static int
-mo_hurt(struct Client *client_p, struct Client *source_p,
+mo_hurt(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 		int parc, const char **parv)
 {
 	const char			*ip, *expire, *reason;
@@ -262,7 +262,7 @@ mo_hurt(struct Client *client_p, struct Client *source_p,
  * parv[3] - reason
  */
 static int
-me_hurt(struct Client *client_p, struct Client *source_p,
+me_hurt(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 		int parc, const char **parv)
 {
 	time_t				expire_time;
@@ -299,7 +299,7 @@ me_hurt(struct Client *client_p, struct Client *source_p,
  * parv[1] - nick or ip
  */
 static int
-mo_heal(struct Client *client_p, struct Client *source_p,
+mo_heal(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 		int parc, const char **parv)
 {
 	struct Client *target_p;
@@ -352,7 +352,7 @@ mo_heal(struct Client *client_p, struct Client *source_p,
 /* }}} */
 
 static int
-me_heal(struct Client *client_p, struct Client *source_p,
+me_heal(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 		int parc, const char **parv)
 {
 	struct Client *target_p;
diff --git a/extensions/m_42.c b/extensions/m_42.c
index e19b0b9f..e30fb267 100644
--- a/extensions/m_42.c
+++ b/extensions/m_42.c
@@ -11,7 +11,7 @@
 #include "ircd.h"
 #include "send.h"
 
-static int mclient_42(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int mclient_42(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 struct Message hgtg_msgtab = {
   "42", 0, 0, 0, MFLG_SLOW,
@@ -26,7 +26,7 @@ DECLARE_MODULE_AV1(42, NULL, NULL, hgtg_clist, NULL, NULL, "Revision 0.42");
 
 
 static int
-mclient_42(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mclient_42(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	sendto_one_notice(source_p, ":The Answer to Life, the Universe, and Everything.");
 	return 0;
diff --git a/extensions/m_adminwall.c b/extensions/m_adminwall.c
index 42920634..dd423b16 100644
--- a/extensions/m_adminwall.c
+++ b/extensions/m_adminwall.c
@@ -39,8 +39,8 @@
 #include "s_serv.h"
 #include "messages.h"
 
-static int mo_adminwall(struct Client *, struct Client *, int, const char **);
-static int me_adminwall(struct Client *, struct Client *, int, const char **);
+static int mo_adminwall(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int me_adminwall(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message adminwall_msgtab = {
 	"ADMINWALL", 0, 0, 0, MFLG_SLOW,
@@ -58,7 +58,7 @@ DECLARE_MODULE_AV1(adminwall, NULL, NULL, adminwall_clist, NULL, NULL, "$Revisio
  */
 
 static int
-mo_adminwall(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_adminwall(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
         if(!IsAdmin(source_p))
         {
@@ -72,7 +72,7 @@ mo_adminwall(struct Client *client_p, struct Client *source_p, int parc, const c
 }
 
 static int
-me_adminwall(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+me_adminwall(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
         sendto_wallops_flags(UMODE_ADMIN, source_p, "ADMINWALL - %s", parv[1]);
         return 0;
diff --git a/extensions/m_extendchans.c b/extensions/m_extendchans.c
index 9dd33def..c5326e8d 100644
--- a/extensions/m_extendchans.c
+++ b/extensions/m_extendchans.c
@@ -31,8 +31,8 @@
 #include "send.h"
 #include "numeric.h"
 
-static int mo_extendchans(struct Client *, struct Client *, int, const char **);
-static int me_extendchans(struct Client *, struct Client *, int, const char **);
+static int mo_extendchans(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int me_extendchans(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message extendchans_msgtab = {
 	"EXTENDCHANS", 0, 0, 0, MFLG_SLOW,
@@ -44,7 +44,7 @@ mapi_clist_av1 extendchans_clist[] = { &extendchans_msgtab, NULL };
 DECLARE_MODULE_AV1(extendchans, NULL, NULL, extendchans_clist, NULL, NULL, "$Revision: $");
 
 static int
-mo_extendchans(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_extendchans(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *target_p;
 
@@ -84,7 +84,7 @@ mo_extendchans(struct Client *client_p, struct Client *source_p, int parc, const
 }
 
 static int
-me_extendchans(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+me_extendchans(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *target_p;
 
diff --git a/extensions/m_findforwards.c b/extensions/m_findforwards.c
index 82b391ed..d2779815 100644
--- a/extensions/m_findforwards.c
+++ b/extensions/m_findforwards.c
@@ -36,7 +36,7 @@
 #include "packet.h"
 #include "messages.h"
 
-static int m_findforwards(struct Client *client_p, struct Client *source_p,
+static int m_findforwards(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 			int parc, const char *parv[]);
 
 struct Message findforwards_msgtab = {
@@ -53,7 +53,7 @@ DECLARE_MODULE_AV1(findforwards, NULL, NULL, findforwards_clist, NULL, NULL, "$R
 **      parv[1] = channel
 */
 static int
-m_findforwards(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_findforwards(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	static time_t last_used = 0;
 	struct Channel *chptr;
diff --git a/extensions/m_identify.c b/extensions/m_identify.c
index b2385408..5ac5cada 100644
--- a/extensions/m_identify.c
+++ b/extensions/m_identify.c
@@ -49,7 +49,7 @@
 #define SVS_chanserv_NICK "ChanServ"
 #define SVS_nickserv_NICK "NickServ"
 
-static int m_identify(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_identify(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 struct Message identify_msgtab = {
 	"IDENTIFY", 0, 0, 0, MFLG_SLOW,
@@ -63,7 +63,7 @@ mapi_clist_av1 identify_clist[] = {
 
 DECLARE_MODULE_AV1(identify, NULL, NULL, identify_clist, NULL, NULL, "$Revision: 2729 $");
 
-static int m_identify(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static int m_identify(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	const char *nick;
 	struct Client *target_p;
diff --git a/extensions/m_mkpasswd.c b/extensions/m_mkpasswd.c
index 80fe64f8..147a4634 100644
--- a/extensions/m_mkpasswd.c
+++ b/extensions/m_mkpasswd.c
@@ -15,9 +15,9 @@
 
 #include <string.h>
 
-static int m_mkpasswd(struct Client *client_p, struct Client *source_p,
+static int m_mkpasswd(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 		      int parc, const char *parv[]);
-static int mo_mkpasswd(struct Client *client_p, struct Client *source_p,
+static int mo_mkpasswd(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 		       int parc, const char *parv[]);
 
 static char *make_md5_salt(int);
@@ -44,7 +44,7 @@ DECLARE_MODULE_AV1(mkpasswd, NULL, NULL, mkpasswd_clist, NULL, NULL, "$Revision$
  *	parv[2] = type
  */
 static int
-m_mkpasswd(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_mkpasswd(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	static time_t last_used = 0;
 	char *salt;
@@ -95,7 +95,7 @@ m_mkpasswd(struct Client *client_p, struct Client *source_p, int parc, const cha
  *	parv[2] = type
  */
 static int
-mo_mkpasswd(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_mkpasswd(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	char *salt;
 	const char *crypted;
diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 37a09050..430faa31 100644
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -37,7 +37,7 @@
 #include "modules.h"
 #include "messages.h"
 
-static int mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 
 struct Message ojoin_msgtab = {
@@ -54,7 +54,7 @@ DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3554
 **      parv[1] = channel
 */
 static int
-mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr;
 	int move_me = 0;
diff --git a/extensions/m_okick.c b/extensions/m_okick.c
index 2a72e952..63f1010d 100644
--- a/extensions/m_okick.c
+++ b/extensions/m_okick.c
@@ -40,7 +40,7 @@
 #include "messages.h"
 #include "logger.h"
 
-static int mo_okick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int mo_okick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 
 struct Message okick_msgtab = {
@@ -59,7 +59,7 @@ DECLARE_MODULE_AV1(okick, NULL, NULL, okick_clist, NULL, NULL, "$Revision: 3554
 **      parv[3] = kick comment
 */
 static int
-mo_okick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_okick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *who;
 	struct Client *target_p;
diff --git a/extensions/m_omode.c b/extensions/m_omode.c
index d6e5dfbc..af39ae88 100644
--- a/extensions/m_omode.c
+++ b/extensions/m_omode.c
@@ -44,7 +44,7 @@
 #include "messages.h"
 #include "logger.h"
 
-static int mo_omode(struct Client *, struct Client *, int, const char **);
+static int mo_omode(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message omode_msgtab = {
 	"OMODE", 0, 0, 0, MFLG_SLOW,
@@ -60,7 +60,7 @@ DECLARE_MODULE_AV1(omode, NULL, NULL, omode_clist, NULL, NULL, "$Revision: 3121
  * parv[1] - channel
  */
 static int
-mo_omode(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_omode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr = NULL;
 	struct membership *msptr;
diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index 533984dd..81790769 100644
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -36,7 +36,7 @@
 #include "s_newconf.h"
 #include "messages.h"
 
-static int mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int mo_opme(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 struct Message opme_msgtab = {
 	"OPME", 0, 0, 0, MFLG_SLOW,
@@ -53,7 +53,7 @@ DECLARE_MODULE_AV1(opme, NULL, NULL, opme_clist, NULL, NULL, "$Revision: 3554 $"
 **      parv[1] = channel
 */
 static int
-mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_opme(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr;
 	struct membership *msptr;
diff --git a/extensions/m_remove.c b/extensions/m_remove.c
index 29c33b40..025460cb 100644
--- a/extensions/m_remove.c
+++ b/extensions/m_remove.c
@@ -44,7 +44,7 @@
 unsigned int CAP_REMOVE;
 static char part_buf[REASONLEN + 1];
 
-static int m_remove(struct Client *, struct Client *, int, const char **);
+static int m_remove(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static void remove_quote_part(hook_data_privmsg_channel *);
 
 struct Message remove_msgtab = {
@@ -75,7 +75,7 @@ moddeinit(void)
 DECLARE_MODULE_AV1(remove, modinit, moddeinit, remove_clist, NULL, remove_hfnlist, "$Revision: 3317 $");
 
 static int
-m_remove(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_remove(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct membership *msptr;
 	struct Client *who;
diff --git a/extensions/m_roleplay.c b/extensions/m_roleplay.c
index 73ae6218..b4894901 100644
--- a/extensions/m_roleplay.c
+++ b/extensions/m_roleplay.c
@@ -29,13 +29,13 @@
 #include "packet.h"
 #include "messages.h"
 
-static int m_scene(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_fsay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_faction(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_npc(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_npca(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_displaymsg(struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text);
-static int me_roleplay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_scene(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_fsay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_faction(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_npc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_npca(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int m_displaymsg(struct MsgBuf *msgbuf_p, struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text);
+static int me_roleplay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static unsigned int mymode;
 
 static int
@@ -98,42 +98,42 @@ mapi_clist_av1 roleplay_clist[] = { &scene_msgtab, &ambiance_msgtab, &fsay_msgta
 DECLARE_MODULE_AV1(roleplay, _modinit, _moddeinit, roleplay_clist, NULL, NULL, "$m_roleplay$");
 
 static int
-m_scene(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_scene(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	m_displaymsg(source_p, parv[1], 0, 0, "=Scene=", parv[2]);
+	m_displaymsg(msgbuf_p, source_p, parv[1], 0, 0, "=Scene=", parv[2]);
 	return 0;
 }
 
 static int
-m_fsay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_fsay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	m_displaymsg(source_p, parv[1], 0, 0, parv[2], parv[3]);
+	m_displaymsg(msgbuf_p, source_p, parv[1], 0, 0, parv[2], parv[3]);
 	return 0;
 }
 
 static int
-m_faction(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_faction(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	m_displaymsg(source_p, parv[1], 0, 1, parv[2], parv[3]);
+	m_displaymsg(msgbuf_p, source_p, parv[1], 0, 1, parv[2], parv[3]);
 	return 0;
 }
 
 static int
-m_npc(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_npc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	m_displaymsg(source_p, parv[1], 1, 0, parv[2], parv[3]);
+	m_displaymsg(msgbuf_p, source_p, parv[1], 1, 0, parv[2], parv[3]);
 	return 0;
 }
 
 static int
-m_npca(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_npca(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	m_displaymsg(source_p, parv[1], 1, 1, parv[2], parv[3]);
+	m_displaymsg(msgbuf_p, source_p, parv[1], 1, 1, parv[2], parv[3]);
 	return 0;
 }
 
 static int
-m_displaymsg(struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text)
+m_displaymsg(struct MsgBuf *msgbuf_p, struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text)
 {
 	struct Channel *chptr;
 	struct membership *msptr;
@@ -212,7 +212,7 @@ m_displaymsg(struct Client *source_p, const char *channel, int underline, int ac
 }
 
 static int
-me_roleplay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+me_roleplay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr;
 
diff --git a/extensions/m_sendbans.c b/extensions/m_sendbans.c
index 16cb5eb9..a6d35216 100644
--- a/extensions/m_sendbans.c
+++ b/extensions/m_sendbans.c
@@ -45,7 +45,7 @@
 #include "messages.h"
 #include "irc_radixtree.h"
 
-static int mo_sendbans(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int mo_sendbans(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 struct Message sendbans_msgtab = {
 	"SENDBANS", 0, 0, 0, MFLG_SLOW,
@@ -83,7 +83,7 @@ static const char *expand_xline(const char *mask)
 	return buf;
 }
 
-static int mo_sendbans(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static int mo_sendbans(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct ConfItem *aconf;
 	rb_dlink_node *ptr;
diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index 1aeba3ca..881c7066 100644
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -55,7 +55,7 @@
 #include "s_conf.h"
 #include "reject.h"
 
-static int mr_webirc(struct Client *, struct Client *, int, const char **);
+static int mr_webirc(struct MsgBuf *msgbuf_p, struct Client *, struct Client *, int, const char **);
 
 struct Message webirc_msgtab = {
 	"WEBIRC", 0, 0, 0, MFLG_SLOW | MFLG_UNREG,
@@ -73,7 +73,7 @@ DECLARE_MODULE_AV1(webirc, NULL, NULL, webirc_clist, NULL, NULL, "$Revision: 207
  *	parv[4] = fake ip
  */
 static int
-mr_webirc(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct ConfItem *aconf;
 	const char *encr;