X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fdynamic.h;h=19ff7bdaf67f56008258a926b2efa1c62e05b8bb;hb=6b27fae945e5310a76cb7fa2a5ff0059cd436ac9;hp=51aaaa3cd261963e294476fb0252aa300df44e26;hpb=703ca18c66d6e7b209b13f415dfc52624801c77a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/dynamic.h b/include/dynamic.h
index 51aaaa3cd..19ff7bdaf 100644
--- a/include/dynamic.h
+++ b/include/dynamic.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -24,14 +24,13 @@ class CoreExport DLLManager
 	/** The last error string, or NULL
 	 */
 	const char *err;
- 
+
  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.
@@ -65,7 +64,7 @@ class CoreExport LoadModuleException : public CoreException
 	: CoreException(message, "the core")
 	{
 	}
-	
+
 	/** This destructor solves world hunger, cancels the world debt, and causes the world to end.
 	 * Actually no, it does nothing. Never mind.
 	 * @throws Nothing!
@@ -82,7 +81,7 @@ class CoreExport FindSymbolException : public CoreException
 	: CoreException(message, "the core")
 	{
 	}
-	
+
 	/** This destructor solves world hunger, cancels the world debt, and causes the world to end.
 	 * Actually no, it does nothing. Never mind.
 	 * @throws Nothing!
@@ -102,16 +101,12 @@ template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
 	 * 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*);	 
- 
+	typedef ReturnType * (initfunctype) ();
+
 	/** Pointer to the init function.
 	 */
 	initfunctype* init_func;
 
-	/** Instance pointer to be passed to init_*() when it is called.
-	 */
-	InspIRCd* ServerInstance;
- 
  public:
 	/** Default constructor.
 	 * This constructor passes its paramerers down through DLLFactoryBase and then DLLManager
@@ -119,11 +114,11 @@ template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
 	 * 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();
-		
+
 		if(!error)
 		{
 			if(!GetSymbol((void **)&init_func, func_name))
@@ -136,7 +131,7 @@ template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
 			throw LoadModuleException(error);
 		}
 	}
-	
+
 	/** Calls the 'init_module' C exported function within a module, which
 	 * returns a pointer to a Module derived object.
 	 */
@@ -144,14 +139,14 @@ template <typename ReturnType> class CoreExport DLLFactory : public DLLManager
 	{
 		if(init_func)
 		{
-			return init_func(ServerInstance);
+			return init_func();
 		}
 		else
 		{
 			return NULL;
 		}
 	}
-	
+
 	/** The destructor deletes the ModuleFactory pointer.
 	 */
 	~DLLFactory()