SIZEOF replaced with more secure analog - _countof

git-svn-id: http://svn.miranda-ng.org/main/trunk@14270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 6 insertions, 6 deletions

diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp
index 12d7923f76..f1264fe660 100644
--- a/plugins/ContactsPlus/src/main.cpp
+++ b/plugins/ContactsPlus/src/main.cpp
@@ -74,7 +74,7 @@ static int HookDBEventAdded(WPARAM hContact, LPARAM hDbEvent)
 	{

 		//add event to the contact list

 		TCHAR caToolTip[128];

-		mir_sntprintf(caToolTip, SIZEOF(caToolTip), _T("%s %s"), TranslateT("Contacts received from"), pcli->pfnGetContactDisplayName(hContact, 0));

+		mir_sntprintf(caToolTip, _countof(caToolTip), _T("%s %s"), TranslateT("Contacts received from"), pcli->pfnGetContactDisplayName(hContact, 0));

 

 		CLISTEVENT cle = { sizeof(cle) };

 		cle.hContact = hContact;

diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp
index 84331201a3..49729cfcf2 100644
--- a/plugins/ContactsPlus/src/receive.cpp
+++ b/plugins/ContactsPlus/src/receive.cpp
@@ -459,7 +459,7 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 		UnhookEvent(wndData->hHook);

 		DestroyMenu(wndData->mhPopup);

 		{

-			for (int i = 0; i < SIZEOF(wndData->hIcons); i++)

+			for (int i = 0; i < _countof(wndData->hIcons); i++)

 				DestroyIcon(wndData->hIcons[i]);

 		}

 		delete wndData; // automatically calls destructor

diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp
index 2e0217c9e0..f06309e72b 100644
--- a/plugins/ContactsPlus/src/send.cpp
+++ b/plugins/ContactsPlus/src/send.cpp
@@ -462,7 +462,7 @@ INT_PTR CALLBACK SendDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 		break;

 

 	case WM_DESTROY:

-		for (int i = 0; i < SIZEOF(wndData->hIcons); i++)

+		for (int i = 0; i < _countof(wndData->hIcons); i++)

 			DestroyIcon(wndData->hIcons[i]);

 		WindowList_Remove(g_hSendWindowList, hwndDlg);

 		delete wndData;

diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp
index 475879861e..3d07a8f99c 100644
--- a/plugins/ContactsPlus/src/utils.cpp
+++ b/plugins/ContactsPlus/src/utils.cpp
@@ -115,7 +115,7 @@ void DrawProtocolIcon(HWND hwndDlg, LPARAM lParam, MCONTACT hContact)
 void UpdateDialogTitle(HWND hwndDlg, MCONTACT hContact, TCHAR *pszTitleStart)

 {

 	TCHAR newtitle[512];

-	mir_tstrncpy(newtitle, TranslateTS(pszTitleStart), SIZEOF(newtitle));

+	mir_tstrncpy(newtitle, TranslateTS(pszTitleStart), _countof(newtitle));

 	

 	if (hContact) {

 		char *szProto = GetContactProto(hContact);

@@ -124,13 +124,13 @@ void UpdateDialogTitle(HWND hwndDlg, MCONTACT hContact, TCHAR *pszTitleStart)
 			TCHAR *contactName = pcli->pfnGetContactDisplayName(hContact, 0);

 

 			TCHAR oldTitle[MAX_PATH];

-			GetDlgItemText(hwndDlg, IDC_NAME, oldTitle, SIZEOF(oldTitle));

+			GetDlgItemText(hwndDlg, IDC_NAME, oldTitle, _countof(oldTitle));

 

 			if (mir_tstrcmp(uid ? uid : contactName, oldTitle))

 				SetDlgItemText(hwndDlg, IDC_NAME, uid ? uid : contactName);

 

 			TCHAR *szStatus = pcli->pfnGetStatusModeDescription(szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

-			mir_sntprintf(newtitle, SIZEOF(newtitle), _T("%s %s (%s)"), TranslateTS(pszTitleStart), contactName, szStatus);

+			mir_sntprintf(newtitle, _countof(newtitle), _T("%s %s (%s)"), TranslateTS(pszTitleStart), contactName, szStatus);

 		}

 	}