From 81e8caf42867b65677efe2bffaa52ecff7303c3a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 27 Jun 2012 13:58:25 +0000
Subject: no more pluginLink in load()

git-svn-id: http://svn.miranda-ng.org/main/trunk@652 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Db3x/commonheaders.h |  1 -
 plugins/Db3x/init.cpp        | 14 +++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'plugins/Db3x')

diff --git a/plugins/Db3x/commonheaders.h b/plugins/Db3x/commonheaders.h
index a79ca1d357..0391366b60 100644
--- a/plugins/Db3x/commonheaders.h
+++ b/plugins/Db3x/commonheaders.h
@@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "database.h"
 #include "resource.h"
 
-extern PLUGINLINK *pluginLink;
 extern HANDLE hDbFile;
 extern CRITICAL_SECTION csDbAccess;
 extern struct DBHeader dbHeader;
diff --git a/plugins/Db3x/init.cpp b/plugins/Db3x/init.cpp
index cb37f20e81..dfbb290b98 100644
--- a/plugins/Db3x/init.cpp
+++ b/plugins/Db3x/init.cpp
@@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 int hLangpack;
 
 HINSTANCE g_hInst=NULL;
-PLUGINLINK *pluginLink;
 
 static PLUGININFOEX pluginInfo = {
 	sizeof(PLUGININFOEX),
@@ -115,18 +114,12 @@ static int grokHeader( char * profile, int * error )
 }
 
 // returns 0 if all the APIs are injected otherwise, 1
-static int LoadDatabase( char * profile, void * plink )
+static int LoadDatabase( char* profile )
 {
-	PLUGINLINK *link = (PLUGINLINK *)plink;
-
 	// don't need thread notifications
 	strncpy(szDbPath, profile, sizeof(szDbPath));
 
-	// this is like Load()'s pluginLink
-	pluginLink=link;
-
-	// set the memory, lists & UTF8 manager
-	mir_getLP( &pluginInfo );
+	mir_getLP(&pluginInfo);
 
 	// inject all APIs and hooks into the core
 	return LoadDatabaseModule();
@@ -145,7 +138,6 @@ static int getFriendlyName( char * buf, size_t cch, int shortName )
 	return 0;
 }
 
-
 static DATABASELINK dblink = {
 	sizeof(DATABASELINK),
 	getCapability,
@@ -178,7 +170,7 @@ extern "C" __declspec(dllexport) const MUUID * MirandaPluginInterfaces(void)
 	return interfaces;
 }
 
-extern "C" __declspec(dllexport) int Load(PLUGINLINK * link)
+extern "C" __declspec(dllexport) int Load(void)
 {
 	return 1;
 }
-- 
cgit v1.2.3