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 | 7 | ||||
| -rw-r--r-- | src/protocol/charybdis.c | 6 | ||||
| -rw-r--r-- | src/protocol/inspircd11.c | 6 | ||||
| -rw-r--r-- | src/protocol/ratbox.c | 6 | ||||
| -rw-r--r-- | src/protocol/unreal32.c | 5 | ||||
| -rw-r--r-- | src/protocol/unreal32.h | 1 |
9 files changed, 5 insertions, 37 deletions
diff --git a/include/extern.h b/include/extern.h index 37301573b..a8222add6 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_swhois(void (*func) (const char *source, const char *who, const char *mask)); E void pmodule_cmd_eob(void (*func) ()); E void pmodule_cmd_jupe(void (*func) (const char *jserver, const char *who, const char *reason)); E void pmodule_set_umode(void (*func) (User * user, int ac, const char **av)); diff --git a/include/services.h b/include/services.h index 0ead7dcad..fa43c3749 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_swhois)(const char *source, const char *who, const char *mask); void (*ircd_cmd_eob)(); void (*ircd_cmd_jupe)(const char *jserver, const char *who, const char *reason); void (*ircd_set_umode)(User *user, int ac, const char **av); @@ -1364,6 +1363,7 @@ class IRCDProtoNew { } virtual void cmd_svsjoin(const char *, const char *, const char *, const char *) { } virtual void cmd_svspart(const char *, const char *, const char *) { } + virtual void cmd_swhois(const char *, const char *, const char *) { } }; /*************************************************************************/ diff --git a/src/ircd.c b/src/ircd.c index 464613369..c00ff25ba 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_swhois = NULL; ircdproto.ircd_cmd_eob = NULL; ircdproto.ircd_flood_mode_check = NULL; ircdproto.ircd_cmd_jupe = NULL; @@ -552,7 +551,7 @@ void anope_cmd_svspart(const char *source, const char *nick, const char *chan) void anope_cmd_swhois(const char *source, const char *who, const char *mask) { - ircdproto.ircd_cmd_swhois(source, who, mask); + ircdprotonew->cmd_swhois(source, who, mask); } void anope_cmd_eob() @@ -689,11 +688,6 @@ void pmodule_cmd_211(void (*func) (const char *buf)) ircdproto.ircd_cmd_211 = func; } -void pmodule_cmd_swhois(void (*func) (const char *source, const char *who, const char *mask)) -{ - ircdproto.ircd_cmd_swhois = func; -} - void pmodule_cmd_eob(void (*func) ()) { ircdproto.ircd_cmd_eob = func; diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 123fb81fb..d2c41f555 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -1230,12 +1230,6 @@ int anope_event_pass(const char *source, int ac, const char **av) return MOD_CONT; } -void bahamut_cmd_swhois(const char *source, const char *who, const char *mask) -{ - /* not supported */ -} - - void bahamut_cmd_eob() { send_cmd(NULL, "BURST 0"); @@ -1358,7 +1352,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(bahamut_cmd_242); pmodule_cmd_243(bahamut_cmd_243); pmodule_cmd_211(bahamut_cmd_211); - pmodule_cmd_swhois(bahamut_cmd_swhois); pmodule_cmd_eob(bahamut_cmd_eob); pmodule_flood_mode_check(bahamut_flood_mode_check); pmodule_cmd_jupe(bahamut_cmd_jupe); diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 00787eb8d..55629527e 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -1437,11 +1437,6 @@ int anope_event_pass(const char *source, int ac, const char **av) return MOD_CONT; } -void charybdis_cmd_swhois(const char *source, const char *who, const char *mask) -{ - /* not supported */ -} - int anope_event_notice(const char *source, int ac, const char **av) { return MOD_CONT; @@ -1593,7 +1588,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(charybdis_cmd_242); pmodule_cmd_243(charybdis_cmd_243); pmodule_cmd_211(charybdis_cmd_211); - pmodule_cmd_swhois(charybdis_cmd_swhois); pmodule_cmd_eob(charybdis_cmd_eob); pmodule_flood_mode_check(charybdis_flood_mode_check); pmodule_cmd_jupe(charybdis_cmd_jupe); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 5b0f3a859..095b3cf18 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -1502,11 +1502,6 @@ void InspIRCdProto::cmd_svspart(const char *source, const char *nick, const char send_cmd(source, "SVSPART %s %s", nick, chan); } -void inspircd_cmd_swhois(const char *source, const char *who, const char *mask) -{ - /* Not used currently */ -} - void inspircd_cmd_eob() { send_cmd(NULL, "ENDBURST"); @@ -1589,7 +1584,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(inspircd_cmd_242); pmodule_cmd_243(inspircd_cmd_243); pmodule_cmd_211(inspircd_cmd_211); - pmodule_cmd_swhois(inspircd_cmd_swhois); pmodule_cmd_eob(inspircd_cmd_eob); pmodule_flood_mode_check(inspircd_flood_mode_check); pmodule_cmd_jupe(inspircd_cmd_jupe); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index b2b4d23ba..a81b00a55 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -1343,11 +1343,6 @@ int anope_event_pass(const char *source, int ac, const char **av) return MOD_CONT; } -void ratbox_cmd_swhois(const char *source, const char *who, const char *mask) -{ - /* not supported */ -} - int anope_event_notice(const char *source, int ac, const char **av) { return MOD_CONT; @@ -1470,7 +1465,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(ratbox_cmd_242); pmodule_cmd_243(ratbox_cmd_243); pmodule_cmd_211(ratbox_cmd_211); - pmodule_cmd_swhois(ratbox_cmd_swhois); pmodule_cmd_eob(ratbox_cmd_eob); pmodule_flood_mode_check(ratbox_flood_mode_check); pmodule_cmd_jupe(ratbox_cmd_jupe); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 1f7818295..8494c2c7b 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -1512,9 +1512,9 @@ int anope_event_sjoin(const char *source, int ac, const char **av) return MOD_CONT; } -void unreal_cmd_swhois(const char *source, const char *who, const char *mask) +void UnrealIRCdProto::cmd_swhois(const char *source, const char *who, const char *mask) { - send_cmd(source, "%s %s :%s", send_token("SWHOIS", "BA"), who, mask); + send_cmd(source, "%s %s :%s", send_token("SWHOIS", "BA"), who, mask); } void unreal_cmd_eob() @@ -1900,7 +1900,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(unreal_cmd_242); pmodule_cmd_243(unreal_cmd_243); pmodule_cmd_211(unreal_cmd_211); - pmodule_cmd_swhois(unreal_cmd_swhois); pmodule_cmd_eob(unreal_cmd_eob); pmodule_flood_mode_check(unreal_flood_mode_check); pmodule_cmd_jupe(unreal_cmd_jupe); diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h index 1005e7bd6..a506688a7 100644 --- a/src/protocol/unreal32.h +++ b/src/protocol/unreal32.h @@ -139,4 +139,5 @@ class UnrealIRCdProto : public IRCDProtoNew { void cmd_svid_umode2(User *, const char *); void cmd_svsjoin(const char *, const char *, const char *, const char *); void cmd_svspart(const char *, const char *, const char *); + void cmd_swhois(const char *, const char *, const char *); } ircd_proto; |