From c2a98771e0d195ca4d5be500f4c8ba9fd012d676 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 3 Sep 2013 18:31:26 +0000
Subject: - settings convertor for Popup+; - various DBCONTACTENUMSETTINGS
 initialization garbage

git-svn-id: http://svn.miranda-ng.org/main/trunk@5922 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IRCG/src/ircproto.cpp          | 4 ++--
 protocols/IRCG/src/options.cpp           | 2 +-
 protocols/IcqOscarJ/src/icq_servlist.cpp | 7 +++----
 protocols/IcqOscarJ/src/icq_uploadui.cpp | 8 ++------
 4 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'protocols')

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index 9a5cfe818d..7a7bb4d3db 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -289,9 +289,9 @@ int CIrcProto::OnModulesLoaded( WPARAM, LPARAM )
 
 	if ( !getByte( "PerformConversionDone", 0 )) {
 		OBJLIST<String> performToConvert(10);
-		DBCONTACTENUMSETTINGS dbces;
+		DBCONTACTENUMSETTINGS dbces = { 0 };
 		dbces.pfnEnumProc = sttCheckPerform;
-		dbces.lParam = ( LPARAM )&performToConvert;
+		dbces.lParam = (LPARAM)&performToConvert;
 		dbces.szModule = m_szModuleName;
 		CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbces);
 
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index dc0f491e5e..344df3c89d 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -167,7 +167,7 @@ void RereadServers()
 {
 	g_servers.destroy();
 
-	DBCONTACTENUMSETTINGS dbces;
+	DBCONTACTENUMSETTINGS dbces = { 0 };
 	dbces.pfnEnumProc = sttServerEnum;
 	dbces.szModule = SERVERSMODULE;
 	CallService(MS_DB_CONTACT_ENUMSETTINGS, NULL, (LPARAM)&dbces);
diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp
index de62755301..7110e3ea2e 100644
--- a/protocols/IcqOscarJ/src/icq_servlist.cpp
+++ b/protocols/IcqOscarJ/src/icq_servlist.cpp
@@ -979,13 +979,13 @@ void CIcqProto::LoadServerIDs()
 	if (wSrvID = getWord("SrvImportID", 0))
 		ReserveServerID(wSrvID, SSIT_ITEM, 0);
 
-	DBCONTACTENUMSETTINGS dbces;
 	int nStart = nServerIDListCount;
 
 	char szModule[MAX_PATH];
 	mir_snprintf(szModule, SIZEOF(szModule), "%sSrvGroups", m_szModuleName);
-
 	GroupReserveIdsEnumParam param = { this, szModule };
+
+	DBCONTACTENUMSETTINGS dbces = { 0 };
 	dbces.pfnEnumProc = &GroupReserveIdsEnumProc;
 	dbces.szModule = szModule;
 	dbces.lParam = (LPARAM)&param;
@@ -1458,7 +1458,6 @@ static int GroupLinksEnumProc(const char *szSetting,LPARAM lParam)
 
 void CIcqProto::removeGroupPathLinks(WORD wGroupID)
 { // remove miranda grouppath links targeting to this groupid
-	DBCONTACTENUMSETTINGS dbces;
 	char szModule[MAX_PATH];
 	char* pars[3];
 
@@ -1468,6 +1467,7 @@ void CIcqProto::removeGroupPathLinks(WORD wGroupID)
 	pars[1] = (char*)wGroupID;
 	pars[2] = szModule;
 
+	DBCONTACTENUMSETTINGS dbces = { 0 };
 	dbces.pfnEnumProc = &GroupLinksEnumProc;
 	dbces.szModule = szModule;
 	dbces.lParam = (LPARAM)pars;
@@ -1809,7 +1809,6 @@ char* CIcqProto::getServListUniqueGroupName(const char *szGroupName, int bAlloce
 		dbces.pfnEnumProc = &SrvGroupNamesEnumProc;
 		dbces.szModule = szModule;
 		dbces.lParam = (LPARAM)pars;
-
 		CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces);
 
 		if (pars[1])
diff --git a/protocols/IcqOscarJ/src/icq_uploadui.cpp b/protocols/IcqOscarJ/src/icq_uploadui.cpp
index 8275a03f4a..477ef69600 100644
--- a/protocols/IcqOscarJ/src/icq_uploadui.cpp
+++ b/protocols/IcqOscarJ/src/icq_uploadui.cpp
@@ -176,17 +176,13 @@ static int GroupEnumIdsEnumProc(const char *szSetting,LPARAM lParam)
 
 static void enumServerGroups(CIcqProto* ppro)
 {
-	DBCONTACTENUMSETTINGS dbces;
-
 	char szModule[MAX_PATH+9];
+	mir_snprintf(szModule, SIZEOF(szModule), "%s%s", ppro->m_szModuleName, "SrvGroups");
 
-	strcpy(szModule, ppro->m_szModuleName);
-	strcat(szModule, "SrvGroups");
-
+	DBCONTACTENUMSETTINGS dbces = { 0 };
 	dbces.pfnEnumProc = &GroupEnumIdsEnumProc;
 	dbces.szModule = szModule;
 	dbces.lParam = (LPARAM)szModule;
-
 	CallService(MS_DB_CONTACT_ENUMSETTINGS, 0, (LPARAM)&dbces);
 }
 
-- 
cgit v1.2.3