diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ircd.c | 9 | ||||
-rw-r--r-- | src/protocol/bahamut.c | 12 | ||||
-rw-r--r-- | src/protocol/bahamut.h | 2 | ||||
-rw-r--r-- | src/protocol/charybdis.c | 8 | ||||
-rw-r--r-- | src/protocol/charybdis.h | 1 | ||||
-rw-r--r-- | src/protocol/inspircd11.c | 9 | ||||
-rwxr-xr-x | src/protocol/inspircd11.h | 1 | ||||
-rw-r--r-- | src/protocol/ratbox.c | 8 | ||||
-rw-r--r-- | src/protocol/ratbox.h | 1 | ||||
-rw-r--r-- | src/protocol/unreal32.c | 14 | ||||
-rw-r--r-- | src/protocol/unreal32.h | 2 |
11 files changed, 11 insertions, 56 deletions
diff --git a/src/ircd.c b/src/ircd.c index 07347f908..2445b5c6e 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_svsmode_chan = NULL; ircdproto.ircd_cmd_svid_umode = NULL; ircdproto.ircd_cmd_nc_change = NULL; ircdproto.ircd_cmd_svid_umode2 = NULL; @@ -525,7 +524,7 @@ void anope_cmd_unban(const char *name, const char *nick) void anope_cmd_svsmode_chan(const char *name, const char *mode, const char *nick) { - ircdproto.ircd_cmd_svsmode_chan(name, mode, nick); + ircdprotonew->cmd_svsmode_chan(name, mode, nick); } void anope_cmd_svid_umode(const char *nick, time_t ts) @@ -698,12 +697,6 @@ void pmodule_cmd_211(void (*func) (const char *buf)) ircdproto.ircd_cmd_211 = func; } -void -pmodule_cmd_svsmode_chan(void (*func) (const char *name, const char *mode, const char *nick)) -{ - ircdproto.ircd_cmd_svsmode_chan = func; -} - void pmodule_cmd_svid_umode(void (*func) (const char *nick, time_t ts)) { ircdproto.ircd_cmd_svid_umode = func; diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 08dd5e74e..4394877ac 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -494,19 +494,16 @@ void BahamutIRCdProto::cmd_release_svshold(const char *nick) /* SVSMODE -b */ void BahamutIRCdProto::cmd_unban(const char *name, const char *nick) { - bahamut_cmd_svsmode_chan(name, "-b", nick); + cmd_svsmode_chan(name, "-b", nick); } /* SVSMODE channel modes */ -void bahamut_cmd_svsmode_chan(const char *name, const char *mode, const char *nick) +void BahamutIRCdProto::cmd_svsmode_chan(const char *name, const char *mode, const char *nick) { - if (nick) { - send_cmd(ServerName, "SVSMODE %s %s %s", name, mode, nick); - } else { - send_cmd(ServerName, "SVSMODE %s %s", name, mode); - } + if (nick) send_cmd(ServerName, "SVSMODE %s %s %s", name, mode, nick); + else send_cmd(ServerName, "SVSMODE %s %s", name, mode); } void BahamutIRCdProto::cmd_bot_chan_mode(const char *nick, const char *chan) @@ -1395,7 +1392,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(bahamut_cmd_242); pmodule_cmd_243(bahamut_cmd_243); pmodule_cmd_211(bahamut_cmd_211); - pmodule_cmd_svsmode_chan(bahamut_cmd_svsmode_chan); pmodule_cmd_svid_umode(bahamut_cmd_svid_umode); pmodule_cmd_nc_change(bahamut_cmd_nc_change); pmodule_cmd_svid_umode2(bahamut_cmd_svid_umode2); diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h index 946611ecd..2f0c0ddea 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_svsmode_chan(const char *name, const char *mode, const char *nick); void bahamut_cmd_svid_umode(const char *nick, time_t ts); void bahamut_cmd_nc_change(User * u); void bahamut_cmd_svid_umode2(User * u, const char *ts); @@ -113,4 +112,5 @@ class BahamutIRCdProto : public IRCDProtoNew { void cmd_szline(const char *, const char *, const char *); void cmd_sgline(const char *, const char *); void cmd_unban(const char *, const char *); + void cmd_svsmode_chan(const char *, const char *, const char *); } ircd_proto; diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index e3594c2e8..15d07e36b 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -1415,13 +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)); } -/* SVSMODE channel modes */ - -void charybdis_cmd_svsmode_chan(const char *name, const char *mode, const char *nick) -{ - /* Not Supported by this IRCD */ -} - /* SVSMODE +d */ /* sent if svid is something weird */ void charybdis_cmd_svid_umode(const char *nick, time_t ts) @@ -1649,7 +1642,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(charybdis_cmd_242); pmodule_cmd_243(charybdis_cmd_243); pmodule_cmd_211(charybdis_cmd_211); - pmodule_cmd_svsmode_chan(charybdis_cmd_svsmode_chan); pmodule_cmd_svid_umode(charybdis_cmd_svid_umode); pmodule_cmd_nc_change(charybdis_cmd_nc_change); pmodule_cmd_svid_umode2(charybdis_cmd_svid_umode2); diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h index 5c0fc0cbe..605058dbb 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_svsmode_chan(const char *name, const char *mode, const char *nick); void charybdis_cmd_svid_umode(const char *nick, time_t ts); void charybdis_cmd_nc_change(User * u); void charybdis_cmd_svid_umode2(User * u, const char *ts); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index eb45b2681..dfdc28e87 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -1479,14 +1479,6 @@ void inspircd_cmd_szline(const char *mask, const char *reason, const char *whom) send_cmd(ServerName, "ADDLINE Z %s %s %ld 0 :%s", mask, whom, static_cast<long>(time(NULL)), reason); } -/* SVSMODE channel modes */ - -void inspircd_cmd_svsmode_chan(const char *name, const char *mode, const char *nick) -{ - /* Not Supported by this IRCD */ -} - - /* SVSMODE +d */ /* sent if svid is something weird */ void inspircd_cmd_svid_umode(const char *nick, time_t ts) @@ -1629,7 +1621,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(inspircd_cmd_242); pmodule_cmd_243(inspircd_cmd_243); pmodule_cmd_211(inspircd_cmd_211); - pmodule_cmd_svsmode_chan(inspircd_cmd_svsmode_chan); pmodule_cmd_svid_umode(inspircd_cmd_svid_umode); pmodule_cmd_nc_change(inspircd_cmd_nc_change); pmodule_cmd_svid_umode2(inspircd_cmd_svid_umode2); diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h index d065c0075..2949c62a4 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_svsmode_chan(const char *name, const char *mode, const char *nick); void inspircd_cmd_svid_umode(const char *nick, time_t ts); void inspircd_cmd_nc_change(User * u); void inspircd_cmd_svid_umode2(User * u, const char *ts); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 8938c2a7f..d188dc535 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -1321,13 +1321,6 @@ int anope_event_capab(const char *source, int ac, const char **av) return MOD_CONT; } -/* SVSMODE channel modes */ - -void ratbox_cmd_svsmode_chan(const char *name, const char *mode, const char *nick) -{ - /* Not Supported by this IRCD */ -} - /* SVSMODE +d */ /* sent if svid is something weird */ void ratbox_cmd_svid_umode(const char *nick, time_t ts) @@ -1527,7 +1520,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(ratbox_cmd_242); pmodule_cmd_243(ratbox_cmd_243); pmodule_cmd_211(ratbox_cmd_211); - pmodule_cmd_svsmode_chan(ratbox_cmd_svsmode_chan); pmodule_cmd_svid_umode(ratbox_cmd_svid_umode); pmodule_cmd_nc_change(ratbox_cmd_nc_change); pmodule_cmd_svid_umode2(ratbox_cmd_svid_umode2); diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h index 442409a3e..841fca049 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_svsmode_chan(const char *name, const char *mode, const char *nick); void ratbox_cmd_svid_umode(const char *nick, time_t ts); void ratbox_cmd_nc_change(User * u); void ratbox_cmd_svid_umode2(User * u, const char *ts); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index f0f34730a..695a6d324 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -1386,21 +1386,16 @@ void UnrealIRCdProto::cmd_sgline(const char *mask, const char *reason) /* SVSMODE -b */ void UnrealIRCdProto::cmd_unban(const char *name, const char *nick) { - unreal_cmd_svsmode_chan(name, "-b", nick); + cmd_svsmode_chan(name, "-b", nick); } /* SVSMODE channel modes */ -void unreal_cmd_svsmode_chan(const char *name, const char *mode, const char *nick) +void UnrealIRCdProto::cmd_svsmode_chan(const char *name, const char *mode, const char *nick) { - if (nick) { - send_cmd(ServerName, "%s %s %s %s", send_token("SVSMODE", "n"), - name, mode, nick); - } else { - send_cmd(ServerName, "%s %s %s", send_token("SVSMODE", "n"), name, - mode); - } + if (nick) send_cmd(ServerName, "%s %s %s %s", send_token("SVSMODE", "n"), name, mode, nick); + else send_cmd(ServerName, "%s %s %s", send_token("SVSMODE", "n"), name, mode); } @@ -1934,7 +1929,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(unreal_cmd_242); pmodule_cmd_243(unreal_cmd_243); pmodule_cmd_211(unreal_cmd_211); - pmodule_cmd_svsmode_chan(unreal_cmd_svsmode_chan); pmodule_cmd_svid_umode(unreal_cmd_svid_umode); pmodule_cmd_nc_change(unreal_cmd_nc_change); pmodule_cmd_svid_umode2(unreal_cmd_svid_umode2); diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h index 4cb4a9cb1..0cf8cf572 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_svsmode_chan(const char *name, const char *mode, const char *nick); void unreal_cmd_svid_umode(const char *nick, time_t ts); void unreal_cmd_nc_change(User * u); void unreal_cmd_svid_umode2(User * u, const char *ts); @@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew { void cmd_szline(const char *, const char *, const char *); void cmd_sgline(const char *, const char *); void cmd_unban(const char *, const char *); + void cmd_svsmode_chan(const char *, const char *, const char *); } ircd_proto; |