From c2a98771e0d195ca4d5be500f4c8ba9fd012d676 Mon Sep 17 00:00:00 2001 From: George Hazan 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 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'plugins/TabSRMM/src/buttonsbar.cpp') 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++) { -- cgit v1.2.3