Moved ModuleError()

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2453 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/commands.cpp b/src/commands.cpp
index d31099a8b9f1422d9bbd351058af87d40c730228..8cfc4d77b6edf7393e25af26fc459f0f7816f056 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -176,7 +176,7 @@ void handle_loadmodule(char **parameters, int pcnt, userrec *user)
        }
        else
        {
-               WriteServ(user->fd,"974 %s %s :Failed to load module: %s",user->nick, parameters[0],ModuleError());
+               WriteServ(user->fd,"974 %s %s :Failed to load module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
        }
 }
 
@@ -189,7 +189,7 @@ void handle_unloadmodule(char **parameters, int pcnt, userrec *user)
         }
         else
         {
-                WriteServ(user->fd,"972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ModuleError());
+                WriteServ(user->fd,"972 %s %s :Failed to unload module: %s",user->nick, parameters[0],ServerInstance->ModuleError());
         }
 }
 

diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 7033284c476c02c212abedaba51a5bd2478bb94a..56e80c57ca0b7c18f8e2dca1b1adf8fa7977a59a 100644 (file)
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -306,7 +306,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                         }
                         else
                         {
-                                WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ModuleError());
+                                WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
                         }
                 }
                 if (!added_modules.empty())
@@ -320,7 +320,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                         }
                         else
                         {
-                                WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ModuleError());
+                                WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
                         }
                 }
                 log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),
@@ -329,8 +329,6 @@ void ServerConfig::Read(bool bail, userrec* user)
 }
 
 
-void WriteOpers(char* text, ...);
-
 void Exit (int status)
 {
        if (Config->log_file)