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

diff --git a/plugins/Dropbox/src/dropbox.cpp b/plugins/Dropbox/src/dropbox.cpp
index 02894645a2..2aa36de2d7 100644
--- a/plugins/Dropbox/src/dropbox.cpp
+++ b/plugins/Dropbox/src/dropbox.cpp
@@ -144,7 +144,7 @@ UINT CDropbox::RequestAccessTokenAsync(void *owner, void *param)
 		instance->DestroyAccessToken();

 

 	char requestToken[128];

-	GetDlgItemTextA(hwndDlg, IDC_REQUEST_CODE, requestToken, SIZEOF(requestToken));

+	GetDlgItemTextA(hwndDlg, IDC_REQUEST_CODE, requestToken, _countof(requestToken));

 

 	GetAccessTokenRequest request(requestToken);

 	NLHR_PTR response(request.Send(instance->hNetlibConnection));

diff --git a/plugins/Dropbox/src/dropbox_icons.cpp b/plugins/Dropbox/src/dropbox_icons.cpp
index ba92aaa8f2..b4b8574344 100644
--- a/plugins/Dropbox/src/dropbox_icons.cpp
+++ b/plugins/Dropbox/src/dropbox_icons.cpp
@@ -8,12 +8,12 @@ static IconItem iconList[] =
 

 void InitializeIcons()

 {

-	Icon_Register(g_hInstance, "Protocols/" MODULE, iconList, SIZEOF(iconList), MODULE);

+	Icon_Register(g_hInstance, "Protocols/" MODULE, iconList, _countof(iconList), MODULE);

 }

 

 HANDLE GetIconHandleByName(const char *name)

 {

-	for (size_t i = 0; i < SIZEOF(iconList); i++)

+	for (size_t i = 0; i < _countof(iconList); i++)

 		if (mir_strcmpi(iconList[i].szName, name) == 0)

 			return iconList[i].hIcolib;

 

@@ -22,7 +22,7 @@ HANDLE GetIconHandleByName(const char *name)
 

 HICON LoadIconEx(int iconId, bool big)

 {

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

+	for (int i = 0; i < _countof(iconList); i++)

 		if (iconList[i].defIconID == iconId)

 			return IcoLib_GetIconByHandle(iconList[i].hIcolib, big);

 

diff --git a/plugins/Dropbox/src/dropbox_services.cpp b/plugins/Dropbox/src/dropbox_services.cpp
index 24dd3c62c8..3909ea4750 100644
--- a/plugins/Dropbox/src/dropbox_services.cpp
+++ b/plugins/Dropbox/src/dropbox_services.cpp
@@ -179,7 +179,7 @@ INT_PTR CDropbox::ProtoSendMessage(WPARAM, LPARAM lParam)
 			{ "delete", &CDropbox::CommandDelete }

 		};

 

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

+		for (int i = 0; i < _countof(commands); i++)

 		{

 			if (!mir_strcmp(szMessage+1, commands[i].szCommand))

 			{

@@ -199,7 +199,7 @@ INT_PTR CDropbox::ProtoSendMessage(WPARAM, LPARAM lParam)
 	}

 

 	char help[1024];

-	mir_snprintf(help, SIZEOF(help), Translate("\"%s\" is not valid.\nUse \"/help\" for more info."), szMessage);

+	mir_snprintf(help, _countof(help), Translate("\"%s\" is not valid.\nUse \"/help\" for more info."), szMessage);

 	CallContactService(GetDefaultContact(), PSR_MESSAGE, 0, (LPARAM)help);

 	return 0;

 }

diff --git a/plugins/Dropbox/src/http_request.h b/plugins/Dropbox/src/http_request.h
index 6fa8816c93..7a4bd11bb0 100644
--- a/plugins/Dropbox/src/http_request.h
+++ b/plugins/Dropbox/src/http_request.h
@@ -69,7 +69,7 @@ protected:
 		char cPair[128];

 		mir_snprintf(

 			cPair,

-			SIZEOF(cPair),

+			_countof(cPair),

 			"%s:%s",

 			szLogin,

 			szPassword);

@@ -79,7 +79,7 @@ protected:
 		char value[128];

 		mir_snprintf(

 			value,

-			SIZEOF(value),

+			_countof(value),

 			"Basic %s",

 			ePair);

 

@@ -96,7 +96,7 @@ protected:
 		char value[128];

 		mir_snprintf(

 			value,

-			SIZEOF(value),

+			_countof(value),

 			"Bearer %s",

 			szValue);