Integrate K/Gline into the bancache system by making some modifications to DefaultApp...

[user/henk/code/inspircd.git] / include / modules.h

diff --git a/include/modules.h b/include/modules.h
index a8bc9f507d3985e0619872f41b53cc11d08094b7..ef0d3f6200de3d394f5da3f27495cdf9c402ae31 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -1521,10 +1521,6 @@ typedef DLLFactory<Module> ircd_module;
  */
 typedef std::vector<Module*> IntModuleList;
 
-/** A list of event handlers
- */
-typedef std::vector<IntModuleList> EventHandlerList;
-
 /** An event handler iterator
  */
 typedef IntModuleList::iterator EventHandlerIter;
@@ -1548,7 +1544,7 @@ class CoreExport ModuleManager : public classbase
  private:
        /** Holds a string describing the last module error to occur
         */
-       char MODERR[MAXBUF];
+       std::string LastModuleError;
  
        /** The feature names published by various modules
         */
@@ -1558,7 +1554,7 @@ class CoreExport ModuleManager : public classbase
         */
        interfacelist Interfaces;
  
-       /** Total number of modules loaded into the ircd, minus one
+       /** Total number of modules loaded into the ircd
         */
        int ModCount; 
        
@@ -1576,7 +1572,7 @@ class CoreExport ModuleManager : public classbase
        /** Event handler hooks.
         * This needs to be public to be used by FOREACH_MOD and friends.
         */
-       EventHandlerList EventHandlers;
+       IntModuleList EventHandlers[I_END];
 
        /** Simple, bog-standard, boring constructor.
         */
@@ -1651,7 +1647,7 @@ class CoreExport ModuleManager : public classbase
        /** Returns text describing the last module error
         * @return The last error message to occur
         */
-       const char* LastError();
+       std::string& LastError();
 
        /** Load a given module file
         * @param filename The file to load