From 441bd151da733d32e194de6e4a1744ae273b83ee Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 31 Oct 2020 20:03:19 +0000 Subject: Add stdalgo::iterator_range and switch config tag reading to use it. This allows us to use range-based for loops which were not possible with the previous config tag system. --- src/modules/m_chanlog.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/modules/m_chanlog.cpp') diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp index 8dff4123d..8250a5d98 100644 --- a/src/modules/m_chanlog.cpp +++ b/src/modules/m_chanlog.cpp @@ -42,19 +42,14 @@ class ModuleChanLog : public Module void ReadConfig(ConfigStatus& status) override { - std::string snomasks; - std::string channel; ChanLogTargets newlogs; - - ConfigTagList tags = ServerInstance->Config->ConfTags("chanlog"); - for (ConfigIter i = tags.first; i != tags.second; ++i) + for (auto& [_, tag] : ServerInstance->Config->ConfTags("chanlog")) { - channel = i->second->getString("channel"); - snomasks = i->second->getString("snomasks"); - + std::string channel = tag->getString("channel"); + std::string snomasks = tag->getString("snomasks"); if (channel.empty() || snomasks.empty()) { - throw ModuleException("Malformed chanlog tag at " + i->second->getTagLocation()); + throw ModuleException("Malformed chanlog tag at " + tag->getTagLocation()); } for (std::string::const_iterator it = snomasks.begin(); it != snomasks.end(); it++) -- cgit v1.3.1-10-gc9f91