summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/extern.h1
-rw-r--r--include/services.h2
-rw-r--r--src/ircd.c10
-rw-r--r--src/protocol/bahamut.c10
-rw-r--r--src/protocol/bahamut.h2
-rw-r--r--src/protocol/charybdis.c6
-rw-r--r--src/protocol/charybdis.h1
-rw-r--r--src/protocol/inspircd11.c6
-rwxr-xr-xsrc/protocol/inspircd11.h1
-rw-r--r--src/protocol/ratbox.c6
-rw-r--r--src/protocol/ratbox.h1
-rw-r--r--src/protocol/unreal32.c6
-rw-r--r--src/protocol/unreal32.h1
13 files changed, 7 insertions, 46 deletions
diff --git a/include/extern.h b/include/extern.h
index c2949bc79..ef576cf05 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -623,7 +623,6 @@ E void pmodule_cmd_318(void (*func) (const char *source, const char *who));
E void pmodule_cmd_242(void (*func) (const char *buf));
E void pmodule_cmd_243(void (*func) (const char *buf));
E void pmodule_cmd_211(void (*func) (const char *buf));
-E void pmodule_cmd_svid_umode3(void (*func) (User * u, const char *ts));
E void pmodule_cmd_ctcp(void (*func) (const char *source, const char *dest, const char *buf));
E void pmodule_cmd_svsjoin(void (*func) (const char *source, const char *nick, const char *chan, const char *param));
E void pmodule_cmd_svspart(void (*func) (const char *source, const char *nick, const char *chan));
diff --git a/include/services.h b/include/services.h
index cf073e6a4..2e8eecce2 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1073,7 +1073,6 @@ typedef struct ircd_proto_ {
void (*ircd_cmd_242)(const char *buf);
void (*ircd_cmd_243)(const char *buf);
void (*ircd_cmd_211)(const char *buf);
- void (*ircd_cmd_svid_umode3)(User * u, const char *ts);
void (*ircd_cmd_ctcp)(const char *source, const char *dest, const char *buf);
void (*ircd_cmd_svsjoin)(const char *source, const char *nick, const char *chan, const char *param);
void (*ircd_cmd_svspart)(const char *source, const char *nick, const char *chan);
@@ -1358,6 +1357,7 @@ class IRCDProtoNew {
virtual void cmd_svid_umode(const char *, time_t) { }
virtual void cmd_nc_change(User *) { }
virtual void cmd_svid_umode2(User *, const char *) { }
+ virtual void cmd_svid_umode3(User *, const char *) { }
};
/*************************************************************************/
diff --git a/src/ircd.c b/src/ircd.c
index 2ecf0f3f0..52893c8f6 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -63,7 +63,6 @@ void initIrcdProto()
ircdproto.ircd_cmd_242 = NULL;
ircdproto.ircd_cmd_243 = NULL;
ircdproto.ircd_cmd_211 = NULL;
- ircdproto.ircd_cmd_svid_umode3 = NULL;
ircdproto.ircd_cmd_svsjoin = NULL;
ircdproto.ircd_cmd_svspart = NULL;
ircdproto.ircd_cmd_swhois = NULL;
@@ -539,9 +538,9 @@ void anope_cmd_svid_umode2(User *u, const char *ts)
ircdprotonew->cmd_svid_umode2(u, ts);
}
-void anope_cmd_svid_umode3(User * u, const char *ts)
+void anope_cmd_svid_umode3(User *u, const char *ts)
{
- ircdproto.ircd_cmd_svid_umode3(u, ts);
+ ircdprotonew->cmd_svid_umode3(u, ts);
}
void anope_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
@@ -694,11 +693,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
ircdproto.ircd_cmd_211 = func;
}
-void pmodule_cmd_svid_umode3(void (*func) (User * u, const char *ts))
-{
- ircdproto.ircd_cmd_svid_umode3 = func;
-}
-
void pmodule_cmd_ctcp(void (*func) (const char *source, const char *dest, const char *buf))
{
ircdproto.ircd_cmd_ctcp = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index e73e1f148..6b582fb5b 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1193,13 +1193,10 @@ void BahamutIRCdProto::cmd_nc_change(User *u)
common_svsmode(u, "+d", "1");
}
-void bahamut_cmd_svid_umode3(User * u, const char *ts)
+void BahamutIRCdProto::cmd_svid_umode3(User *u, const char *ts)
{
- if (u->svid != u->timestamp) {
- common_svsmode(u, "+rd", ts);
- } else {
- common_svsmode(u, "+r", NULL);
- }
+ if (u->svid != u->timestamp) common_svsmode(u, "+rd", ts);
+ else common_svsmode(u, "+r", NULL);
}
int anope_event_error(const char *source, int ac, const char **av)
@@ -1384,7 +1381,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(bahamut_cmd_242);
pmodule_cmd_243(bahamut_cmd_243);
pmodule_cmd_211(bahamut_cmd_211);
- pmodule_cmd_svid_umode3(bahamut_cmd_svid_umode3);
pmodule_cmd_svsjoin(bahamut_cmd_svsjoin);
pmodule_cmd_svspart(bahamut_cmd_svspart);
pmodule_cmd_swhois(bahamut_cmd_swhois);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 572cd186a..3d4364c19 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -76,7 +76,6 @@ void bahamut_cmd_318(const char *source, const char *who);
void bahamut_cmd_242(const char *buf);
void bahamut_cmd_243(const char *buf);
void bahamut_cmd_211(const char *buf);
-void bahamut_cmd_svid_umode3(User * u, const char *ts);
void bahamut_cmd_eob();
int bahamut_flood_mode_check(const char *value);
void bahamut_cmd_jupe(const char *jserver, const char *who, const char *reason);
@@ -112,4 +111,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
void cmd_svsmode_chan(const char *, const char *, const char *);
void cmd_svid_umode(const char *, time_t);
void cmd_nc_change(User *);
+ void cmd_svid_umode3(User *, const char *);
} ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 538eebe91..7996b849f 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1415,11 +1415,6 @@ void CharybdisProto::cmd_svsnick(const char *oldnick, const char *newnick, time_
send_cmd(NULL, "ENCAP %s RSFNC %s %s %ld %ld", u->server->name, u->nick, newnick, static_cast<long>(when), static_cast<long>(u->timestamp));
}
-void charybdis_cmd_svid_umode3(User * u, const char *ts)
-{
- /* not used */
-}
-
/*
* SVINFO
* parv[0] = sender prefix
@@ -1622,7 +1617,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(charybdis_cmd_242);
pmodule_cmd_243(charybdis_cmd_243);
pmodule_cmd_211(charybdis_cmd_211);
- pmodule_cmd_svid_umode3(charybdis_cmd_svid_umode3);
pmodule_cmd_svsjoin(charybdis_cmd_svsjoin);
pmodule_cmd_svspart(charybdis_cmd_svspart);
pmodule_cmd_swhois(charybdis_cmd_swhois);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index d3c03e97a..d7a948f86 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -64,7 +64,6 @@ void charybdis_cmd_318(const char *source, const char *who);
void charybdis_cmd_242(const char *buf);
void charybdis_cmd_243(const char *buf);
void charybdis_cmd_211(const char *buf);
-void charybdis_cmd_svid_umode3(User * u, const char *ts);
void charybdis_cmd_eob();
int charybdis_flood_mode_check(const char *value);
void charybdis_cmd_jupe(const char *jserver, const char *who, const char *reason);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 93462c315..8ba0dd713 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1492,11 +1492,6 @@ void InspIRCdProto::cmd_svid_umode2(User *u, const char *ts)
common_svsmode(u, "+r", NULL);
}
-void inspircd_cmd_svid_umode3(User * u, const char *ts)
-{
- /* not used */
-}
-
void inspircd_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param)
{
send_cmd(source, "SVSJOIN %s %s", nick, chan);
@@ -1609,7 +1604,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(inspircd_cmd_242);
pmodule_cmd_243(inspircd_cmd_243);
pmodule_cmd_211(inspircd_cmd_211);
- pmodule_cmd_svid_umode3(inspircd_cmd_svid_umode3);
pmodule_cmd_svsjoin(inspircd_cmd_svsjoin);
pmodule_cmd_svspart(inspircd_cmd_svspart);
pmodule_cmd_swhois(inspircd_cmd_swhois);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 6a864f1a6..780271d81 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -69,7 +69,6 @@ void inspircd_cmd_318(const char *source, const char *who);
void inspircd_cmd_242(const char *buf);
void inspircd_cmd_243(const char *buf);
void inspircd_cmd_211(const char *buf);
-void inspircd_cmd_svid_umode3(User * u, const char *ts);
void inspircd_cmd_eob();
int inspircd_flood_mode_check(const char *value);
void inspircd_cmd_jupe(const char *jserver, const char *who, const char *reason);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 64bb8e04c..e2bbb367d 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1321,11 +1321,6 @@ int anope_event_capab(const char *source, int ac, const char **av)
return MOD_CONT;
}
-void ratbox_cmd_svid_umode3(User * u, const char *ts)
-{
- /* not used */
-}
-
/*
* SVINFO
* parv[0] = sender prefix
@@ -1500,7 +1495,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(ratbox_cmd_242);
pmodule_cmd_243(ratbox_cmd_243);
pmodule_cmd_211(ratbox_cmd_211);
- pmodule_cmd_svid_umode3(ratbox_cmd_svid_umode3);
pmodule_cmd_svsjoin(ratbox_cmd_svsjoin);
pmodule_cmd_svspart(ratbox_cmd_svspart);
pmodule_cmd_swhois(ratbox_cmd_swhois);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index b627d5dce..f179d48d9 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -63,7 +63,6 @@ void ratbox_cmd_318(const char *source, const char *who);
void ratbox_cmd_242(const char *buf);
void ratbox_cmd_243(const char *buf);
void ratbox_cmd_211(const char *buf);
-void ratbox_cmd_svid_umode3(User * u, const char *ts);
void ratbox_cmd_eob();
int ratbox_flood_mode_check(const char *value);
void ratbox_cmd_jupe(const char *jserver, const char *who, const char *reason);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index bcfe96ac1..2839fac9d 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1421,11 +1421,6 @@ void UnrealIRCdProto::cmd_svid_umode2(User *u, const char *ts)
else common_svsmode(u, "+r", NULL);
}
-void unreal_cmd_svid_umode3(User * u, const char *ts)
-{
- /* not used */
-}
-
int anope_event_error(const char *source, int ac, const char **av)
{
if (av[0]) {
@@ -1921,7 +1916,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(unreal_cmd_242);
pmodule_cmd_243(unreal_cmd_243);
pmodule_cmd_211(unreal_cmd_211);
- pmodule_cmd_svid_umode3(unreal_cmd_svid_umode3);
pmodule_cmd_svsjoin(unreal_cmd_svsjoin);
pmodule_cmd_svspart(unreal_cmd_svspart);
pmodule_cmd_swhois(unreal_cmd_swhois);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index e1e0b2d5d..1f77f79b0 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -98,7 +98,6 @@ void unreal_cmd_318(const char *source, const char *who);
void unreal_cmd_242(const char *buf);
void unreal_cmd_243(const char *buf);
void unreal_cmd_211(const char *buf);
-void unreal_cmd_svid_umode3(User * u, const char *ts);
void unreal_cmd_eob();
int unreal_flood_mode_check(const char *value);
void unreal_cmd_jupe(const char *jserver, const char *who, const char *reason);