diff options
-rw-r--r-- | include/extern.h | 1 | ||||
-rw-r--r-- | include/services.h | 2 | ||||
-rw-r--r-- | src/ircd.c | 8 | ||||
-rw-r--r-- | src/protocol/bahamut.c | 5 | ||||
-rw-r--r-- | src/protocol/bahamut.h | 2 | ||||
-rw-r--r-- | src/protocol/charybdis.c | 6 | ||||
-rw-r--r-- | src/protocol/charybdis.h | 1 | ||||
-rw-r--r-- | src/protocol/inspircd11.c | 6 | ||||
-rwxr-xr-x | src/protocol/inspircd11.h | 1 | ||||
-rw-r--r-- | src/protocol/ratbox.c | 6 | ||||
-rw-r--r-- | src/protocol/ratbox.h | 1 | ||||
-rw-r--r-- | src/protocol/unreal32.c | 5 | ||||
-rw-r--r-- | src/protocol/unreal32.h | 2 |
13 files changed, 8 insertions, 38 deletions
diff --git a/include/extern.h b/include/extern.h index ca8148093..3b4345a30 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_unban(void (*func) (const char *name, const char *nick)); E void pmodule_cmd_svsmode_chan(void (*func) (const char *name, const char *mode, const char *nick)); E void pmodule_cmd_svid_umode(void (*func) (const char *nick, time_t ts)); E void pmodule_cmd_nc_change(void (*func) (User * u)); diff --git a/include/services.h b/include/services.h index 8054f81e8..4bc80fe3e 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_unban)(const char *name, const char *nick); void (*ircd_cmd_svsmode_chan)(const char *name, const char *mode, const char *nick); void (*ircd_cmd_svid_umode)(const char *nick, time_t ts); void (*ircd_cmd_nc_change)(User * u); @@ -1358,6 +1357,7 @@ class IRCDProtoNew { virtual void cmd_unszline(const char *) { } virtual void cmd_szline(const char *, const char *, const char *) { } virtual void cmd_sgline(const char *, const char *) { } + virtual void cmd_unban(const char *, const char *) { } }; /*************************************************************************/ diff --git a/src/ircd.c b/src/ircd.c index e7cefcc4f..07347f908 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_unban = NULL; ircdproto.ircd_cmd_svsmode_chan = NULL; ircdproto.ircd_cmd_svid_umode = NULL; ircdproto.ircd_cmd_nc_change = NULL; @@ -521,7 +520,7 @@ void anope_cmd_sgline(const char *mask, const char *reason) void anope_cmd_unban(const char *name, const char *nick) { - ircdproto.ircd_cmd_unban(name, nick); + ircdprotonew->cmd_unban(name, nick); } void anope_cmd_svsmode_chan(const char *name, const char *mode, const char *nick) @@ -699,11 +698,6 @@ void pmodule_cmd_211(void (*func) (const char *buf)) ircdproto.ircd_cmd_211 = func; } -void pmodule_cmd_unban(void (*func) (const char *name, const char *nick)) -{ - ircdproto.ircd_cmd_unban = func; -} - void pmodule_cmd_svsmode_chan(void (*func) (const char *name, const char *mode, const char *nick)) { diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 8b1a31698..08dd5e74e 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -492,9 +492,9 @@ void BahamutIRCdProto::cmd_release_svshold(const char *nick) } /* SVSMODE -b */ -void bahamut_cmd_unban(const char *name, const char *nick) +void BahamutIRCdProto::cmd_unban(const char *name, const char *nick) { - bahamut_cmd_svsmode_chan(name, "-b", nick); + bahamut_cmd_svsmode_chan(name, "-b", nick); } @@ -1395,7 +1395,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(bahamut_cmd_242); pmodule_cmd_243(bahamut_cmd_243); pmodule_cmd_211(bahamut_cmd_211); - pmodule_cmd_unban(bahamut_cmd_unban); pmodule_cmd_svsmode_chan(bahamut_cmd_svsmode_chan); pmodule_cmd_svid_umode(bahamut_cmd_svid_umode); pmodule_cmd_nc_change(bahamut_cmd_nc_change); diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h index b35c7bb81..946611ecd 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_unban(const char *name, const char *nick); 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); @@ -113,4 +112,5 @@ class BahamutIRCdProto : public IRCDProtoNew { void cmd_unszline(const char *); void cmd_szline(const char *, const char *, const char *); void cmd_sgline(const char *, const char *); + void cmd_unban(const char *, const char *); } ircd_proto; diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 42b0c995e..e3594c2e8 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_unban(const char *name, const char *nick) -{ - /* Not Supported by this IRCD */ -} - /* SVSMODE channel modes */ void charybdis_cmd_svsmode_chan(const char *name, const char *mode, const char *nick) @@ -1654,7 +1649,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(charybdis_cmd_242); pmodule_cmd_243(charybdis_cmd_243); pmodule_cmd_211(charybdis_cmd_211); - pmodule_cmd_unban(charybdis_cmd_unban); pmodule_cmd_svsmode_chan(charybdis_cmd_svsmode_chan); pmodule_cmd_svid_umode(charybdis_cmd_svid_umode); pmodule_cmd_nc_change(charybdis_cmd_nc_change); diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h index c990cfa62..5c0fc0cbe 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_unban(const char *name, const char *nick); 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); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index a9b2d4820..eb45b2681 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -1479,11 +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); } -void inspircd_cmd_unban(const char *name, const char *nick) -{ - /* Not Supported by this IRCD */ -} - /* SVSMODE channel modes */ void inspircd_cmd_svsmode_chan(const char *name, const char *mode, const char *nick) @@ -1634,7 +1629,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(inspircd_cmd_242); pmodule_cmd_243(inspircd_cmd_243); pmodule_cmd_211(inspircd_cmd_211); - pmodule_cmd_unban(inspircd_cmd_unban); pmodule_cmd_svsmode_chan(inspircd_cmd_svsmode_chan); pmodule_cmd_svid_umode(inspircd_cmd_svid_umode); pmodule_cmd_nc_change(inspircd_cmd_nc_change); diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h index 424f816a3..d065c0075 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_unban(const char *name, const char *nick); 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); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index ea51a22df..8938c2a7f 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_unban(const char *name, const char *nick) -{ - /* Not Supported by this IRCD */ -} - /* SVSMODE channel modes */ void ratbox_cmd_svsmode_chan(const char *name, const char *mode, const char *nick) @@ -1532,7 +1527,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(ratbox_cmd_242); pmodule_cmd_243(ratbox_cmd_243); pmodule_cmd_211(ratbox_cmd_211); - pmodule_cmd_unban(ratbox_cmd_unban); pmodule_cmd_svsmode_chan(ratbox_cmd_svsmode_chan); pmodule_cmd_svid_umode(ratbox_cmd_svid_umode); pmodule_cmd_nc_change(ratbox_cmd_nc_change); diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h index a53dc817d..442409a3e 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_unban(const char *name, const char *nick); 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); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 9625b542e..f0f34730a 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -1384,9 +1384,9 @@ void UnrealIRCdProto::cmd_sgline(const char *mask, const char *reason) } /* SVSMODE -b */ -void unreal_cmd_unban(const char *name, const char *nick) +void UnrealIRCdProto::cmd_unban(const char *name, const char *nick) { - unreal_cmd_svsmode_chan(name, "-b", nick); + unreal_cmd_svsmode_chan(name, "-b", nick); } @@ -1934,7 +1934,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(unreal_cmd_242); pmodule_cmd_243(unreal_cmd_243); pmodule_cmd_211(unreal_cmd_211); - pmodule_cmd_unban(unreal_cmd_unban); pmodule_cmd_svsmode_chan(unreal_cmd_svsmode_chan); pmodule_cmd_svid_umode(unreal_cmd_svid_umode); pmodule_cmd_nc_change(unreal_cmd_nc_change); diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h index c6a0d87a4..4cb4a9cb1 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_unban(const char *name, const char *nick); 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); @@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew { void cmd_unszline(const char *); void cmd_szline(const char *, const char *, const char *); void cmd_sgline(const char *, const char *); + void cmd_unban(const char *, const char *); } ircd_proto; |