diff options
Diffstat (limited to 'src')
81 files changed, 103 insertions, 103 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index fa4e096ee..21e648c9f 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -204,7 +204,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co if (cname.length() > ServerInstance->Config->Limits.MaxChannel) cname.resize(ServerInstance->Config->Limits.MaxChannel); - Channel* chan = ServerInstance->Channels.Find(cname); + auto chan = ServerInstance->Channels.Find(cname); bool created_by_local = !chan; // Flag that will be passed to ForceJoin later std::string privs; // Prefix mode(letter)s to give to the joining user diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 79b9bdaa5..028378eb4 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -400,7 +400,7 @@ void CommandParser::TranslateSingleParam(TranslateType to, const std::string& it case TR_NICK: { /* Translate single nickname */ - User* user = ServerInstance->Users.Find(item); + auto user = ServerInstance->Users.Find(item); if (user) dest.append(user->uuid); else diff --git a/src/configreader.cpp b/src/configreader.cpp index 718488115..d15005804 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -440,7 +440,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string& useruid) } } - User* user = ServerInstance->Users.FindUUID(useruid); + auto user = ServerInstance->Users.FindUUID(useruid); if (!valid) { @@ -622,7 +622,7 @@ void ConfigReaderThread::OnStop() */ ServerInstance->Users.RehashCloneCounts(); - User* user = ServerInstance->Users.FindUUID(UUID); + auto user = ServerInstance->Users.FindUUID(UUID); ConfigStatus status(user); for (const auto& [modname, mod] : ServerInstance->Modules.GetModules()) diff --git a/src/coremods/core_channel/cmd_invite.cpp b/src/coremods/core_channel/cmd_invite.cpp index 982688c23..ae8b10717 100644 --- a/src/coremods/core_channel/cmd_invite.cpp +++ b/src/coremods/core_channel/cmd_invite.cpp @@ -65,7 +65,7 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters) else u = ServerInstance->Users.Find(parameters[0]); - Channel* c = ServerInstance->Channels.Find(parameters[1]); + auto c = ServerInstance->Channels.Find(parameters[1]); time_t timeout = 0; if (parameters.size() >= 3) { diff --git a/src/coremods/core_channel/cmd_kick.cpp b/src/coremods/core_channel/cmd_kick.cpp index 35a84c51d..f679d2f4a 100644 --- a/src/coremods/core_channel/cmd_kick.cpp +++ b/src/coremods/core_channel/cmd_kick.cpp @@ -46,7 +46,7 @@ CommandKick::CommandKick(Module* parent) CmdResult CommandKick::Handle(User* user, const Params& parameters) { - Channel* c = ServerInstance->Channels.Find(parameters[0]); + auto c = ServerInstance->Channels.Find(parameters[0]); User* u; if (CommandParser::LoopCall(user, this, parameters, 1)) diff --git a/src/coremods/core_channel/cmd_topic.cpp b/src/coremods/core_channel/cmd_topic.cpp index 57e6ba4e1..cbf1c0def 100644 --- a/src/coremods/core_channel/cmd_topic.cpp +++ b/src/coremods/core_channel/cmd_topic.cpp @@ -53,7 +53,7 @@ CommandTopic::CommandTopic(Module* parent) CmdResult CommandTopic::HandleLocal(LocalUser* user, const Params& parameters) { - Channel* c = ServerInstance->Channels.Find(parameters[0]); + auto c = ServerInstance->Channels.Find(parameters[0]); if (!c) { user->WriteNumeric(Numerics::NoSuchChannel(parameters[0])); diff --git a/src/coremods/core_channel/invite.cpp b/src/coremods/core_channel/invite.cpp index c44cff58c..fdac06f17 100644 --- a/src/coremods/core_channel/invite.cpp +++ b/src/coremods/core_channel/invite.cpp @@ -164,7 +164,7 @@ void Invite::APIImpl::Unserialize(LocalUser* user, const std::string& value) irc::spacesepstream ss(value); for (std::string channame, exptime; (ss.GetToken(channame) && ss.GetToken(exptime)); ) { - Channel* chan = ServerInstance->Channels.Find(channame); + auto chan = ServerInstance->Channels.Find(channame); if (chan) Create(user, chan, ConvToNum<time_t>(exptime)); } diff --git a/src/coremods/core_hostname_lookup.cpp b/src/coremods/core_hostname_lookup.cpp index c15e23e8d..6d9681d92 100644 --- a/src/coremods/core_hostname_lookup.cpp +++ b/src/coremods/core_hostname_lookup.cpp @@ -179,7 +179,7 @@ public: } LogLookup(*rr, query->cached); - UserResolver* res_forward = new UserIPResolver(this->manager, this->creator, user, rr->rdata); + auto res_forward = new UserIPResolver(this->manager, this->creator, user, rr->rdata); try { this->manager->Process(res_forward); @@ -223,7 +223,7 @@ public: user->WriteNotice("*** Looking up your hostname..."); - UserResolver* res_reverse = new UserHostResolver(*this->DNS, this, user); + auto res_reverse = new UserHostResolver(*this->DNS, this, user); try { /* If both the reverse and forward queries are cached, the user will be able to pass DNS completely diff --git a/src/coremods/core_message.cpp b/src/coremods/core_message.cpp index b7b301153..40aee06d9 100644 --- a/src/coremods/core_message.cpp +++ b/src/coremods/core_message.cpp @@ -140,7 +140,7 @@ private: CmdResult HandleChannelTarget(User* source, const Params& parameters, const char* target, PrefixMode* pm) { - Channel* chan = ServerInstance->Channels.Find(target); + auto chan = ServerInstance->Channels.Find(target); if (!chan) { // The target channel does not exist. diff --git a/src/coremods/core_mode.cpp b/src/coremods/core_mode.cpp index e6fba59bd..5329b64ef 100644 --- a/src/coremods/core_mode.cpp +++ b/src/coremods/core_mode.cpp @@ -100,7 +100,7 @@ CommandMode::CommandMode(Module* parent) CmdResult CommandMode::Handle(User* user, const Params& parameters) { const std::string& target = parameters[0]; - Channel* targetchannel = ServerInstance->Channels.Find(target); + auto targetchannel = ServerInstance->Channels.Find(target); User* targetuser = nullptr; if (!targetchannel) { diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp index e1b061c89..ff5c5cc07 100644 --- a/src/coremods/core_oper/cmd_kill.cpp +++ b/src/coremods/core_oper/cmd_kill.cpp @@ -66,7 +66,7 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters) return CmdResult::FAILURE; } - User* target = ServerInstance->Users.Find(parameters[0]); + auto target = ServerInstance->Users.Find(parameters[0]); if (!target) { user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp index be4aff152..a96acb397 100644 --- a/src/coremods/core_reloadmodule.cpp +++ b/src/coremods/core_reloadmodule.cpp @@ -706,7 +706,7 @@ public: ServerInstance->SNO.WriteGlobalSno('a', "Failed to reload the %s module.", passedname.c_str()); } - User* user = ServerInstance->Users.FindUUID(uuid); + auto user = ServerInstance->Users.FindUUID(uuid); if (user) { if (result) diff --git a/src/coremods/core_user/cmd_part.cpp b/src/coremods/core_user/cmd_part.cpp index 121d7169f..e1bbeb01b 100644 --- a/src/coremods/core_user/cmd_part.cpp +++ b/src/coremods/core_user/cmd_part.cpp @@ -52,7 +52,7 @@ CmdResult CommandPart::Handle(User* user, const Params& parameters) if (CommandParser::LoopCall(user, this, parameters, 0)) return CmdResult::SUCCESS; - Channel* c = ServerInstance->Channels.Find(parameters[0]); + auto c = ServerInstance->Channels.Find(parameters[0]); if (!c) { diff --git a/src/coremods/core_user/cmd_userhost.cpp b/src/coremods/core_user/cmd_userhost.cpp index 2152c47cc..6a92f74e8 100644 --- a/src/coremods/core_user/cmd_userhost.cpp +++ b/src/coremods/core_user/cmd_userhost.cpp @@ -41,7 +41,7 @@ CmdResult CommandUserhost::Handle(User* user, const Params& parameters) size_t paramcount = std::min<size_t>(parameters.size(), 5); for (size_t i = 0; i < paramcount; ++i) { - User* u = ServerInstance->Users.FindNick(parameters[i]); + auto u = ServerInstance->Users.FindNick(parameters[i]); if ((u) && (u->registered == REG_ALL)) { diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp index bc527cfde..ee07f0a53 100644 --- a/src/coremods/core_who.cpp +++ b/src/coremods/core_who.cpp @@ -598,7 +598,7 @@ CmdResult CommandWho::HandleLocal(LocalUser* user, const Params& parameters) WhoData data(parameters); // Is the source running a WHO on a channel? - Channel* chan = ServerInstance->Channels.Find(data.matchtext); + auto chan = ServerInstance->Channels.Find(data.matchtext); if (chan) WhoChannel(user, parameters, chan, data); diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp index 4c4e71544..812fea6da 100644 --- a/src/coremods/core_whois.cpp +++ b/src/coremods/core_whois.cpp @@ -262,7 +262,7 @@ CmdResult CommandWhois::HandleRemote(RemoteUser* target, const Params& parameter if (parameters.size() < 2) return CmdResult::FAILURE; - User* user = ServerInstance->Users.FindUUID(parameters[0]); + auto user = ServerInstance->Users.FindUUID(parameters[0]); if (!user) return CmdResult::FAILURE; diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp index 720bf51f1..ab96061ce 100644 --- a/src/coremods/core_xline/cmd_eline.cpp +++ b/src/coremods/core_xline/cmd_eline.cpp @@ -43,7 +43,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters) if (parameters.size() >= 3) { IdentHostPair ih; - User* find = ServerInstance->Users.Find(target); + auto find = ServerInstance->Users.Find(target); if ((find) && (find->registered == REG_ALL)) { ih.first = find->GetBanIdent(); diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp index ee96193f2..5730eec7e 100644 --- a/src/coremods/core_xline/cmd_gline.cpp +++ b/src/coremods/core_xline/cmd_gline.cpp @@ -44,7 +44,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters) if (parameters.size() >= 3) { IdentHostPair ih; - User* find = ServerInstance->Users.Find(target); + auto find = ServerInstance->Users.Find(target); if ((find) && (find->registered == REG_ALL)) { ih.first = find->GetBanIdent(); diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp index cf7cd538e..842bb406b 100644 --- a/src/coremods/core_xline/cmd_kline.cpp +++ b/src/coremods/core_xline/cmd_kline.cpp @@ -44,7 +44,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters) if (parameters.size() >= 3) { IdentHostPair ih; - User* find = ServerInstance->Users.Find(target); + auto find = ServerInstance->Users.Find(target); if ((find) && (find->registered == REG_ALL)) { ih.first = find->GetBanIdent(); diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp index 65e3965c5..b4c804263 100644 --- a/src/coremods/core_xline/cmd_zline.cpp +++ b/src/coremods/core_xline/cmd_zline.cpp @@ -50,7 +50,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) return CmdResult::FAILURE; } - User* u = ServerInstance->Users.Find(target); + auto u = ServerInstance->Users.Find(target); if ((u) && (u->registered == REG_ALL)) { diff --git a/src/coremods/core_xline/core_xline.h b/src/coremods/core_xline/core_xline.h index 1280f0996..28b7dc5dc 100644 --- a/src/coremods/core_xline/core_xline.h +++ b/src/coremods/core_xline/core_xline.h @@ -41,7 +41,7 @@ public: long Run(const std::string& mask) override { long matches = 0; - const T* c = static_cast<T*>(this); + auto c = static_cast<T*>(this); for (const auto& [_, user] : ServerInstance->Users.GetUsers()) { if (c->Check(user, mask)) diff --git a/src/logging.cpp b/src/logging.cpp index 279584577..c1f030615 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -117,7 +117,7 @@ Log::MethodPtr Log::FileEngine::Create(std::shared_ptr<ConfigTag> tag) throw CoreException("<log:target> must be specified for file logger at " + tag->source.str()); const std::string fulltarget = ServerInstance->Config->Paths.PrependLog(InspIRCd::TimeString(ServerInstance->Time(), target.c_str())); - FILE* fh = fopen(fulltarget.c_str(), "a"); + auto fh = fopen(fulltarget.c_str(), "a"); if (!fh) { throw CoreException(InspIRCd::Format("Unable to open %s for file logger at %s: %s", diff --git a/src/modules/extra/m_log_json.cpp b/src/modules/extra/m_log_json.cpp index 93a74c181..9dcdc628b 100644 --- a/src/modules/extra/m_log_json.cpp +++ b/src/modules/extra/m_log_json.cpp @@ -138,7 +138,7 @@ public: throw CoreException("<log:target> must be specified for JSON logger at " + tag->source.str()); const std::string fulltarget = ServerInstance->Config->Paths.PrependLog(InspIRCd::TimeString(ServerInstance->Time(), target.c_str())); - FILE* fh = fopen(fulltarget.c_str(), "a"); + auto fh = fopen(fulltarget.c_str(), "a"); if (!fh) { throw CoreException(InspIRCd::Format("Unable to open %s for JSON logger at %s: %s", diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index f3bd96700..b7de8c8a7 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -285,7 +285,7 @@ public: if (!a.RequiredNick.empty()) { int numeric = a.ServiceOnly ? ERR_NOSUCHSERVICE : ERR_NOSUCHNICK; - User* u = ServerInstance->Users.FindNick(a.RequiredNick); + auto u = ServerInstance->Users.FindNick(a.RequiredNick); if (!u) { user->WriteNumeric(numeric, a.RequiredNick, "is currently unavailable. Please try again later."); diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index dc45aff03..7c32722b5 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -163,7 +163,7 @@ public: return false; } - Channel* c = ServerInstance->Channels.Find(mask[CHAN]); + auto c = ServerInstance->Channels.Find(mask[CHAN]); if (!c) { source->WriteNumeric(690, InspIRCd::Format("Target channel %s must exist to be set as a redirect.", mask[CHAN].c_str())); @@ -327,7 +327,7 @@ public: return MOD_RES_DENY; /* tell them they're banned and are being transferred */ - Channel* destchan = ServerInstance->Channels.Find(redirect.targetchan); + auto destchan = ServerInstance->Channels.Find(redirect.targetchan); std::string destlimit; if (destchan) diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 04e5c54c6..4fc1c114e 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -113,7 +113,7 @@ struct CallerIDExtInfo final while (s.GetToken(tok)) { - User* u = ServerInstance->Users.Find(tok); + auto u = ServerInstance->Users.Find(tok); if ((u) && (u->registered == REG_ALL) && (!u->quitting)) { if (dat->accepting.insert(u).second) diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index 46b3354f7..745c5f847 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -129,7 +129,7 @@ class Cap::ManagerImpl final // Set back the cap for all users who were using it before the reload for (const auto& uuid : capdata.users) { - User* user = ServerInstance->Users.FindUUID(uuid); + auto user = ServerInstance->Users.FindUUID(uuid); if (!user) { ServerInstance->Logs.Debug(MODNAME, "User %s is gone when trying to restore cap %s", uuid.c_str(), capdata.name.c_str()); diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp index 9df0ba075..aaef87704 100644 --- a/src/modules/m_chanlog.cpp +++ b/src/modules/m_chanlog.cpp @@ -74,7 +74,7 @@ public: const std::string snotice = "\002" + desc + "\002: " + msg; for (const auto& [_, channel] : channels) { - Channel* c = ServerInstance->Channels.Find(channel); + auto c = ServerInstance->Channels.Find(channel); if (c) { ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->Config->ServerName, c, snotice); diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 5df627711..4ccacccd0 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -171,8 +171,8 @@ public: if (parameters.size() > 1 && !irc::equals(parameters[1], ServerInstance->Config->ServerName)) return CmdResult::SUCCESS; - User* targetuser = ServerInstance->Users.FindNick(parameters[0]); - Channel* targetchan = ServerInstance->Channels.Find(parameters[0]); + auto targetuser = ServerInstance->Users.FindNick(parameters[0]); + auto targetchan = ServerInstance->Channels.Find(parameters[0]); /* * Syntax of a /check reply: diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index f857ca5cd..0cb65bf6e 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -57,7 +57,7 @@ public: } } - User* dest = ServerInstance->Users.Find(parameters[0]); + auto dest = ServerInstance->Users.Find(parameters[0]); // Allow services to change the host of unregistered users if ((!dest) || ((dest->registered != REG_ALL) && (!user->server->IsService()))) diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index 5f247b4ff..ab6d78b53 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -42,7 +42,7 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - User* dest = ServerInstance->Users.Find(parameters[0]); + auto dest = ServerInstance->Users.Find(parameters[0]); if ((!dest) || (dest->registered != REG_ALL)) { diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index 7448c8299..40761d8d2 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -40,7 +40,7 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - User* dest = ServerInstance->Users.Find(parameters[0]); + auto dest = ServerInstance->Users.Find(parameters[0]); if ((!dest) || (dest->registered != REG_ALL)) { diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp index 0b75f5d0c..64f80abc4 100644 --- a/src/modules/m_cycle.cpp +++ b/src/modules/m_cycle.cpp @@ -42,7 +42,7 @@ public: CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { - Channel* channel = ServerInstance->Channels.Find(parameters[0]); + auto channel = ServerInstance->Channels.Find(parameters[0]); std::string reason = "Cycling"; if (parameters.size() > 1) diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index 057761374..15c1148ad 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -234,7 +234,7 @@ public: } std::string nick(parameters[0], 1); - User* target = ServerInstance->Users.FindNick(nick); + auto target = ServerInstance->Users.FindNick(nick); if ((target) && (!target->quitting) && (target->registered == REG_ALL)) { diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index fd72c7e52..d100daebb 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -444,7 +444,7 @@ public: std::string hostname = reversedip + "." + dnsbl->domain; /* now we'd need to fire off lookups for `hostname'. */ - DNSBLResolver* r = new DNSBLResolver(*this->DNS, this, nameExt, countExt, hostname, user, dnsbl); + auto r = new DNSBLResolver(*this->DNS, this, nameExt, countExt, hostname, user, dnsbl); try { this->DNS->Process(r); diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp index 4729c4b6c..f1317e467 100644 --- a/src/modules/m_ircv3_ctctags.cpp +++ b/src/modules/m_ircv3_ctctags.cpp @@ -69,7 +69,7 @@ private: CmdResult HandleChannelTarget(User* source, const Params& parameters, const char* target, PrefixMode* pm) { - Channel* chan = ServerInstance->Channels.Find(target); + auto chan = ServerInstance->Channels.Find(target); if (!chan) { // The target channel does not exist. diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index 836164268..e8372a915 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -81,7 +81,7 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - Channel* c = ServerInstance->Channels.Find(parameters[0]); + auto c = ServerInstance->Channels.Find(parameters[0]); if (!c) { user->WriteNumeric(Numerics::NoSuchChannel(parameters[0])); diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp index accd43412..d5577e86d 100644 --- a/src/modules/m_ldapauth.cpp +++ b/src/modules/m_ldapauth.cpp @@ -110,7 +110,7 @@ public: void OnResult(const LDAPResult& r) override { - User* user = ServerInstance->Users.FindUUID(uid); + auto user = ServerInstance->Users.FindUUID(uid); dynamic_reference<LDAPProvider> LDAP(me, provider); if (!user || !LDAP) @@ -195,7 +195,7 @@ public: return; } - User* user = ServerInstance->Users.FindUUID(uid); + auto user = ServerInstance->Users.FindUUID(uid); if (user) { if (verbose) @@ -254,7 +254,7 @@ public: void OnError(const LDAPResult& err) override { ServerInstance->SNO.WriteToSnoMask('a', "Error searching LDAP server: %s", err.getError().c_str()); - User* user = ServerInstance->Users.FindUUID(uid); + auto user = ServerInstance->Users.FindUUID(uid); if (user) ServerInstance->Users.QuitUser(user, killreason); delete this; diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp index 3aa8dfffb..78a235919 100644 --- a/src/modules/m_ldapoper.cpp +++ b/src/modules/m_ldapoper.cpp @@ -54,7 +54,7 @@ protected: void Fallback() { - User* user = ServerInstance->Users.FindUUID(uid); + auto user = ServerInstance->Users.FindUUID(uid); Fallback(user); } @@ -84,7 +84,7 @@ public: void OnResult(const LDAPResult& r) override { - User* user = ServerInstance->Users.FindUUID(uid); + auto user = ServerInstance->Users.FindUUID(uid); ServerConfig::OperIndex::const_iterator iter = ServerInstance->Config->oper_blocks.find(opername); if (!user || iter == ServerInstance->Config->oper_blocks.end()) diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp index b6a0d3022..9d2c776b8 100644 --- a/src/modules/m_monitor.cpp +++ b/src/modules/m_monitor.cpp @@ -180,7 +180,7 @@ public: static User* FindNick(const std::string& nick) { - User* user = ServerInstance->Users.FindNick(nick); + auto user = ServerInstance->Users.FindNick(nick); if ((user) && (user->registered == REG_ALL)) return user; return nullptr; diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index 28a2cd37a..7e5c2fe80 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -98,7 +98,7 @@ public: continue; } - Channel* chan = ServerInstance->Channels.Find(channel.substr(hashpos)); + auto chan = ServerInstance->Channels.Find(channel.substr(hashpos)); if (!chan) { // Should never happen. diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 7696fbc41..b173a882c 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -49,7 +49,7 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - User* target = ServerInstance->Users.Find(parameters[0]); + auto target = ServerInstance->Users.Find(parameters[0]); if ((!target) || (target->registered != REG_ALL)) { @@ -108,7 +108,7 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - User* target = ServerInstance->Users.Find(parameters[0]); + auto target = ServerInstance->Users.Find(parameters[0]); if (!target) { diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp index b5cc9299a..ee8e39cb3 100644 --- a/src/modules/m_ojoin.cpp +++ b/src/modules/m_ojoin.cpp @@ -96,7 +96,7 @@ public: ModResult AccessCheck(User* source, Channel* channel, Modes::Change& change) override { - User* theuser = ServerInstance->Users.Find(change.param); + auto theuser = ServerInstance->Users.Find(change.param); // remove own privs? if (source == theuser && !change.adding) return MOD_RES_ALLOW; diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp index c6e4ecfd6..8721df61f 100644 --- a/src/modules/m_passforward.cpp +++ b/src/modules/m_passforward.cpp @@ -88,7 +88,7 @@ public: if (!nickrequired.empty()) { /* Check if nick exists and is on a services server. */ - User* u = ServerInstance->Users.Find(nickrequired); + auto u = ServerInstance->Users.Find(nickrequired); if (!u || !u->server->IsService()) return; } diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index e39a380ff..37d088934 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -211,7 +211,7 @@ public: continue; } - Channel* c = ServerInstance->Channels.Find(channel); + auto c = ServerInstance->Channels.Find(channel); if (!c) { time_t TS = tag->getInt("ts", ServerInstance->Time(), 1); diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index 8f5e3f078..430c6ea38 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -54,7 +54,7 @@ public: if (IS_LOCAL(source) && !source->IsOper()) { - Channel* c = ServerInstance->Channels.Find(parameter); + auto c = ServerInstance->Channels.Find(parameter); if (!c) { source->WriteNumeric(690, InspIRCd::Format("Target channel %s must exist to be set as a redirect.", parameter.c_str())); @@ -109,7 +109,7 @@ public: const std::string& channel = *re.ext.Get(chan); /* sometimes broken services can make circular or chained +L, avoid this */ - Channel* destchan = ServerInstance->Channels.Find(channel); + auto destchan = ServerInstance->Channels.Find(channel); if (destchan && destchan->IsModeSet(re)) { user->WriteNumeric(470, cname, '*', "You may not join this channel. A redirect is set, but you may not be redirected as it is a circular loop."); diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 584a29dbc..2b9aaa597 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -67,7 +67,7 @@ public: target = ServerInstance->Users.Find(username); /* And the channel we're meant to be removing them from */ - Channel* channel = ServerInstance->Channels.Find(channame); + auto channel = ServerInstance->Channels.Find(channame); /* Fix by brain - someone needs to learn to validate their input! */ if (!channel) diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp index d351becad..d0d09ef13 100644 --- a/src/modules/m_rmode.cpp +++ b/src/modules/m_rmode.cpp @@ -35,7 +35,7 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - Channel* chan = ServerInstance->Channels.Find(parameters[0]); + auto chan = ServerInstance->Channels.Find(parameters[0]); if (!chan) { user->WriteNumeric(Numerics::NoSuchChannel(parameters[0])); diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index 3f710033d..0b859887d 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -52,7 +52,7 @@ public: const std::string& channel = parameters[channelindex]; const std::string& nickname = parameters.size() > 1 ? parameters[0] : user->nick; - User* dest = ServerInstance->Users.Find(nickname); + auto dest = ServerInstance->Users.Find(nickname); if ((dest) && (dest->registered == REG_ALL)) { if (user != dest && !user->HasPrivPermission("users/sajoin-others")) @@ -73,7 +73,7 @@ public: return CmdResult::FAILURE; } - Channel* chan = ServerInstance->Channels.Find(channel); + auto chan = ServerInstance->Channels.Find(channel); if ((chan) && (chan->HasUser(dest))) { user->WriteRemoteNotice("*** " + dest->nick + " is already on " + channel); diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp index 28fd9c54a..b27636669 100644 --- a/src/modules/m_sakick.cpp +++ b/src/modules/m_sakick.cpp @@ -43,8 +43,8 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - User* dest = ServerInstance->Users.Find(parameters[1]); - Channel* channel = ServerInstance->Channels.Find(parameters[0]); + auto dest = ServerInstance->Users.Find(parameters[1]); + auto channel = ServerInstance->Channels.Find(parameters[0]); if ((dest) && (dest->registered == REG_ALL) && (channel)) { diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp index 86f77d24f..578c252bc 100644 --- a/src/modules/m_samode.cpp +++ b/src/modules/m_samode.cpp @@ -46,7 +46,7 @@ public: { if (!ServerInstance->Channels.IsPrefix(parameters[0][0])) { - User* target = ServerInstance->Users.FindNick(parameters[0]); + auto target = ServerInstance->Users.FindNick(parameters[0]); if ((!target) || (target->registered != REG_ALL)) { user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp index 8d1bd55d7..062caf72f 100644 --- a/src/modules/m_sanick.cpp +++ b/src/modules/m_sanick.cpp @@ -43,7 +43,7 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - User* target = ServerInstance->Users.Find(parameters[0]); + auto target = ServerInstance->Users.Find(parameters[0]); /* Do local sanity checks and bails */ if (IS_LOCAL(user)) diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index 629236240..30134cf00 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -47,8 +47,8 @@ public: if (CommandParser::LoopCall(user, this, parameters, 1)) return CmdResult::FAILURE; - User* dest = ServerInstance->Users.Find(parameters[0]); - Channel* channel = ServerInstance->Channels.Find(parameters[1]); + auto dest = ServerInstance->Users.Find(parameters[0]); + auto channel = ServerInstance->Channels.Find(parameters[1]); std::string reason; if ((dest) && (dest->registered == REG_ALL) && (channel)) diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp index 1b00e5dce..3229e8e5c 100644 --- a/src/modules/m_saquit.cpp +++ b/src/modules/m_saquit.cpp @@ -45,7 +45,7 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - User* dest = ServerInstance->Users.Find(parameters[0]); + auto dest = ServerInstance->Users.Find(parameters[0]); if ((dest) && (dest->registered == REG_ALL)) { if (dest->IsModeSet(servprotectmode)) diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 70f0daf2b..73dd21c2a 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -372,7 +372,7 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - User* target = ServerInstance->Users.FindUUID(parameters[1]); + auto target = ServerInstance->Users.FindUUID(parameters[1]); if (!target) { ServerInstance->Logs.Debug(MODNAME, "User not found in sasl ENCAP event: %s", parameters[1].c_str()); diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp index 450b332eb..ae2fc5f17 100644 --- a/src/modules/m_satopic.cpp +++ b/src/modules/m_satopic.cpp @@ -43,7 +43,7 @@ public: /* * Handles a SATOPIC request. Notifies all +s users. */ - Channel* target = ServerInstance->Channels.Find(parameters[0]); + auto target = ServerInstance->Channels.Find(parameters[0]); if(target) { diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp index b1ac0e014..159230f3f 100644 --- a/src/modules/m_servprotect.cpp +++ b/src/modules/m_servprotect.cpp @@ -82,7 +82,7 @@ public: /* Check if the parameter is a valid nick/uuid */ - User* u = ServerInstance->Users.Find(change.param); + auto u = ServerInstance->Users.Find(change.param); if (u) { Membership* memb = chan->GetUser(u); diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp index 7656e2c3c..90a6ac5ae 100644 --- a/src/modules/m_showwhois.cpp +++ b/src/modules/m_showwhois.cpp @@ -61,11 +61,11 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - User* dest = ServerInstance->Users.Find(parameters[0]); + auto dest = ServerInstance->Users.Find(parameters[0]); if (!dest) return CmdResult::FAILURE; - User* source = ServerInstance->Users.Find(parameters[1]); + auto source = ServerInstance->Users.Find(parameters[1]); if (IS_LOCAL(dest) && source) HandleFast(dest, source); diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index d23ac00db..96f9260ae 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -71,7 +71,7 @@ public: std::string target = parameters[0]; - User* find = ServerInstance->Users.Find(target); + auto find = ServerInstance->Users.Find(target); if ((find) && (find->registered == REG_ALL)) target = "*!" + find->GetBanIdent() + "@" + find->GetIPString(); diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp index 46de08382..a478094b2 100644 --- a/src/modules/m_spanningtree/fjoin.cpp +++ b/src/modules/m_spanningtree/fjoin.cpp @@ -117,7 +117,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params) time_t TS = ServerCommand::ExtractTS(params[1]); const std::string& channel = params[0]; - Channel* chan = ServerInstance->Channels.Find(channel); + auto chan = ServerInstance->Channels.Find(channel); bool apply_other_sides_modes = true; TreeServer* const sourceserver = TreeServer::Get(srcuser); @@ -201,7 +201,7 @@ void CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeServer* sour // Comma not required anymore if the user has no modes const std::string::size_type ubegin = (comma == std::string::npos ? 0 : comma+1); std::string uuid(item, ubegin, UIDGenerator::UUID_LENGTH); - User* who = ServerInstance->Users.FindUUID(uuid); + auto who = ServerInstance->Users.FindUUID(uuid); if (!who) { // Probably KILLed, ignore diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp index 8b365bec8..ddbfe9f3e 100644 --- a/src/modules/m_spanningtree/ftopic.cpp +++ b/src/modules/m_spanningtree/ftopic.cpp @@ -28,7 +28,7 @@ /** FTOPIC command */ CmdResult CommandFTopic::Handle(User* user, Params& params) { - Channel* c = ServerInstance->Channels.Find(params[0]); + auto c = ServerInstance->Channels.Find(params[0]); if (!c) return CmdResult::FAILURE; diff --git a/src/modules/m_spanningtree/idle.cpp b/src/modules/m_spanningtree/idle.cpp index 8e9945582..c4bc9b191 100644 --- a/src/modules/m_spanningtree/idle.cpp +++ b/src/modules/m_spanningtree/idle.cpp @@ -39,7 +39,7 @@ CmdResult CommandIdle::HandleRemote(RemoteUser* issuer, Params& params) * the number of seconds 'issuer' has been idle. */ - User* target = ServerInstance->Users.FindUUID(params[0]); + auto target = ServerInstance->Users.FindUUID(params[0]); if ((!target) || (target->registered != REG_ALL)) return CmdResult::FAILURE; diff --git a/src/modules/m_spanningtree/ijoin.cpp b/src/modules/m_spanningtree/ijoin.cpp index 625f0bdfc..c781ba17d 100644 --- a/src/modules/m_spanningtree/ijoin.cpp +++ b/src/modules/m_spanningtree/ijoin.cpp @@ -27,7 +27,7 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, Params& params) { - Channel* chan = ServerInstance->Channels.Find(params[0]); + auto chan = ServerInstance->Channels.Find(params[0]); if (!chan) { // Desync detected, recover @@ -60,7 +60,7 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, Params& params) CmdResult CommandResync::HandleServer(TreeServer* server, CommandBase::Params& params) { ServerInstance->Logs.Debug(MODNAME, "Resyncing " + params[0]); - Channel* chan = ServerInstance->Channels.Find(params[0]); + auto chan = ServerInstance->Channels.Find(params[0]); if (!chan) { // This can happen for a number of reasons, safe to ignore diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp index bf7f47aa9..0b52a093a 100644 --- a/src/modules/m_spanningtree/metadata.cpp +++ b/src/modules/m_spanningtree/metadata.cpp @@ -47,11 +47,11 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params) if (params.size() < 6) throw ProtocolException("Insufficient parameters for channel METADATA"); - User* u = ServerInstance->Users.FindUUID(params[1]); + auto u = ServerInstance->Users.FindUUID(params[1]); if (!u) return CmdResult::FAILURE; // User does not exist. - Channel* c = ServerInstance->Channels.Find(params[2]); + auto c = ServerInstance->Channels.Find(params[2]); if (!c) return CmdResult::FAILURE; // Channel does not exist. @@ -77,7 +77,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params) if (params.size() < 3) throw ProtocolException("Insufficient parameters for channel METADATA"); - Channel* c = ServerInstance->Channels.Find(params[0]); + auto c = ServerInstance->Channels.Find(params[0]); if (!c) return CmdResult::FAILURE; @@ -95,7 +95,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params) } else { - User* u = ServerInstance->Users.FindUUID(params[0]); + auto u = ServerInstance->Users.FindUUID(params[0]); if (u) { ExtensionItem* item = ServerInstance->Extensions.GetItem(params[1]); diff --git a/src/modules/m_spanningtree/nick.cpp b/src/modules/m_spanningtree/nick.cpp index 56fe314b1..734e81251 100644 --- a/src/modules/m_spanningtree/nick.cpp +++ b/src/modules/m_spanningtree/nick.cpp @@ -37,7 +37,7 @@ CmdResult CommandNick::HandleRemote(::RemoteUser* user, Params& params) * On nick messages, check that the nick doesn't already exist here. * If it does, perform collision logic. */ - User* x = ServerInstance->Users.FindNick(params[0]); + auto x = ServerInstance->Users.FindNick(params[0]); if ((x) && (x != user) && (x->registered == REG_ALL)) { // 'x' is the already existing user using the same nick as params[0] diff --git a/src/modules/m_spanningtree/override_whois.cpp b/src/modules/m_spanningtree/override_whois.cpp index 594f291e2..70c711f02 100644 --- a/src/modules/m_spanningtree/override_whois.cpp +++ b/src/modules/m_spanningtree/override_whois.cpp @@ -30,7 +30,7 @@ ModResult ModuleSpanningTree::HandleRemoteWhois(const CommandBase::Params& parameters, User* user) { - User* remote = ServerInstance->Users.FindNick(parameters[1]); + auto remote = ServerInstance->Users.FindNick(parameters[1]); if (remote && !IS_LOCAL(remote)) { CmdBuilder(user, "IDLE").push(remote->uuid).Unicast(remote); diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp index fe0857bd7..398cf05be 100644 --- a/src/modules/m_spanningtree/postcommand.cpp +++ b/src/modules/m_spanningtree/postcommand.cpp @@ -97,7 +97,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm } if (ServerInstance->Channels.IsPrefix(dest[0])) { - Channel* c = ServerInstance->Channels.Find(dest); + auto c = ServerInstance->Channels.Find(dest); if (!c) return; // TODO OnBuildExemptList hook was here @@ -114,7 +114,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm else { // user target? - User* d = ServerInstance->Users.Find(dest); + auto d = ServerInstance->Users.Find(dest); if (!d || IS_LOCAL(d)) return; TreeServer* tsd = TreeServer::Get(d)->GetRoute(); diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp index a7845a55a..a55f164dd 100644 --- a/src/modules/m_spanningtree/save.cpp +++ b/src/modules/m_spanningtree/save.cpp @@ -32,7 +32,7 @@ */ CmdResult CommandSave::Handle(User* user, Params& params) { - User* u = ServerInstance->Users.FindUUID(params[0]); + auto u = ServerInstance->Users.FindUUID(params[0]); if (!u) return CmdResult::FAILURE; diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp index 1458e2ece..d9f40fdb3 100644 --- a/src/modules/m_spanningtree/svsjoin.cpp +++ b/src/modules/m_spanningtree/svsjoin.cpp @@ -33,7 +33,7 @@ CmdResult CommandSVSJoin::Handle(User* user, Params& parameters) return CmdResult::FAILURE; // Check target exists - User* u = ServerInstance->Users.FindUUID(parameters[0]); + auto u = ServerInstance->Users.FindUUID(parameters[0]); if (!u) return CmdResult::FAILURE; diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp index df52d8252..397ae0c39 100644 --- a/src/modules/m_spanningtree/svsnick.cpp +++ b/src/modules/m_spanningtree/svsnick.cpp @@ -29,7 +29,7 @@ CmdResult CommandSVSNick::Handle(User* user, Params& parameters) { - User* u = ServerInstance->Users.Find(parameters[0]); + auto u = ServerInstance->Users.Find(parameters[0]); if (u && IS_LOCAL(u)) { diff --git a/src/modules/m_spanningtree/svspart.cpp b/src/modules/m_spanningtree/svspart.cpp index 6e5217ace..18ebfc797 100644 --- a/src/modules/m_spanningtree/svspart.cpp +++ b/src/modules/m_spanningtree/svspart.cpp @@ -28,11 +28,11 @@ CmdResult CommandSVSPart::Handle(User* user, Params& parameters) { - User* u = ServerInstance->Users.FindUUID(parameters[0]); + auto u = ServerInstance->Users.FindUUID(parameters[0]); if (!u) return CmdResult::FAILURE; - Channel* c = ServerInstance->Channels.Find(parameters[1]); + auto c = ServerInstance->Channels.Find(parameters[1]); if (!c) return CmdResult::FAILURE; diff --git a/src/modules/m_spanningtree/translate.cpp b/src/modules/m_spanningtree/translate.cpp index 740ada398..203b3c264 100644 --- a/src/modules/m_spanningtree/translate.cpp +++ b/src/modules/m_spanningtree/translate.cpp @@ -33,7 +33,7 @@ std::string Translate::ModeChangeListToParams(const Modes::ChangeList::List& mod if (mh->IsPrefixMode()) { - User* target = ServerInstance->Users.Find(item.param); + auto target = ServerInstance->Users.Find(item.param); if (target) { ret.append(target->uuid); diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index e78506a08..4258695ef 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -242,7 +242,7 @@ User* TreeSocket::FindSource(const std::string& prefix, const std::string& comma else { // If the prefix string is a uuid FindUUID() returns the appropriate User object - User* user = ServerInstance->Users.FindUUID(prefix); + auto user = ServerInstance->Users.FindUUID(prefix); if (user) return user; } diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index 9fe9069a0..b954b5a8c 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -48,7 +48,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params throw ProtocolException("Invalid mode string"); // See if there is a nick collision - User* collideswith = ServerInstance->Users.FindNick(params[2]); + auto collideswith = ServerInstance->Users.FindNick(params[2]); if ((collideswith) && (collideswith->registered != REG_ALL)) { // User that the incoming user is colliding with is not fully registered, we force nick change the @@ -77,7 +77,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params /* For remote users, we pass the UUID they sent to the constructor. * If the UUID already exists User::User() throws an exception which causes this connection to be closed. */ - RemoteUser* _new = new SpanningTree::RemoteUser(params[0], remoteserver); + auto _new = new SpanningTree::RemoteUser(params[0], remoteserver); ServerInstance->Users.clientlist[params[2]] = _new; _new->nick = params[2]; _new->ChangeRealHost(params[3], false); diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp index 9c56fd9b9..ae7b31f1c 100644 --- a/src/modules/m_sqlauth.cpp +++ b/src/modules/m_sqlauth.cpp @@ -111,7 +111,7 @@ public: void OnError(SQL::Error& error) override { - User* user = ServerInstance->Users.Find(uid); + auto user = ServerInstance->Users.Find(uid); if (!user) return; pendingExt.Set(user, AUTH_STATE_FAIL); diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp index fc1cf4e32..453654c9e 100644 --- a/src/modules/m_sqloper.cpp +++ b/src/modules/m_sqloper.cpp @@ -126,7 +126,7 @@ public: // Call /oper after placing all blocks from the SQL table into the config->oper_blocks list. void OperExec() { - User* user = ServerInstance->Users.Find(uid); + auto user = ServerInstance->Users.Find(uid); LocalUser* localuser = IS_LOCAL(user); // This should never be true if (!localuser) diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index c65f119e6..457dc436a 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -192,7 +192,7 @@ private: CmdResult HandleUser(LocalUser* source, const std::string& nick) { - User* target = ServerInstance->Users.FindNick(nick); + auto target = ServerInstance->Users.FindNick(nick); if (!target || target->registered != REG_ALL) { source->WriteNumeric(Numerics::NoSuchNick(nick)); @@ -211,7 +211,7 @@ private: CmdResult HandleChannel(LocalUser* source, const std::string& channel) { - Channel* chan = ServerInstance->Channels.Find(channel); + auto chan = ServerInstance->Channels.Find(channel); if (!chan) { source->WriteNumeric(Numerics::NoSuchChannel(channel)); diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index e19252911..99f9007d0 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -47,7 +47,7 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - User* dest = ServerInstance->Users.Find(parameters[0]); + auto dest = ServerInstance->Users.Find(parameters[0]); if (!dest) // allow setting swhois using SWHOIS before reg { diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 09085dabb..f6ec5c6ee 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -83,7 +83,7 @@ public: CmdResult Handle(User* user, const Params& parameters) override { - Channel* channel = ServerInstance->Channels.Find(parameters[0]); + auto channel = ServerInstance->Channels.Find(parameters[0]); if (!channel) { user->WriteNumeric(Numerics::NoSuchChannel(parameters[0])); diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp index 632de2bb1..a959f0af2 100644 --- a/src/modules/m_topiclock.cpp +++ b/src/modules/m_topiclock.cpp @@ -44,7 +44,7 @@ public: return CmdResult::FAILURE; } - Channel* chan = ServerInstance->Channels.Find(parameters[0]); + auto chan = ServerInstance->Channels.Find(parameters[0]); if (!chan) return CmdResult::FAILURE; diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp index 27bbd0592..2462101bc 100644 --- a/src/modules/m_uninvite.cpp +++ b/src/modules/m_uninvite.cpp @@ -57,7 +57,7 @@ public: else u = ServerInstance->Users.Find(parameters[0]); - Channel* c = ServerInstance->Channels.Find(parameters[1]); + auto c = ServerInstance->Channels.Find(parameters[1]); if ((!c) || (!u) || (u->registered != REG_ALL)) { |