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, 12 insertions, 12 deletions

diff --git a/plugins/XSoundNotify/src/Common.h b/plugins/XSoundNotify/src/Common.h
index 2f31a6276e..16a60182fa 100644
--- a/plugins/XSoundNotify/src/Common.h
+++ b/plugins/XSoundNotify/src/Common.h
@@ -31,7 +31,7 @@ struct XSN_Data
 	__forceinline XSN_Data(MCONTACT _aContact, TCHAR *_path, BYTE _ignore) :

 		hContact(_aContact)

 	{

-		_tcsncpy(path, _path, SIZEOF(path));

+		_tcsncpy(path, _path, _countof(path));

 		ignore = _ignore;

 	}

 };

diff --git a/plugins/XSoundNotify/src/dialog.cpp b/plugins/XSoundNotify/src/dialog.cpp
index 00bb9d704f..68a86ced56 100644
--- a/plugins/XSoundNotify/src/dialog.cpp
+++ b/plugins/XSoundNotify/src/dialog.cpp
@@ -42,7 +42,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 

 				TCHAR *nick = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR);

 				TCHAR value[100];

-				mir_sntprintf(value, SIZEOF(value), TranslateT("Custom sound for %s (%s)"), nick, uid);

+				mir_sntprintf(value, _countof(value), TranslateT("Custom sound for %s (%s)"), nick, uid);

 				SetWindowText(hwndDlg, value);

 				db_free(&dbvuid);

 			}

@@ -102,9 +102,9 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 			ofn.lStructSize = sizeof(ofn);

 			TCHAR tmp[MAX_PATH];

 			if (GetModuleHandle(_T("bass_interface.dll")))

-				mir_sntprintf(tmp, SIZEOF(tmp), _T("%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c"), TranslateT("Sound files"), 0, 0, 0);

+				mir_sntprintf(tmp, _countof(tmp), _T("%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c"), TranslateT("Sound files"), 0, 0, 0);

 			else

-				mir_sntprintf(tmp, SIZEOF(tmp), _T("%s (*.wav)%c*.wav%c%c"), TranslateT("WAV files"), 0, 0, 0);

+				mir_sntprintf(tmp, _countof(tmp), _T("%s (*.wav)%c*.wav%c%c"), TranslateT("WAV files"), 0, 0, 0);

 			ofn.lpstrFilter = tmp;

 			ofn.hwndOwner = 0;

 			ofn.lpstrFile = FileName;

@@ -122,7 +122,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 				if (p == NULL)

 					XSN_Users.insert(new XSN_Data(hContact, FileName, IsDlgButtonChecked(hwndDlg, IDC_CONT_IGNORE_SOUND) ? 1 : 0));

 				else {

-					_tcsncpy(p->path, FileName, SIZEOF(p->path));

+					_tcsncpy(p->path, FileName, _countof(p->path));

 					p->ignore = IsDlgButtonChecked(hwndDlg, IDC_CONT_IGNORE_SOUND) ? 1 : 0;

 				}

 				EnableWindow(GetDlgItem(hwndDlg, IDC_CONT_BUTTON_TEST_PLAY), TRUE);

diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp
index 8e414f6a24..8f70bf6c77 100644
--- a/plugins/XSoundNotify/src/options.cpp
+++ b/plugins/XSoundNotify/src/options.cpp
@@ -122,9 +122,9 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			ofn.lStructSize = sizeof(ofn);

 			TCHAR tmp[MAX_PATH];

 			if (GetModuleHandle(_T("bass_interface.dll")))

-				mir_sntprintf(tmp, SIZEOF(tmp), _T("%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c"), TranslateT("Sound files"), 0, 0, 0);

+				mir_sntprintf(tmp, _countof(tmp), _T("%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c"), TranslateT("Sound files"), 0, 0, 0);

 			else

-				mir_sntprintf(tmp, SIZEOF(tmp), _T("%s (*.wav)%c*.wav%c%c"), TranslateT("WAV files"), 0, 0, 0);

+				mir_sntprintf(tmp, _countof(tmp), _T("%s (*.wav)%c*.wav%c%c"), TranslateT("WAV files"), 0, 0, 0);

 			ofn.lpstrFilter = tmp;

 			ofn.hwndOwner = 0;

 			ofn.lpstrFile = FileName;

@@ -144,7 +144,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 					XSN_Users.insert(new XSN_Data(hContact, FileName, IsDlgButtonChecked(hwndDlg, IDC_OPT_IGNORE_SOUND) ? 1 : 0));

 				else

 				{

-					_tcsncpy(p->path, FileName, SIZEOF(p->path));

+					_tcsncpy(p->path, FileName, _countof(p->path));

 					p->ignore = IsDlgButtonChecked(hwndDlg, IDC_OPT_IGNORE_SOUND) ? 1 : 0;

 				}

 				EnableWindow(GetDlgItem(hwndDlg, IDC_OPT_BUTTON_TEST_PLAY), TRUE);

diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp
index e54db97808..e33b915fae 100644
--- a/plugins/XSoundNotify/src/xsn_main.cpp
+++ b/plugins/XSoundNotify/src/xsn_main.cpp
@@ -71,12 +71,12 @@ void InitSelfSounds()
 

 	Proto_EnumAccounts(&protoCount, &protos);

 	for (int i = 0; i < protoCount; i++) {

-		for (int j = 0; j < SIZEOF(selfSounds); j++) {

+		for (int j = 0; j < _countof(selfSounds); j++) {

 			char namebuf[128];

-			mir_snprintf(namebuf, SIZEOF(namebuf), "%s%s", protos[i]->szModuleName, selfSounds[j].szName);

+			mir_snprintf(namebuf, _countof(namebuf), "%s%s", protos[i]->szModuleName, selfSounds[j].szName);

 

 			TCHAR infobuf[256];

-			mir_sntprintf(infobuf, SIZEOF(infobuf), _T("%s [%s]"), TranslateT("Self status"), protos[i]->tszAccountName);

+			mir_sntprintf(infobuf, _countof(infobuf), _T("%s [%s]"), TranslateT("Self status"), protos[i]->tszAccountName);

 			SkinAddNewSoundExT(namebuf, infobuf, (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, selfSounds[j].iStatus, GSMDF_TCHAR));

 		}

 	}

@@ -86,7 +86,7 @@ static int ProtoAck(WPARAM, LPARAM lParam)
 {

 	ACKDATA *ack = (ACKDATA*)lParam;

 	if (ack != 0 && ack->szModule && ack->type == ACKTYPE_STATUS && ack->result == ACKRESULT_SUCCESS) {

-		for (int i = 0; i < SIZEOF(selfSounds); i++) {

+		for (int i = 0; i < _countof(selfSounds); i++) {

 			if (selfSounds[i].iStatus == ack->lParam) {

 				char buf[128];

 				mir_snprintf(buf, "%s%s", ack->szModule, selfSounds[i].szName);