code cleaning and reordering

git-svn-id: http://svn.miranda-ng.org/main/trunk@7432 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 16 insertions, 16 deletions

diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index 9fab4512f0..0e799b933c 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -163,7 +163,7 @@ char* GetPluginNameByInstance(HINSTANCE hInstance)
 		return NULL;

 

 	for (int i=0; i < pluginList.getCount(); i++) {

-		pluginEntry* p = pluginList[i];

+		pluginEntry *p = pluginList[i];

 		if (p->bpi.pluginInfo && p->bpi.hInst == hInstance)

 			return p->bpi.pluginInfo->shortName;

 	}

@@ -176,7 +176,7 @@ int GetPluginLangByInstance(HINSTANCE hInstance)
 		return NULL;

 

 	for (int i=0; i < pluginList.getCount(); i++) {

-		pluginEntry* p = pluginList[i];

+		pluginEntry *p = pluginList[i];

 		if (p->bpi.pluginInfo && p->bpi.hInst == hInstance)

 			return p->hLangpack;

 	}

@@ -186,7 +186,7 @@ int GetPluginLangByInstance(HINSTANCE hInstance)
 int GetPluginFakeId(const MUUID &uuid, int hLangpack)

 {

 	for (int i=0; i < pluginList.getCount(); i++) {

-		pluginEntry* p = pluginList[i];

+		pluginEntry *p = pluginList[i];

 		if ( !p->bpi.hInst)

 			continue;

 

@@ -287,7 +287,7 @@ LBL_Ok:
 }

 

 // perform any API related tasks to freeing

-void Plugin_Uninit(pluginEntry* p)

+void Plugin_Uninit(pluginEntry *p)

 {

 	// if the basic API check had passed, call Unload if Load(void) was ever called

 	if (p->pclass & PCLASS_LOADED) {

@@ -390,7 +390,7 @@ void enumPlugins(SCAN_PLUGINS_CALLBACK cb, WPARAM wParam, LPARAM lParam)
 

 pluginEntry* OpenPlugin(TCHAR *tszFileName, TCHAR *dir, TCHAR *path)

 {

-	pluginEntry* p = (pluginEntry*)HeapAlloc(hPluginListHeap, HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY, sizeof(pluginEntry));

+	pluginEntry *p = (pluginEntry*)HeapAlloc(hPluginListHeap, HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY, sizeof(pluginEntry));

 	_tcsncpy(p->pluginname, tszFileName, SIZEOF(p->pluginname));

 

 	// add it to the list anyway

@@ -620,7 +620,7 @@ static pluginEntry* getCListModule(TCHAR *exe, TCHAR *slice)
 int UnloadPlugin(TCHAR* buf, int bufLen)

 {

 	for (int i = pluginList.getCount()-1; i >= 0; i--) {

-		pluginEntry* p = pluginList[i];

+		pluginEntry *p = pluginList[i];

 		if ( !_tcsicmp(p->pluginname, buf)) {

 			GetModuleFileName(p->bpi.hInst, buf, bufLen);

 			Plugin_Uninit(p);

@@ -639,7 +639,7 @@ void SetServiceModePlugin(pluginEntry *p)
 	serviceModePlugin = p;

 }

 

-static int LaunchServicePlugin(pluginEntry* p)

+static int LaunchServicePlugin(pluginEntry *p)

 {

 	// plugin load failed - terminating Miranda

 	if ( !( p->pclass & PCLASS_LOADED)) {

@@ -667,7 +667,7 @@ int LoadDefaultServiceModePlugin()
 

 	size_t cbLen = _tcslen(param);

 	for (int i=0; i < servicePlugins.getCount(); i++) {

-		pluginEntry* p = servicePlugins[i];

+		pluginEntry *p = servicePlugins[i];

 		if ( !_tcsnicmp(p->pluginname, param, cbLen)) {

 			int res = LaunchServicePlugin(p);

 			if (res == SERVICE_ONLYDB) // load it later

@@ -687,7 +687,7 @@ int LoadServiceModePlugin()
 void EnsureCheckerLoaded(bool bEnable)

 {

 	for (int i=0; i < pluginList.getCount(); i++) {

-		pluginEntry* p = pluginList[i];

+		pluginEntry *p = pluginList[i];

 		if ( _tcsicmp(p->pluginname, _T("dbchecker.dll")))

 			continue;

 

@@ -714,7 +714,7 @@ void UnloadNewPlugins(void)
 {

 	// unload everything but the special db/clist plugins

 	for (int i = pluginList.getCount()-1; i >= 0; i--) {

-		pluginEntry* p = pluginList[i];

+		pluginEntry *p = pluginList[i];

 		if ( !(p->pclass & PCLASS_LAST) && (p->pclass & PCLASS_OK))

 			Plugin_Uninit(p);

 	}

@@ -791,7 +791,7 @@ int LoadNewPluginsModule(void)
 

 static BOOL scanPluginsDir(WIN32_FIND_DATA *fd, TCHAR *path, WPARAM, LPARAM)

 {

-	pluginEntry* p = OpenPlugin(fd->cFileName, _T("Plugins"), path);

+	pluginEntry *p = OpenPlugin(fd->cFileName, _T("Plugins"), path);

 	if ( !(p->pclass & PCLASS_FAILED)) {

 		if (pluginList_freeimg == NULL && lstrcmpi(fd->cFileName, _T("advaimg.dll")) == 0)

 			pluginList_freeimg = p;

@@ -848,7 +848,7 @@ void UnloadNewPluginsModule(void)
 

 	// unload everything but the DB

 	for (int i = pluginList.getCount()-1; i >= 0; i--) {

-		pluginEntry* p = pluginList[i];

+		pluginEntry *p = pluginList[i];

 		if (!(p->pclass & (PCLASS_DB | PCLASS_CRYPT)) && p != pluginList_crshdmp)

 			Plugin_Uninit(p);

 	}

@@ -859,7 +859,7 @@ void UnloadNewPluginsModule(void)
 	UnloadDatabase();

 

 	for (int k = pluginList.getCount()-1; k >= 0; k--) {

-		pluginEntry* p = pluginList[k];

+		pluginEntry *p = pluginList[k];

 		Plugin_Uninit(p);

 	}

 

diff --git a/src/modules/plugins/pluginopts.cpp b/src/modules/plugins/pluginopts.cpp
index d3b362ad84..4190ec275a 100644
--- a/src/modules/plugins/pluginopts.cpp
+++ b/src/modules/plugins/pluginopts.cpp
@@ -198,7 +198,7 @@ LBL_Error:
 

 static bool UnloadPluginDynamically(PluginListItemData *dat)

 {

-	pluginEntry* p = pluginList.find((pluginEntry*)dat->fileName);

+	pluginEntry *p = pluginList.find((pluginEntry*)dat->fileName);

 	if (p) {

 		if ( !Plugin_UnloadDyn(p))

 			return false;

diff --git a/src/modules/plugins/plugins.h b/src/modules/plugins/plugins.h
index 2b7adb7f9b..35ae742b60 100644
--- a/src/modules/plugins/plugins.h
+++ b/src/modules/plugins/plugins.h
@@ -66,8 +66,8 @@ int checkAPI(TCHAR* plugin, BASIC_PLUGIN_INFO* bpi, DWORD mirandaVersion, int ch
 pluginEntry* OpenPlugin(TCHAR *tszFileName, TCHAR *dir, TCHAR *path);

 

 bool TryLoadPlugin(pluginEntry *p, bool bDynamic);

-void Plugin_Uninit(pluginEntry* p);

-int  Plugin_UnloadDyn(pluginEntry* p);

+void Plugin_Uninit(pluginEntry *p);

+int  Plugin_UnloadDyn(pluginEntry *p);

 

 typedef BOOL (*SCAN_PLUGINS_CALLBACK) (WIN32_FIND_DATA * fd, TCHAR *path, WPARAM wParam, LPARAM lParam);

 void enumPlugins(SCAN_PLUGINS_CALLBACK cb, WPARAM wParam, LPARAM lParam);