diff options
Diffstat (limited to 'src/modules')
28 files changed, 51 insertions, 52 deletions
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 36156013d..e1db996c8 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -186,7 +186,7 @@ class SQLConn : public SQL::Provider, public EventHandler public: reference<ConfigTag> conf; /* The <database> entry */ std::deque<QueueItem> queue; - PGconn* sql; /* PgSQL database connection handle */ + PGconn* sql; /* PgSQL database connection handle */ SQLstatus status; /* PgSQL database connection status */ QueueItem qinprog; /* If there is currently a query in progress */ diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 5dadda184..e02c4a697 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -1248,7 +1248,7 @@ class GnuTLSIOHookProvider : public SSLIOHookProvider GnuTLS::Profile profile; public: - GnuTLSIOHookProvider(Module* mod, GnuTLS::Profile::Config& config) + GnuTLSIOHookProvider(Module* mod, GnuTLS::Profile::Config& config) : SSLIOHookProvider(mod, config.name) , profile(config) { diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index 5c768ce3c..c3d040ad0 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -822,7 +822,7 @@ class mbedTLSIOHookProvider : public SSLIOHookProvider mbedTLS::Profile profile; public: - mbedTLSIOHookProvider(Module* mod, mbedTLS::Profile::Config& config) + mbedTLSIOHookProvider(Module* mod, mbedTLS::Profile::Config& config) : SSLIOHookProvider(mod, config.name) , profile(config) { diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 14f7012b6..ec1114cb9 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -45,7 +45,7 @@ enum class callerid_data { public: - typedef insp::flat_set<User*> UserSet; + typedef insp::flat_set<User*> UserSet; typedef std::vector<callerid_data*> CallerIdDataSet; time_t lastnotify; diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 1cf6c29bf..c7960c836 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -83,7 +83,7 @@ class CBanFactory : public XLineFactory CBanFactory() : XLineFactory("CBAN") { } /** Generate a CBAN - */ + */ XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { return new CBan(set_time, duration, source, reason, xline_specific_mask); @@ -218,7 +218,7 @@ class ModuleCBan : public Module, public Stats::EventListener // Channel is banned. user->WriteNumeric(ERR_BADCHANNEL, cname, InspIRCd::Format("Channel %s is CBANed: %s", cname.c_str(), rl->reason.c_str())); ServerInstance->SNO->WriteGlobalSno('a', "%s tried to join %s which is CBANed (%s)", - user->nick.c_str(), cname.c_str(), rl->reason.c_str()); + user->nick.c_str(), cname.c_str(), rl->reason.c_str()); return MOD_RES_DENY; } diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp index 1210c7c12..3336b1817 100644 --- a/src/modules/m_clones.cpp +++ b/src/modules/m_clones.cpp @@ -39,7 +39,7 @@ class CommandClones : public SplitCommand IRCv3::Batch::Batch batch; public: - CommandClones(Module* Creator) + CommandClones(Module* Creator) : SplitCommand(Creator,"CLONES", 1) , batchmanager(Creator) , batch("inspircd.org/clones") diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index 98bcbf4cd..007f0efef 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -352,7 +352,7 @@ class CommandDccallow : public Command void DisplayDCCAllowList(User* user) { - // display current DCCALLOW list + // display current DCCALLOW list user->WriteNumeric(RPL_DCCALLOWSTART, "Users on your DCCALLOW list:"); dl = ext.get(user); diff --git a/src/modules/m_haproxy.cpp b/src/modules/m_haproxy.cpp index cf551d545..f7ef52213 100644 --- a/src/modules/m_haproxy.cpp +++ b/src/modules/m_haproxy.cpp @@ -110,7 +110,7 @@ struct HAProxyHeader class HAProxyHookProvider : public IOHookProvider { private: - UserCertificateAPI sslapi; + UserCertificateAPI sslapi; public: HAProxyHookProvider(Module* mod) diff --git a/src/modules/m_hidemode.cpp b/src/modules/m_hidemode.cpp index 66e70fb89..3f041344f 100644 --- a/src/modules/m_hidemode.cpp +++ b/src/modules/m_hidemode.cpp @@ -91,7 +91,7 @@ class ModeHook : public ClientProtocol::EventHook const Modes::Change& curr = *i; if (settings.GetRequiredRank(*curr.mh) <= rank) { - // No restriction on who can see this mode or there is one but the member's rank is sufficient + // No restriction on who can see this mode or there is one but the member's rank is sufficient if (modechangelist) modechangelist->push(curr); diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index eefb3ed93..f3ec3298b 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -359,7 +359,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru { if (pathsegment == ".") { - // Stay at the current level. + // Stay at the current level. continue; } diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp index 197bf589e..270e8b007 100644 --- a/src/modules/m_httpd_acl.cpp +++ b/src/modules/m_httpd_acl.cpp @@ -48,7 +48,7 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener HTTPdAPI API; public: - ModuleHTTPAccessList() + ModuleHTTPAccessList() : HTTPACLEventListener(this) , API(this) { diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp index 54163f2b1..e23999045 100644 --- a/src/modules/m_ircv3.cpp +++ b/src/modules/m_ircv3.cpp @@ -51,10 +51,10 @@ class JoinHook : public ClientProtocol::EventHook ClientProtocol::Events::Join extendedjoinmsg; public: - const std::string asterisk; + const std::string asterisk; ClientProtocol::EventProvider awayprotoev; AwayMessage awaymsg; - Cap::Capability extendedjoincap; + Cap::Capability extendedjoincap; Cap::Capability awaycap; JoinHook(Module* mod) diff --git a/src/modules/m_ircv3_batch.cpp b/src/modules/m_ircv3_batch.cpp index aa464f9fe..e280339e4 100644 --- a/src/modules/m_ircv3_batch.cpp +++ b/src/modules/m_ircv3_batch.cpp @@ -59,12 +59,12 @@ struct IRCv3::Batch::BatchInfo class IRCv3::Batch::ManagerImpl : public Manager { - typedef std::vector<Batch*> BatchList; + typedef std::vector<Batch*> BatchList; Cap::Capability cap; ClientProtocol::EventProvider protoevprov; LocalIntExt batchbits; - BatchList active_batches; + BatchList active_batches; bool unloading; bool ShouldSendTag(LocalUser* user, const ClientProtocol::MessageTagData& tagdata) CXX11_OVERRIDE diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp index 4885bc0e5..8d4b956e7 100644 --- a/src/modules/m_ldapauth.cpp +++ b/src/modules/m_ldapauth.cpp @@ -325,7 +325,7 @@ public: whitelistedcidrs.clear(); requiredattributes.clear(); - base = tag->getString("baserdn"); + base = tag->getString("baserdn"); attribute = tag->getString("attribute"); killreason = tag->getString("killreason"); vhost = tag->getString("host"); diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp index ea631b2e8..823a6fe5d 100644 --- a/src/modules/m_monitor.cpp +++ b/src/modules/m_monitor.cpp @@ -190,7 +190,7 @@ class IRCv3::Monitor::Manager } private: - typedef TR1NS::unordered_map<std::string, Entry, irc::insensitive, irc::StrHashComp> NickHash; + typedef TR1NS::unordered_map<std::string, Entry, irc::insensitive, irc::StrHashComp> NickHash; Entry* Find(const std::string& nick) { @@ -239,9 +239,9 @@ class IRCv3::Monitor::Manager return &extdata->list; } - NickHash nicks; - ExtItem ext; - WatchedList emptywatchedlist; + NickHash nicks; + ExtItem ext; + WatchedList emptywatchedlist; }; void IRCv3::Monitor::Manager::ExtItem::FromInternal(Extensible* container, const std::string& value) diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp index 3b9afd5bd..91293573f 100644 --- a/src/modules/m_nationalchars.cpp +++ b/src/modules/m_nationalchars.cpp @@ -40,7 +40,6 @@ class lwbNickHandler static bool Call(const std::string&); }; - /*,m_reverse_additionalUp[256];*/ static unsigned char m_reverse_additional[256],m_additionalMB[256],m_additionalUtf8[256],m_additionalUtf8range[256],m_additionalUtf8interval[256]; char utf8checkrest(unsigned char * mb, unsigned char cnt) @@ -417,7 +416,7 @@ class ModuleNationalChars : public Module if (*p == '0') { if (p[1] == 'x') - /* hex with the leading "0x" */ + /* hex with the leading "0x" */ chartable[i] = symtoi(p + 2, 16); else chartable[i] = symtoi(p + 1, 8); @@ -426,12 +425,13 @@ class ModuleNationalChars : public Module else if (*p == 'x') { chartable[i] = symtoi(p + 1, 16); - }else /* decimal form */ + } + else /* decimal form */ { chartable[i] = symtoi(p, 10); } } - else /* plain-text char between '' */ + else /* plain-text char between '' */ { if (*(p + 1) == '\\') { diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index e0dbabf42..cd59f07bc 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -44,7 +44,7 @@ class RemoveBase : public Command ChanModeReference& nokicksmode; public: - unsigned int protectedrank; + unsigned int protectedrank; RemoveBase(Module* Creator, bool& snk, ChanModeReference& nkm, const char* cmdn) : Command(Creator, cmdn, 2, 3) @@ -108,7 +108,7 @@ class RemoveBase : public Command { /* We'll let everyone remove their level and below, eg: * ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1) - a ulined target will get a higher level than it's possible for a /remover to get..so they're safe. + * a ulined target will get a higher level than it's possible for a /remover to get..so they're safe. * Nobody may remove people with >= protectedrank rank. */ unsigned int ulevel = channel->GetPrefixValue(user); diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp index 5a532389a..33ca5b057 100644 --- a/src/modules/m_repeat.cpp +++ b/src/modules/m_repeat.cpp @@ -30,7 +30,7 @@ class ChannelSettings { public: - enum RepeatAction + enum RepeatAction { ACT_KICK, ACT_BLOCK, diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index e202bae45..57e605d61 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -235,11 +235,11 @@ class SaslAuthenticator { switch (this->state) { - case SASL_INIT: + case SASL_INIT: this->agent = msg[0]; this->state = SASL_COMM; /* fall through */ - case SASL_COMM: + case SASL_COMM: if (msg[0] != this->agent) return this->state; @@ -267,9 +267,9 @@ class SaslAuthenticator ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Services sent an unknown SASL message \"%s\" \"%s\"", msg[2].c_str(), msg[3].c_str()); break; - case SASL_DONE: + case SASL_DONE: break; - default: + default: ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WTF: SaslState is not a known state (%d)", this->state); break; } @@ -301,16 +301,16 @@ class SaslAuthenticator switch (this->result) { - case SASL_OK: + case SASL_OK: this->user->WriteNumeric(RPL_SASLSUCCESS, "SASL authentication successful"); break; - case SASL_ABORT: + case SASL_ABORT: this->user->WriteNumeric(ERR_SASLABORTED, "SASL authentication aborted"); break; - case SASL_FAIL: + case SASL_FAIL: this->user->WriteNumeric(ERR_SASLFAIL, "SASL authentication failed"); break; - default: + default: break; } @@ -321,8 +321,8 @@ class SaslAuthenticator class CommandAuthenticate : public SplitCommand { private: - // The maximum length of an AUTHENTICATE request. - static const size_t MAX_AUTHENTICATE_SIZE = 400; + // The maximum length of an AUTHENTICATE request. + static const size_t MAX_AUTHENTICATE_SIZE = 400; public: SimpleExtItem<SaslAuthenticator>& authExt; diff --git a/src/modules/m_sha1.cpp b/src/modules/m_sha1.cpp index 2d8ce635c..69af2eba6 100644 --- a/src/modules/m_sha1.cpp +++ b/src/modules/m_sha1.cpp @@ -166,7 +166,7 @@ class SHA1Context class SHA1HashProvider : public HashProvider { public: - SHA1HashProvider(Module* mod) + SHA1HashProvider(Module* mod) : HashProvider(mod, "sha1", 20, 64) { } diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index d63b721a0..c68afc494 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -43,7 +43,7 @@ class ShunFactory : public XLineFactory ShunFactory() : XLineFactory("SHUN") { } /** Generate a shun - */ + */ XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { return new Shun(set_time, duration, source, reason, xline_specific_mask); diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 01387c753..507897a4e 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -128,7 +128,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) { if (user->IsOper()) { - ShowLinks(server, user, hops+1); + ShowLinks(server, user, hops+1); } } else diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp index 80b4e87c7..bef739ed0 100644 --- a/src/modules/m_spanningtree/nickcollide.cpp +++ b/src/modules/m_spanningtree/nickcollide.cpp @@ -78,8 +78,7 @@ bool SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remo * if ident@ip is equal, and theirs is newer, or * ident@ip differ, and ours is newer */ - if((SamePerson && remotets < localts) || - (!SamePerson && remotets > localts)) + if ((SamePerson && remotets < localts) || (!SamePerson && remotets > localts)) { // Only remote needs to change bChangeLocal = false; diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp index 32f8caf04..64c02e149 100644 --- a/src/modules/m_spanningtree/override_squit.cpp +++ b/src/modules/m_spanningtree/override_squit.cpp @@ -54,7 +54,7 @@ ModResult ModuleSpanningTree::HandleSquit(const CommandBase::Params& parameters, } else { - user->WriteNotice("*** SQUIT: The server \002" + parameters[0] + "\002 does not exist on the network."); + user->WriteNotice("*** SQUIT: The server \002" + parameters[0] + "\002 does not exist on the network."); } return MOD_RES_DENY; } diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index f705887b7..5d0fc9f2d 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -55,10 +55,10 @@ * CONNECTING: indicates an outbound socket which is * waiting to be writeable. * WAIT_AUTH_1: indicates the socket is outbound and - * has successfully connected, but has not + * has successfully connected, but has not * yet sent and received SERVER strings. * WAIT_AUTH_2: indicates that the socket is inbound - * but has not yet sent and received + * but has not yet sent and received * SERVER strings. * CONNECTED: represents a fully authorized, fully * connected server. diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h index 889cd182e..26e6e7c22 100644 --- a/src/modules/m_spanningtree/utils.h +++ b/src/modules/m_spanningtree/utils.h @@ -50,7 +50,7 @@ class SpanningTreeUtilities : public classbase CacheRefreshTimer RefreshTimer; public: - typedef std::set<TreeSocket*> TreeSocketSet; + typedef std::set<TreeSocket*> TreeSocketSet; typedef std::map<TreeSocket*, std::pair<std::string, unsigned int> > TimeoutList; /** Creator module diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index ec7fb1a11..48dad2ca4 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -82,7 +82,7 @@ class SVSHoldFactory : public XLineFactory SVSHoldFactory() : XLineFactory("SVSHOLD") { } /** Generate an SVSHOLD - */ + */ XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { return new SVSHold(set_time, duration, source, reason, xline_specific_mask); diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp index 6928e43d7..9db277164 100644 --- a/src/modules/m_xline_db.cpp +++ b/src/modules/m_xline_db.cpp @@ -48,9 +48,9 @@ class ModuleXLineDB { /* Load the configuration * Note: - * This is on purpose not changed on a rehash. It would be non-trivial to change the database on-the-fly. - * Imagine a scenario where the new file already exists. Merging the current XLines with the existing database is likely a bad idea - * ...and so is discarding all current in-memory XLines for the ones in the database. + * This is on purpose not changed on a rehash. It would be non-trivial to change the database on-the-fly. + * Imagine a scenario where the new file already exists. Merging the current XLines with the existing database is likely a bad idea + * ...and so is discarding all current in-memory XLines for the ones in the database. */ ConfigTag* Conf = ServerInstance->Config->ConfValue("xlinedb"); xlinedbpath = ServerInstance->Config->Paths.PrependData(Conf->getString("filename", "xline.db", 1)); @@ -119,7 +119,7 @@ class ModuleXLineDB * xline types may not have a conf tag, so let's just write them. * In addition, let's use a file version, so we can maintain some * semblance of backwards compatibility for reading on startup.. - * -- w00t + * -- w00t */ stream << "VERSION 1" << std::endl; |