Fix double dot in half-cloaked resolved hosts

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

diff --git a/include/dynamic.h b/include/dynamic.h
index b48eaeacdaf776d1cbe12b4d490226e74d9f96a3..fe150716e69e46c58666a6e938c874a915e795e5 100644 (file)
--- a/include/dynamic.h
+++ b/include/dynamic.h
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,7 +17,7 @@
 /** The DLLManager class is able to load a module file by filename,
  * and locate its init_module symbol.
  */
-class CoreExport DLLManager
+class CoreExport DLLManager : public classbase
 {
  protected:
 
@@ -27,11 +27,10 @@ class CoreExport DLLManager
 
  public:
        /** This constructor loads the module using dlopen()
-        * @param ServerInstance The creator class of this object
         * @param fname The filename to load. This should be within
         * the modules dir.
         */
-       DLLManager(InspIRCd* ServerInstance, const char *fname);
+       DLLManager(const char *fname);
        virtual ~DLLManager();
 
        /** Get a symbol using dynamic linking.
@@ -90,37 +89,29 @@ class CoreExport FindSymbolException : public CoreException
        virtual ~FindSymbolException() throw() {};
 };
 
+class Module;
 /** This is the highest-level class of the DLLFactory system used to load InspIRCd modules and commands.
  * All the dirty mucking around with dl*() is done by DLLManager, all this does it put a pretty shell on
  * it and make it nice to use to load modules and core commands. This class is quite specialised for these
  * two uses and it may not be useful more generally -- use DLLManager directly for that.
  */
-template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
+class CoreExport DLLFactory : public DLLManager
 {
- protected:
-       /** This typedef represents the init_* function within each module or command.
-        * The init_module function is the only exported extern "C" declaration
-        * in any module file. In a cmd_*.cpp file the equivilant is init_command
-        */
-       typedef ReturnType * (initfunctype) (InspIRCd*);
+ public:
+       typedef Module* (initfunctype)();
 
        /** Pointer to the init function.
         */
-       initfunctype* init_func;
-
-       /** Instance pointer to be passed to init_*() when it is called.
-        */
-       InspIRCd* ServerInstance;
+       initfunctype* const init_func;
 
- public:
        /** Default constructor.
         * This constructor passes its paramerers down through DLLFactoryBase and then DLLManager
         * to load the module, then calls the factory function to retrieve a pointer to a ModuleFactory
         * class. It is then down to the core to call the ModuleFactory::CreateModule() method and
         * receive a Module* which it can insert into its module lists.
         */
-       DLLFactory(InspIRCd* Instance, const char *fname, const char *func_name)
-       : DLLManager(Instance, fname), init_func(NULL), ServerInstance(Instance)
+       DLLFactory(const char *fname, const char *func_name)
+       : DLLManager(fname), init_func(NULL)
        {
                const char* error = LastError();
 
@@ -137,21 +128,6 @@ template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
                }
        }
 
-       /** Calls the 'init_module' C exported function within a module, which
-        * returns a pointer to a Module derived object.
-        */
-       ReturnType* CallInit()
-       {
-               if(init_func)
-               {
-                       return init_func(ServerInstance);
-               }
-               else
-               {
-                       return NULL;
-               }
-       }
-
        /** The destructor deletes the ModuleFactory pointer.
         */
        ~DLLFactory()