From eccbb5307a048e70ac4adb0d3fd333be28245fa8 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 28 Mar 2017 14:21:33 +0300
Subject: massive cleanup of useless cbSize fields

---
 plugins/NoHistory/src/dllmain.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/NoHistory/src')

diff --git a/plugins/NoHistory/src/dllmain.cpp b/plugins/NoHistory/src/dllmain.cpp
index 3e735690ae..3d95c96dd8 100644
--- a/plugins/NoHistory/src/dllmain.cpp
+++ b/plugins/NoHistory/src/dllmain.cpp
@@ -165,7 +165,7 @@ INT_PTR ServiceToggle(WPARAM hContact, LPARAM)
 	remove = !remove;
 	db_set_b(hContact, MODULE, DBSETTING_REMOVE, remove != 0);
 
-	StatusIconData sid = { sizeof(sid) };
+	StatusIconData sid = {};
 	sid.szModule = MODULE;
 
 	for (int i = 0; i < 2; ++i) {
@@ -191,7 +191,7 @@ int WindowEvent(WPARAM, LPARAM lParam)
 		bool chat_room = (proto && db_get_b(hContact, proto, "ChatRoom", 0) != 0);
 		int remove = db_get_b(hContact, MODULE, DBSETTING_REMOVE, 0) != 0;
 
-		StatusIconData sid = { sizeof(sid) };
+		StatusIconData sid = {};
 		sid.szModule = MODULE;
 		for (int i=0; i < 2; ++i) {
 			sid.dwId = i;
@@ -206,7 +206,7 @@ int WindowEvent(WPARAM, LPARAM lParam)
 int IconPressed(WPARAM hContact, LPARAM lParam)
 {
 	StatusIconClickData *sicd = (StatusIconClickData *)lParam;
-	if (sicd->cbSize < sizeof(StatusIconClickData))
+	if (sicd == nullptr)
 		return 0;
 
 	if (sicd->flags & MBCF_RIGHTBUTTON) return 0; // ignore right-clicks
@@ -224,7 +224,7 @@ int IconPressed(WPARAM hContact, LPARAM lParam)
 // add icon to srmm status icons
 void SrmmMenu_Load()
 {
-	StatusIconData sid = { sizeof(sid) };
+	StatusIconData sid = {};
 	sid.szModule = MODULE;
 
 	sid.dwId = 0;
-- 
cgit v1.2.3