From b327ed7872ca83c3a4249039ba1a3d8dd3ece630 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 17 Jan 2017 17:19:19 +0300
Subject: useless field DBEVENTINFO::cbSize removed

---
 plugins/Variables/src/parse_miranda.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'plugins/Variables/src/parse_miranda.cpp')

diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp
index da9874adad..0c3c2af113 100644
--- a/plugins/Variables/src/parse_miranda.cpp
+++ b/plugins/Variables/src/parse_miranda.cpp
@@ -415,14 +415,9 @@ static BOOL isValidDbEvent(DBEVENTINFO *dbe, int flags)
 
 static MEVENT findDbEvent(MCONTACT hContact, MEVENT hDbEvent, int flags)
 {
-	DBEVENTINFO dbe;
 	BOOL bEventOk;
 
 	do {
-		memset(&dbe, 0, sizeof(DBEVENTINFO));
-		dbe.cbSize = sizeof(DBEVENTINFO);
-		dbe.cbBlob = 0;
-		dbe.pBlob = NULL;
 		if (hContact != NULL) {
 			if ((flags & DBE_FIRST) && (flags & DBE_UNREAD)) {
 				hDbEvent = db_event_firstUnread(hContact);
@@ -442,6 +437,7 @@ static MEVENT findDbEvent(MCONTACT hContact, MEVENT hDbEvent, int flags)
 			MEVENT hMatchEvent = NULL, hSearchEvent = NULL;
 			DWORD matchTimestamp = 0, priorTimestamp = 0;
 
+			DBEVENTINFO dbe = {};
 			if (flags & DBE_FIRST) {
 				for (MCONTACT hSearchContact = db_find_first(); hSearchContact; hSearchContact = db_find_next(hSearchContact)) {
 					hSearchEvent = findDbEvent(hSearchContact, NULL, flags);
@@ -502,7 +498,8 @@ static MEVENT findDbEvent(MCONTACT hContact, MEVENT hDbEvent, int flags)
 				}
 			}
 		}
-		dbe.cbBlob = 0;
+
+		DBEVENTINFO dbe = {};
 		if (db_event_get(hDbEvent, &dbe))
 			bEventOk = FALSE;
 		else
@@ -569,7 +566,7 @@ static wchar_t* parseDbEvent(ARGUMENTSINFO *ai)
 	if (hDbEvent == NULL)
 		return NULL;
 
-	DBEVENTINFO dbe = { sizeof(dbe) };
+	DBEVENTINFO dbe = {};
 	dbe.cbBlob = db_event_getBlobSize(hDbEvent);
 	dbe.pBlob = (PBYTE)mir_calloc(dbe.cbBlob);
 	if (db_event_get(hDbEvent, &dbe)) {
-- 
cgit v1.2.3