mir_sntprintf / mir_snprintf: obsoleted second parameter removed wherever possible

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

4 files changed, 32 insertions, 32 deletions

diff --git a/plugins/PluginUpdater/src/DlgListNew.cpp b/plugins/PluginUpdater/src/DlgListNew.cpp
index 60f3d2a623..da34ebfc80 100644
--- a/plugins/PluginUpdater/src/DlgListNew.cpp
+++ b/plugins/PluginUpdater/src/DlgListNew.cpp
@@ -53,10 +53,10 @@ static void ApplyDownloads(void *param)
 	//create needed folders after escalating priviledges. Folders creates when we actually install updates

 	TCHAR tszFileTemp[MAX_PATH], tszFileBack[MAX_PATH];

 

-	mir_sntprintf(tszFileBack, _countof(tszFileBack), _T("%s\\Backups"), g_tszRoot);

+	mir_sntprintf(tszFileBack, _T("%s\\Backups"), g_tszRoot);

 	SafeCreateDirectory(tszFileBack);

 

-	mir_sntprintf(tszFileTemp, _countof(tszFileTemp), _T("%s\\Temp"), g_tszRoot);

+	mir_sntprintf(tszFileTemp, _T("%s\\Temp"), g_tszRoot);

 	SafeCreateDirectory(tszFileTemp);

 

 	VARST tszMirandaPath(_T("%miranda_path%"));

@@ -113,7 +113,7 @@ static LRESULT CALLBACK PluginListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LP
 				TCHAR *p = _tcschr(tszFileName, L'.'); *p = 0;

 

 				TCHAR link[MAX_PATH];

-				mir_sntprintf(link, _countof(link), PLUGIN_INFO_URL, tszFileName);

+				mir_sntprintf(link, PLUGIN_INFO_URL, tszFileName);

 				Utils_OpenUrlT(link);

 			}

 		}

