From 50f7429fda7cb3ffd8c34abb0a13f3dcc929f2ed Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 8 Oct 2017 12:46:05 -0400 Subject: Fix some compiler warnings --- modules/protocol/bahamut.cpp | 27 ++++++++++++++------------- modules/protocol/charybdis.cpp | 35 +++++++++++++++++++---------------- modules/protocol/hybrid.cpp | 26 ++++++++++++++------------ modules/protocol/inspircd20.cpp | 13 +++++++------ modules/protocol/ngircd.cpp | 17 +++++++++-------- modules/protocol/plexus.cpp | 31 +++++++++++++++++-------------- modules/protocol/ratbox.cpp | 24 +++++++++++++----------- modules/protocol/rfc1459.cpp | 1 - modules/protocol/unreal.cpp | 26 ++++++++++++++------------ 9 files changed, 107 insertions(+), 93 deletions(-) (limited to 'modules/protocol') diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp index fa41ebc39..211570ccb 100644 --- a/modules/protocol/bahamut.cpp +++ b/modules/protocol/bahamut.cpp @@ -576,23 +576,11 @@ class ProtoBahamut : public Module , message_sjoin(this) , message_topic(this) - , sender_akill(this) - , sender_akill_del(this) - , sender_channel(this) , sender_global_notice(this) , sender_global_privmsg(this) , sender_invite(this) - , sender_join(this) , sender_kick(this) - , sender_kill(this) - , sender_login(this) - , sender_logout(this) - , sender_mode_channel(this) - , sender_mode_user(this) , sender_nickchange(this) - , sender_nickintroduction(this) - , sender_noop(this) - , sender_topic(this) , sender_notice(this) , sender_part(this) , sender_ping(this) @@ -600,16 +588,29 @@ class ProtoBahamut : public Module , sender_privmsg(this) , sender_quit(this) , sender_server(this) + , sender_squit(this) + + , sender_akill(this) + , sender_akill_del(this) + , sender_channel(this) + , sender_join(this) + , sender_kill(this) + , sender_login(this) + , sender_logout(this) + , sender_mode_channel(this) + , sender_mode_user(this) + , sender_nickintroduction(this) + , sender_noop(this) , sender_sgline(this) , sender_sgline_del(this) , sender_sqline(this) , sender_sqline_del(this) , sender_szline(this) , sender_szline_del(this) - , sender_squit(this) , sender_svshold(this) , sender_svsholddel(this) , sender_svsnick(this) + , sender_topic(this) , sender_wallops(this) { IRCD = &ircd_proto; diff --git a/modules/protocol/charybdis.cpp b/modules/protocol/charybdis.cpp index adb8b0a54..862fdf44b 100644 --- a/modules/protocol/charybdis.cpp +++ b/modules/protocol/charybdis.cpp @@ -356,43 +356,46 @@ class ProtoCharybdis : public Module , message_tmode(this) , message_uid(this) - , sender_akill(this) - , sender_akill_del(this) - , sender_channel(this) - , sender_global_notice(this) - , sender_global_privmsg(this) , sender_invite(this) - , sender_join(this) , sender_kick(this) , sender_svskill(this) - , sender_login(this) - , sender_logout(this) , sender_mode_chan(this) , sender_mode_user(this) , sender_nickchange(this) - , sender_nickintroduction(this) , sender_notice(this) , sender_part(this) , sender_ping(this) , sender_pong(this) , sender_privmsg(this) , sender_quit(this) + , sender_squit(this) + + , sender_akill(this) + , sender_akill_del(this) + , sender_channel(this) + , sender_global_notice(this) + , sender_global_privmsg(this) + , sender_join(this) , sender_server(this) - , sender_sasl(this) - , sender_sasl_mechs(this) , sender_sgline(this) , sender_sgline_del(this) - , sender_sqline(this) - , sender_sqline_del(this) - , sender_squit(this) , sender_svshold(this) , sender_svsholddel(this) - , sender_svslogin(this) + + , sender_login(this) + , sender_logout(this) + , sender_sqline(this) + , sender_sqline_del(this) , sender_svsnick(this) , sender_topic(this) + , sender_wallops(this) + + , sender_nickintroduction(this) + , sender_sasl(this) + , sender_sasl_mechs(this) + , sender_svslogin(this) , sender_vhost_del(this) , sender_vhost_set(this) - , sender_wallops(this) { IRCD = &ircd_proto; } diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp index 23e5d279b..76cad6fd3 100644 --- a/modules/protocol/hybrid.cpp +++ b/modules/protocol/hybrid.cpp @@ -678,6 +678,8 @@ public: , message_topic(this) , message_version(this) , message_whois(this) + + , message_certfp(this) , message_bmask(this) , message_eob(this) , message_join(this) @@ -691,7 +693,18 @@ public: , message_tburst(this) , message_tmode(this) , message_uid(this) - , message_certfp(this) + + , sender_kick(this) + , sender_svskill(this) + , sender_mode_chan(this) + , sender_nickchange(this) + , sender_notice(this) + , sender_part(this) + , sender_ping(this) + , sender_pong(this) + , sender_privmsg(this) + , sender_quit(this) + , sender_squit(this) , sender_akill(this) , sender_akill_del(this) @@ -700,20 +713,10 @@ public: , sender_global_privmsg(this) , sender_invite(this) , sender_join(this) - , sender_kick(this) - , sender_svskill(this) , sender_login(this) , sender_logout(this) - , sender_mode_chan(this) , sender_mode_user(this) - , sender_nickchange(this) , sender_nickintroduction(this) - , sender_notice(this) - , sender_part(this) - , sender_ping(this) - , sender_pong(this) - , sender_privmsg(this) - , sender_quit(this) , sender_server(this) , sender_sgline(this) , sender_sgline_del(this) @@ -721,7 +724,6 @@ public: , sender_sqline_del(this) , sender_szline(this) , sender_szline_del(this) - , sender_squit(this) , sender_svshold(this) , sender_svsholddel(this) , sender_svsnick(this) diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index 6baebb34c..774d214c6 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -1404,26 +1404,27 @@ class ProtoInspIRCd20 : public Module , message_time(this) , message_uid(this) - , sender_akill(this, &ircd_proto) - , sender_akill_del(this, &ircd_proto) - , sender_channel(this) , sender_global_notice(this) , sender_global_privmsg(this) , sender_invite(this) , sender_kick(this) , sender_svskill(this) - , sender_login(this) - , sender_logout(this) , sender_mode_chan(this) , sender_mode_user(this) , sender_nickchange(this) - , sender_nickintroduction(this) , sender_notice(this) , sender_part(this) , sender_ping(this) , sender_pong(this) , sender_privmsg(this) + , sender_quit(this) + , sender_akill(this, &ircd_proto) + , sender_akill_del(this, &ircd_proto) + , sender_channel(this) + , sender_login(this) + , sender_logout(this) + , sender_nickintroduction(this) , sender_server(this) , sender_sasl(this) , sender_sasl_mechs(this) diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp index e33df21bd..bbb594ff8 100644 --- a/modules/protocol/ngircd.cpp +++ b/modules/protocol/ngircd.cpp @@ -533,6 +533,7 @@ class ProtongIRCd : public Module , message_squit(this) , message_stats(this) , message_time(this) + , message_topic(this) , message_version(this) , message_whois(this) @@ -545,19 +546,13 @@ class ProtongIRCd : public Module , message_njoin(this) , message_pong(this) , message_server(this) - , message_topic(this) - , sender_akill(this) - , sender_akill_del(this) - , sender_channel(this) , sender_global_notice(this) , sender_global_privmsg(this) , sender_invite(this) , sender_join(this) , sender_kick(this) , sender_svskill(this) - , sender_login(this) - , sender_logout(this) , sender_mode_chan(this) , sender_mode_user(this) , sender_nickchange(this) @@ -569,11 +564,17 @@ class ProtongIRCd : public Module , sender_quit(this) , sender_server(this) , sender_squit(this) - , sender_svsnick(this) , sender_topic(this) + , sender_wallops(this) + + , sender_akill(this) + , sender_akill_del(this) + , sender_channel(this) + , sender_login(this) + , sender_logout(this) + , sender_svsnick(this) , sender_vhost_del(this) , sender_vhost_set(this) - , sender_wallops(this) { Servers::Capab.insert("QS"); diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp index 5743ef50e..a36f7f2c2 100644 --- a/modules/protocol/plexus.cpp +++ b/modules/protocol/plexus.cpp @@ -383,35 +383,39 @@ class ProtoPlexus : public Module , message_tmode(this) , message_uid(this) - , sender_akill(this) - , sender_akill_del(this) - , sender_channel(this) - , sender_global_notice(this) - , sender_global_privmsg(this) , sender_invite(this) - , sender_join(this) , sender_kick(this) , sender_svskill(this) - , sender_login(this) - , sender_logout(this) , sender_mode_chan(this) - , sender_mode_user(this) , sender_nickchange(this) - , sender_nickintroduction(this) - , sender_noop(this) - , sender_sasl(this) , sender_notice(this) , sender_part(this) , sender_ping(this) , sender_pong(this) , sender_privmsg(this) , sender_quit(this) + , sender_squit(this) + + , sender_akill(this) + , sender_akill_del(this) + , sender_channel(this) + , sender_global_notice(this) + , sender_global_privmsg(this) + , sender_join(this) , sender_server(this) , sender_sqline(this) , sender_sqline_del(this) - , sender_squit(this) , sender_svshold(this) , sender_svsholddel(this) + + , sender_login(this) + , sender_logout(this) + , sender_wallops(this) + + , sender_mode_user(this) + , sender_nickintroduction(this) + , sender_noop(this) + , sender_sasl(this) , sender_svsjoin(this) , sender_svslogin(this) , sender_svsnick(this) @@ -419,7 +423,6 @@ class ProtoPlexus : public Module , sender_topic(this) , sender_vhost_del(this) , sender_vhost_set(this) - , sender_wallops(this) { IRCD = &ircd_proto; } diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp index fcfca05dd..4541419b7 100644 --- a/modules/protocol/ratbox.cpp +++ b/modules/protocol/ratbox.cpp @@ -357,33 +357,35 @@ class ProtoRatbox : public Module , message_tmode(this) , message_uid(this) - , sender_akill(this) - , sender_akill_del(this) - , sender_channel(this) - , sender_global_notice(this) - , sender_global_privmsg(this) , sender_invite(this) - , sender_join(this) , sender_kick(this) , sender_svskill(this) - , sender_login(this) - , sender_logout(this) , sender_mode_chan(this) - , sender_mode_user(this) , sender_nickchange(this) - , sender_nickintroduction(this) , sender_notice(this) , sender_part(this) , sender_ping(this) , sender_pong(this) , sender_privmsg(this) , sender_quit(this) + , sender_squit(this) + + , sender_akill(this) + , sender_akill_del(this) + , sender_channel(this) + , sender_global_notice(this) + , sender_global_privmsg(this) + , sender_join(this) + , sender_mode_user(this) , sender_server(this) , sender_sgline(this) , sender_sgline_del(this) + + , sender_login(this) + , sender_logout(this) + , sender_nickintroduction(this) , sender_sqline(this) , sender_sqline_del(this) - , sender_squit(this) , sender_svsnick(this) , sender_topic(this) , sender_wallops(this) diff --git a/modules/protocol/rfc1459.cpp b/modules/protocol/rfc1459.cpp index 77f3dedc3..4519447b3 100644 --- a/modules/protocol/rfc1459.cpp +++ b/modules/protocol/rfc1459.cpp @@ -505,7 +505,6 @@ void Privmsg::Run(MessageSource &source, const std::vector ¶m } else if (message.substr(0, 9).equals_ci("\1VERSION\1")) { - Module *enc = ModuleManager::FindFirstOf(ENCRYPTION); IRCD->SendCTCPReply(bi, u->nick, "VERSION Anope-{0}", Anope::Version()); } return; diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp index 44a5d1a41..bf4a6a8a8 100644 --- a/modules/protocol/unreal.cpp +++ b/modules/protocol/unreal.cpp @@ -1207,39 +1207,41 @@ class ProtoUnreal : public Module , message_uid(this) , message_umode2(this) - , sender_akill(this) - , sender_akill_del(this) - , sender_channel(this) , sender_global_notice(this) , sender_global_privmsg(this) , sender_invite(this) - , sender_join(this) , sender_kick(this) - , sender_svskill(this) - , sender_login(this) - , sender_logout(this) , sender_mode_chan(this) - , sender_mode_user(this) , sender_nickchange(this) - , sender_nickintroduction(this) - , sender_noop(this) , sender_notice(this) , sender_part(this) , sender_ping(this) , sender_pong(this) , sender_privmsg(this) , sender_quit(this) + , sender_squit(this) + + , sender_noop(this) + , sender_svsnick(this) + + , sender_akill(this) + , sender_akill_del(this) + , sender_channel(this) + , sender_join(this) + , sender_svskill(this) + , sender_login(this) + , sender_logout(this) + , sender_mode_user(this) + , sender_nickintroduction(this) , sender_server(this) , sender_sasl(this) , sender_sgline(this) , sender_sgline_del(this) , sender_sqline(this) , sender_sqline_del(this) - , sender_squit(this) , sender_svshold(this) , sender_svsholddel(this) , sender_svsjoin(this) - , sender_svsnick(this) , sender_svspart(this) , sender_swhois(this) , sender_topic(this) -- cgit