SIZEOF replaced with more secure analog - _countof

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

2 files changed, 7 insertions, 7 deletions

diff --git a/protocols/MinecraftDynmap/src/dialogs.cpp b/protocols/MinecraftDynmap/src/dialogs.cpp
index cc6c8efbf3..ee04d32b47 100644
--- a/protocols/MinecraftDynmap/src/dialogs.cpp
+++ b/protocols/MinecraftDynmap/src/dialogs.cpp
@@ -30,14 +30,14 @@ static IconItem icons[] = {
 	{ "proto", LPGEN("Protocol icon"), IDI_PROTO },
 };
 
-static HANDLE hIconLibItem[SIZEOF(icons)];
+static HANDLE hIconLibItem[_countof(icons)];
 
 void InitIcons(void) {
-	Icon_Register(g_hInstance, "Protocols/MinecraftDynmap", icons, SIZEOF(icons), "MinecraftDynmap");
+	Icon_Register(g_hInstance, "Protocols/MinecraftDynmap", icons, _countof(icons), "MinecraftDynmap");
 }
 
 HANDLE GetIconHandle(const char* name) {
-	for (size_t i = 0; i < SIZEOF(icons); i++) {
+	for (size_t i = 0; i < _countof(icons); i++) {
 		if (strcmp(icons[i].szName, name) == 0) {
 			return hIconLibItem[i];
 		}
@@ -73,7 +73,7 @@ static void StoreDBText(MinecraftDynmapProto* ppro, HWND hwnd, int idCtrl, const
 {
 	TCHAR tstr[250+1];
 
-	GetDlgItemText(hwnd, idCtrl, tstr, SIZEOF(tstr));
+	GetDlgItemText(hwnd, idCtrl, tstr, _countof(tstr));
 	if (tstr[0] != '\0') {
 		db_set_ts(NULL, ppro->m_szModuleName, szSetting, tstr);
 	} else {
diff --git a/protocols/MinecraftDynmap/src/main.cpp b/protocols/MinecraftDynmap/src/main.cpp
index 9f60c4d084..28b45731ed 100644
--- a/protocols/MinecraftDynmap/src/main.cpp
+++ b/protocols/MinecraftDynmap/src/main.cpp
@@ -92,8 +92,8 @@ extern "C" int __declspec(dllexport) Load(void)
 	mir_getLP(&pluginInfo);
 	mir_getCLI();
 
-	PROTOCOLDESCRIPTOR pd = { 0 };

-	pd.cbSize = sizeof(pd);

+	PROTOCOLDESCRIPTOR pd = { 0 };
+	pd.cbSize = sizeof(pd);
 	pd.szName = "MinecraftDynmap";
 	pd.type = PROTOTYPE_PROTOCOL;
 	pd.fnInit = protoInit;
@@ -130,7 +130,7 @@ extern "C" int __declspec(dllexport) Load(void)
 
 extern "C" int __declspec(dllexport) Unload(void)
 {
-	for (size_t i=0; i < SIZEOF(g_hEvents); i++)
+	for (size_t i=0; i < _countof(g_hEvents); i++)
 		UnhookEvent(g_hEvents[i]);
 
 	return 0;