diff options
| author | 2021-08-17 21:13:05 +0100 | |
|---|---|---|
| committer | 2021-08-17 21:13:05 +0100 | |
| commit | 8e6d811f34146ab4591e9ca88d5b84cf0c4bca52 (patch) | |
| tree | f2fb6c6422c962468b4e4930186e494d6f570e28 /src | |
| parent | Fix the Detach method which got borked during a rebase. (diff) | |
Remove a bunch of unnecessary whitespace.
Diffstat (limited to 'src')
42 files changed, 0 insertions, 53 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index d75cc6303..0264fef1f 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -509,7 +509,6 @@ bool Membership::SetPrefix(PrefixMode* delta_mh, bool adding) return adding; } - void Membership::WriteNotice(const std::string& text) const { LocalUser* const localuser = IS_LOCAL(user); diff --git a/src/configparser.cpp b/src/configparser.cpp index 65ee663ae..59a8d7f6c 100644 --- a/src/configparser.cpp +++ b/src/configparser.cpp @@ -79,7 +79,6 @@ class FileWrapper } }; - struct Parser { ParseStack& stack; diff --git a/src/configreader.cpp b/src/configreader.cpp index 55e2ce985..ed1463147 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -525,7 +525,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid) return; } - // If there were errors processing configuration, don't touch modules. if (!valid) return; diff --git a/src/coremods/core_channel/extban.cpp b/src/coremods/core_channel/extban.cpp index f9ae24eca..255c8bbdc 100644 --- a/src/coremods/core_channel/extban.cpp +++ b/src/coremods/core_channel/extban.cpp @@ -70,7 +70,6 @@ ModResult ExtBanManager::GetStatus(ExtBan::Acting* extban, User* user, Channel* return MOD_RES_PASSTHRU; } - void ExtBanManager::DelExtBan(ExtBan::Base* extban) { byletter.erase(extban->GetLetter()); diff --git a/src/coremods/core_info/core_info.cpp b/src/coremods/core_info/core_info.cpp index 673eed725..40885c1f9 100644 --- a/src/coremods/core_info/core_info.cpp +++ b/src/coremods/core_info/core_info.cpp @@ -52,7 +52,6 @@ class CoreModInfo : public Module CommandVersion cmdversion; Numeric::Numeric numeric004; - /** Returns a list of user or channel mode characters. * Used for constructing the parts of the mode list in the 004 numeric. * @param mt Controls whether to list user modes or channel modes diff --git a/src/coremods/core_list.cpp b/src/coremods/core_list.cpp index 460478fed..0fedbefd1 100644 --- a/src/coremods/core_list.cpp +++ b/src/coremods/core_list.cpp @@ -61,7 +61,6 @@ class CommandList : public Command CmdResult Handle(User* user, const Params& parameters) override; }; - CmdResult CommandList::Handle(User* user, const Params& parameters) { // C: Searching based on creation time, via the "C<val" and "C>val" modifiers diff --git a/src/coremods/core_message.cpp b/src/coremods/core_message.cpp index 6bfed4326..910491819 100644 --- a/src/coremods/core_message.cpp +++ b/src/coremods/core_message.cpp @@ -24,7 +24,6 @@ #include "inspircd.h" - class MessageDetailsImpl : public MessageDetails { public: diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp index 2bee6f22b..bc694fcd6 100644 --- a/src/coremods/core_oper/cmd_kill.cpp +++ b/src/coremods/core_oper/cmd_kill.cpp @@ -148,7 +148,6 @@ RouteDescriptor CommandKill::GetRouting(User* user, const Params& parameters) return ROUTE_BROADCAST; } - void CommandKill::EncodeParameter(std::string& param, unsigned int index) { // Manually translate the nick -> uuid (see above), and also the reason (params[1]) diff --git a/src/coremods/core_user/core_user.h b/src/coremods/core_user/core_user.h index 577a9e505..406559a61 100644 --- a/src/coremods/core_user/core_user.h +++ b/src/coremods/core_user/core_user.h @@ -78,7 +78,6 @@ class CommandIson : public SplitCommand CmdResult HandleLocal(LocalUser* user, const Params& parameters) override; }; - class CommandNick : public SplitCommand { public: diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp index 6b6d90b5e..80d12fa9a 100644 --- a/src/coremods/core_whois.cpp +++ b/src/coremods/core_whois.cpp @@ -82,8 +82,6 @@ class CommandWhois : public SplitCommand /** How to handle private/secret channels in the WHOIS response. */ SplitWhoisState splitwhois; - - CommandWhois(Module* parent) : SplitCommand(parent, "WHOIS", 1) , secretmode(parent, "secret") diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index dc8dacc59..6f68b615f 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -136,7 +136,6 @@ size_t irc::find(const std::string& haystack, const std::string& needle) return std::string::npos; } - bool irc::insensitive_swo::operator()(const std::string& a, const std::string& b) const { std::string::size_type asize = a.size(); diff --git a/src/inspircd.cpp b/src/inspircd.cpp index f1864f000..98ff0329c 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -490,7 +490,6 @@ InspIRCd::InspIRCd(int argc, char** argv) Logs.AddLogTypes("*", fls, true); } - if (!FindConfigFile(ConfigFileName)) { this->Logs.Log("STARTUP", LOG_DEFAULT, "Unable to open config file %s", ConfigFileName.c_str()); diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 480347fd2..6fc7b9624 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -513,7 +513,6 @@ IOHook* StreamSocket::GetLastHook() const return last; } - void StreamSocket::AddIOHook(IOHook* newhook) { IOHook* curr = GetIOHook(); diff --git a/src/logger.cpp b/src/logger.cpp index 989efd11f..f60bed2f7 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -291,7 +291,6 @@ void LogManager::Log(const std::string &type, LogLevel loglevel, const std::stri Logging = false; } - FileWriter::FileWriter(FILE* logfile, unsigned int flushcount) : log(logfile) , flush(flushcount) diff --git a/src/mode.cpp b/src/mode.cpp index ab5b2f8e6..5fa1e9332 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -133,7 +133,6 @@ ModeAction SimpleUserMode::OnModeChange(User* source, User* dest, Channel* chann return MODEACTION_ALLOW; } - ModeAction SimpleChannelMode::OnModeChange(User* source, User* dest, Channel* channel, Modes::Change& change) { /* We're either trying to add a mode we already have or diff --git a/src/modules.cpp b/src/modules.cpp index 6e77c5edf..f76dca5b6 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -208,7 +208,6 @@ bool ModuleManager::Detach(Implementation i, Module* mod) return stdalgo::erase(EventHandlers[i], mod); } - void ModuleManager::Attach(Implementation* i, Module* mod, size_t sz) { for (size_t n = 0; n < sz; ++n) diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 2d2f4c991..75adbd4e3 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -237,7 +237,6 @@ namespace OpenSSL } } - long GetDefaultContextOptions() const { return ctx_options; diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index e04d3a3de..660601ac9 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -260,7 +260,6 @@ class ModuleAlias : public Module } } - int DoAlias(User *user, Channel *c, const Alias& a, const std::string& compare, const std::string& safe) { std::string stripped(compare); diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index a86e0c0a5..49c8539b5 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -323,7 +323,6 @@ public: if (!stdalgo::vector::swaperase(dat2->wholistsme, dat)) ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (4)"); - user->WriteNotice(whotoremove->nick + " is no longer on your accept list"); return true; } @@ -348,7 +347,6 @@ class CallerIDAPIImpl : public CallerID::APIBase } }; - class ModuleCallerID : public Module , public CTCTags::EventListener diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index 333cda05f..c8f5546e0 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -82,7 +82,6 @@ class CommandChghost : public Command } }; - class ModuleChgHost : public Module { private: diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp index 945453137..e54034732 100644 --- a/src/modules/m_cycle.cpp +++ b/src/modules/m_cycle.cpp @@ -78,7 +78,6 @@ class CommandCycle : public SplitCommand } }; - class ModuleCycle : public Module { private: diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 829a34de2..b4411502b 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -64,7 +64,6 @@ class DelayJoinMode final void RevealUser(User* user, Channel* chan); }; - namespace { diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 830d89f49..cbda03229 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -644,7 +644,6 @@ void ModuleFilter::ReadConfig(ConfigStatus& status) factory = RegexEngine ? (RegexEngine.operator->()) : NULL; - RegexEngine.SetEngine(newrxengine); if (!RegexEngine) { diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 321ad7659..25b11396a 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -35,7 +35,6 @@ enum ERR_UNAVAILRESOURCE = 437 }; - class KickRejoinData { struct KickedUser diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp index bc79a3089..902ec2d11 100644 --- a/src/modules/m_md5.cpp +++ b/src/modules/m_md5.cpp @@ -228,7 +228,6 @@ class MD5Provider : public HashProvider buf[3] += d; } - void MyMD5(void *dest, void *orig, size_t len) { MD5Context context; diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp index 1de897082..96a3cdd7d 100644 --- a/src/modules/m_nationalchars.cpp +++ b/src/modules/m_nationalchars.cpp @@ -53,7 +53,6 @@ char utf8checkrest(unsigned char* mb, unsigned char cnt) return cnt + 1; } - char utf8size(unsigned char * mb) { if (!*mb) @@ -69,7 +68,6 @@ char utf8size(unsigned char * mb) return -1; } - /* Conditions added */ bool lwbNickHandler::Call(const std::string& nick) { @@ -219,7 +217,6 @@ bool lwbNickHandler::Call(const std::string& nick) return (p < ServerInstance->Config->Limits.MaxNick); } - class ModuleNationalChars : public Module { std::string charset; diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp index b599c258d..36472abb4 100644 --- a/src/modules/m_opermotd.cpp +++ b/src/modules/m_opermotd.cpp @@ -78,7 +78,6 @@ class CommandOpermotd : public Command } }; - class ModuleOpermotd : public Module { private: diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 8741dc17c..55d6ab158 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -115,7 +115,6 @@ class ModuleOverride return ((tokenlist.find(token, 0) != std::string::npos) || (tokenlist.find('*', 0) != std::string::npos)); } - ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) override { if (IS_LOCAL(source) && source->IsOper() && CanOverride(source, "TOPIC")) diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index 546abcc87..104768339 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -29,7 +29,6 @@ #include "listmode.h" #include <fstream> - /** Handles the +P channel mode */ class PermChannel final diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 513eeb5c7..2b412fe0e 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -91,7 +91,6 @@ class RLine : public XLine Regex::PatternPtr regex; }; - /** An XLineFactory specialized to generate RLine* pointers */ class RLineFactory : public XLineFactory diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp index 70795df9f..1d5a213b3 100644 --- a/src/modules/m_sanick.cpp +++ b/src/modules/m_sanick.cpp @@ -86,7 +86,6 @@ class CommandSanick : public Command } }; - class ModuleSanick : public Module { private: diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index 8055f3420..2a9316c3f 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -87,7 +87,6 @@ class CommandSapart : public Command } }; - class ModuleSapart : public Module { private: diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp index ba4521a70..3f9b8d768 100644 --- a/src/modules/m_sethost.cpp +++ b/src/modules/m_sethost.cpp @@ -65,7 +65,6 @@ class CommandSethost : public Command } }; - class ModuleSetHost : public Module { private: diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp index e0d6b55c5..2591dc9bd 100644 --- a/src/modules/m_setidle.cpp +++ b/src/modules/m_setidle.cpp @@ -62,7 +62,6 @@ class CommandSetidle : public SplitCommand } }; - class ModuleSetIdle : public Module { private: diff --git a/src/modules/m_sha2.cpp b/src/modules/m_sha2.cpp index 47d5bd340..31a146ef7 100644 --- a/src/modules/m_sha2.cpp +++ b/src/modules/m_sha2.cpp @@ -58,7 +58,6 @@ class HashSHA2 : public HashProvider } }; - class ModuleSHA2 : public Module { private: diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index db9e622fc..d3034ce3c 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -34,7 +34,6 @@ #include "modules/shun.h" #include "modules/stats.h" - /** An XLineFactory specialized to generate shun pointers */ class ShunFactory : public XLineFactory diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp index 8f0d17bbd..5a0031cde 100644 --- a/src/modules/m_spanningtree/netburst.cpp +++ b/src/modules/m_spanningtree/netburst.cpp @@ -76,7 +76,6 @@ class FModeBuilder : public CmdBuilder return push_raw(params); } - /** Returns true if this message is empty (has no modes) */ bool empty() const diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index 4f9651f40..127ff32cc 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -177,7 +177,6 @@ class ModuleSVSHold : public Module, public Stats::EventListener CommandSvshold cmd; SVSHoldFactory s; - public: ModuleSVSHold() : Module(VF_VENDOR | VF_COMMON, "Adds the /SVSHOLD command which allows services to reserve nicknames.") diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp index ba4621b87..fa1188a8f 100644 --- a/src/modules/m_websocket.cpp +++ b/src/modules/m_websocket.cpp @@ -385,7 +385,6 @@ class WebSocketHook : public IOHookMiddle } } - HTTPHeaderFinder keyheader; if (!keyheader.Find(recvq, "Sec-WebSocket-Key:", 18, reqend)) { diff --git a/src/socket.cpp b/src/socket.cpp index f839e32b5..6c78bf24f 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -205,7 +205,6 @@ bool irc::sockets::isunix(const std::string& file) return false; } - int irc::sockets::sockaddrs::family() const { return sa.sa_family; diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 2a1a3cd72..d655df971 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -177,7 +177,6 @@ bool SocketEngine::BoundsCheckFd(EventHandler* eh) return eh && eh->HasFd(); } - int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen) { return accept(fd->GetFd(), addr, addrlen); diff --git a/src/xline.cpp b/src/xline.cpp index 441f655f9..49c00e206 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -108,7 +108,6 @@ class ZLineFactory : public XLineFactory } }; - /* * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and * efficient as we can this time so we can close this file and never ever touch it again .. @@ -182,7 +181,6 @@ void XLineManager::CheckELines() } } - XLineLookup* XLineManager::GetAll(const std::string &type) { ContainerIter n = lookup_lines.find(type); @@ -347,7 +345,6 @@ bool XLineManager::DelLine(const char* hostmask, const std::string& type, std::s return true; } - void ELine::Unset() { ServerInstance->XLines->CheckELines(); @@ -444,7 +441,6 @@ void XLineManager::ExpireLine(ContainerIter container, LookupIter item, bool sil container->second.erase(item); } - // applies lines, removing clients and changing nicks etc as applicable void XLineManager::ApplyLines() { @@ -507,7 +503,6 @@ XLineManager::XLineManager() QLineFactory* QFact; ZLineFactory* ZFact; - GFact = new GLineFactory; EFact = new ELineFactory; KFact = new KLineFactory; @@ -559,7 +554,6 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache) else ServerInstance->Users.QuitUser(u, banReason); - if (bancache) { ServerInstance->Logs.Log("BANCACHE", LOG_DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString()); @@ -644,7 +638,6 @@ void ZLine::Apply(User* u) DefaultApply(u, "Z", true); } - bool QLine::Matches(User *u) { if (InspIRCd::Match(u->nick, this->nick)) @@ -660,7 +653,6 @@ void QLine::Apply(User* u) u->ChangeNick(u->uuid); } - bool ZLine::Matches(const std::string &str) { if (InspIRCd::MatchCIDR(str, this->ipaddr)) |
