SIZEOF replaced with more secure analog - _countof

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

1 files changed, 9 insertions, 9 deletions

diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp
index d5f03c8076..1ea04d468d 100644
--- a/plugins/PluginUpdater/src/Utils.cpp
+++ b/plugins/PluginUpdater/src/Utils.cpp
@@ -32,7 +32,7 @@ IconItemT iconList[] =
 

 void InitIcoLib()

 {

-	Icon_RegisterT(hInst,MODULE,iconList, SIZEOF(iconList));

+	Icon_RegisterT(hInst,MODULE,iconList, _countof(iconList));

 }

 #endif

 

@@ -128,8 +128,8 @@ bool ParseHashes(const TCHAR *ptszUrl, ptrT &baseUrl, SERVLIST &arHashes)
 

 	// Download version info

 	FILEURL pFileUrl;

-	mir_sntprintf(pFileUrl.tszDownloadURL, SIZEOF(pFileUrl.tszDownloadURL), _T("%s/hashes.zip"), baseUrl);

-	mir_sntprintf(pFileUrl.tszDiskPath, SIZEOF(pFileUrl.tszDiskPath), _T("%s\\hashes.zip"), tszTempPath);

+	mir_sntprintf(pFileUrl.tszDownloadURL, _countof(pFileUrl.tszDownloadURL), _T("%s/hashes.zip"), baseUrl);

+	mir_sntprintf(pFileUrl.tszDiskPath, _countof(pFileUrl.tszDiskPath), _T("%s\\hashes.zip"), tszTempPath);

 	pFileUrl.CRCsum = 0;

 

 	HANDLE nlc;

@@ -153,7 +153,7 @@ bool ParseHashes(const TCHAR *ptszUrl, ptrT &baseUrl, SERVLIST &arHashes)
 	DeleteFile(pFileUrl.tszDiskPath);

 

 	TCHAR tszTmpIni[MAX_PATH] = {0};

-	mir_sntprintf(tszTmpIni, SIZEOF(tszTmpIni), _T("%s\\hashes.txt"), tszTempPath);

+	mir_sntprintf(tszTmpIni, _countof(tszTmpIni), _T("%s\\hashes.txt"), tszTempPath);

 	FILE *fp = _tfopen(tszTmpIni, _T("r"));

 	if (!fp) {

 		Netlib_LogfT(hNetlibUser,_T("Opening %s failed"), tszTempPath);

@@ -163,7 +163,7 @@ bool ParseHashes(const TCHAR *ptszUrl, ptrT &baseUrl, SERVLIST &arHashes)
 

 	bool bDoNotSwitchToStable = false;

 	char str[200];

-	while(fgets(str, SIZEOF(str), fp) != NULL) {

+	while(fgets(str, _countof(str), fp) != NULL) {

 		rtrim(str);

 		// Do not allow the user to switch back to stable

 		if (!strcmp(str, "DoNotSwitchToStable")) {

@@ -261,7 +261,7 @@ bool DownloadFile(FILEURL *pFileURL, HANDLE &nlc)
 				else {

 					// try to write it via PU stub

 					TCHAR tszTempFile[MAX_PATH];

-					mir_sntprintf(tszTempFile, SIZEOF(tszTempFile), _T("%s\\pulocal.tmp"), tszTempPath);

+					mir_sntprintf(tszTempFile, _countof(tszTempFile), _T("%s\\pulocal.tmp"), tszTempPath);

 					hFile = CreateFile(tszTempFile, GENERIC_READ | GENERIC_WRITE, NULL, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

 					if (hFile != INVALID_HANDLE_VALUE) {

 						DWORD dwBytes;

@@ -468,7 +468,7 @@ bool PrepareEscalation()
 {

 	// First try to create a file near Miranda32.exe

 	TCHAR szPath[MAX_PATH];

-	GetModuleFileName(NULL, szPath, SIZEOF(szPath));

+	GetModuleFileName(NULL, szPath, _countof(szPath));

 	TCHAR *ext = _tcsrchr(szPath, '.');

 	if (ext != NULL)

 		*ext = '\0';

@@ -487,7 +487,7 @@ bool PrepareEscalation()
 	else {

 		// Elevate the process. Create a pipe for a stub first

 		TCHAR tszPipeName[MAX_PATH];

-		mir_sntprintf(tszPipeName, SIZEOF(tszPipeName), _T("\\\\.\\pipe\\Miranda_Pu_%d"), GetCurrentProcessId());

+		mir_sntprintf(tszPipeName, _countof(tszPipeName), _T("\\\\.\\pipe\\Miranda_Pu_%d"), GetCurrentProcessId());

 		hPipe = CreateNamedPipe(tszPipeName, PIPE_ACCESS_DUPLEX, PIPE_READMODE_BYTE | PIPE_WAIT, 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL);

 		if (hPipe == INVALID_HANDLE_VALUE) {

 			hPipe = NULL;

@@ -497,7 +497,7 @@ bool PrepareEscalation()
 			GetModuleFileName(NULL, szPath, ARRAYSIZE(szPath));

 			if ((p = _tcsrchr(szPath, '\\')) != 0)

 				_tcscpy(p+1, _T("pu_stub.exe"));

-			mir_sntprintf(cmdLine, SIZEOF(cmdLine), _T("%d"), GetCurrentProcessId());

+			mir_sntprintf(cmdLine, _countof(cmdLine), _T("%d"), GetCurrentProcessId());

 

 			// Launch a stub

 			SHELLEXECUTEINFO sei = { sizeof(sei) };