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/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index 31251d0c20..e8cd5ab68b 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -220,7 +220,7 @@ void SvcFlagsLoadModule()
 		langid = 1;

 

 	char szId[20];

-	mir_snprintf(szId, SIZEOF(szId), (langid == 0xFFFF) ? "%s_0x%X" : "%s_%i", "flags", langid); /* buffer safe */

+	mir_snprintf(szId, _countof(szId), (langid == 0xFFFF) ? "%s_0x%X" : "%s_%i", "flags", langid); /* buffer safe */

 	hExtraIconSvc = ExtraIcon_Register("Flags", LPGEN("Flags (uinfoex)"), szId);

 }

 

diff --git a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
index efb5c18697..9710ee4f73 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
@@ -102,13 +102,13 @@ static int CountryNumberToBitmapIndex(int countryNumber)
 	/* binary search in index array */

 	if (countryNumber > 0) {

 		int i,high/*,low=0*/;

-		high=SIZEOF(BitmapIndexMap);

+		high=_countof(BitmapIndexMap);

 		/*old code need sortet BitmapIndexMap*/

 		/*if (countryNumber<=BitmapIndexMap[high])

 			while(low<=high) {

 				i=low+((high-low)/2);

 				// never happens

-				if (i<0 || i>=SIZEOF(BitmapIndexMap)) DebugBreak();

+				if (i<0 || i>=_countof(BitmapIndexMap)) DebugBreak();

 				if (BitmapIndexMap[i]==countryNumber) return i;

 				if (countryNumber>BitmapIndexMap[i]) low=i+1;      

 				else high=i-1;

@@ -133,7 +133,7 @@ HICON LoadFlag(int countryNumber)
 		szCountry = (char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER,countryNumber=0xFFFF,0);

 

 	char szId[20];

-	mir_snprintf(szId, SIZEOF(szId), (countryNumber == 0xFFFF) ? "%s_0x%X" : "%s_%i", "flags", countryNumber); /* buffer safe */

+	mir_snprintf(szId, _countof(szId), (countryNumber == 0xFFFF) ? "%s_0x%X" : "%s_%i", "flags", countryNumber); /* buffer safe */

 	return IcoLib_GetIcon(szId);

 }

 

@@ -255,7 +255,7 @@ static INT_PTR ServiceCreateMergedFlagIcon(WPARAM wParam,LPARAM lParam)
 				memset(&aptTriangle, 0, sizeof(aptTriangle));

 				aptTriangle[1].y=bm.bmHeight-1;

 				aptTriangle[2].x=bm.bmWidth-1;

-				HRGN hrgn=CreatePolygonRgn(aptTriangle,SIZEOF(aptTriangle),WINDING);

+				HRGN hrgn=CreatePolygonRgn(aptTriangle,_countof(aptTriangle),WINDING);

 				if (hrgn!=NULL) {

 					SelectClipRgn(hdc,hrgn);

 					HBITMAP hbmPrev=(HBITMAP)SelectObject(hdc,icoi.hbmColor);

@@ -397,7 +397,7 @@ void InitIcons()
 			for (int i=0; i < nCountriesCount; i++) {

 				sid.description.t = mir_a2t(LPGEN(countries[i].szName));

 				/* create identifier */

-				mir_snprintf(szId, SIZEOF(szId), (countries[i].id == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countries[i].id); /* buffer safe */

+				mir_snprintf(szId, _countof(szId), (countries[i].id == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countries[i].id); /* buffer safe */

 				int index = CountryNumberToBitmapIndex(countries[i].id);

 				/* create icon */

 				sid.hDefaultIcon = ImageList_ExtractIcon(NULL, himl, index);

@@ -421,7 +421,7 @@ void UninitIcons()
 	for(int i=0;i<nCountriesCount;++i) {

 		/* create identifier */

 		char szId[20];

-		mir_snprintf(szId, SIZEOF(szId), (countries[i].id == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countries[i].id); /* buffer safe */

+		mir_snprintf(szId, _countof(szId), (countries[i].id == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countries[i].id); /* buffer safe */

 		IcoLib_RemoveIcon(szId);

 	}

 	mir_free(phIconHandles);  /* does NULL check */