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

5 files changed, 12 insertions, 12 deletions

diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp
index 176e0894cf..065d6c1b25 100644
--- a/plugins/HTTPServer/src/GuiElements.cpp
+++ b/plugins/HTTPServer/src/GuiElements.cpp
@@ -434,7 +434,7 @@ bool bShowShareNewFileDlg(HWND hwndOwner, STFileShareInfo * pstNewShare) {
 	ofn.lStructSize = sizeof(OPENFILENAME);

 

 	char temp[MAX_PATH];

-	mir_snprintf(temp, _countof(temp), _T("%s (*.*)%c*.*%c%c"), Translate("All files"), 0, 0, 0);

+	mir_snprintf(temp, _T("%s (*.*)%c*.*%c%c"), Translate("All files"), 0, 0, 0);

 	ofn.lpstrFilter = temp;

 

 	ofn.lpstrFile = pstNewShare->pszRealPath;

@@ -1208,7 +1208,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 							GetDlgItemText(hwndDlg, IDC_PAGE_KEYWORD, szKeyWord, _countof(szKeyWord));

 							DWORD dwExternalIP = GetExternIP(szUrl, szKeyWord);

 

-							mir_snprintf(szKeyWord, _countof(szKeyWord), Translate("Your external IP was detected as %d.%d.%d.%d\r\nby: %s") ,

+							mir_snprintf(szKeyWord, Translate("Your external IP was detected as %d.%d.%d.%d\r\nby: %s") ,

 							    SplitIpAddress(dwExternalIP) ,

 							    szUrl);

 							MessageBox(hwndDlg, szKeyWord, MSG_BOX_TITEL, MB_OK);

diff --git a/plugins/HTTPServer/src/HttpUser.cpp b/plugins/HTTPServer/src/HttpUser.cpp
index a4e2597fd7..b31694142a 100644
--- a/plugins/HTTPServer/src/HttpUser.cpp
+++ b/plugins/HTTPServer/src/HttpUser.cpp
@@ -231,7 +231,7 @@ void CLHttpUser::SendError(int iErrorCode, const char * pszError, const char * p
 		pszDescription = pszError;

 

 	char szBuf[1000];

-	DWORD dwBytesToWrite = mir_snprintf(szBuf, _countof(szBuf),

+	DWORD dwBytesToWrite = mir_snprintf(szBuf,

 	    "HTTP/1.1 %i %s\r\n"

 	    "Date: %s\r\n"

 	    "Server: MirandaWeb/%s\r\n"

@@ -281,7 +281,7 @@ void CLHttpUser::SendRedir(int iErrorCode, const char * pszError, const char * p
 		pszDescription = pszError;

 

 	char szBuff[1000];

-	DWORD dwBytesToWrite = mir_snprintf(szBuff, _countof(szBuff),

+	DWORD dwBytesToWrite = mir_snprintf(szBuff,

 	    "HTTP/1.1 %i %s\r\n"

 	    "Date: %s\r\n"

 	    "Server: MirandaWeb/%s\r\n"

@@ -546,7 +546,7 @@ bool CLHttpUser::bProcessGetRequest(char * pszRequest, bool bIsGetCommand) {
 

 			char szETag[ 50 ];

 			{

-				int nETagLen = mir_snprintf(szETag, _countof(szETag), "\"%x-%x-%x\"",

+				int nETagLen = mir_snprintf(szETag, "\"%x-%x-%x\"",

 				    nDataSize, stFileTime.dwHighDateTime, stFileTime.dwLowDateTime);

 

 				if (!apszParam[eIfRange] || (strncmp(szETag, apszParam[eIfRange], nETagLen) == 0)) {

@@ -616,7 +616,7 @@ bool CLHttpUser::bProcessGetRequest(char * pszRequest, bool bIsGetCommand) {
 				    "Last-Modified: %s\r\n"

 				    "\r\n";

 

-				dwBytesToWrite = mir_snprintf(szBuf, _countof(szBuf), szHttpPartial,

+				dwBytesToWrite = mir_snprintf(szBuf, szHttpPartial,

 				    szCurTime,

 				    PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

 				    szETag,

@@ -638,7 +638,7 @@ bool CLHttpUser::bProcessGetRequest(char * pszRequest, bool bIsGetCommand) {
 				    "Last-Modified: %s\r\n"

 				    "\r\n";

 

-				dwBytesToWrite = mir_snprintf(szBuf, _countof(szBuf), szHttpOk,

+				dwBytesToWrite = mir_snprintf(szBuf, szHttpOk,

 				    szCurTime,

 				    PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

 				    szETag,

diff --git a/plugins/HTTPServer/src/IndexHTML.cpp b/plugins/HTTPServer/src/IndexHTML.cpp
index 04a991cb4e..6bf65357ac 100644
--- a/plugins/HTTPServer/src/IndexHTML.cpp
+++ b/plugins/HTTPServer/src/IndexHTML.cpp
@@ -62,7 +62,7 @@ bool LoadIndexHTMLTemplate() {
 	char  szDestBuf[10000];

 	char* pszDestBuf = szDestBuf;

 

-	mir_snprintf(szBuf, _countof(szBuf), "%s%s", szPluginPath, szIndexHTMLTemplateFile);

+	mir_snprintf(szBuf, "%s%s", szPluginPath, szIndexHTMLTemplateFile);

 

 	HANDLE hFile = CreateFile(pszBuf, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,

 	    NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

@@ -282,7 +282,7 @@ bool bCreateIndexHTML(const char * pszRealPath, const char * pszIndexPath,
 

 	// check if directory exists

 	char szMask[MAX_PATH];

-	mir_snprintf(szMask, _countof(szMask), "%s*", pszRealPath);

+	mir_snprintf(szMask, "%s*", pszRealPath);

 

 	WIN32_FIND_DATAA fdFindFileData;

 	HANDLE hFind = FindFirstFile(szMask, &fdFindFileData);

diff --git a/plugins/HTTPServer/src/IndexXML.cpp b/plugins/HTTPServer/src/IndexXML.cpp
index b6b79bab1d..6e25cfce28 100644
--- a/plugins/HTTPServer/src/IndexXML.cpp
+++ b/plugins/HTTPServer/src/IndexXML.cpp
@@ -64,7 +64,7 @@ static void ReplaceSign(char* pszSrc, int MaxLength, const char pszReplace,
 bool bCreateIndexXML(const char * pszRealPath, const char * pszIndexPath, const char * pszSrvPath, DWORD dwRemoteIP)

 {

 	char szMask[MAX_PATH+1];

-	mir_snprintf(szMask, _countof(szMask), "%s*", pszRealPath);

+	mir_snprintf(szMask, "%s*", pszRealPath);

 

 	WIN32_FIND_DATAA fdFindFileData;

 	HANDLE hFind = FindFirstFile(szMask, &fdFindFileData);

@@ -100,7 +100,7 @@ bool bCreateIndexXML(const char * pszRealPath, const char * pszIndexPath, const
 	WriteFile(hFile, szXmlHeader1, sizeof(szXmlHeader1) - 1, &dwBytesWritten, NULL);

 

 	// check if a index.xsl exists in the same directory otherwise use the global

-	mir_snprintf(szMask, _countof(szMask), "%s%s", pszRealPath, "index.xsl");

+	mir_snprintf(szMask, "%s%s", pszRealPath, "index.xsl");

 

 	HANDLE hFileExists = CreateFile(szMask, GENERIC_READ, 

 		FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 

diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp
index d7ff1aa033..5b543738b9 100644
--- a/plugins/HTTPServer/src/main.cpp
+++ b/plugins/HTTPServer/src/main.cpp
@@ -350,7 +350,7 @@ bool bWriteConfigurationFile()
 	} else {

 		CLFileShareNode * pclCur = pclFirstNode;

 		while (pclCur) {

-			DWORD dwBytesToWrite = mir_snprintf(szBuf, _countof(szBuf), szXmlData ,

+			DWORD dwBytesToWrite = mir_snprintf(szBuf, szXmlData ,

 			    pclCur->st.pszSrvPath,

 			    pclCur->pszOrigRealPath,

 			    pclCur->st.nMaxDownloads,