diff options
99 files changed, 445 insertions, 212 deletions
diff --git a/include/hashcomp.h b/include/hashcomp.h index b17be3648..8933b3e24 100644 --- a/include/hashcomp.h +++ b/include/hashcomp.h @@ -171,7 +171,8 @@ namespace irc public: /** Initialize with comma separator */ - commasepstream(const std::string& source, bool allowempty = false) : sepstream(source, ',', allowempty) + commasepstream(const std::string& source, bool allowempty = false) + : sepstream(source, ',', allowempty) { } }; @@ -183,7 +184,8 @@ namespace irc public: /** Initialize with space separator */ - spacesepstream(const std::string& source, bool allowempty = false) : sepstream(source, ' ', allowempty) + spacesepstream(const std::string& source, bool allowempty = false) + : sepstream(source, ' ', allowempty) { } }; diff --git a/include/iohook.h b/include/iohook.h index a5f6f5819..1e0e6c72b 100644 --- a/include/iohook.h +++ b/include/iohook.h @@ -45,7 +45,11 @@ public: * @param middle True if the IOHook instances created by this hook are subclasses of IOHookMiddle, false otherwise */ IOHookProvider(Module* mod, const std::string& Name, Type hooktype = IOH_UNKNOWN, bool middle = false) - : ServiceProvider(mod, Name, SERVICE_IOHOOK), middlehook(middle), type(hooktype) { } + : ServiceProvider(mod, Name, SERVICE_IOHOOK) + , middlehook(middle) + , type(hooktype) + { + } /** Check if the IOHook provided can appear in the non-last position of a hook chain. * That is the case if and only if the IOHook instances created are subclasses of IOHookMiddle. diff --git a/include/listmode.h b/include/listmode.h index b3a67d86c..9bd252530 100644 --- a/include/listmode.h +++ b/include/listmode.h @@ -35,7 +35,11 @@ public: std::string mask; time_t time; ListItem(const std::string& Mask, const std::string& Setter, time_t Time) - : setter(Setter), mask(Mask), time(Time) { } + : setter(Setter) + , mask(Mask) + , time(Time) + { + } }; /** Items stored in the channel's list @@ -47,9 +51,7 @@ private: { public: ModeList list; - long maxitems; - - ChanData() : maxitems(-1) { } + long maxitems = -1; }; /** The number of items a listmode's list may contain @@ -58,7 +60,12 @@ private: { std::string mask; unsigned long limit; - ListLimit(const std::string& Mask, unsigned long Limit) : mask(Mask), limit(Limit) { } + ListLimit(const std::string& Mask, unsigned long Limit) + : mask(Mask) + , limit(Limit) + { + } + bool operator==(const ListLimit& other) const { return (this->mask == other.mask && this->limit == other.limit); } }; diff --git a/include/modules.h b/include/modules.h index 926d2f38e..7ba228196 100644 --- a/include/modules.h +++ b/include/modules.h @@ -452,7 +452,7 @@ public: * @param timeout The time the invite will expire (0 == never) * @return 1 to deny the invite, 0 to check whether or not the user has permission to invite, -1 to explicitly allow the invite */ - virtual ModResult OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout); + virtual ModResult OnUserPreInvite(User* source, User* dest, Channel* channel, time_t timeout); /** Called after a user has been successfully invited to a channel. * You cannot prevent the invite from occurring using this function, to do that, diff --git a/include/modules/dns.h b/include/modules/dns.h index 95685eae7..73c59b2de 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -173,7 +173,10 @@ namespace DNS class Manager : public DataProvider { public: - Manager(Module* mod) : DataProvider(mod, "DNS") { } + Manager(Module* mod) + : DataProvider(mod, "DNS") + { + } virtual void Process(Request* req) = 0; virtual void RemoveRequest(Request* req) = 0; diff --git a/include/modules/hash.h b/include/modules/hash.h index 9c5370366..5b8dfe625 100644 --- a/include/modules/hash.h +++ b/include/modules/hash.h @@ -31,7 +31,9 @@ public: const unsigned int out_size; const unsigned int block_size; HashProvider(Module* mod, const std::string& Name, unsigned int osiz = 0, unsigned int bsiz = 0) - : DataProvider(mod, "hash/" + Name), out_size(osiz), block_size(bsiz) + : DataProvider(mod, "hash/" + Name) + , out_size(osiz) + , block_size(bsiz) { } diff --git a/include/modules/httpd.h b/include/modules/httpd.h index ea01de16a..fe325341a 100644 --- a/include/modules/httpd.h +++ b/include/modules/httpd.h @@ -86,7 +86,7 @@ struct HTTPRequestURI final class HTTPHeaders final { protected: - std::map<std::string,std::string> headers; + std::map<std::string, std::string> headers; public: /** Set the value of a header @@ -125,7 +125,7 @@ public: */ std::string GetHeader(const std::string& name) { - std::map<std::string,std::string>::iterator it = headers.find(name); + std::map<std::string, std::string>::iterator it = headers.find(name); if (it == headers.end()) return std::string(); @@ -137,7 +137,7 @@ public: */ bool IsSet(const std::string& name) { - std::map<std::string,std::string>::iterator it = headers.find(name); + std::map<std::string, std::string>::iterator it = headers.find(name); return (it != headers.end()); } @@ -263,7 +263,10 @@ public: * based upon the response code. */ HTTPDocumentResponse(Module* mod, HTTPRequest& req, std::stringstream* doc, unsigned int response) - : module(mod), document(doc), responsecode(response), src(req) + : module(mod) + , document(doc) + , responsecode(response) + , src(req) { } }; diff --git a/include/modules/ldap.h b/include/modules/ldap.h index f3cc15b4a..9f07f0455 100644 --- a/include/modules/ldap.h +++ b/include/modules/ldap.h @@ -97,13 +97,8 @@ struct LDAPResult final std::vector<LDAPAttributes> messages; std::string error; - QueryType type; - LDAPQuery id; - - LDAPResult() - : type(QUERY_UNKNOWN), id(-1) - { - } + QueryType type = QUERY_UNKNOWN; + LDAPQuery id = -1; size_t size() const { @@ -133,9 +128,11 @@ class LDAPInterface public: ModuleRef creator; - LDAPInterface(Module* m) : creator(m) { } + LDAPInterface(Module* m) + : creator(m) + { + } virtual ~LDAPInterface() = default; - virtual void OnResult(const LDAPResult& r) = 0; virtual void OnError(const LDAPResult& err) = 0; }; diff --git a/include/modules/reload.h b/include/modules/reload.h index e70782f54..34f731722 100644 --- a/include/modules/reload.h +++ b/include/modules/reload.h @@ -32,7 +32,11 @@ namespace ReloadModule { EventListener* handler; void* data; - Data(EventListener* Handler, void* moddata) : handler(Handler), data(moddata) { } + Data(EventListener* Handler, void* moddata) + : handler(Handler) + , data(moddata) + { + } }; typedef std::vector<Data> List; List list; diff --git a/include/xline.h b/include/xline.h index f2360a3d5..b922f58a4 100644 --- a/include/xline.h +++ b/include/xline.h @@ -193,7 +193,9 @@ public: * @param host Host to match */ KLine(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& ident, const std::string& host) - : XLine(s_time, d, src, re, "K"), identmask(ident), hostmask(host) + : XLine(s_time, d, src, re, "K") + , identmask(ident) + , hostmask(host) { matchtext = this->identmask; matchtext.append("@").append(this->hostmask); @@ -234,7 +236,9 @@ public: * @param host Host to match */ GLine(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& ident, const std::string& host) - : XLine(s_time, d, src, re, "G"), identmask(ident), hostmask(host) + : XLine(s_time, d, src, re, "G") + , identmask(ident) + , hostmask(host) { matchtext = this->identmask; matchtext.append("@").append(this->hostmask); @@ -273,7 +277,9 @@ public: * @param host Host to match */ ELine(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& ident, const std::string& host) - : XLine(s_time, d, src, re, "E"), identmask(ident), hostmask(host) + : XLine(s_time, d, src, re, "E") + , identmask(ident) + , hostmask(host) { matchtext = this->identmask; matchtext.append("@").append(this->hostmask); @@ -313,7 +319,8 @@ public: * @param ip IP to match */ ZLine(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& ip) - : XLine(s_time, d, src, re, "Z"), ipaddr(ip) + : XLine(s_time, d, src, re, "Z") + , ipaddr(ip) { } @@ -344,7 +351,8 @@ public: * @param nickname Nickname to match */ QLine(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& nickname) - : XLine(s_time, d, src, re, "Q"), nick(nickname) + : XLine(s_time, d, src, re, "Q") + , nick(nickname) { } @@ -379,7 +387,10 @@ public: /** Create an XLine factory * @param t Type of XLine this factory generates */ - XLineFactory(const std::string& t) : type(t) { } + XLineFactory(const std::string& t) + : type(t) + { + } /** Return the type of XLine this factory generates * @return The type of XLine this factory generates diff --git a/src/coremods/core_channel/cmd_invite.cpp b/src/coremods/core_channel/cmd_invite.cpp index 8cef260a8..4a1b29bc6 100644 --- a/src/coremods/core_channel/cmd_invite.cpp +++ b/src/coremods/core_channel/cmd_invite.cpp @@ -46,7 +46,7 @@ enum }; CommandInvite::CommandInvite(Module* parent, Invite::APIImpl& invapiimpl) - : Command(parent, "INVITE", 0, 0) + : Command(parent, "INVITE") , invapi(invapiimpl) { penalty = 4000; @@ -119,7 +119,7 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters) return CmdResult::FAILURE; } - FIRST_MOD_RESULT(OnUserPreInvite, MOD_RESULT, (user,u,c,timeout)); + FIRST_MOD_RESULT(OnUserPreInvite, MOD_RESULT, (user, u, c, timeout)); if (MOD_RESULT == MOD_RES_DENY) { diff --git a/src/coremods/core_channel/cmd_names.cpp b/src/coremods/core_channel/cmd_names.cpp index 878b48a01..dbec0890e 100644 --- a/src/coremods/core_channel/cmd_names.cpp +++ b/src/coremods/core_channel/cmd_names.cpp @@ -40,7 +40,7 @@ enum }; CommandNames::CommandNames(Module* parent) - : SplitCommand(parent, "NAMES", 0, 0) + : SplitCommand(parent, "NAMES") , secretmode(parent, "secret") , privatemode(parent, "private") , invisiblemode(parent, "invisible") diff --git a/src/coremods/core_channel/cmd_topic.cpp b/src/coremods/core_channel/cmd_topic.cpp index cbf1c0def..d3f0f78e4 100644 --- a/src/coremods/core_channel/cmd_topic.cpp +++ b/src/coremods/core_channel/cmd_topic.cpp @@ -81,7 +81,7 @@ CmdResult CommandTopic::HandleLocal(LocalUser* user, const Params& parameters) std::string t = parameters[1]; // needed, in case a module wants to change it ModResult res; - FIRST_MOD_RESULT(OnPreTopicChange, res, (user,c,t)); + FIRST_MOD_RESULT(OnPreTopicChange, res, (user, c, t)); if (res == MOD_RES_DENY) return CmdResult::FAILURE; diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp index 7c9bdb7f4..6b25baec2 100644 --- a/src/coremods/core_dns.cpp +++ b/src/coremods/core_dns.cpp @@ -878,7 +878,7 @@ class ModuleDNS final resolv >> DNSServer; if (DNSServer.find_first_not_of("0123456789.") == std::string::npos || DNSServer.find_first_not_of("0123456789ABCDEFabcdef:") == std::string::npos) { - ServerInstance->Logs.Normal(MODNAME, "<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",DNSServer.c_str()); + ServerInstance->Logs.Normal(MODNAME, "<dns:server> set to '%s' as first resolver in /etc/resolv.conf.", DNSServer.c_str()); return; } } diff --git a/src/coremods/core_info/cmd_version.cpp b/src/coremods/core_info/cmd_version.cpp index 6ba604e56..3d30c7361 100644 --- a/src/coremods/core_info/cmd_version.cpp +++ b/src/coremods/core_info/cmd_version.cpp @@ -27,7 +27,7 @@ #include "core_info.h" CommandVersion::CommandVersion(Module* parent, ISupportManager& isupportmgr) - : Command(parent, "VERSION", 0, 0) + : Command(parent, "VERSION") , isupport(isupportmgr) , operversion(RPL_VERSION) , version(RPL_VERSION) diff --git a/src/coremods/core_list.cpp b/src/coremods/core_list.cpp index 0ad74d55e..119d24e07 100644 --- a/src/coremods/core_list.cpp +++ b/src/coremods/core_list.cpp @@ -51,7 +51,7 @@ public: bool showmodes; CommandList(Module* parent) - : Command(parent,"LIST", 0, 0) + : Command(parent, "LIST") , secretmode(creator, "secret") , privatemode(creator, "private") { diff --git a/src/coremods/core_loadmodule.cpp b/src/coremods/core_loadmodule.cpp index 043807881..a6d93f672 100644 --- a/src/coremods/core_loadmodule.cpp +++ b/src/coremods/core_loadmodule.cpp @@ -31,7 +31,7 @@ class CommandLoadmodule final { public: CommandLoadmodule(Module* parent) - : Command(parent,"LOADMODULE", 1, 1) + : Command(parent, "LOADMODULE", 1, 1) { access_needed = CmdAccess::OPERATOR; syntax = { "<modulename>" }; @@ -44,7 +44,7 @@ CmdResult CommandLoadmodule::Handle(User* user, const Params& parameters) { if (ServerInstance->Modules.Load(parameters[0])) { - ServerInstance->SNO.WriteGlobalSno('a', "NEW MODULE: %s loaded %s",user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO.WriteGlobalSno('a', "NEW MODULE: %s loaded %s", user->nick.c_str(), parameters[0].c_str()); user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded."); return CmdResult::SUCCESS; } diff --git a/src/coremods/core_lusers.cpp b/src/coremods/core_lusers.cpp index 19b308393..705c63836 100644 --- a/src/coremods/core_lusers.cpp +++ b/src/coremods/core_lusers.cpp @@ -76,7 +76,7 @@ private: public: CommandLusers(Module* parent, LusersCounters& Counters) - : Command(parent,"LUSERS",0,0) + : Command(parent, "LUSERS") , counters(Counters) { } diff --git a/src/coremods/core_stub.cpp b/src/coremods/core_stub.cpp index 4928b1d88..278cf05b7 100644 --- a/src/coremods/core_stub.cpp +++ b/src/coremods/core_stub.cpp @@ -79,7 +79,7 @@ class CommandLinks final { public: CommandLinks(Module* parent) - : Command(parent, "LINKS", 0, 0) + : Command(parent, "LINKS") { } diff --git a/src/coremods/core_user/core_user.h b/src/coremods/core_user/core_user.h index db4748af9..871eb1856 100644 --- a/src/coremods/core_user/core_user.h +++ b/src/coremods/core_user/core_user.h @@ -137,7 +137,7 @@ private: public: CommandUserhost(Module* parent) - : Command(parent,"USERHOST", 1) + : Command(parent, "USERHOST", 1) , hideopermode(parent, "hideoper") { syntax = { "<nick> [<nick>]+" }; diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp index 23c0f90b2..0d0c26397 100644 --- a/src/coremods/core_whois.cpp +++ b/src/coremods/core_whois.cpp @@ -228,7 +228,7 @@ void CommandWhois::DoWhois(LocalUser* user, User* dest, time_t signon, unsigned if (genericoper) whois.SendLine(RPL_WHOISOPERATOR, dest->server->IsService() ? "is a network service" : "is a server operator"); else - whois.SendLine(RPL_WHOISOPERATOR, InspIRCd::Format("is %s %s on %s", (strchr("AEIOUaeiou",dest->oper->GetType()[0]) ? "an" : "a"), dest->oper->GetType().c_str(), ServerInstance->Config->Network.c_str())); + whois.SendLine(RPL_WHOISOPERATOR, InspIRCd::Format("is %s %s on %s", (strchr("AEIOUaeiou", dest->oper->GetType()[0]) ? "an" : "a"), dest->oper->GetType().c_str(), ServerInstance->Config->Network.c_str())); } if (whois.IsSelfWhois() || user->HasPrivPermission("users/auspex")) @@ -318,7 +318,7 @@ CmdResult CommandWhois::HandleLocal(LocalUser* user, const Params& parameters) signon = dest->signon; } - DoWhois(user,dest,signon,idle); + DoWhois(user, dest, signon, idle); } else { diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp index 660990f5f..2b86187ff 100644 --- a/src/coremods/core_xline/cmd_kline.cpp +++ b/src/coremods/core_xline/cmd_kline.cpp @@ -78,7 +78,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters) } auto kl = new KLine(ServerInstance->Time(), duration, user->nick, parameters[2], ih.first, ih.second); - if (ServerInstance->XLines->AddLine(kl,user)) + if (ServerInstance->XLines->AddLine(kl, user)) { if (!duration) { diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp index aaf073650..cafea5f26 100644 --- a/src/coremods/core_xline/cmd_qline.cpp +++ b/src/coremods/core_xline/cmd_qline.cpp @@ -60,7 +60,7 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters) } auto ql = new QLine(ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]); - if (ServerInstance->XLines->AddLine(ql,user)) + if (ServerInstance->XLines->AddLine(ql, user)) { if (!duration) { diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp index ff5dd6c12..56f538a51 100644 --- a/src/coremods/core_xline/cmd_zline.cpp +++ b/src/coremods/core_xline/cmd_zline.cpp @@ -58,7 +58,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) const char* ipaddr = target.c_str(); - if (strchr(ipaddr,'@')) + if (strchr(ipaddr, '@')) { while (*ipaddr != '@') ipaddr++; @@ -77,7 +77,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) } auto zl = new ZLine(ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr); - if (ServerInstance->XLines->AddLine(zl,user)) + if (ServerInstance->XLines->AddLine(zl, user)) { if (!duration) { diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 983dcd557..6b9dbaebc 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -565,7 +565,7 @@ InspIRCd::InspIRCd(int argc, char** argv) if (kill(getppid(), SIGTERM) == -1) { std::cout << "Error killing parent process: " << strerror(errno) << std::endl; - Logs.Normal("STARTUP", "Error killing parent process: %s",strerror(errno)); + Logs.Normal("STARTUP", "Error killing parent process: %s", strerror(errno)); } } diff --git a/src/listensocket.cpp b/src/listensocket.cpp index 9c9695fea..821191245 100644 --- a/src/listensocket.cpp +++ b/src/listensocket.cpp @@ -183,7 +183,7 @@ void ListenSocket::OnEventHandlerRead() * Big, big thanks to danieldg for his work on this. * -- w00t */ - static constexpr unsigned char prefix4in6[12] = { 0,0,0,0, 0,0,0,0, 0,0,0xFF,0xFF }; + static constexpr unsigned char prefix4in6[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF }; if (!memcmp(prefix4in6, &client.in6.sin6_addr, 12)) { // recreate as a sockaddr_in using the IPv4 IP diff --git a/src/mode.cpp b/src/mode.cpp index ba60cafbe..4d24dca8f 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -154,7 +154,9 @@ ModeAction SimpleChannelMode::OnModeChange(User* source, User* dest, Channel* ch } ModeWatcher::ModeWatcher(Module* Creator, const std::string& modename, ModeType type) - : mode(modename), m_type(type), creator(Creator) + : mode(modename) + , m_type(type) + , creator(Creator) { ServerInstance->Modes.AddModeWatcher(this); } diff --git a/src/modules.cpp b/src/modules.cpp index 575c54211..a7601dcc9 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -169,7 +169,9 @@ void Module::OnOperLogout(User*) { DetachEvent(I_OnOperLogout); } void Module::OnPostOperLogout(User*, const std::shared_ptr<OperAccount>&) { DetachEvent(I_OnPostOperLogout); } ServiceProvider::ServiceProvider(Module* Creator, const std::string& Name, ServiceType Type) - : creator(Creator), name(Name), service(Type) + : creator(Creator) + , name(Name) + , service(Type) { if ((ServerInstance) && (ServerInstance->Modules.NewServices)) ServerInstance->Modules.NewServices->push_back(this); @@ -485,7 +487,10 @@ namespace : public ActionBase { Module* const mod; - UnloadAction(Module* m) : mod(m) {} + UnloadAction(Module* m) + : mod(m) + { + } void Call() override { ServerInstance->Modules.DoSafeUnload(mod); diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index c8ffc33a2..9addb1aeb 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -148,7 +148,10 @@ class DispatcherThread final private: ModuleSQL* const Parent; public: - DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { } + DispatcherThread(ModuleSQL* CreatorModule) + : Parent(CreatorModule) + { + } void OnStart() override; void OnNotify() override; }; diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 980ccd627..912b4f18c 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -79,7 +79,9 @@ class ReconnectTimer final private: ModulePgSQL* mod; public: - ReconnectTimer(ModulePgSQL* m) : Timer(5, false), mod(m) + ReconnectTimer(ModulePgSQL* m) + : Timer(5, false) + , mod(m) { } bool Tick() override; @@ -89,7 +91,11 @@ struct QueueItem final { SQL::Query* c; std::string q; - QueueItem(SQL::Query* C, const std::string& Q) : c(C), q(Q) {} + QueueItem(SQL::Query* C, const std::string& Q) + : c(C) + , q(Q) + { + } }; /** PgSQLresult is a subclass of the mostly-pure-virtual class SQLresult. @@ -422,7 +428,7 @@ restart: ServerInstance->Logs.Debug(MODNAME, "Executing PostgreSQL query: " + q); if (qinprog.q.empty()) { - DoQuery(QueueItem(req,q)); + DoQuery(QueueItem(req, q)); } else { diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp index ce6c19549..83ef0219e 100644 --- a/src/modules/m_allowinvite.cpp +++ b/src/modules/m_allowinvite.cpp @@ -41,7 +41,7 @@ public: { } - ModResult OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout) override + ModResult OnUserPreInvite(User* user, User* dest, Channel* channel, time_t timeout) override { if (IS_LOCAL(user)) { diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp index 88c00783b..efa8c1bfe 100644 --- a/src/modules/m_alltime.cpp +++ b/src/modules/m_alltime.cpp @@ -30,7 +30,8 @@ class CommandAlltime final : public Command { public: - CommandAlltime(Module* Creator) : Command(Creator, "ALLTIME", 0) + CommandAlltime(Module* Creator) + : Command(Creator, "ALLTIME", 0) { access_needed = CmdAccess::OPERATOR; } diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 7c32722b5..83ad230e8 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -42,7 +42,8 @@ public: std::string banmask; BanRedirectEntry(const std::string& target = "", const std::string& mask = "") - : targetchan(target), banmask(mask) + : targetchan(target) + , banmask(mask) { } }; diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index 93254a852..2dd8b927d 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -43,7 +43,9 @@ public: time_t sent; BlockedMessage(const std::string& msg, const std::string& tgt, time_t when) - : message(msg), target(tgt), sent(when) + : message(msg) + , target(tgt) + , sent(when) { } }; diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 51dcc87cc..c164014d9 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -185,8 +185,9 @@ class CommandAccept final public: CallerIDExtInfo extInfo; unsigned long maxaccepts; - CommandAccept(Module* Creator) : Command(Creator, "ACCEPT", 1), - extInfo(Creator) + CommandAccept(Module* Creator) + : Command(Creator, "ACCEPT", 1) + , extInfo(Creator) { syntax = { "*|(+|-)<nick>[,(+|-)<nick>]+" }; translation = { TR_CUSTOM }; diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 437cef2b5..d83b5fbf5 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -75,7 +75,10 @@ class CBanFactory final : public XLineFactory { public: - CBanFactory() : XLineFactory("CBAN") { } + CBanFactory() + : XLineFactory("CBAN") + { + } XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) override { @@ -92,7 +95,8 @@ class CommandCBan final : public Command { public: - CommandCBan(Module* Creator) : Command(Creator, "CBAN", 1, 3) + CommandCBan(Module* Creator) + : Command(Creator, "CBAN", 1, 3) { access_needed = CmdAccess::OPERATOR; syntax = { "<channelmask> [<duration> [:<reason>]]" }; diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 839a5027b..60e14576e 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -136,7 +136,7 @@ class CommandCheck final public: CommandCheck(Module* parent) - : Command(parent,"CHECK", 1) + : Command(parent, "CHECK", 1) , snomaskmode(parent, "snomask") { access_needed = CmdAccess::OPERATOR; diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index d84b70a8e..e6885734c 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -33,7 +33,7 @@ public: CharState hostmap; CommandChghost(Module* Creator) - : Command(Creator,"CHGHOST", 2) + : Command(Creator, "CHGHOST", 2) { access_needed = CmdAccess::OPERATOR; syntax = { "<nick> <host>" }; diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index 0b342dc2b..f1ac3bafa 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -33,7 +33,8 @@ class CommandChgident final : public Command { public: - CommandChgident(Module* Creator) : Command(Creator,"CHGIDENT", 2) + CommandChgident(Module* Creator) + : Command(Creator, "CHGIDENT", 2) { access_needed = CmdAccess::OPERATOR; syntax = { "<nick> <ident>" }; diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index d53ed40a3..cbe29696f 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -31,7 +31,8 @@ class CommandChgname final : public Command { public: - CommandChgname(Module* Creator) : Command(Creator,"CHGNAME", 2, 2) + CommandChgname(Module* Creator) + : Command(Creator, "CHGNAME", 2, 2) { access_needed = CmdAccess::OPERATOR; syntax = { "<nick> :<realname>" }; diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 3c25e0a58..2b3e674d9 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -198,7 +198,8 @@ class CommandCloak final : public Command { public: - CommandCloak(Module* Creator) : Command(Creator, "CLOAK", 1) + CommandCloak(Module* Creator) + : Command(Creator, "CLOAK", 1) { access_needed = CmdAccess::OPERATOR; syntax = { "<host>" }; @@ -288,7 +289,7 @@ public: else input.append(item); - std::string rv = Hash->GenerateRaw(input).substr(0,len); + std::string rv = Hash->GenerateRaw(input).substr(0, len); for(size_t i = 0; i < len; i++) { // this discards 3 bits per byte. We have an diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp index ae23214c6..a76c1cb39 100644 --- a/src/modules/m_conn_join.cpp +++ b/src/modules/m_conn_join.cpp @@ -50,7 +50,9 @@ private: public: JoinTimer(LocalUser* u, SimpleExtItem<JoinTimer>& ex, const std::string& chans, unsigned int delay) : Timer(delay, false) - , user(u), channels(chans), ext(ex) + , user(u) + , channels(chans) + , ext(ex) { ServerInstance->Timers.AddTimer(this); } diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index bfd2f420e..22cd6fafe 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -67,7 +67,7 @@ public: CustomVhostMap configs; CommandTitle(Module* Creator) - : Command(Creator,"TITLE", 2) + : Command(Creator, "TITLE", 2) , ctitle(Creator, "ctitle", ExtensionType::USER, true) { syntax = { "<username> <password>" }; diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index a40115df9..7b4d570e1 100644 --- a/src/modules/m_globalload.cpp +++ b/src/modules/m_globalload.cpp @@ -31,7 +31,7 @@ class CommandGLoadModule final { public: CommandGLoadModule(Module* Creator) - : Command(Creator,"GLOADMODULE", 1) + : Command(Creator, "GLOADMODULE", 1) { access_needed = CmdAccess::OPERATOR; syntax = { "<modulename> [<servermask>]" }; @@ -45,7 +45,7 @@ public: { if (ServerInstance->Modules.Load(parameters[0])) { - ServerInstance->SNO.WriteToSnoMask('a', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick.c_str()); + ServerInstance->SNO.WriteToSnoMask('a', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'", parameters[0].c_str(), user->nick.c_str()); user->WriteRemoteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded."); } else @@ -54,7 +54,7 @@ public: } } else - ServerInstance->SNO.WriteToSnoMask('a', "MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)",parameters[0].c_str(), user->nick.c_str()); + ServerInstance->SNO.WriteToSnoMask('a', "MODULE '%s' GLOBAL LOAD BY '%s' (not loaded here)", parameters[0].c_str(), user->nick.c_str()); return CmdResult::SUCCESS; } @@ -70,7 +70,7 @@ class CommandGUnloadModule final { public: CommandGUnloadModule(Module* Creator) - : Command(Creator,"GUNLOADMODULE", 1) + : Command(Creator, "GUNLOADMODULE", 1) { access_needed = CmdAccess::OPERATOR; syntax = { "<modulename> [<servermask>]" }; @@ -93,7 +93,7 @@ public: { if (ServerInstance->Modules.Unload(m)) { - ServerInstance->SNO.WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str()); + ServerInstance->SNO.WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'", parameters[0].c_str(), user->nick.c_str()); user->WriteRemoteNumeric(RPL_UNLOADEDMODULE, parameters[0], "Module successfully unloaded."); } else @@ -105,7 +105,7 @@ public: user->WriteRemoteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "No such module"); } else - ServerInstance->SNO.WriteToSnoMask('a', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str()); + ServerInstance->SNO.WriteToSnoMask('a', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)", parameters[0].c_str(), user->nick.c_str()); return CmdResult::SUCCESS; } @@ -146,7 +146,7 @@ public: } } else - ServerInstance->SNO.WriteToSnoMask('a', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0].c_str(), user->nick.c_str()); + ServerInstance->SNO.WriteToSnoMask('a', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)", parameters[0].c_str(), user->nick.c_str()); return CmdResult::SUCCESS; } diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp index 760d41488..b02670805 100644 --- a/src/modules/m_globops.cpp +++ b/src/modules/m_globops.cpp @@ -32,7 +32,8 @@ class CommandGlobops final : public Command { public: - CommandGlobops(Module* Creator) : Command(Creator,"GLOBOPS", 1,1) + CommandGlobops(Module* Creator) + : Command(Creator, "GLOBOPS", 1, 1) { access_needed = CmdAccess::OPERATOR; allow_empty_last_param = true; @@ -67,7 +68,7 @@ public: void init() override { - ServerInstance->SNO.EnableSnomask('g',"GLOBOPS"); + ServerInstance->SNO.EnableSnomask('g', "GLOBOPS"); } }; diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp index 931a489e1..ebedfe795 100644 --- a/src/modules/m_httpd_acl.cpp +++ b/src/modules/m_httpd_acl.cpp @@ -37,8 +37,13 @@ public: HTTPACL(const std::string& set_path, const std::string& set_username, const std::string& set_password, const std::string& set_whitelist, const std::string& set_blacklist) - : path(set_path), username(set_username), password(set_password), whitelist(set_whitelist), - blacklist(set_blacklist) { } + : path(set_path) + , username(set_username) + , password(set_password) + , whitelist(set_whitelist) + , blacklist(set_blacklist) + { + } }; class ModuleHTTPAccessList final diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index cb8b3a462..8a9248976 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -224,7 +224,7 @@ namespace Stats serializer.BeginBlock("channel") .Attribute("channelname", c->name) .Attribute("usercount", c->GetUsers().size()) - .Attribute("channelmodes",c->ChanModes(true)); + .Attribute("channelmodes", c->ChanModes(true)); if (!c->topic.empty()) { @@ -348,7 +348,11 @@ namespace Stats OrderBy order; bool desc; - UserSorter(OrderBy Order, bool Desc = false) : order(Order), desc(Desc) {} + UserSorter(OrderBy Order, bool Desc = false) + : order(Order) + , desc(Desc) + { + } template <typename T> inline bool Compare(const T& a, const T& b) diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 90ffd4243..17ac98301 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -51,7 +51,10 @@ class KickRejoinData final public: const unsigned int delay; - KickRejoinData(unsigned int Delay) : delay(Delay) { } + KickRejoinData(unsigned int Delay) + : delay(Delay) + { + } bool canjoin(LocalUser* user) const { diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index e8372a915..cad3349c1 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -70,7 +70,7 @@ public: int notify; CommandKnock(Module* Creator, SimpleChannelMode& Noknockmode) - : Command(Creator,"KNOCK", 2, 2) + : Command(Creator, "KNOCK", 2, 2) , noknockmode(Noknockmode) , inviteonlymode(Creator, "inviteonly") , inviteapi(Creator) diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp index d5577e86d..1d3763b0b 100644 --- a/src/modules/m_ldapauth.cpp +++ b/src/modules/m_ldapauth.cpp @@ -215,7 +215,9 @@ class SearchInterface final public: SearchInterface(Module* c, const std::string& p, const std::string& u) - : LDAPInterface(c), provider(p), uid(u) + : LDAPInterface(c) + , provider(p) + , uid(u) { } @@ -271,7 +273,11 @@ class AdminBindInterface final public: AdminBindInterface(Module* c, const std::string& p, const std::string& u, const std::string& b, const std::string& w) - : LDAPInterface(c), provider(p), uuid(u), base(b), what(w) + : LDAPInterface(c) + , provider(p) + , uuid(u) + , base(b) + , what(w) { } diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp index 57e570d31..420017ebf 100644 --- a/src/modules/m_ldapoper.cpp +++ b/src/modules/m_ldapoper.cpp @@ -61,7 +61,9 @@ protected: public: LDAPOperBase(Module* mod, const std::string& uuid, const std::string& oper, const std::string& pass) : LDAPInterface(mod) - , uid(uuid), opername(oper), password(pass) + , uid(uuid) + , opername(oper) + , password(pass) { } diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp index f28a57747..ed98c2dff 100644 --- a/src/modules/m_namedmodes.cpp +++ b/src/modules/m_namedmodes.cpp @@ -113,7 +113,8 @@ class DummyZ final : public ModeHandler { public: - DummyZ(Module* parent) : ModeHandler(parent, "namebase", 'Z', PARAM_ALWAYS, MODETYPE_CHANNEL) + DummyZ(Module* parent) + : ModeHandler(parent, "namebase", 'Z', PARAM_ALWAYS, MODETYPE_CHANNEL) { list = true; } diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index cd73f468d..c6a8474ec 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -39,8 +39,9 @@ class CommandNicklock final { public: BoolExtItem& locked; - CommandNicklock (Module* Creator, BoolExtItem& ext) : Command(Creator,"NICKLOCK", 2), - locked(ext) + CommandNicklock (Module* Creator, BoolExtItem& ext) + : Command(Creator, "NICKLOCK", 2) + , locked(ext) { access_needed = CmdAccess::OPERATOR; syntax = { "<nick> <newnick>" }; @@ -97,8 +98,9 @@ class CommandNickunlock final { public: BoolExtItem& locked; - CommandNickunlock (Module* Creator, BoolExtItem& ext) : Command(Creator,"NICKUNLOCK", 1), - locked(ext) + CommandNickunlock (Module* Creator, BoolExtItem& ext) + : Command(Creator, "NICKUNLOCK", 1) + , locked(ext) { access_needed = CmdAccess::OPERATOR; syntax = { "<nick>" }; diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp index c6cdd691d..9d94d3e63 100644 --- a/src/modules/m_opermotd.cpp +++ b/src/modules/m_opermotd.cpp @@ -43,7 +43,8 @@ class CommandOpermotd final public: std::vector<std::string> opermotd; - CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0, 1) + CommandOpermotd(Module* Creator) + : Command(Creator, "OPERMOTD") { access_needed = CmdAccess::OPERATOR; syntax = { "[<servername>]" }; diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 348889de5..5cbf5b4b5 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -171,7 +171,7 @@ public: { if (!channel->HasUser(source) || (channel->IsModeSet(topiclock) && channel->GetPrefixValue(source) < HALFOP_VALUE)) { - ServerInstance->SNO.WriteGlobalSno('v',source->nick+" used oper override to change a topic on "+channel->name); + ServerInstance->SNO.WriteGlobalSno('v', source->nick + " used oper override to change a topic on " + channel->name); } // Explicit allow @@ -183,13 +183,13 @@ public: ModResult OnUserPreKick(User* source, Membership* memb, const std::string& reason) override { - if (source->IsOper() && CanOverride(source,"KICK")) + if (source->IsOper() && CanOverride(source, "KICK")) { // If the kicker's status is less than the target's, or the kicker's status is less than or equal to voice if ((memb->chan->GetPrefixValue(source) < memb->GetRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE) || (memb->chan->GetPrefixValue(source) == HALFOP_VALUE && memb->GetRank() == HALFOP_VALUE)) { - ServerInstance->SNO.WriteGlobalSno('v',source->nick+" used oper override to kick "+memb->user->nick+" on "+memb->chan->name+" ("+reason+")"); + ServerInstance->SNO.WriteGlobalSno('v', source->nick + " used oper override to kick " + memb->user->nick + " on " + memb->chan->name + " (" + reason + ")"); return MOD_RES_ALLOW; } } @@ -231,7 +231,7 @@ public: msg += item.mh->GetModeChar(); } msg += params; - ServerInstance->SNO.WriteGlobalSno('v',msg); + ServerInstance->SNO.WriteGlobalSno('v', msg); return MOD_RES_ALLOW; } return MOD_RES_PASSTHRU; @@ -243,20 +243,20 @@ public: { if (chan) { - if (chan->IsModeSet(inviteonly) && (CanOverride(user,"INVITE"))) + if (chan->IsModeSet(inviteonly) && (CanOverride(user, "INVITE"))) { if (!invapi->IsInvited(user, chan)) return HandleJoinOverride(user, chan, keygiven, "invite-only", "+i"); return MOD_RES_ALLOW; } - if (chan->IsModeSet(key) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter(key)) + if (chan->IsModeSet(key) && (CanOverride(user, "KEY")) && keygiven != chan->GetModeParameter(key)) return HandleJoinOverride(user, chan, keygiven, "the channel key", "+k"); - if (chan->IsModeSet(limit) && (chan->GetUsers().size() >= ConvToNum<size_t>(chan->GetModeParameter(limit))) && (CanOverride(user,"LIMIT"))) + if (chan->IsModeSet(limit) && (chan->GetUsers().size() >= ConvToNum<size_t>(chan->GetModeParameter(limit))) && (CanOverride(user, "LIMIT"))) return HandleJoinOverride(user, chan, keygiven, "the channel limit", "+l"); - if (chan->IsBanned(user) && CanOverride(user,"BANWALK")) + if (chan->IsBanned(user) && CanOverride(user, "BANWALK")) return HandleJoinOverride(user, chan, keygiven, "channel ban", "channel ban"); } } diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp index 4aa384192..58c7841f4 100644 --- a/src/modules/m_password_hash.cpp +++ b/src/modules/m_password_hash.cpp @@ -31,7 +31,8 @@ class CommandMkpasswd final : public Command { public: - CommandMkpasswd(Module* Creator) : Command(Creator, "MKPASSWD", 2) + CommandMkpasswd(Module* Creator) + : Command(Creator, "MKPASSWD", 2) { penalty = 5000; syntax = { "<hashtype> <plaintext>" }; diff --git a/src/modules/m_pbkdf2.cpp b/src/modules/m_pbkdf2.cpp index 7d4486a22..f845dacd5 100644 --- a/src/modules/m_pbkdf2.cpp +++ b/src/modules/m_pbkdf2.cpp @@ -38,7 +38,10 @@ public: std::string hash; PBKDF2Hash(unsigned long itr, size_t dkl, const std::string& slt, const std::string& hsh = "") - : iterations(itr), length(dkl), salt(slt), hash(hsh) + : iterations(itr) + , length(dkl) + , salt(slt) + , hash(hsh) { } diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp index 33bcf731a..e2f197ad3 100644 --- a/src/modules/m_repeat.cpp +++ b/src/modules/m_repeat.cpp @@ -75,7 +75,11 @@ private: { time_t ts; std::string line; - RepeatItem(time_t TS, const std::string& Line) : ts(TS), line(Line) { } + RepeatItem(time_t TS, const std::string& Line) + : ts(TS) + , line(Line) + { + } }; typedef std::deque<RepeatItem> RepeatItemList; diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 7065102b3..8bca971f9 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -138,7 +138,9 @@ class CommandRLine final RLineFactory& factory; public: - CommandRLine(Module* Creator, RLineFactory& rlf) : Command(Creator,"RLINE", 1, 3), factory(rlf) + CommandRLine(Module* Creator, RLineFactory& rlf) + : Command(Creator, "RLINE", 1, 3) + , factory(rlf) { access_needed = CmdAccess::OPERATOR; syntax = { "<regex> [<duration> :<reason>]" }; diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp index d0d09ef13..628715668 100644 --- a/src/modules/m_rmode.cpp +++ b/src/modules/m_rmode.cpp @@ -28,7 +28,8 @@ class CommandRMode final : public Command { public: - CommandRMode(Module* Creator) : Command(Creator,"RMODE", 2, 3) + CommandRMode(Module* Creator) + : Command(Creator, "RMODE", 2, 3) { syntax = { "<channel> <mode> [<pattern>]" }; } diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index 33c043b04..cca2e8a1f 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -35,7 +35,7 @@ private: public: CommandSajoin(Module* Creator) - : Command(Creator,"SAJOIN", 1) + : Command(Creator, "SAJOIN", 1) , servprotectmode(Creator, "servprotect") { access_needed = CmdAccess::OPERATOR; diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp index 017074476..5d9c0f5f1 100644 --- a/src/modules/m_sakick.cpp +++ b/src/modules/m_sakick.cpp @@ -32,7 +32,7 @@ private: public: CommandSakick(Module* Creator) - : Command(Creator,"SAKICK", 2, 3) + : Command(Creator, "SAKICK", 2, 3) , servprotectmode(Creator, "servprotect") { access_needed = CmdAccess::OPERATOR; diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp index c95e5f010..b58782bd9 100644 --- a/src/modules/m_samode.cpp +++ b/src/modules/m_samode.cpp @@ -35,7 +35,8 @@ class CommandSamode final public: bool active; - CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2) + CommandSamode(Module* Creator) + : Command(Creator, "SAMODE", 2) { access_needed = CmdAccess::OPERATOR; syntax = { "<target> (+|-)<modes> [<mode-parameters>]" }; diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp index b701bebfc..d7ed09254 100644 --- a/src/modules/m_sanick.cpp +++ b/src/modules/m_sanick.cpp @@ -33,7 +33,7 @@ private: public: CommandSanick(Module* Creator) - : Command(Creator,"SANICK", 2) + : Command(Creator, "SANICK", 2) , servprotectmode(Creator, "servprotect") { access_needed = CmdAccess::OPERATOR; diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index 108bfda14..b5b8faa50 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -33,7 +33,7 @@ private: public: CommandSapart(Module* Creator) - : Command(Creator,"SAPART", 2, 3) + : Command(Creator, "SAPART", 2, 3) , servprotectmode(Creator, "servprotect") { access_needed = CmdAccess::OPERATOR; diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 4ca3e6979..b11894870 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -365,7 +365,9 @@ class CommandSASL final { public: SimpleExtItem<SaslAuthenticator>& authExt; - CommandSASL(Module* Creator, SimpleExtItem<SaslAuthenticator>& ext) : Command(Creator, "SASL", 2), authExt(ext) + CommandSASL(Module* Creator, SimpleExtItem<SaslAuthenticator>& ext) + : Command(Creator, "SASL", 2) + , authExt(ext) { this->access_needed = CmdAccess::SERVER; // should not be called by users } diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp index ae2fc5f17..f7d0faa7f 100644 --- a/src/modules/m_satopic.cpp +++ b/src/modules/m_satopic.cpp @@ -31,7 +31,8 @@ class CommandSATopic final : public Command { public: - CommandSATopic(Module* Creator) : Command(Creator,"SATOPIC", 2, 2) + CommandSATopic(Module* Creator) + : Command(Creator, "SATOPIC", 2, 2) { access_needed = CmdAccess::OPERATOR; allow_empty_last_param = true; diff --git a/src/modules/m_seenicks.cpp b/src/modules/m_seenicks.cpp index 0c7652a53..c3cfb78a0 100644 --- a/src/modules/m_seenicks.cpp +++ b/src/modules/m_seenicks.cpp @@ -34,12 +34,12 @@ public: void init() override { - ServerInstance->SNO.EnableSnomask('n',"NICK"); + ServerInstance->SNO.EnableSnomask('n', "NICK"); } void OnUserPostNick(User* user, const std::string& oldnick) override { - ServerInstance->SNO.WriteToSnoMask(IS_LOCAL(user) ? 'n' : 'N',"User %s changed their nickname to %s", oldnick.c_str(), user->nick.c_str()); + ServerInstance->SNO.WriteToSnoMask(IS_LOCAL(user) ? 'n' : 'N', "User %s changed their nickname to %s", oldnick.c_str(), user->nick.c_str()); } }; diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp index a881f8069..4f3adc159 100644 --- a/src/modules/m_sethost.cpp +++ b/src/modules/m_sethost.cpp @@ -32,7 +32,7 @@ public: CharState hostmap; CommandSethost(Module* Creator) - : Command(Creator,"SETHOST", 1) + : Command(Creator, "SETHOST", 1) { access_needed = CmdAccess::OPERATOR; syntax = { "<host>" }; diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp index f9013718a..54119fae6 100644 --- a/src/modules/m_setident.cpp +++ b/src/modules/m_setident.cpp @@ -31,7 +31,8 @@ class CommandSetident final : public Command { public: - CommandSetident(Module* Creator) : Command(Creator,"SETIDENT", 1) + CommandSetident(Module* Creator) + : Command(Creator, "SETIDENT", 1) { access_needed = CmdAccess::OPERATOR; syntax = { "<ident>" }; diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp index ff420fe5e..23cbc433c 100644 --- a/src/modules/m_setidle.cpp +++ b/src/modules/m_setidle.cpp @@ -38,7 +38,8 @@ class CommandSetidle final : public SplitCommand { public: - CommandSetidle(Module* Creator) : SplitCommand(Creator,"SETIDLE", 1) + CommandSetidle(Module* Creator) + : SplitCommand(Creator, "SETIDLE", 1) { access_needed = CmdAccess::OPERATOR; syntax = { "<duration>" }; diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp index 90a6ac5ae..ccafd7577 100644 --- a/src/modules/m_showwhois.cpp +++ b/src/modules/m_showwhois.cpp @@ -47,7 +47,8 @@ class WhoisNoticeCmd final : public Command { public: - WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 2) + WhoisNoticeCmd(Module* Creator) + : Command(Creator, "WHOISNOTICE", 2) { access_needed = CmdAccess::SERVER; } diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index 3b0d7baf4..754ee426c 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -41,7 +41,8 @@ class ShunFactory final : public XLineFactory { public: - ShunFactory() : XLineFactory("SHUN") { } + ShunFactory() + : XLineFactory("SHUN") { } XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) override { @@ -58,7 +59,8 @@ class CommandShun final : public Command { public: - CommandShun(Module* Creator) : Command(Creator, "SHUN", 1, 3) + CommandShun(Module* Creator) + : Command(Creator, "SHUN", 1, 3) { access_needed = CmdAccess::OPERATOR; syntax = { "<nick!user@host> [<duration> :<reason>]" }; diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index e4a328901..7d7b02072 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -558,7 +558,7 @@ bool TreeSocket::Capab(const CommandBase::Params& params) } /* Challenge response, store their challenge for our password */ - std::map<std::string,std::string>::iterator n = this->capab->CapKeys.find("CHALLENGE"); + std::map<std::string, std::string>::iterator n = this->capab->CapKeys.find("CHALLENGE"); if ((n != this->capab->CapKeys.end()) && (ServerInstance->Modules.FindService(SERVICE_DATA, "hash/sha256"))) { /* Challenge-response is on now */ diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h index 3acbea5f6..36d37b5dd 100644 --- a/src/modules/m_spanningtree/commands.h +++ b/src/modules/m_spanningtree/commands.h @@ -74,7 +74,10 @@ class CommandSVSJoin final : public ServerCommand { public: - CommandSVSJoin(Module* Creator) : ServerCommand(Creator, "SVSJOIN", 2) { } + CommandSVSJoin(Module* Creator) + : ServerCommand(Creator, "SVSJOIN", 2) + { + } CmdResult Handle(User* user, Params& params) override; RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; @@ -83,7 +86,10 @@ class CommandSVSPart final : public ServerCommand { public: - CommandSVSPart(Module* Creator) : ServerCommand(Creator, "SVSPART", 2) { } + CommandSVSPart(Module* Creator) + : ServerCommand(Creator, "SVSPART", 2) + { + } CmdResult Handle(User* user, Params& params) override; RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; @@ -92,7 +98,10 @@ class CommandSVSNick final : public ServerCommand { public: - CommandSVSNick(Module* Creator) : ServerCommand(Creator, "SVSNICK", 3) { } + CommandSVSNick(Module* Creator) + : ServerCommand(Creator, "SVSNICK", 3) + { + } CmdResult Handle(User* user, Params& params) override; RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; @@ -101,7 +110,10 @@ class CommandMetadata final : public ServerCommand { public: - CommandMetadata(Module* Creator) : ServerCommand(Creator, "METADATA", 2) { } + CommandMetadata(Module* Creator) + : ServerCommand(Creator, "METADATA", 2) + { + } CmdResult Handle(User* user, Params& params) override; class Builder final @@ -117,7 +129,10 @@ class CommandUID final : public ServerOnlyServerCommand<CommandUID> { public: - CommandUID(Module* Creator) : ServerOnlyServerCommand<CommandUID>(Creator, "UID", 10) { } + CommandUID(Module* Creator) + : ServerOnlyServerCommand<CommandUID>(Creator, "UID", 10) + { + } CmdResult HandleServer(TreeServer* server, CommandBase::Params& params); class Builder final @@ -132,7 +147,10 @@ class CommandOpertype final : public UserOnlyServerCommand<CommandOpertype> { public: - CommandOpertype(Module* Creator) : UserOnlyServerCommand<CommandOpertype>(Creator, "OPERTYPE", 1) { } + CommandOpertype(Module* Creator) + : UserOnlyServerCommand<CommandOpertype>(Creator, "OPERTYPE", 1) + { + } CmdResult HandleRemote(RemoteUser* user, Params& params); class Builder final @@ -163,7 +181,10 @@ class CommandFJoin final static void LowerTS(Channel* chan, time_t TS, const std::string& newname); static void ProcessModeUUIDPair(const std::string& item, TreeServer* sourceserver, Channel* chan, Modes::ChangeList* modechangelist, FwdFJoinBuilder& fwdfjoin); public: - CommandFJoin(Module* Creator) : ServerCommand(Creator, "FJOIN", 3) { } + CommandFJoin(Module* Creator) + : ServerCommand(Creator, "FJOIN", 3) + { + } CmdResult Handle(User* user, Params& params) override; RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_LOCALONLY; } @@ -199,7 +220,10 @@ class CommandFMode final : public ServerCommand { public: - CommandFMode(Module* Creator) : ServerCommand(Creator, "FMODE", 3) { } + CommandFMode(Module* Creator) + : ServerCommand(Creator, "FMODE", 3) + { + } CmdResult Handle(User* user, Params& params) override; }; @@ -207,7 +231,10 @@ class CommandFTopic final : public ServerCommand { public: - CommandFTopic(Module* Creator) : ServerCommand(Creator, "FTOPIC", 4, 5) { } + CommandFTopic(Module* Creator) + : ServerCommand(Creator, "FTOPIC", 4, 5) + { + } CmdResult Handle(User* user, Params& params) override; class Builder final @@ -223,7 +250,10 @@ class CommandFHost final : public UserOnlyServerCommand<CommandFHost> { public: - CommandFHost(Module* Creator) : UserOnlyServerCommand<CommandFHost>(Creator, "FHOST", 1) { } + CommandFHost(Module* Creator) + : UserOnlyServerCommand<CommandFHost>(Creator, "FHOST", 1) + { + } CmdResult HandleRemote(RemoteUser* user, Params& params); }; @@ -231,7 +261,10 @@ class CommandFRHost final : public UserOnlyServerCommand<CommandFRHost> { public: - CommandFRHost(Module* Creator) : UserOnlyServerCommand<CommandFRHost>(Creator, "FRHOST", 1) { } + CommandFRHost(Module* Creator) + : UserOnlyServerCommand<CommandFRHost>(Creator, "FRHOST", 1) + { + } CmdResult HandleRemote(RemoteUser* user, Params& params); }; @@ -239,7 +272,10 @@ class CommandFIdent final : public UserOnlyServerCommand<CommandFIdent> { public: - CommandFIdent(Module* Creator) : UserOnlyServerCommand<CommandFIdent>(Creator, "FIDENT", 1) { } + CommandFIdent(Module* Creator) + : UserOnlyServerCommand<CommandFIdent>(Creator, "FIDENT", 1) + { + } CmdResult HandleRemote(RemoteUser* user, Params& params); }; @@ -247,7 +283,10 @@ class CommandFName final : public UserOnlyServerCommand<CommandFName> { public: - CommandFName(Module* Creator) : UserOnlyServerCommand<CommandFName>(Creator, "FNAME", 1) { } + CommandFName(Module* Creator) + : UserOnlyServerCommand<CommandFName>(Creator, "FNAME", 1) + { + } CmdResult HandleRemote(RemoteUser* user, Params& params); }; @@ -255,7 +294,10 @@ class CommandIJoin final : public UserOnlyServerCommand<CommandIJoin> { public: - CommandIJoin(Module* Creator) : UserOnlyServerCommand<CommandIJoin>(Creator, "IJOIN", 2) { } + CommandIJoin(Module* Creator) + : UserOnlyServerCommand<CommandIJoin>(Creator, "IJOIN", 2) + { + } CmdResult HandleRemote(RemoteUser* user, Params& params); }; @@ -263,7 +305,10 @@ class CommandResync final : public ServerOnlyServerCommand<CommandResync> { public: - CommandResync(Module* Creator) : ServerOnlyServerCommand<CommandResync>(Creator, "RESYNC", 1) { } + CommandResync(Module* Creator) + : ServerOnlyServerCommand<CommandResync>(Creator, "RESYNC", 1) + { + } CmdResult HandleServer(TreeServer* server, Params& parameters); RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_LOCALONLY; } }; @@ -295,7 +340,10 @@ class CommandAddLine final : public ServerCommand { public: - CommandAddLine(Module* Creator) : ServerCommand(Creator, "ADDLINE", 6, 6) { } + CommandAddLine(Module* Creator) + : ServerCommand(Creator, "ADDLINE", 6, 6) + { + } CmdResult Handle(User* user, Params& parameters) override; class Builder final @@ -310,7 +358,10 @@ class CommandDelLine final : public ServerCommand { public: - CommandDelLine(Module* Creator) : ServerCommand(Creator, "DELLINE", 2, 2) { } + CommandDelLine(Module* Creator) + : ServerCommand(Creator, "DELLINE", 2, 2) + { + } CmdResult Handle(User* user, Params& parameters) override; }; @@ -318,7 +369,10 @@ class CommandEncap final : public ServerCommand { public: - CommandEncap(Module* Creator) : ServerCommand(Creator, "ENCAP", 2) { } + CommandEncap(Module* Creator) + : ServerCommand(Creator, "ENCAP", 2) + { + } CmdResult Handle(User* user, Params& parameters) override; RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; @@ -327,7 +381,10 @@ class CommandIdle final : public UserOnlyServerCommand<CommandIdle> { public: - CommandIdle(Module* Creator) : UserOnlyServerCommand<CommandIdle>(Creator, "IDLE", 1) { } + CommandIdle(Module* Creator) + : UserOnlyServerCommand<CommandIdle>(Creator, "IDLE", 1) + { + } CmdResult HandleRemote(RemoteUser* user, Params& parameters); RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_UNICAST(parameters[0]); } }; @@ -336,7 +393,10 @@ class SpanningTree::CommandNick final : public UserOnlyServerCommand<SpanningTree::CommandNick> { public: - CommandNick(Module* Creator) : UserOnlyServerCommand<SpanningTree::CommandNick>(Creator, "NICK", 2) { } + CommandNick(Module* Creator) + : UserOnlyServerCommand<SpanningTree::CommandNick>(Creator, "NICK", 2) + { + } CmdResult HandleRemote(::RemoteUser* user, Params& parameters); }; @@ -344,7 +404,10 @@ class SpanningTree::CommandPing final : public ServerCommand { public: - CommandPing(Module* Creator) : ServerCommand(Creator, "PING", 1) { } + CommandPing(Module* Creator) + : ServerCommand(Creator, "PING", 1) + { + } CmdResult Handle(User* user, Params& parameters) override; RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_UNICAST(parameters[0]); } }; @@ -353,7 +416,10 @@ class SpanningTree::CommandPong final : public ServerOnlyServerCommand<SpanningTree::CommandPong> { public: - CommandPong(Module* Creator) : ServerOnlyServerCommand<SpanningTree::CommandPong>(Creator, "PONG", 1) { } + CommandPong(Module* Creator) + : ServerOnlyServerCommand<SpanningTree::CommandPong>(Creator, "PONG", 1) + { + } CmdResult HandleServer(TreeServer* server, Params& parameters); RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_UNICAST(parameters[0]); } }; @@ -366,7 +432,10 @@ public: */ static constexpr time_t SavedTimestamp = 100; - CommandSave(Module* Creator) : ServerCommand(Creator, "SAVE", 2) { } + CommandSave(Module* Creator) + : ServerCommand(Creator, "SAVE", 2) + { + } CmdResult Handle(User* user, Params& parameters) override; }; @@ -376,7 +445,10 @@ class SpanningTree::CommandServer final static void HandleExtra(TreeServer* newserver, Params& params); public: - CommandServer(Module* Creator) : ServerOnlyServerCommand<SpanningTree::CommandServer>(Creator, "SERVER", 3) { } + CommandServer(Module* Creator) + : ServerOnlyServerCommand<SpanningTree::CommandServer>(Creator, "SERVER", 3) + { + } CmdResult HandleServer(TreeServer* server, Params& parameters); class Builder final @@ -395,7 +467,10 @@ class CommandSQuit final : public ServerOnlyServerCommand<CommandSQuit> { public: - CommandSQuit(Module* Creator) : ServerOnlyServerCommand<CommandSQuit>(Creator, "SQUIT", 2) { } + CommandSQuit(Module* Creator) + : ServerOnlyServerCommand<CommandSQuit>(Creator, "SQUIT", 2) + { + } CmdResult HandleServer(TreeServer* server, Params& parameters); }; @@ -403,7 +478,10 @@ class CommandSNONotice final : public ServerCommand { public: - CommandSNONotice(Module* Creator) : ServerCommand(Creator, "SNONOTICE", 2) { } + CommandSNONotice(Module* Creator) + : ServerCommand(Creator, "SNONOTICE", 2) + { + } CmdResult Handle(User* user, Params& parameters) override; }; @@ -411,7 +489,10 @@ class CommandEndBurst final : public ServerOnlyServerCommand<CommandEndBurst> { public: - CommandEndBurst(Module* Creator) : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") { } + CommandEndBurst(Module* Creator) + : ServerOnlyServerCommand<CommandEndBurst>(Creator, "ENDBURST") + { + } CmdResult HandleServer(TreeServer* server, Params& parameters); }; @@ -419,7 +500,10 @@ class CommandSInfo final : public ServerOnlyServerCommand<CommandSInfo> { public: - CommandSInfo(Module* Creator) : ServerOnlyServerCommand<CommandSInfo>(Creator, "SINFO", 2) { } + CommandSInfo(Module* Creator) + : ServerOnlyServerCommand<CommandSInfo>(Creator, "SINFO", 2) + { + } CmdResult HandleServer(TreeServer* server, Params& parameters); class Builder final @@ -434,7 +518,10 @@ class CommandNum final : public ServerOnlyServerCommand<CommandNum> { public: - CommandNum(Module* Creator) : ServerOnlyServerCommand<CommandNum>(Creator, "NUM", 3) { } + CommandNum(Module* Creator) + : ServerOnlyServerCommand<CommandNum>(Creator, "NUM", 3) + { + } CmdResult HandleServer(TreeServer* server, Params& parameters); RouteDescriptor GetRouting(User* user, const Params& parameters) override; @@ -450,7 +537,10 @@ class CommandLMode final : public ServerCommand { public: - CommandLMode(Module* Creator) : ServerCommand(Creator, "LMODE", 3) { } + CommandLMode(Module* Creator) + : ServerCommand(Creator, "LMODE", 3) + { + } CmdResult Handle(User* user, Params& params) override; }; diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp index bd3895c6b..0023fa7d5 100644 --- a/src/modules/m_spanningtree/hmac.cpp +++ b/src/modules/m_spanningtree/hmac.cpp @@ -81,7 +81,7 @@ bool TreeSocket::ComparePass(const Link& link, const std::string& theirs) /* Require fingerprint to exist and match */ if (link.Fingerprint != fp) { - ServerInstance->SNO.WriteToSnoMask('l',"Invalid TLS certificate fingerprint on link %s: need \"%s\" got \"%s\"", + ServerInstance->SNO.WriteToSnoMask('l', "Invalid TLS certificate fingerprint on link %s: need \"%s\" got \"%s\"", link.Name.c_str(), link.Fingerprint.c_str(), fp.c_str()); SendError("Invalid TLS certificate fingerprint " + fp + " - expected " + link.Fingerprint); return false; diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 1cfaae9c7..f84e1c91a 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -171,7 +171,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) void ModuleSpanningTree::HandleLinks(const CommandBase::Params& parameters, User* user) { - ShowLinks(Utils->TreeRoot,user,0); + ShowLinks(Utils->TreeRoot, user, 0); user->WriteNumeric(RPL_ENDOFLINKS, '*', "End of /LINKS list."); } @@ -273,7 +273,7 @@ void ModuleSpanningTree::ConnectServer(std::shared_ptr<Link> x, std::shared_ptr< catch (const DNS::Exception& e) { delete snr; - ServerInstance->SNO.WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason().c_str()); + ServerInstance->SNO.WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.", x->Name.c_str(), e.GetReason().c_str()); ConnectServer(y, false); } } @@ -307,7 +307,7 @@ void ModuleSpanningTree::DoConnectTimeout(time_t curtime) } else if (curtime > s->age + (time_t)p.second) { - ServerInstance->SNO.WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002 (timeout of %u seconds)",p.first.c_str(),p.second); + ServerInstance->SNO.WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002 (timeout of %u seconds)", p.first.c_str(), p.second); Utils->timeoutlist.erase(me); s->Close(); } diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp index 0b52a093a..da4435e79 100644 --- a/src/modules/m_spanningtree/metadata.cpp +++ b/src/modules/m_spanningtree/metadata.cpp @@ -91,7 +91,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params) ExtensionItem* item = ServerInstance->Extensions.GetItem(params[2]); if (item && item->extype == ExtensionType::CHANNEL) item->FromNetwork(c, value); - FOREACH_MOD(OnDecodeMetaData, (c,params[2],value)); + FOREACH_MOD(OnDecodeMetaData, (c, params[2], value)); } else { @@ -103,7 +103,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params) if (item && item->extype == ExtensionType::USER) item->FromNetwork(u, value); - FOREACH_MOD(OnDecodeMetaData, (u,params[1],value)); + FOREACH_MOD(OnDecodeMetaData, (u, params[1], value)); } } diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp index 4664111c2..abe28282f 100644 --- a/src/modules/m_spanningtree/netburst.cpp +++ b/src/modules/m_spanningtree/netburst.cpp @@ -88,7 +88,10 @@ public: struct TreeSocket::BurstState final { SpanningTreeProtocolInterface::Server server; - BurstState(TreeSocket* sock) : server(sock) { } + BurstState(TreeSocket* sock) + : server(sock) + { + } }; /** This function is called when we want to send a netburst to a local @@ -98,7 +101,7 @@ struct TreeSocket::BurstState final */ void TreeSocket::DoBurst(TreeServer* s) { - ServerInstance->SNO.WriteToSnoMask('l',"Bursting to \002%s\002 (Authentication: %s%s).", + ServerInstance->SNO.WriteToSnoMask('l', "Bursting to \002%s\002 (Authentication: %s%s).", s->GetName().c_str(), capab->auth_fingerprint ? "TLS certificate fingerprint and " : "", capab->auth_challenge ? "challenge-response" : "plaintext password"); @@ -119,7 +122,7 @@ void TreeSocket::DoBurst(TreeServer* s) this->SendXLines(); Utils->Creator->synceventprov.Call(&ServerProtocol::SyncEventListener::OnSyncNetwork, bs.server); this->WriteLine(CmdBuilder("ENDBURST")); - ServerInstance->SNO.WriteToSnoMask('l',"Finished bursting to \002"+ s->GetName()+"\002."); + ServerInstance->SNO.WriteToSnoMask('l', "Finished bursting to \002"+ s->GetName()+"\002."); } void TreeSocket::SendServerInfo(TreeServer* from) diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp index 93e7ae73b..c0173d1a3 100644 --- a/src/modules/m_spanningtree/override_map.cpp +++ b/src/modules/m_spanningtree/override_map.cpp @@ -35,7 +35,7 @@ #include "commands.h" CommandMap::CommandMap(Module* Creator) - : Command(Creator, "MAP", 0, 1) + : Command(Creator, "MAP") { penalty = 2000; } diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp index b46297b75..82644d3c0 100644 --- a/src/modules/m_spanningtree/override_squit.cpp +++ b/src/modules/m_spanningtree/override_squit.cpp @@ -44,7 +44,7 @@ ModResult ModuleSpanningTree::HandleSquit(const CommandBase::Params& parameters, if (s->IsLocal()) { - ServerInstance->SNO.WriteToSnoMask('l',"SQUIT: Server \002%s\002 removed from network by %s",parameters[0].c_str(),user->nick.c_str()); + ServerInstance->SNO.WriteToSnoMask('l', "SQUIT: Server \002%s\002 removed from network by %s", parameters[0].c_str(), user->nick.c_str()); s->SQuit("Server quit by " + user->GetFullRealHost()); } else diff --git a/src/modules/m_spanningtree/precommand.cpp b/src/modules/m_spanningtree/precommand.cpp index 0c60fbed4..46e96b72c 100644 --- a/src/modules/m_spanningtree/precommand.cpp +++ b/src/modules/m_spanningtree/precommand.cpp @@ -33,15 +33,15 @@ ModResult ModuleSpanningTree::OnPreCommand(std::string& command, CommandBase::Pa if (command == "CONNECT") { - return this->HandleConnect(parameters,user); + return this->HandleConnect(parameters, user); } else if (command == "SQUIT") { - return this->HandleSquit(parameters,user); + return this->HandleSquit(parameters, user); } else if (command == "LINKS") { - this->HandleLinks(parameters,user); + this->HandleLinks(parameters, user); return MOD_RES_DENY; } else if (command == "WHOIS") @@ -49,12 +49,12 @@ ModResult ModuleSpanningTree::OnPreCommand(std::string& command, CommandBase::Pa if (parameters.size() > 1) { // remote whois - return this->HandleRemoteWhois(parameters,user); + return this->HandleRemoteWhois(parameters, user); } } else if ((command == "VERSION") && (!parameters.empty())) { - return this->HandleVersion(parameters,user); + return this->HandleVersion(parameters, user); } return MOD_RES_PASSTHRU; } diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h index 7322738eb..4c1688ed5 100644 --- a/src/modules/m_spanningtree/protocolinterface.h +++ b/src/modules/m_spanningtree/protocolinterface.h @@ -33,7 +33,10 @@ public: TreeSocket* const sock; public: - Server(TreeSocket* s) : sock(s) { } + Server(TreeSocket* s) + : sock(s) + { + } void SendMetaData(const std::string& key, const std::string& data) override; }; diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp index 8607f718b..7a0df868e 100644 --- a/src/modules/m_spanningtree/rconnect.cpp +++ b/src/modules/m_spanningtree/rconnect.cpp @@ -47,10 +47,11 @@ CmdResult CommandRConnect::Handle(User* user, const Params& parameters) } /* Is this aimed at our server? */ - if (InspIRCd::Match(ServerInstance->Config->ServerName,parameters[0])) + if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[0])) { /* Yes, initiate the given connect */ - ServerInstance->SNO.WriteToSnoMask('l',"Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick.c_str(),parameters[0].c_str(),parameters[1].c_str()); + ServerInstance->SNO.WriteToSnoMask('l', "Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002", + user->nick.c_str(), parameters[0].c_str(), parameters[1].c_str()); CommandBase::Params para; para.push_back(parameters[1]); ((ModuleSpanningTree*)(Module*)creator)->HandleConnect(para, user); diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp index cdc3cce62..076ebaef4 100644 --- a/src/modules/m_spanningtree/rsquit.cpp +++ b/src/modules/m_spanningtree/rsquit.cpp @@ -59,7 +59,7 @@ CmdResult CommandRSQuit::Handle(User* user, const Params& parameters) { // We have been asked to remove server_target. const char* reason = parameters.size() == 2 ? parameters[1].c_str() : "No reason"; - ServerInstance->SNO.WriteToSnoMask('l',"RSQUIT: Server \002%s\002 removed from network by %s (%s)", parameters[0].c_str(), user->nick.c_str(), reason); + ServerInstance->SNO.WriteToSnoMask('l', "RSQUIT: Server \002%s\002 removed from network by %s (%s)", parameters[0].c_str(), user->nick.c_str(), reason); server_target->SQuit("Server quit by " + user->GetFullRealHost() + " (" + reason + ")"); } diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index 427c3b719..4dea9bc64 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -82,7 +82,7 @@ struct CapabData final std::string ChanModes; std::string UserModes; std::string ExtBans; - std::map<std::string,std::string> CapKeys; /* CAPAB keys from other server */ + std::map<std::string, std::string> CapKeys; /* CAPAB keys from other server */ std::string ourchallenge; /* Challenge sent for challenge/response */ std::string theirchallenge; /* Challenge recv for challenge/response */ int capab_phase = 0; /* Have sent CAPAB already */ diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index e141f022b..a45335ea3 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -135,7 +135,10 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params dosend = false; if (dosend) - ServerInstance->SNO.WriteToSnoMask('C',"Client connecting at %s: %s (%s) [%s\x0F]", remoteserver->GetName().c_str(), _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->GetRealName().c_str()); + { + ServerInstance->SNO.WriteToSnoMask('C', "Client connecting at %s: %s (%s) [%s\x0F]", remoteserver->GetName().c_str(), + _new->GetFullRealHost().c_str(), _new->GetIPString().c_str(), _new->GetRealName().c_str()); + } FOREACH_MOD(OnPostConnect, (_new)); diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp index d3a4cbbe7..227bf42a8 100644 --- a/src/modules/m_sqlauth.cpp +++ b/src/modules/m_sqlauth.cpp @@ -173,7 +173,7 @@ public: if (!tag->getBool("usesqlauth", true)) return MOD_RES_PASSTHRU; - if (!allowpattern.empty() && InspIRCd::Match(user->nick,allowpattern)) + if (!allowpattern.empty() && InspIRCd::Match(user->nick, allowpattern)) return MOD_RES_PASSTHRU; if (pendingExt.Get(user)) diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index 15b76e4f3..269dcd43b 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -93,7 +93,7 @@ public: std::stringstream s(value); std::string v; - getline(s,v,' '); + getline(s, v, ' '); cert->invalid = (v.find('v') != std::string::npos); cert->trusted = (v.find('T') != std::string::npos); @@ -101,13 +101,13 @@ public: cert->unknownsigner = (v.find('s') != std::string::npos); if (v.find('E') != std::string::npos) { - getline(s,cert->error,'\n'); + getline(s, cert->error, '\n'); } else { - getline(s,cert->fingerprint,' '); - getline(s,cert->dn,' '); - getline(s,cert->issuer,'\n'); + getline(s, cert->fingerprint, ' '); + getline(s, cert->dn, ' '); + getline(s, cert->issuer, '\n'); } } diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index 842ad6f11..631fd37e7 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -77,7 +77,10 @@ class SVSHoldFactory final : public XLineFactory { public: - SVSHoldFactory() : XLineFactory("SVSHOLD") { } + SVSHoldFactory() + : XLineFactory("SVSHOLD") + { + } XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) override { @@ -94,7 +97,8 @@ class CommandSvshold final : public Command { public: - CommandSvshold(Module* Creator) : Command(Creator, "SVSHOLD", 1) + CommandSvshold(Module* Creator) + : Command(Creator, "SVSHOLD", 1) { access_needed = CmdAccess::OPERATOR; syntax = { "<nick> [<duration> :<reason>]" }; diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index f6ec5c6ee..b5348c84b 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -75,7 +75,7 @@ public: bool sendnotice; CommandTban(Module* Creator) - : Command(Creator,"TBAN", 3) + : Command(Creator, "TBAN", 3) , banmode(Creator, "ban") { syntax = { "<channel> <duration> <banmask>" }; diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp index 744de774a..56705006f 100644 --- a/src/modules/m_tline.cpp +++ b/src/modules/m_tline.cpp @@ -29,7 +29,8 @@ class CommandTline final : public Command { public: - CommandTline(Module* Creator) : Command(Creator,"TLINE", 1) + CommandTline(Module* Creator) + : Command(Creator, "TLINE", 1) { access_needed = CmdAccess::OPERATOR; syntax = { "<mask>" }; @@ -43,7 +44,7 @@ public: for (const auto& [_, u] : ServerInstance->Users.GetUsers()) { - if (InspIRCd::Match(u->GetFullRealHost(),parameters[0])) + if (InspIRCd::Match(u->GetFullRealHost(), parameters[0])) { n_matched++; n_match_host++; diff --git a/src/socketengines/select.cpp b/src/socketengines/select.cpp index a579a00b0..a474cd83f 100644 --- a/src/socketengines/select.cpp +++ b/src/socketengines/select.cpp @@ -43,7 +43,7 @@ void SocketEngine::Init() #ifdef _WIN32 // Set up winsock. WSADATA wsadata; - WSAStartup(MAKEWORD(2,2), &wsadata); + WSAStartup(MAKEWORD(2, 2), &wsadata); #endif MaxSetSize = FD_SETSIZE; diff --git a/src/threadsocket.cpp b/src/threadsocket.cpp index 999b9eb25..e4c2eb450 100644 --- a/src/threadsocket.cpp +++ b/src/threadsocket.cpp @@ -33,7 +33,8 @@ private: SocketThread* parent = nullptr; public: - ThreadSignalSocket(SocketThread* p, int newfd) : parent(p) + ThreadSignalSocket(SocketThread* p, int newfd) + : parent(p) { SetFd(newfd); SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE); diff --git a/src/usermanager.cpp b/src/usermanager.cpp index da40abd5c..54e3041d7 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -170,7 +170,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs if (this->local_users.size() > ServerInstance->Config->SoftLimit) { ServerInstance->SNO.WriteToSnoMask('a', "Warning: softlimit value has been reached: %lu clients", ServerInstance->Config->SoftLimit); - this->QuitUser(New,"No more connections allowed"); + this->QuitUser(New, "No more connections allowed"); return; } @@ -186,7 +186,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs * besides that, if we get a positive bancache hit, we still won't fuck * them over if they are exempt. -- w00t */ - New->exempt = (ServerInstance->XLines->MatchesLine("E",New) != nullptr); + New->exempt = (ServerInstance->XLines->MatchesLine("E", New) != nullptr); BanCacheHit* const b = ServerInstance->BanCache.GetHit(New->GetIPString()); if (b) @@ -213,7 +213,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs { if (!New->exempt) { - XLine* r = ServerInstance->XLines->MatchesLine("Z",New); + XLine* r = ServerInstance->XLines->MatchesLine("Z", New); if (r) { @@ -292,7 +292,10 @@ void UserManager::QuitUser(User* user, const std::string& quitmessage, const std lu->eh.Close(); if (lu->IsFullyConnected()) - ServerInstance->SNO.WriteToSnoMask('q',"Client exiting: %s (%s) [%s]", user->GetFullRealHost().c_str(), user->GetIPString().c_str(), operquitmsg.c_str()); + { + ServerInstance->SNO.WriteToSnoMask('q', "Client exiting: %s (%s) [%s]", user->GetFullRealHost().c_str(), + user->GetIPString().c_str(), operquitmsg.c_str()); + } local_users.erase(lu); } diff --git a/src/users.cpp b/src/users.cpp index 982566869..fad22e7e3 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -524,8 +524,9 @@ void LocalUser::FullConnect() FOREACH_MOD(OnPostConnect, (this)); - ServerInstance->SNO.WriteToSnoMask('c',"Client connecting on port %d (class %s): %s (%s) [%s\x0F]", - this->server_sa.port(), this->GetClass()->name.c_str(), GetFullRealHost().c_str(), this->GetIPString().c_str(), this->GetRealName().c_str()); + ServerInstance->SNO.WriteToSnoMask('c', "Client connecting on port %d (class %s): %s (%s) [%s\x0F]", + this->server_sa.port(), this->GetClass()->name.c_str(), GetFullRealHost().c_str(), + this->GetIPString().c_str(), this->GetRealName().c_str()); ServerInstance->Logs.Debug("BANCACHE", "BanCache: Adding NEGATIVE hit for " + this->GetIPString()); ServerInstance->BanCache.AddHit(this->GetIPString(), "", ""); // reset the flood penalty (which could have been raised due to things like auto +x) @@ -603,7 +604,7 @@ bool User::ChangeNick(const std::string& newnick, time_t newts) ServerInstance->Users.clientlist[newnick] = this; if (IsFullyConnected()) - FOREACH_MOD(OnUserPostNick, (this,oldnick)); + FOREACH_MOD(OnUserPostNick, (this, oldnick)); return true; } @@ -628,7 +629,7 @@ const std::string& User::GetIPString() cachedip = client_sa.addr(); /* IP addresses starting with a : on irc are a Bad Thing (tm) */ if (cachedip[0] == ':') - cachedip.insert(cachedip.begin(),1,'0'); + cachedip.insert(cachedip.begin(), 1, '0'); } return cachedip; @@ -935,7 +936,7 @@ bool User::ChangeDisplayedHost(const std::string& shost) return false; } - FOREACH_MOD(OnChangeHost, (this,shost)); + FOREACH_MOD(OnChangeHost, (this, shost)); if (realhost == shost) this->displayhost.clear(); @@ -991,7 +992,7 @@ bool User::ChangeIdent(const std::string& newident) if (this->ident == newident) return true; - FOREACH_MOD(OnChangeIdent, (this,newident)); + FOREACH_MOD(OnChangeIdent, (this, newident)); this->ident.assign(newident, 0, ServerInstance->Config->Limits.MaxUser); this->InvalidateCache(); @@ -1032,7 +1033,7 @@ void LocalUser::SetClass(const std::string& explicit_name) c->GetName().c_str()); ModResult MOD_RESULT; - FIRST_MOD_RESULT(OnSetConnectClass, MOD_RESULT, (this,c)); + FIRST_MOD_RESULT(OnSetConnectClass, MOD_RESULT, (this, c)); if (MOD_RESULT == MOD_RES_DENY) continue; diff --git a/src/xline.cpp b/src/xline.cpp index 38bf0b07d..11288298c 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -37,7 +37,10 @@ class GLineFactory final : public XLineFactory { public: - GLineFactory() : XLineFactory("G") { } + GLineFactory() + : XLineFactory("G") + { + } /** Generate a GLine */ @@ -54,7 +57,10 @@ class ELineFactory final : public XLineFactory { public: - ELineFactory() : XLineFactory("E") { } + ELineFactory() + : XLineFactory("E") + { + } /** Generate an ELine */ @@ -71,7 +77,10 @@ class KLineFactory final : public XLineFactory { public: - KLineFactory() : XLineFactory("K") { } + KLineFactory() + : XLineFactory("K") + { + } /** Generate a KLine */ @@ -88,7 +97,10 @@ class QLineFactory final : public XLineFactory { public: - QLineFactory() : XLineFactory("Q") { } + QLineFactory() + : XLineFactory("Q") + { + } /** Generate a QLine */ @@ -104,7 +116,10 @@ class ZLineFactory final : public XLineFactory { public: - ZLineFactory() : XLineFactory("Z") { } + ZLineFactory() + : XLineFactory("Z") + { + } /** Generate a ZLine */ @@ -238,11 +253,11 @@ std::vector<std::string> XLineManager::GetAllTypes() IdentHostPair XLineManager::IdentSplit(const std::string& ident_and_host) { - IdentHostPair n = std::make_pair<std::string,std::string>("*","*"); + IdentHostPair n = std::make_pair<std::string, std::string>("*", "*"); std::string::size_type x = ident_and_host.find('@'); if (x != std::string::npos) { - n.second = ident_and_host.substr(x + 1,ident_and_host.length()); + n.second = ident_and_host.substr(x + 1, ident_and_host.length()); n.first = ident_and_host.substr(0, x); if (!n.first.length()) n.first.assign("*"); diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp index 70381dc8f..2fdb27b1f 100644 --- a/win/inspircd_win32wrapper.cpp +++ b/win/inspircd_win32wrapper.cpp @@ -27,7 +27,7 @@ #include "inspircd_win32wrapper.h" #include "inspircd.h" -CWin32Exception::CWin32Exception() : exception() +CWin32Exception::CWin32Exception() { dwErrorCode = GetLastError(); if( FormatMessageA( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), nullptr) == 0 ) diff --git a/win/win32service.cpp b/win/win32service.cpp index 796e4f828..7db7c4b20 100644 --- a/win/win32service.cpp +++ b/win/win32service.cpp @@ -177,7 +177,7 @@ void InstallService() throw CWin32Exception(); } - InspServiceHandle = CreateService(SCMHandle, TEXT("InspIRCd"),TEXT("InspIRCd Daemon"), SERVICE_CHANGE_CONFIG, SERVICE_WIN32_OWN_PROCESS, + InspServiceHandle = CreateService(SCMHandle, TEXT("InspIRCd"), TEXT("InspIRCd Daemon"), SERVICE_CHANGE_CONFIG, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, tszBinaryPath, 0, 0, 0, TEXT("NT AUTHORITY\\NetworkService"), nullptr); if (!InspServiceHandle) |