@@ -355,8 +355,8 @@ static FILEINFO* ServerEntryToFileInfo(const ServListEntry &hash, const TCHAR* t
 	tp = _tcschr(tszRelFileName, L'\\'); if (tp) tp++; else tp = tszRelFileName;

 	_tcslwr(tp);

 

-	mir_sntprintf(FileInfo->File.tszDiskPath, _countof(FileInfo->File.tszDiskPath), _T("%s\\Temp\\%s.zip"), g_tszRoot, tszFileName);

-	mir_sntprintf(FileInfo->File.tszDownloadURL, _countof(FileInfo->File.tszDownloadURL), _T("%s/%s.zip"), tszBaseUrl, tszRelFileName);

+	mir_sntprintf(FileInfo->File.tszDiskPath, _T("%s\\Temp\\%s.zip"), g_tszRoot, tszFileName);

+	mir_sntprintf(FileInfo->File.tszDownloadURL, _T("%s/%s.zip"), tszBaseUrl, tszRelFileName);

 	for (tp = _tcschr(FileInfo->File.tszDownloadURL, '\\'); tp != 0; tp = _tcschr(tp, '\\'))

 		*tp++ = '/';

 	FileInfo->File.CRCsum = hash.m_crc;

@@ -386,7 +386,7 @@ static void GetList(void *)
 		ServListEntry &hash = hashes[i];

 

 		TCHAR tszPath[MAX_PATH];

-		mir_sntprintf(tszPath, _countof(tszPath), _T("%s\\%s"), dirname, hash.m_name);

+		mir_sntprintf(tszPath, _T("%s\\%s"), dirname, hash.m_name);

 

 		if (GetFileAttributes(tszPath) == INVALID_FILE_ATTRIBUTES) {

 			FILEINFO *FileInfo = ServerEntryToFileInfo(hash, baseUrl, tszPath);

@@ -469,7 +469,7 @@ static INT_PTR ParseUriService(WPARAM, LPARAM lParam)
 

 	VARST dirName(_T("%miranda_path%"));

 	TCHAR tszPath[MAX_PATH];

-	mir_sntprintf(tszPath, _countof(tszPath), _T("%s\\%s"), dirName, hash->m_name);

+	mir_sntprintf(tszPath, _T("%s\\%s"), dirName, hash->m_name);

 	FILEINFO *fileInfo = ServerEntryToFileInfo(*hash, baseUrl, tszPath);

 

 	FILELIST *fileList = new FILELIST(1);

diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 8b77616451..b3298611f1 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -59,9 +59,9 @@ static void ApplyUpdates(void *param)
 	HWND hwndList = GetDlgItem(hDlg, IDC_LIST_UPDATES);

 	//create needed folders after escalating priviledges. Folders creates when we actually install updates

 	TCHAR tszFileTemp[MAX_PATH], tszFileBack[MAX_PATH];

-	mir_sntprintf(tszFileBack, _countof(tszFileBack), _T("%s\\Backups"), g_tszRoot);

+	mir_sntprintf(tszFileBack, _T("%s\\Backups"), g_tszRoot);

 	SafeCreateDirectory(tszFileBack);

-	mir_sntprintf(tszFileTemp, _countof(tszFileTemp), _T("%s\\Temp"), g_tszRoot);

+	mir_sntprintf(tszFileTemp, _T("%s\\Temp"), g_tszRoot);

 	SafeCreateDirectory(tszFileTemp);

 

 	// 2) Download all plugins

@@ -101,7 +101,7 @@ static void ApplyUpdates(void *param)
 			if (p.bDeleteOnly) {

 				// we need only to backup the old file

 				TCHAR *ptszRelPath = p.tszNewName + _tcslen(tszMirandaPath) + 1, tszBackFile[MAX_PATH];

-				mir_sntprintf(tszBackFile, _countof(tszBackFile), _T("%s\\%s"), tszFileBack, ptszRelPath);

+				mir_sntprintf(tszBackFile, _T("%s\\%s"), tszFileBack, ptszRelPath);

 				BackupFile(p.tszNewName, tszBackFile);

 			}

 			else {

@@ -109,8 +109,8 @@ static void ApplyUpdates(void *param)
 				// otherwise it would be replaced by unzip

 				if ( _tcsicmp(p.tszOldName, p.tszNewName)) {

 					TCHAR tszSrcPath[MAX_PATH], tszBackFile[MAX_PATH];

-					mir_sntprintf(tszSrcPath, _countof(tszSrcPath), _T("%s\\%s"), tszMirandaPath, p.tszOldName);

-					mir_sntprintf(tszBackFile, _countof(tszBackFile), _T("%s\\%s"), tszFileBack, p.tszOldName);

+					mir_sntprintf(tszSrcPath, _T("%s\\%s"), tszMirandaPath, p.tszOldName);

+					mir_sntprintf(tszBackFile, _T("%s\\%s"), tszFileBack, p.tszOldName);

 					BackupFile(tszSrcPath, tszBackFile);

 				}

 

@@ -377,10 +377,10 @@ static void DlgUpdateSilent(void *param)
 	//create needed folders after escalating priviledges. Folders creates when we actually install updates

 	TCHAR tszFileTemp[MAX_PATH], tszFileBack[MAX_PATH];

 

-	mir_sntprintf(tszFileBack, _countof(tszFileBack), _T("%s\\Backups"), g_tszRoot);

+	mir_sntprintf(tszFileBack, _T("%s\\Backups"), g_tszRoot);

 	SafeCreateDirectory(tszFileBack);

 

-	mir_sntprintf(tszFileTemp, _countof(tszFileTemp), _T("%s\\Temp"), g_tszRoot);

+	mir_sntprintf(tszFileTemp, _T("%s\\Temp"), g_tszRoot);

 	SafeCreateDirectory(tszFileTemp);

 

 	// 2) Download all plugins

@@ -418,7 +418,7 @@ static void DlgUpdateSilent(void *param)
 			if (p.bDeleteOnly) {

 				// we need only to backup the old file

 				TCHAR *ptszRelPath = p.tszNewName + _tcslen(tszMirandaPath) + 1, tszBackFile[MAX_PATH];

-				mir_sntprintf(tszBackFile, _countof(tszBackFile), _T("%s\\%s"), tszFileBack, ptszRelPath);

+				mir_sntprintf(tszBackFile, _T("%s\\%s"), tszFileBack, ptszRelPath);

 				BackupFile(p.tszNewName, tszBackFile);

 			}

 			else {

@@ -426,8 +426,8 @@ static void DlgUpdateSilent(void *param)
 				// otherwise it would be replaced by unzip

 				if (_tcsicmp(p.tszOldName, p.tszNewName)) {

 					TCHAR tszSrcPath[MAX_PATH], tszBackFile[MAX_PATH];

-					mir_sntprintf(tszSrcPath, _countof(tszSrcPath), _T("%s\\%s"), tszMirandaPath, p.tszOldName);

-					mir_sntprintf(tszBackFile, _countof(tszBackFile), _T("%s\\%s"), tszFileBack, p.tszOldName);

+					mir_sntprintf(tszSrcPath, _T("%s\\%s"), tszMirandaPath, p.tszOldName);

+					mir_sntprintf(tszBackFile, _T("%s\\%s"), tszFileBack, p.tszOldName);

 					BackupFile(tszSrcPath, tszBackFile);

 				}

 

@@ -455,7 +455,7 @@ static void DlgUpdateSilent(void *param)
 

 	// 5) Prepare Restart

 	TCHAR tszTitle[100];

-	mir_sntprintf(tszTitle, _countof(tszTitle), TranslateT("%d component(s) was updated"), count);

+	mir_sntprintf(tszTitle, TranslateT("%d component(s) was updated"), count);

 

 	if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1)) {

 		ShowPopup(tszTitle,TranslateT("You need to restart your Miranda to apply installed updates."),POPUP_TYPE_MSG);

@@ -477,7 +477,7 @@ static void DlgUpdateSilent(void *param)
 		if (!notified) {

 			// Error, let's try to show MessageBox as last way to inform user about successful update

 			TCHAR tszText[200];

-			mir_sntprintf(tszText, _countof(tszText), _T("%s\n\n%s"), TranslateT("You need to restart your Miranda to apply installed updates."), TranslateT("Would you like to restart it now?"));

+			mir_sntprintf(tszText, _T("%s\n\n%s"), TranslateT("You need to restart your Miranda to apply installed updates."), TranslateT("Would you like to restart it now?"));

 

 			if (MessageBox(NULL, tszText, tszTitle, MB_ICONINFORMATION | MB_YESNO) == IDYES)

 #if MIRANDA_VER >= 0x0A00

@@ -599,7 +599,7 @@ static int ScanFolder(const TCHAR *tszFolder, size_t cbBaseLen, int level, const
 		return 0;

 

 	TCHAR tszBuf[MAX_PATH];

-	mir_sntprintf(tszBuf, _countof(tszBuf), _T("%s\\*"), tszFolder);

+	mir_sntprintf(tszBuf, _T("%s\\*"), tszFolder);

 

 	WIN32_FIND_DATA ffd;

 	HANDLE hFind = FindFirstFile(tszBuf, &ffd);

@@ -613,7 +613,7 @@ static int ScanFolder(const TCHAR *tszFolder, size_t cbBaseLen, int level, const
 		if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {

 			// Scan recursively all subfolders

 			if (_tcscmp(ffd.cFileName, _T(".")) && _tcscmp(ffd.cFileName, _T(".."))) {

-				mir_sntprintf(tszBuf, _countof(tszBuf), _T("%s\\%s"), tszFolder, ffd.cFileName);

+				mir_sntprintf(tszBuf, _T("%s\\%s"), tszFolder, ffd.cFileName);

 				count += ScanFolder(tszBuf, cbBaseLen, level + 1, tszBaseUrl, hashes, UpdateFiles);

 			}

 		}

@@ -624,12 +624,12 @@ static int ScanFolder(const TCHAR *tszFolder, size_t cbBaseLen, int level, const
 				if (level == 0)

 					_tcsncpy(tszNewName, ffd.cFileName, MAX_PATH);

 				else

-					mir_sntprintf(tszNewName, _countof(tszNewName), _T("%s\\%s"), tszFolder + cbBaseLen, ffd.cFileName);

+					mir_sntprintf(tszNewName, _T("%s\\%s"), tszFolder + cbBaseLen, ffd.cFileName);

 			}

 

 			TCHAR *ptszUrl;

 			int MyCRC;

-			mir_sntprintf(tszBuf, _countof(tszBuf), _T("%s\\%s"), tszFolder, ffd.cFileName);

+			mir_sntprintf(tszBuf, _T("%s\\%s"), tszFolder, ffd.cFileName);

 

 			bool bDeleteOnly = (tszNewName[0] == 0);

 			// this file is not marked for deletion

@@ -709,8 +709,8 @@ static int ScanFolder(const TCHAR *tszFolder, size_t cbBaseLen, int level, const
 			p = (p) ? p + 1 : tszBuf;

 			_tcslwr(p);

 

-			mir_sntprintf(FileInfo->File.tszDiskPath, _countof(FileInfo->File.tszDiskPath), _T("%s\\Temp\\%s.zip"), g_tszRoot, p);

-			mir_sntprintf(FileInfo->File.tszDownloadURL, _countof(FileInfo->File.tszDownloadURL), _T("%s/%s.zip"), tszBaseUrl, tszBuf);

+			mir_sntprintf(FileInfo->File.tszDiskPath, _T("%s\\Temp\\%s.zip"), g_tszRoot, p);

+			mir_sntprintf(FileInfo->File.tszDownloadURL, _T("%s/%s.zip"), tszBaseUrl, tszBuf);

 			for (p = _tcschr(FileInfo->File.tszDownloadURL, '\\'); p != 0; p = _tcschr(p, '\\'))

 				*p++ = '/';

 

diff --git a/plugins/PluginUpdater/src/Notifications.cpp b/plugins/PluginUpdater/src/Notifications.cpp
index de54bb43e5..d2cae3353b 100644
--- a/plugins/PluginUpdater/src/Notifications.cpp
+++ b/plugins/PluginUpdater/src/Notifications.cpp
@@ -71,7 +71,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hPopup, UINT uMsg, WPARAM wParam, LPAR
 static void _stdcall RestartPrompt(void *)

 {

 	TCHAR tszText[200];

-	mir_sntprintf(tszText, _countof(tszText), _T("%s\n\n%s"), TranslateT("You need to restart your Miranda to apply installed updates."), TranslateT("Would you like to restart it now?"));

+	mir_sntprintf(tszText, _T("%s\n\n%s"), TranslateT("You need to restart your Miranda to apply installed updates."), TranslateT("Would you like to restart it now?"));

 

 	if (MessageBox(0, tszText, TranslateT("Plugin Updater"), MB_YESNO | MB_ICONQUESTION | MB_TOPMOST) == IDYES)

 		CallService(MS_SYSTEM_RESTART, db_get_b(NULL, MODNAME, "RestartCurrentProfile", 1) ? 1 : 0, 0);

diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp
index 8b983b49da..30f212abe1 100644
--- a/plugins/PluginUpdater/src/Utils.cpp
+++ b/plugins/PluginUpdater/src/Utils.cpp
@@ -151,8 +151,8 @@ bool ParseHashes(const TCHAR *ptszUrl, ptrT &baseUrl, SERVLIST &arHashes)
 

 	// Download version info

 	FILEURL pFileUrl;

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

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

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

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

 	pFileUrl.CRCsum = 0;

 

 	HANDLE nlc;

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

 

 	TCHAR tszTmpIni[MAX_PATH] = {0};

-	mir_sntprintf(tszTmpIni, _countof(tszTmpIni), _T("%s\\hashes.txt"), g_tszTempPath);

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

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

 	if (!fp) {

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

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

 					// try to write it via PU stub

 					TCHAR tszTempFile[MAX_PATH];

-					mir_sntprintf(tszTempFile, _countof(tszTempFile), _T("%s\\pulocal.tmp"), g_tszTempPath);

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

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

 					if (hFile != INVALID_HANDLE_VALUE) {

 						DWORD dwBytes;

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

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

 		TCHAR tszPipeName[MAX_PATH];

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

+		mir_sntprintf(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;

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

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

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

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

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

 

 			// Launch a stub

 			SHELLEXECUTEINFO sei = { sizeof(sei) };