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
---
 plugins/TabSRMM/src/buttonsbar.cpp | 9 ++++-----
 plugins/TabSRMM/src/sendlater.cpp  | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'plugins/TabSRMM/src')

diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index afac6207cb..27b3fa1c16 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -103,20 +103,19 @@ static int DBRemoveEnumProc(const char *szSetting, LPARAM lParam)
 
 static int Hlp_RemoveDatabaseSettings(HANDLE hContact, char *szModule, char *szPrefix)
 {
-	DBCONTACTENUMSETTINGS dbces;
 	RemoveSettings rs;
 	int i, count;
 
 	ZeroMemory(&rs, sizeof(RemoveSettings));
 	rs.szPrefix = szPrefix;
-	ZeroMemory(&dbces, sizeof(DBCONTACTENUMSETTINGS));
+
+	DBCONTACTENUMSETTINGS dbces = { 0 };
 	dbces.pfnEnumProc = DBRemoveEnumProc;
 	dbces.lParam = (LPARAM)&rs;
 	dbces.szModule = szModule;
-	if (CallService(MS_DB_CONTACT_ENUMSETTINGS, (WPARAM)(HANDLE)hContact, (LPARAM)&dbces) == -1) {
-
+	if (CallService(MS_DB_CONTACT_ENUMSETTINGS, (WPARAM)(HANDLE)hContact, (LPARAM)&dbces) == -1)
 		return -1;
-	}
+
 	count = 0;
 	if (rs.szSettings != NULL) {
 		for (i=0; i < rs.count; i++) {
diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index 5e414b6123..22e859bd0e 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -275,7 +275,6 @@ void CSendLater::processSingleContact(const HANDLE hContact)
 
 	if (iCount) {
 		DBCONTACTENUMSETTINGS ces = {0};
-
 		ces.pfnEnumProc = CSendLater::addStub;
 		ces.szModule = "SendLater";
 		ces.lParam = (LPARAM)hContact;
-- 
cgit v1.2.3