From e1efa862f373aacefa027f346c0976f802818727 Mon Sep 17 00:00:00 2001 From: brain Date: Sun, 4 Nov 2007 19:28:22 +0000 Subject: Not yet tested: remove last vestiges of modules[] and module_names[] arrays. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8514 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_httpd_stats.cpp | 4 +++- src/modules/m_spanningtree/treesocket1.cpp | 7 +------ 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 1022d1563..ef1b87cb8 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -119,7 +119,8 @@ class ModuleHttpStats : public Module data << ""; data << ""; - for (int i = 0; i <= ServerInstance->Modules->GetCount(); i++) + /* XXX FIXME + * for (int i = 0; i <= ServerInstance->Modules->GetCount(); i++) { if (!ServerInstance->Config->module_names[i].empty()) { @@ -128,6 +129,7 @@ class ModuleHttpStats : public Module v.Major << "." << v.Minor << "." << v.Revision << "." << v.Build << ""; } } + */ data << ""; data << ""; diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index 18ae9b6cd..488607c96 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -277,13 +277,8 @@ void TreeSocket::SendServers(TreeServer* Current, TreeServer* s, int hops) std::string TreeSocket::MyCapabilities() { - std::vector modlist; + std::vector modlist = this->Instance->Modules->GetAllModuleNames(VF_COMMON); std::string capabilities; - for (int i = 0; i <= this->Instance->Modules->GetCount(); i++) - { - if (this->Instance->Modules->modules[i]->GetVersion().Flags & VF_COMMON) - modlist.push_back(this->Instance->Config->module_names[i]); - } sort(modlist.begin(),modlist.end()); for (unsigned int i = 0; i < modlist.size(); i++) { -- cgit v1.3.1-10-gc9f91