From 942fd2bcfd384a12c900999fe663202c87319a68 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 6 Apr 2021 20:06:18 +0100 Subject: Switch simple iterator loops to use range-based for loops. --- src/modules/m_sslmodes.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/modules/m_sslmodes.cpp') diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp index 9bf7c75cf..d67f09b1a 100644 --- a/src/modules/m_sslmodes.cpp +++ b/src/modules/m_sslmodes.cpp @@ -86,19 +86,18 @@ class SSLMode : public ModeHandler return MODEACTION_DENY; } - unsigned long nonssl = 0; - const Channel::MemberMap& userlist = channel->GetUsers(); - for (Channel::MemberMap::const_iterator i = userlist.begin(); i != userlist.end(); ++i) + size_t nonssl = 0; + for (const auto& [u, _] : channel->GetUsers()) { - ssl_cert* cert = API->GetCertificate(i->first); - if (!cert && !i->first->server->IsService()) + ssl_cert* cert = API->GetCertificate(u); + if (!cert && !u->server->IsService()) nonssl++; } if (nonssl) { - source->WriteNumeric(ERR_ALLMUSTSSL, channel->name, InspIRCd::Format("All members of the channel must be connected via TLS (SSL) (%lu/%lu are non-TLS (SSL))", - nonssl, static_cast(userlist.size()))); + source->WriteNumeric(ERR_ALLMUSTSSL, channel->name, InspIRCd::Format("All members of the channel must be connected via TLS (SSL) (%zu/%zu are non-TLS (SSL))", + nonssl, channel->GetUsers().size())); return MODEACTION_DENY; } } -- cgit v1.3.1-10-gc9f91