m_spanningtree Use iterators in CAPAB handler and when generating reply to spanningtr...

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 3786950910d4452ea5530d26426669d91bc424ea..40769df3d95eb39e1cc24f8156d4ad1f4b3d672e 100644 (file)
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -37,12 +37,12 @@ std::string TreeSocket::MyModules(int filter)
 
        std::string capabilities;
        sort(modlist.begin(),modlist.end());
-       for (unsigned int i = 0; i < modlist.size(); i++)
+       for (std::vector<std::string>::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
        {
-               if (i)
+               if (i != modlist.begin())
                        capabilities.push_back(proto_version > 1201 ? ' ' : ',');
-               capabilities.append(modlist[i]);
-               Module* m = ServerInstance->Modules->Find(modlist[i]);
+               capabilities.append(*i);
+               Module* m = ServerInstance->Modules->Find(*i);
                if (m && proto_version > 1201)
                {
                        Version v = m->GetVersion();

diff --git a/src/modules/m_spanningtree/override_stats.cpp b/src/modules/m_spanningtree/override_stats.cpp
index 83691c1513b03939819035b38756c3c4b19f11bb..688661b8039c4c6a13182a7b01fd7edcf9e24d1f 100644 (file)
--- a/src/modules/m_spanningtree/override_stats.cpp
+++ b/src/modules/m_spanningtree/override_stats.cpp
@@ -33,11 +33,12 @@ ModResult ModuleSpanningTree::OnStats(char statschar, User* user, string_list &r
 {
        if ((statschar == 'c') || (statschar == 'n'))
        {
-               for (unsigned int i = 0; i < Utils->LinkBlocks.size(); i++)
+               for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i != Utils->LinkBlocks.end(); ++i)
                {
-                       results.push_back(std::string(ServerInstance->Config->ServerName)+" 213 "+user->nick+" "+statschar+" *@"+(Utils->LinkBlocks[i]->HiddenFromStats ? "<hidden>" : Utils->LinkBlocks[i]->IPAddr)+" * "+Utils->LinkBlocks[i]->Name.c_str()+" "+ConvToStr(Utils->LinkBlocks[i]->Port)+" "+(Utils->LinkBlocks[i]->Hook.empty() ? "plaintext" : Utils->LinkBlocks[i]->Hook));
+                       Link* L = *i;
+                       results.push_back(std::string(ServerInstance->Config->ServerName)+" 213 "+user->nick+" "+statschar+" *@"+(L->HiddenFromStats ? "<hidden>" : L->IPAddr)+" * "+(*i)->Name.c_str()+" "+ConvToStr(L->Port)+" "+(L->Hook.empty() ? "plaintext" : L->Hook));
                        if (statschar == 'c')
-                               results.push_back(std::string(ServerInstance->Config->ServerName)+" 244 "+user->nick+" H * * "+Utils->LinkBlocks[i]->Name.c_str());
+                               results.push_back(std::string(ServerInstance->Config->ServerName)+" 244 "+user->nick+" H * * "+L->Name.c_str());
                }
                return MOD_RES_DENY;
        }

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 65e1191495fe5d4b59157a4e310c1f06f4474c20..493b05ebf78f6dda096e3c8b3ab04f86200dc16e 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -321,13 +321,11 @@ void TreeServer::AddChild(TreeServer* Child)
 
 bool TreeServer::DelChild(TreeServer* Child)
 {
-       for (std::vector<TreeServer*>::iterator a = Children.begin(); a != Children.end(); a++)
+       std::vector<TreeServer*>::iterator it = std::find(Children.begin(), Children.end(), Child);
+       if (it != Children.end())
        {
-               if (*a == Child)
-               {
-                       Children.erase(a);
-                       return true;
-               }
+               Children.erase(it);
+               return true;
        }
        return false;
 }