diff options
-rw-r--r-- | include/extern.h | 1 | ||||
-rw-r--r-- | include/services.h | 2 | ||||
-rw-r--r-- | src/ircd.c | 10 | ||||
-rw-r--r-- | src/protocol/bahamut.c | 5 | ||||
-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 | 7 | ||||
-rwxr-xr-x | src/protocol/inspircd11.h | 2 | ||||
-rw-r--r-- | src/protocol/ratbox.c | 8 | ||||
-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, 12 insertions, 42 deletions
diff --git a/include/extern.h b/include/extern.h index 07ac4d2d0..c687c6225 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_nc_change(void (*func) (User * u)); E void pmodule_cmd_svid_umode2(void (*func) (User * u, const char *ts)); 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)); diff --git a/include/services.h b/include/services.h index 1478bf18f..5931ebd06 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_nc_change)(User * u); void (*ircd_cmd_svid_umode2)(User * u, const char *ts); void (*ircd_cmd_svid_umode3)(User * u, const char *ts); void (*ircd_cmd_ctcp)(const char *source, const char *dest, const char *buf); @@ -1358,6 +1357,7 @@ class IRCDProtoNew { virtual void cmd_unban(const char *, const char *) { } virtual void cmd_svsmode_chan(const char *, const char *, const char *) { } virtual void cmd_svid_umode(const char *, time_t) { } + virtual void cmd_nc_change(User *) { } }; /*************************************************************************/ diff --git a/src/ircd.c b/src/ircd.c index a5bf448ce..d07da44a8 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_nc_change = NULL; ircdproto.ircd_cmd_svid_umode2 = NULL; ircdproto.ircd_cmd_svid_umode3 = NULL; ircdproto.ircd_cmd_svsjoin = NULL; @@ -531,9 +530,9 @@ void anope_cmd_svid_umode(const char *nick, time_t ts) ircdprotonew->cmd_svid_umode(nick, ts); } -void anope_cmd_nc_change(User * u) +void anope_cmd_nc_change(User *u) { - ircdproto.ircd_cmd_nc_change(u); + ircdprotonew->cmd_nc_change(u); } void anope_cmd_svid_umode2(User * u, const char *ts) @@ -696,11 +695,6 @@ void pmodule_cmd_211(void (*func) (const char *buf)) ircdproto.ircd_cmd_211 = func; } -void pmodule_cmd_nc_change(void (*func) (User * u)) -{ - ircdproto.ircd_cmd_nc_change = func; -} - void pmodule_cmd_svid_umode2(void (*func) (User * u, const char *ts)) { ircdproto.ircd_cmd_svid_umode2 = func; diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 752867263..b9503a2ac 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -1188,9 +1188,9 @@ void BahamutIRCdProto::cmd_svid_umode(const char *nick, time_t ts) /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void bahamut_cmd_nc_change(User * u) +void BahamutIRCdProto::cmd_nc_change(User *u) { - common_svsmode(u, "+d", "1"); + common_svsmode(u, "+d", "1"); } /* SVSMODE +d */ @@ -1391,7 +1391,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(bahamut_cmd_242); pmodule_cmd_243(bahamut_cmd_243); pmodule_cmd_211(bahamut_cmd_211); - pmodule_cmd_nc_change(bahamut_cmd_nc_change); pmodule_cmd_svid_umode2(bahamut_cmd_svid_umode2); pmodule_cmd_svid_umode3(bahamut_cmd_svid_umode3); pmodule_cmd_svsjoin(bahamut_cmd_svsjoin); diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h index 1d5d1cdb1..e990d8ea0 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_nc_change(User * u); void bahamut_cmd_svid_umode2(User * u, const char *ts); void bahamut_cmd_svid_umode3(User * u, const char *ts); void bahamut_cmd_eob(); @@ -113,4 +112,5 @@ class BahamutIRCdProto : public IRCDProtoNew { void cmd_unban(const char *, const char *); void cmd_svsmode_chan(const char *, const char *, const char *); void cmd_svid_umode(const char *, time_t); + void cmd_nc_change(User *); } ircd_proto; diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 895f01196..6b398601c 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -1416,13 +1416,6 @@ void CharybdisProto::cmd_svsnick(const char *oldnick, const char *newnick, time_ } /* SVSMODE +d */ -/* nc_change was = 1, and there is no na->status */ -void charybdis_cmd_nc_change(User * u) -{ - /* not supported */ -} - -/* SVSMODE +d */ void charybdis_cmd_svid_umode2(User * u, const char *ts) { /* not supported */ @@ -1635,7 +1628,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(charybdis_cmd_242); pmodule_cmd_243(charybdis_cmd_243); pmodule_cmd_211(charybdis_cmd_211); - pmodule_cmd_nc_change(charybdis_cmd_nc_change); pmodule_cmd_svid_umode2(charybdis_cmd_svid_umode2); pmodule_cmd_svid_umode3(charybdis_cmd_svid_umode3); pmodule_cmd_svsjoin(charybdis_cmd_svsjoin); diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h index 4312f6036..8b44d7aa4 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_nc_change(User * u); void charybdis_cmd_svid_umode2(User * u, const char *ts); void charybdis_cmd_svid_umode3(User * u, const char *ts); void charybdis_cmd_eob(); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 7bf70b45b..118b24f07 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -1481,11 +1481,9 @@ void inspircd_cmd_szline(const char *mask, const char *reason, const char *whom) /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void inspircd_cmd_nc_change(User * u) +void InspIRCdProto::cmd_nc_change(User *u) { - if (debug) - alog("debug: common_svsmode(1)"); - common_svsmode(u, "-r", NULL); + common_svsmode(u, "-r", NULL); } /* SVSMODE +r */ @@ -1613,7 +1611,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(inspircd_cmd_242); pmodule_cmd_243(inspircd_cmd_243); pmodule_cmd_211(inspircd_cmd_211); - pmodule_cmd_nc_change(inspircd_cmd_nc_change); pmodule_cmd_svid_umode2(inspircd_cmd_svid_umode2); pmodule_cmd_svid_umode3(inspircd_cmd_svid_umode3); pmodule_cmd_svsjoin(inspircd_cmd_svsjoin); diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h index f91b65296..0e0fbd9e4 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_nc_change(User * u); void inspircd_cmd_svid_umode2(User * u, const char *ts); void inspircd_cmd_svid_umode3(User * u, const char *ts); void inspircd_cmd_eob(); @@ -114,4 +113,5 @@ class InspIRCdProto : public IRCDProtoNew { void cmd_release_svshold(const char *); void cmd_unszline(const char *); void cmd_szline(const char *, const char *, const char *); + void cmd_nc_change(User *); } ircd_proto; diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 66049896f..03bc09e56 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -1322,13 +1322,6 @@ int anope_event_capab(const char *source, int ac, const char **av) } /* SVSMODE +d */ -/* nc_change was = 1, and there is no na->status */ -void ratbox_cmd_nc_change(User * u) -{ - /* not supported */ -} - -/* SVSMODE +d */ void ratbox_cmd_svid_umode2(User * u, const char *ts) { /* not supported */ @@ -1513,7 +1506,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(ratbox_cmd_242); pmodule_cmd_243(ratbox_cmd_243); pmodule_cmd_211(ratbox_cmd_211); - pmodule_cmd_nc_change(ratbox_cmd_nc_change); pmodule_cmd_svid_umode2(ratbox_cmd_svid_umode2); pmodule_cmd_svid_umode3(ratbox_cmd_svid_umode3); pmodule_cmd_svsjoin(ratbox_cmd_svsjoin); diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h index 2c5771a4d..175a00d33 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_nc_change(User * u); void ratbox_cmd_svid_umode2(User * u, const char *ts); void ratbox_cmd_svid_umode3(User * u, const char *ts); void ratbox_cmd_eob(); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index bbc2f47c4..72589ad90 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -1409,9 +1409,9 @@ void UnrealIRCdProto::cmd_svid_umode(const char *nick, time_t ts) /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void unreal_cmd_nc_change(User * u) +void UnrealIRCdProto::cmd_nc_change(User *u) { - common_svsmode(u, "-r+d", "1"); + common_svsmode(u, "-r+d", "1"); } /* SVSMODE +r */ @@ -1924,7 +1924,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(unreal_cmd_242); pmodule_cmd_243(unreal_cmd_243); pmodule_cmd_211(unreal_cmd_211); - pmodule_cmd_nc_change(unreal_cmd_nc_change); pmodule_cmd_svid_umode2(unreal_cmd_svid_umode2); pmodule_cmd_svid_umode3(unreal_cmd_svid_umode3); pmodule_cmd_svsjoin(unreal_cmd_svsjoin); diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h index 681bdf92f..1d98b972c 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_nc_change(User * u); void unreal_cmd_svid_umode2(User * u, const char *ts); void unreal_cmd_svid_umode3(User * u, const char *ts); void unreal_cmd_eob(); @@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew { void cmd_unban(const char *, const char *); void cmd_svsmode_chan(const char *, const char *, const char *); void cmd_svid_umode(const char *, time_t); + void cmd_nc_change(User *); } ircd_proto; |