Fix 2 clang warnings reported by @SaberUK

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index bf5506d6876c23ad5e0157df2b6740ad0b4783ae..ccd78a8f028c63d6790c04fa499a50c5d2ae9696 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -1,16 +1,29 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2003-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2007 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2003 randomdan <???@???>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "xline.h"
 #include "socket.h"
@@ -34,24 +47,15 @@ void dynamic_reference_base::reset_all()
 }
 
 // Version is a simple class for holding a modules version number
-template<>
-VersionBase<API_VERSION>::VersionBase(const std::string &desc, int flags)
-: description(desc), Flags(flags)
+Version::Version(const std::string &desc, int flags) : description(desc), Flags(flags)
 {
 }
 
-template<>
-VersionBase<API_VERSION>::VersionBase(const std::string &desc, int flags, const std::string& linkdata)
+Version::Version(const std::string &desc, int flags, const std::string& linkdata)
 : description(desc), Flags(flags), link_data(linkdata)
 {
 }
 
-template<>
-bool VersionBase<API_VERSION>::CanLink(const std::string& other_data)
-{
-       return link_data == other_data;
-}
-
 Request::Request(Module* src, Module* dst, const char* idstr)
 : id(idstr), source(src), dest(dst)
 {
@@ -171,7 +175,7 @@ void                Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) {
 ModResult      Module::OnNumeric(User*, unsigned int, const std::string&) { return MOD_RES_PASSTHRU; }
 void           Module::OnHookIO(StreamSocket*, ListenSocket*) { }
 ModResult   Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { return MOD_RES_PASSTHRU; }
-void           Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, Channel*, std::string&) { }
+void           Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, std::string&) { }
 
 ModuleManager::ModuleManager() : ModCount(0)
 {
@@ -183,9 +187,6 @@ ModuleManager::~ModuleManager()
 
 bool ModuleManager::Attach(Implementation i, Module* mod)
 {
-       if (Modules.find(mod->ModuleSourceFile) == Modules.end())
-               ServerInstance->Logs->Log("MODULE", DEFAULT, "Module is attaching to hook %d in constructor; this does not handle exceptions correctly!", i);
-
        if (std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod) != EventHandlers[i].end())
                return false;
 
@@ -312,7 +313,7 @@ swap_now:
 
                for (unsigned int j = my_pos; j != swap_pos; j += incrmnt)
                {
-                       if (( j + incrmnt > EventHandlers[i].size() - 1) || (j + incrmnt < 0))
+                       if ((j + incrmnt > EventHandlers[i].size() - 1) || ((incrmnt == -1) && (j == 0)))
                                continue;
 
                        std::swap(EventHandlers[i][j], EventHandlers[i][j+incrmnt]);
@@ -395,6 +396,29 @@ void ModuleManager::DoSafeUnload(Module* mod)
        ServerInstance->BuildISupport();
 }
 
+void ModuleManager::UnloadAll()
+{
+       /* We do this more than once, so that any service providers get a
+        * chance to be unhooked by the modules using them, but then get
+        * a chance to be removed themsleves.
+        *
+        * Note: this deliberately does NOT delete the DLLManager objects
+        */
+       for (int tries = 0; tries < 4; tries++)
+       {
+               std::map<std::string, Module*>::iterator i = Modules.begin();
+               while (i != Modules.end())
+               {
+                       std::map<std::string, Module*>::iterator me = i++;
+                       if (CanUnload(me->second))
+                       {
+                               DoSafeUnload(me->second);
+                       }
+               }
+               ServerInstance->GlobalCulls.Apply();
+       }
+}
+
 std::string& ModuleManager::LastError()
 {
        return LastModuleError;
@@ -412,10 +436,6 @@ bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, Us
 
 void ModuleManager::AddService(ServiceProvider& item)
 {
-       Module* owner = item.creator;
-       if (Modules.find(owner->ModuleSourceFile) == Modules.end())
-               ServerInstance->Logs->Log("MODULE", DEFAULT, "Module is registering item %s in constructor; this does not handle exceptions correctly!", item.name.c_str());
-
        switch (item.service)
        {
                case SERVICE_COMMAND: