From 4c814798c7bc7f6a0f92c21b027b26290622aa2f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 19 Jun 2015 19:35:42 +0000
Subject: SIZEOF replaced with more secure analog - _countof

git-svn-id: http://svn.miranda-ng.org/main/trunk@14270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SimpleAR/src/Main.cpp    | 6 +++---
 plugins/SimpleAR/src/Options.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/SimpleAR/src')

diff --git a/plugins/SimpleAR/src/Main.cpp b/plugins/SimpleAR/src/Main.cpp
index c6a38af98c..f87f1b2c09 100644
--- a/plugins/SimpleAR/src/Main.cpp
+++ b/plugins/SimpleAR/src/Main.cpp
@@ -114,7 +114,7 @@ INT CheckDefaults(WPARAM, LPARAM)
 
 	for (int c=ID_STATUS_ONLINE; c<ID_STATUS_IDLE; c++)
 	{
-		mir_snprintf(szStatus,SIZEOF(szStatus),"%d",c);
+		mir_snprintf(szStatus,_countof(szStatus),"%d",c);
 		if (c == ID_STATUS_ONLINE || c == ID_STATUS_FREECHAT || c == ID_STATUS_INVISIBLE)
 			continue;
 		else
@@ -193,7 +193,7 @@ INT addEvent(WPARAM hContact, LPARAM hDBEvent)
 				if (isQun)
 					return FALSE;
 
-				mir_snprintf(szStatus,SIZEOF(szStatus),"%d",status);
+				mir_snprintf(szStatus,_countof(szStatus),"%d",status);
 				if (!db_get_ts(NULL,protocolname,szStatus,&dbv))
 				{
 					if (*dbv.ptszVal)
@@ -286,7 +286,7 @@ extern "C" int __declspec(dllexport)Load(void)
 	HookEvent(ME_DB_EVENT_ADDED, addEvent);
 	HookEvent(ME_SYSTEM_MODULESLOADED, CheckDefaults);
 
-	Icon_RegisterT(hinstance, _T("Simple Auto Replier"), iconList, SIZEOF(iconList));
+	Icon_RegisterT(hinstance, _T("Simple Auto Replier"), iconList, _countof(iconList));
 
 	return 0;
 }
diff --git a/plugins/SimpleAR/src/Options.cpp b/plugins/SimpleAR/src/Options.cpp
index 40b6b01bdd..25055aca41 100644
--- a/plugins/SimpleAR/src/Options.cpp
+++ b/plugins/SimpleAR/src/Options.cpp
@@ -25,7 +25,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 
 			for (INT c = ID_STATUS_ONLINE; c < ID_STATUS_IDLE; c++)
 			{
-				mir_snprintf(tszStatus, SIZEOF(tszStatus), "%d", c);
+				mir_snprintf(tszStatus, _countof(tszStatus), "%d", c);
 				pszStatus=(TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION,(WPARAM)c,GSMDF_TCHAR);
 				if (c == ID_STATUS_ONLINE || c == ID_STATUS_FREECHAT || c == ID_STATUS_INVISIBLE)
 					continue;
@@ -98,7 +98,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 					mi.icolibItem = fEnabled ? iconList[0].hIcolib : iconList[1].hIcolib;
 					Menu_ModifyItem(hEnableMenu, &mi);
 
-					GetDlgItemText(hwndDlg, IDC_HEADING, ptszText, SIZEOF(ptszText));
+					GetDlgItemText(hwndDlg, IDC_HEADING, ptszText, _countof(ptszText));
 					db_set_ts(NULL, protocolname, KEY_HEADING, ptszText);
 
 					INT size = GetDlgItemInt(hwndDlg, IDC_INTERVAL, &translated, FALSE);
@@ -116,7 +116,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 						else
 						{
 							char szStatus[6] = {0};
-							mir_snprintf(szStatus, SIZEOF(szStatus), "%d", c);
+							mir_snprintf(szStatus, _countof(szStatus), "%d", c);
 
 							if (c<ID_STATUS_FREECHAT && ptszMessage[c-ID_STATUS_ONLINE-1])
 								db_set_ts(NULL,protocolname,szStatus,ptszMessage[c-ID_STATUS_ONLINE-1]);
-- 
cgit v1.2.3