From b2d86bb8a1bc965ad72d00ba5ef98d0e4bbfb155 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 10 Jan 2023 23:02:45 +0000 Subject: Qualify auto correctly in all cases. --- src/coremods/core_channel/cmd_invite.cpp | 2 +- src/coremods/core_channel/cmd_kick.cpp | 4 ++-- src/coremods/core_channel/cmd_topic.cpp | 2 +- src/coremods/core_channel/core_channel.cpp | 2 +- src/coremods/core_channel/extban.cpp | 4 ++-- src/coremods/core_channel/invite.cpp | 2 +- src/coremods/core_hostname_lookup.cpp | 4 ++-- src/coremods/core_info/isupport.cpp | 2 +- src/coremods/core_message.cpp | 2 +- src/coremods/core_mode.cpp | 8 ++++---- src/coremods/core_oper/cmd_kill.cpp | 2 +- src/coremods/core_oper/core_oper.cpp | 4 ++-- src/coremods/core_oper/umode_s.cpp | 2 +- src/coremods/core_reloadmodule.cpp | 2 +- src/coremods/core_stats.cpp | 2 +- src/coremods/core_user/cmd_part.cpp | 2 +- src/coremods/core_user/cmd_userhost.cpp | 2 +- src/coremods/core_who.cpp | 4 ++-- src/coremods/core_whois.cpp | 2 +- src/coremods/core_whowas.cpp | 4 ++-- src/coremods/core_xline/cmd_eline.cpp | 4 ++-- src/coremods/core_xline/cmd_gline.cpp | 4 ++-- src/coremods/core_xline/cmd_kline.cpp | 4 ++-- src/coremods/core_xline/cmd_qline.cpp | 2 +- src/coremods/core_xline/cmd_zline.cpp | 4 ++-- 25 files changed, 38 insertions(+), 38 deletions(-) (limited to 'src/coremods') diff --git a/src/coremods/core_channel/cmd_invite.cpp b/src/coremods/core_channel/cmd_invite.cpp index fad1bbbf4..b287c9736 100644 --- a/src/coremods/core_channel/cmd_invite.cpp +++ b/src/coremods/core_channel/cmd_invite.cpp @@ -64,7 +64,7 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters) else u = ServerInstance->Users.Find(parameters[0], true); - auto 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 c89bd8185..e6061190a 100644 --- a/src/coremods/core_channel/cmd_kick.cpp +++ b/src/coremods/core_channel/cmd_kick.cpp @@ -45,7 +45,7 @@ CommandKick::CommandKick(Module* parent) CmdResult CommandKick::Handle(User* user, const Params& parameters) { - auto c = ServerInstance->Channels.Find(parameters[0]); + auto* c = ServerInstance->Channels.Find(parameters[0]); User* u; if (CommandParser::LoopCall(user, this, parameters, 1)) @@ -114,7 +114,7 @@ CmdResult CommandKick::Handle(User* user, const Params& parameters) { ModeHandler::Rank them = srcmemb->GetRank(); ModeHandler::Rank req = HALFOP_VALUE; - for (const auto& mh : memb->modes) + for (const auto* mh : memb->modes) { if (mh->GetLevelRequired(true) > req) req = mh->GetLevelRequired(true); diff --git a/src/coremods/core_channel/cmd_topic.cpp b/src/coremods/core_channel/cmd_topic.cpp index 1288b6173..8fae6a057 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) { - auto 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/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp index 6c0c83e28..cb66c5e1c 100644 --- a/src/coremods/core_channel/core_channel.cpp +++ b/src/coremods/core_channel/core_channel.cpp @@ -224,7 +224,7 @@ public: std::vector limits; std::string vlist; - for (const auto& lm : ServerInstance->Modes.GetListModes()) + for (auto* lm : ServerInstance->Modes.GetListModes()) { limits.push_back(InspIRCd::Format("%c:%lu", lm->GetModeChar(), lm->GetLowerLimit())); if (lm->HasVariableLength()) diff --git a/src/coremods/core_channel/extban.cpp b/src/coremods/core_channel/extban.cpp index 2e36cf6d9..39a892523 100644 --- a/src/coremods/core_channel/extban.cpp +++ b/src/coremods/core_channel/extban.cpp @@ -69,7 +69,7 @@ bool ExtBanManager::Canonicalize(std::string& text) const void ExtBanManager::BuildISupport(std::string& out) { - for (const LetterMap::value_type& extban : byletter) + for (const auto& extban : byletter) out.push_back(extban.first); std::sort(out.begin(), out.end()); @@ -86,7 +86,7 @@ ModResult ExtBanManager::GetStatus(ExtBan::Acting* extban, User* user, Channel* if (!list) return MOD_RES_PASSTHRU; - for (const ListModeBase::ListItem& ban : *list) + for (const auto& ban : *list) { bool inverted; std::string xbname; diff --git a/src/coremods/core_channel/invite.cpp b/src/coremods/core_channel/invite.cpp index 084c71e37..5e10c8548 100644 --- a/src/coremods/core_channel/invite.cpp +++ b/src/coremods/core_channel/invite.cpp @@ -163,7 +163,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)); ) { - auto chan = ServerInstance->Channels.Find(channame); + auto* chan = ServerInstance->Channels.Find(channame); if (chan) Create(user, chan, ConvToNum(exptime)); } diff --git a/src/coremods/core_hostname_lookup.cpp b/src/coremods/core_hostname_lookup.cpp index 0d23f7fc8..756236897 100644 --- a/src/coremods/core_hostname_lookup.cpp +++ b/src/coremods/core_hostname_lookup.cpp @@ -180,7 +180,7 @@ public: } LogLookup(*rr, query->cached); - auto 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); @@ -224,7 +224,7 @@ public: user->WriteNotice("*** Looking up your hostname..."); - auto 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_info/isupport.cpp b/src/coremods/core_info/isupport.cpp index 822af8b6b..ec237c017 100644 --- a/src/coremods/core_info/isupport.cpp +++ b/src/coremods/core_info/isupport.cpp @@ -59,7 +59,7 @@ void ISupportManager::AppendValue(std::string& buffer, const std::string& value) // This function implements value escaping according to the rules of the ISUPPORT draft: // https://tools.ietf.org/html/draft-brocklesby-irc-isupport-03 buffer.push_back('='); - for (const auto& chr : value) + for (const auto chr : value) { // The value must be escaped if: // (1) It is a banned character in an IRC parameter (NUL, LF, CR, SPACE). diff --git a/src/coremods/core_message.cpp b/src/coremods/core_message.cpp index ed68f3613..49fd58e6b 100644 --- a/src/coremods/core_message.cpp +++ b/src/coremods/core_message.cpp @@ -141,7 +141,7 @@ private: CmdResult HandleChannelTarget(User* source, const Params& parameters, const char* target, PrefixMode* pm) { - auto 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 5329b64ef..beee1c708 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]; - auto targetchannel = ServerInstance->Channels.Find(target); + auto* targetchannel = ServerInstance->Channels.Find(target); User* targetuser = nullptr; if (!targetchannel) { @@ -179,7 +179,7 @@ void CommandMode::DisplayListModes(User* user, Channel* chan, const std::string& { seq++; - for (const auto& mletter : mode_sequence) + for (const auto mletter : mode_sequence) { if (mletter == '+') continue; @@ -354,7 +354,7 @@ private: static std::string GeneratePrefixList(bool includemodechars) { std::vector prefixes; - for (const auto& pm : ServerInstance->Modes.GetPrefixModes()) + for (auto* pm : ServerInstance->Modes.GetPrefixModes()) { if (pm->GetPrefix()) prefixes.push_back(pm); @@ -366,7 +366,7 @@ private: std::string modechars; std::string prefixchars; - for (const auto& pm : insp::iterator_range(prefixes.rbegin(), prefixes.rend())) + for (const auto* pm : insp::iterator_range(prefixes.rbegin(), prefixes.rend())) { modechars += pm->GetModeChar(); prefixchars += pm->GetPrefix(); diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp index f3faf38cc..cd9dee907 100644 --- a/src/coremods/core_oper/cmd_kill.cpp +++ b/src/coremods/core_oper/cmd_kill.cpp @@ -65,7 +65,7 @@ CmdResult CommandKill::Handle(User* user, const Params& parameters) return CmdResult::FAILURE; } - auto 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_oper/core_oper.cpp b/src/coremods/core_oper/core_oper.cpp index 58335f344..e511f04c8 100644 --- a/src/coremods/core_oper/core_oper.cpp +++ b/src/coremods/core_oper/core_oper.cpp @@ -193,7 +193,7 @@ public: { // Online server operators. size_t opers = 0; - for (const auto& oper : ServerInstance->Users.all_opers) + for (auto* oper : ServerInstance->Users.all_opers) { if (oper->server->IsService()) continue; @@ -208,7 +208,7 @@ public: awaytime.c_str(), oper->awaymsg.c_str()); } - auto loper = IS_LOCAL(oper); + auto* loper = IS_LOCAL(oper); if (loper) { const std::string idleperiod = InspIRCd::DurationString(ServerInstance->Time() - loper->idle_lastmsg); diff --git a/src/coremods/core_oper/umode_s.cpp b/src/coremods/core_oper/umode_s.cpp index 8e8c7701c..b6534f0a8 100644 --- a/src/coremods/core_oper/umode_s.cpp +++ b/src/coremods/core_oper/umode_s.cpp @@ -76,7 +76,7 @@ std::string ModeUserServerNoticeMask::ProcessNoticeMasks(User* user, const std:: bool adding = true; std::bitset<64> curr = user->snomasks; - for (const auto& snomask : input) + for (const auto snomask : input) { switch (snomask) { diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp index 112a1ced2..1c00ed390 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()); } - auto user = ServerInstance->Users.FindUUID(uuid); + auto* user = ServerInstance->Users.FindUUID(uuid); if (user) { if (result) diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp index ffed4a669..0c575d544 100644 --- a/src/coremods/core_stats.cpp +++ b/src/coremods/core_stats.cpp @@ -127,7 +127,7 @@ void CommandStats::DoStats(Stats::Context& stats) /* stats p (show listening ports) */ case 'p': { - for (const auto& ls : ServerInstance->ports) + for (const auto* ls : ServerInstance->ports) { std::stringstream portentry; diff --git a/src/coremods/core_user/cmd_part.cpp b/src/coremods/core_user/cmd_part.cpp index 206e956d9..75d713863 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; - auto 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 fa90c3560..ced65bc21 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(parameters.size(), 5); for (size_t i = 0; i < paramcount; ++i) { - auto u = ServerInstance->Users.FindNick(parameters[i], true); + auto* u = ServerInstance->Users.FindNick(parameters[i], true); if (u) { retbuf += u->nick; diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp index 81678e95a..2dc751ddd 100644 --- a/src/coremods/core_who.cpp +++ b/src/coremods/core_who.cpp @@ -129,7 +129,7 @@ private: { // Build a map of prefixes ordered descending by their rank. std::multimap> ranks; - for (const auto& pm : ServerInstance->Modes.GetPrefixModes()) + for (const auto* pm : ServerInstance->Modes.GetPrefixModes()) ranks.insert(std::make_pair(pm->GetPrefixRank(), pm)); // Now we have the ranks ordered we can assign them levels. @@ -316,7 +316,7 @@ bool CommandWho::MatchUser(LocalUser* source, User* user, WhoData& data) if (source_can_see_target) { bool set = true; - for (const auto& chr : data.matchtext) + for (const auto chr : data.matchtext) { switch (chr) { diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp index 6981a5f16..8ee7969fc 100644 --- a/src/coremods/core_whois.cpp +++ b/src/coremods/core_whois.cpp @@ -261,7 +261,7 @@ CmdResult CommandWhois::HandleRemote(RemoteUser* target, const Params& parameter if (parameters.size() < 2) return CmdResult::FAILURE; - auto user = ServerInstance->Users.FindUUID(parameters[0]); + auto* user = ServerInstance->Users.FindUUID(parameters[0]); if (!user) return CmdResult::FAILURE; diff --git a/src/coremods/core_whowas.cpp b/src/coremods/core_whowas.cpp index be7997612..342bbffd5 100644 --- a/src/coremods/core_whowas.cpp +++ b/src/coremods/core_whowas.cpp @@ -222,7 +222,7 @@ CmdResult CommandWhowas::Handle(User* user, const Params& parameters) last = nick->entries.rbegin() + count; } - for (const auto& u : insp::iterator_range(nick->entries.rbegin(), last)) + for (const auto* u : insp::iterator_range(nick->entries.rbegin(), last)) { user->WriteNumeric(RPL_WHOWASUSER, parameters[0], u->ident, u->dhost, '*', u->real); @@ -270,7 +270,7 @@ void WhoWas::Manager::Add(User* user) if (ret.second) // If inserted { // This nick is new, create a list for it and add the first record to it - auto nick = new WhoWas::Nick(ret.first->first); + auto* nick = new WhoWas::Nick(ret.first->first); nick->entries.push_back(new Entry(user)); ret.first->second = nick; diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp index 2f4ec2a36..0fe7b2e07 100644 --- a/src/coremods/core_xline/cmd_eline.cpp +++ b/src/coremods/core_xline/cmd_eline.cpp @@ -45,7 +45,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters) if (parameters.size() >= 3) { IdentHostPair ih; - auto find = ServerInstance->Users.Find(target, true); + auto* find = ServerInstance->Users.Find(target, true); if (find) { ih.first = find->GetBanIdent(); @@ -72,7 +72,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters) return CmdResult::FAILURE; } - auto el = new ELine(ServerInstance->Time(), duration, user->nick, parameters[2], ih.first, ih.second); + auto* el = new ELine(ServerInstance->Time(), duration, user->nick, parameters[2], ih.first, ih.second); if (ServerInstance->XLines->AddLine(el, user)) { if (!duration) diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp index 8efa94d5d..ecca89cd3 100644 --- a/src/coremods/core_xline/cmd_gline.cpp +++ b/src/coremods/core_xline/cmd_gline.cpp @@ -46,7 +46,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters) if (parameters.size() >= 3) { IdentHostPair ih; - auto find = ServerInstance->Users.Find(target, true); + auto* find = ServerInstance->Users.Find(target, true); if (find) { ih.first = find->GetBanIdent(); @@ -79,7 +79,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters) return CmdResult::FAILURE; } - auto gl = new GLine(ServerInstance->Time(), duration, user->nick, parameters[2], ih.first, ih.second); + auto* gl = new GLine(ServerInstance->Time(), duration, user->nick, parameters[2], ih.first, ih.second); if (ServerInstance->XLines->AddLine(gl, user)) { if (!duration) diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp index 345cdd9f4..cf76b8763 100644 --- a/src/coremods/core_xline/cmd_kline.cpp +++ b/src/coremods/core_xline/cmd_kline.cpp @@ -46,7 +46,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters) if (parameters.size() >= 3) { IdentHostPair ih; - auto find = ServerInstance->Users.Find(target, true); + auto* find = ServerInstance->Users.Find(target, true); if (find) { ih.first = find->GetBanIdent(); @@ -79,7 +79,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters) return CmdResult::FAILURE; } - auto kl = new KLine(ServerInstance->Time(), duration, user->nick, parameters[2], ih.first, ih.second); + auto* kl = new KLine(ServerInstance->Time(), duration, user->nick, parameters[2], ih.first, ih.second); 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 c6df5acd2..6956edc03 100644 --- a/src/coremods/core_xline/cmd_qline.cpp +++ b/src/coremods/core_xline/cmd_qline.cpp @@ -61,7 +61,7 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters) return CmdResult::FAILURE; } - auto ql = new QLine(ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]); + auto* ql = new QLine(ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]); 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 1b736036f..a4bb979fb 100644 --- a/src/coremods/core_xline/cmd_zline.cpp +++ b/src/coremods/core_xline/cmd_zline.cpp @@ -52,7 +52,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) return CmdResult::FAILURE; } - auto u = ServerInstance->Users.Find(target, true); + auto* u = ServerInstance->Users.Find(target, true); if (u) { target = u->GetIPString(); @@ -78,7 +78,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) return CmdResult::FAILURE; } - auto zl = new ZLine(ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr); + auto* zl = new ZLine(ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr); if (ServerInstance->XLines->AddLine(zl, user)) { if (!duration) -- cgit v1.3.1-10-gc9f91