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

6 files changed, 27 insertions, 27 deletions

diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp
index e0174d74a7..281b1aa8e9 100644
--- a/plugins/WebView/src/main.cpp
+++ b/plugins/WebView/src/main.cpp
@@ -145,7 +145,7 @@ extern "C" int __declspec(dllexport) Load()
 

 	// register netlib handle

    char tempNdesc[50];

-	mir_snprintf(tempNdesc, _countof(tempNdesc), "%s connection settings", MODULENAME);

+	mir_snprintf(tempNdesc, "%s connection settings", MODULENAME);

 

 	NETLIBUSER nlu = { sizeof(nlu) };

    nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS;

@@ -216,7 +216,7 @@ extern "C" int __declspec(dllexport) Load()
 		CreateServiceFunction("Countdown", CountdownMenuCommand);

 		mi.flags |= CMIF_KEEPUNTRANSLATED;

 		TCHAR countername[100];

-		mir_sntprintf(countername, _countof(countername), TranslateT("%d minutes to update"), db_get_dw(NULL, MODULENAME, COUNTDOWN_KEY, 0));

+		mir_sntprintf(countername, TranslateT("%d minutes to update"), db_get_dw(NULL, MODULENAME, COUNTDOWN_KEY, 0));

 		mi.position = 600090099;

 		mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_UPDATEALL));

 		mi.name.t = countername;

diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp
index dc2adfdbf9..361afbba7c 100644
--- a/plugins/WebView/src/webview.cpp
+++ b/plugins/WebView/src/webview.cpp
@@ -64,7 +64,7 @@ void ChangeMenuItemCountdown()
 	HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_UPDATEALL));

 

 	TCHAR countername[100];

-	mir_sntprintf(countername, _countof(countername), TranslateT("%d minutes to update"), db_get_dw(NULL, MODULENAME, COUNTDOWN_KEY, 0));

+	mir_sntprintf(countername, TranslateT("%d minutes to update"), db_get_dw(NULL, MODULENAME, COUNTDOWN_KEY, 0));

 

 	Menu_ModifyItem(hMenuItemCountdown, countername, hIcon, CMIF_KEEPUNTRANSLATED);

 }

diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp
index b790468edb..706c6b8627 100644
--- a/plugins/WebView/src/webview_alerts.cpp
+++ b/plugins/WebView/src/webview_alerts.cpp
@@ -126,9 +126,9 @@ int PopupAlert(WPARAM wParam, LPARAM lParam)
 

 	TCHAR *displaytext = (TCHAR*)lParam;

 	if ((mir_tstrlen(displaytext) == MAX_SECONDLINE) ||  (mir_tstrlen(displaytext) > MAX_SECONDLINE))

-		mir_sntprintf(ppd.lptzText, _countof(ppd.lptzText), displaytext);

+		mir_sntprintf(ppd.lptzText, displaytext);

 	else if (mir_tstrlen(displaytext) < MAX_SECONDLINE)

-		mir_sntprintf(ppd.lptzText, _countof(ppd.lptzText), displaytext);

+		mir_sntprintf(ppd.lptzText, displaytext);

 

 	if ( db_get_b(NULL, MODULENAME, POP_USECUSTCLRS_KEY, 0)) {

 		ppd.colorBack = db_get_dw(NULL, MODULENAME, POP_BG_CLR_KEY, Def_color_bg);

@@ -169,7 +169,7 @@ int OSDAlert(WPARAM hContact, LPARAM lParam)
 		strncpy_s(contactname, _countof(contactname), MODULENAME, _TRUNCATE);

 

 	char *displaytext = (char*)lParam;

-	mir_snprintf(newdisplaytext, _countof(newdisplaytext), "%s: %s", contactname, Translate(displaytext));

+	mir_snprintf(newdisplaytext, "%s: %s", contactname, Translate(displaytext));

 

 	if (ServiceExists("OSD/Announce"))

 		CallService("OSD/Announce", (WPARAM)newdisplaytext, 0);

@@ -188,11 +188,11 @@ int ErrorMsgs(WPARAM wParam, LPARAM lParam)
 

 	TCHAR *ptszContactName = pcli->pfnGetContactDisplayName(hContact, 0);

 	if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, MODULENAME, ERROR_POPUP_KEY, 0)) {

-		mir_sntprintf(newdisplaytext, _countof(newdisplaytext), _T("%s\n%s"), ptszContactName, displaytext);

+		mir_sntprintf(newdisplaytext, _T("%s\n%s"), ptszContactName, displaytext);

 		PUShowMessageT(newdisplaytext, SM_WARNING);

 	}

 	else if ( ServiceExists("OSD/Announce") && db_get_b(NULL, MODULENAME, ERROR_POPUP_KEY, 0)) {

-		mir_sntprintf(newdisplaytext, _countof(newdisplaytext), _T("%s: %s"), ptszContactName, TranslateTS(displaytext));

+		mir_sntprintf(newdisplaytext, _T("%s: %s"), ptszContactName, TranslateTS(displaytext));

 		CallService("OSD/Announce", (WPARAM)newdisplaytext, 0);

 	}

 	else if (ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {

@@ -237,10 +237,10 @@ void SaveToFile(MCONTACT hContact, char *truncated)
 		time_t ftime = time(NULL);

 		struct tm *nTime = localtime(&ftime);

 

-		mir_snprintf(timeprefix, _countof(timeprefix), " %s ", Translate("Last updated on"));

+		mir_snprintf(timeprefix, " %s ", Translate("Last updated on"));

 		strftime(temptime1, 32, " %a, %b %d, %Y ", nTime);

 		strftime(temptime2, 32, " %I:%M %p.", nTime);

-		mir_snprintf(timestring, _countof(timestring), "(%s)%s\n%s,%s\n", MODULENAME, url, temptime1, temptime2);

+		mir_snprintf(timestring, "(%s)%s\n%s,%s\n", MODULENAME, url, temptime1, temptime2);

 

 		fputs(timestring, pfile);

 		fwrite(truncated, mir_strlen(truncated), 1, pfile);

@@ -357,7 +357,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 					//

 					if ((!notpresent)) {

 						if (alertIndex == 0) { // popup

-							mir_sntprintf(displaystring, _countof(displaystring), _T("%s \"%S\" %s."), Translate("The string"), alertstring, Translate("has been found on the web page"));

+							mir_sntprintf(displaystring, _T("%s \"%S\" %s."), Translate("The string"), alertstring, Translate("has been found on the web page"));

 							WAlertPopup(hContact, displaystring);

 

 							// contactlist name//

@@ -397,7 +397,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 							}

 						}

 						else if (alertIndex == 3) {

-							mir_sntprintf(displaystring, _countof(displaystring), _T("%s \"%s\" %s."), TranslateT("The string"), alertstring, TranslateT("has been found on the web page"));

+							mir_sntprintf(displaystring, _T("%s \"%s\" %s."), TranslateT("The string"), alertstring, TranslateT("has been found on the web page"));

 							WAlertOSD(hContact, displaystring);

 

 							// contactlist name//

@@ -426,9 +426,9 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 			cacheend++;

 			*cacheend = '\0';

 

-			mir_sntprintf(cachedirectorypath, _countof(cachedirectorypath), _T("%s%S%S"), cachepath, MODULENAME, "cache\\");

+			mir_sntprintf(cachedirectorypath, _T("%s%S%S"), cachepath, MODULENAME, "cache\\");

 			CreateDirectory(cachedirectorypath, NULL);

-			mir_sntprintf(newcachepath, _countof(newcachepath), _T("%s%S%S%S%S"), cachepath, MODULENAME, "cache\\", contactname, ".txt");

+			mir_sntprintf(newcachepath, _T("%s%S%S%S%S"), cachepath, MODULENAME, "cache\\", contactname, ".txt");

 			// file exists?

 			if ( _taccess(newcachepath, 0) != -1) {

 				if ((pcachefile = _tfopen(newcachepath, _T("r"))) == NULL)

@@ -638,9 +638,9 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn
 				cacheend++;

 				*cacheend = '\0';

 

-				mir_sntprintf(cachedirectorypath, _countof(cachedirectorypath), _T("%s%S%S"), cachepath, MODULENAME, "cache\\");

+				mir_sntprintf(cachedirectorypath, _T("%s%S%S"), cachepath, MODULENAME, "cache\\");

 				CreateDirectory(cachedirectorypath, NULL);

-				mir_sntprintf(newcachepath, _countof(newcachepath), _T("%s%S%S%S%S"), cachepath, MODULENAME, "cache\\", contactname, ".txt");

+				mir_sntprintf(newcachepath, _T("%s%S%S%S%S"), cachepath, MODULENAME, "cache\\", contactname, ".txt");

 				// file exists?

 				if ( _taccess(newcachepath, 0) != -1) {

 					if ((pcachefile = _tfopen(newcachepath, _T("r"))) == NULL)

diff --git a/plugins/WebView/src/webview_getdata.cpp b/plugins/WebView/src/webview_getdata.cpp
index ab59060515..a97f3c31e2 100644
--- a/plugins/WebView/src/webview_getdata.cpp
+++ b/plugins/WebView/src/webview_getdata.cpp
@@ -280,9 +280,9 @@ void GetData(void *param)
 					strftime(temptime, 128, "(%b %d,%H:%M:%S)", nTime);

 

 				if (db_get_b(hContact, MODULENAME, CONTACT_PREFIX_KEY, 1) == 1)

-					mir_snprintf(tstr, _countof(tstr), "%s %s", temptime, dbv.pszVal);

+					mir_snprintf(tstr, "%s %s", temptime, dbv.pszVal);

 				if (db_get_b(hContact, MODULENAME, CONTACT_PREFIX_KEY, 1) == 0)

-					mir_snprintf(tstr, _countof(tstr), "%s %s", dbv.pszVal, temptime);

+					mir_snprintf(tstr, "%s %s", dbv.pszVal, temptime);

 				db_free(&dbv);

 			}

 			else {

@@ -300,9 +300,9 @@ void GetData(void *param)
 

 				db_set_ts(hContact, MODULENAME, PRESERVE_NAME_KEY, dbv.ptszVal);

 				if (db_get_b(hContact, MODULENAME, CONTACT_PREFIX_KEY, 1) == 1)

-					mir_snprintf(tstr, _countof(tstr), "%s %s", temptime, dbv.pszVal);

+					mir_snprintf(tstr, "%s %s", temptime, dbv.pszVal);

 				if (db_get_b(hContact, MODULENAME, CONTACT_PREFIX_KEY, 1) == 0)

-					mir_snprintf(tstr, _countof(tstr), "%s %s", dbv.pszVal, temptime);

+					mir_snprintf(tstr, "%s %s", dbv.pszVal, temptime);

 				db_free(&dbv);

 			}

 

@@ -313,7 +313,7 @@ void GetData(void *param)
 			strncpy_s(timeat, _countof(timeat), Translate("at the time"), _TRUNCATE);

 			strftime(temptime1, 32, " %a, %b %d, %Y ", nTime);

 			strftime(temptime2, 32, " %I:%M %p.", nTime);

-			mir_snprintf(timestring, _countof(timestring), " %s %s%s%s", timeprefix, temptime1, timeat, temptime2);

+			mir_snprintf(timestring, " %s %s%s%s", timeprefix, temptime1, timeat, temptime2);

 		} // end download success 

 

 		if (DownloadSuccess) {

diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp
index b4b45bd99e..1adf9ccb7c 100644
--- a/plugins/WebView/src/webview_opts.cpp
+++ b/plugins/WebView/src/webview_opts.cpp
@@ -64,7 +64,7 @@ TCHAR* FixButtonText(TCHAR *url, size_t len)
 			int posafter = (stringafter - buttontext) + 1;

 			strdel(stringafter, 1);

 			_tcsncpy_s(stringbefore, pos, buttontext, _TRUNCATE);

-			mir_sntprintf(newbuttontext, _countof(buttontext), _T("%s!!%s"), stringbefore, stringafter);

+			mir_sntprintf(newbuttontext, _T("%s!!%s"), stringbefore, stringafter);

 

 			posafter = 0;

 			posbefore = 0;

diff --git a/plugins/WebView/src/webview_services.cpp b/plugins/WebView/src/webview_services.cpp
index 80472ae058..6fd09544a1 100644
--- a/plugins/WebView/src/webview_services.cpp
+++ b/plugins/WebView/src/webview_services.cpp
@@ -85,12 +85,12 @@ int DBSettingChanged(WPARAM wParam, LPARAM lParam)
 			TCHAR *cacheend = _tcsrchr(cachepath, '\\');
 			cacheend++;
 			*cacheend = '\0';
-			mir_sntprintf(cachedirectorypath, _countof(cachedirectorypath), _T("%s")_T(MODULENAME)_T("cache\\"), cachepath);
+			mir_sntprintf(cachedirectorypath, _T("%s")_T(MODULENAME)_T("cache\\"), cachepath);
 			CreateDirectory(cachedirectorypath, NULL);
 
 			TCHAR newcachepath[MAX_PATH + 50], renamedcachepath[MAX_PATH + 50];
-			mir_sntprintf(newcachepath, _countof(newcachepath), _T("%s")_T(MODULENAME)_T("cache\\%s.txt"), cachepath, oldName);
-			mir_sntprintf(renamedcachepath, _countof(newcachepath), _T("%s")_T(MODULENAME)_T("cache\\%s.txt"), cachepath, nick);
+			mir_sntprintf(newcachepath, _T("%s")_T(MODULENAME)_T("cache\\%s.txt"), cachepath, oldName);
+			mir_sntprintf(renamedcachepath, _T("%s")_T(MODULENAME)_T("cache\\%s.txt"), cachepath, nick);
 
 			// file exists?
 			if ( _taccess(newcachepath, 0) != -1) {
@@ -124,9 +124,9 @@ int SiteDeleted(WPARAM wParam, LPARAM)
 	cacheend++;
 	*cacheend = '\0';
 
-	mir_sntprintf(cachedirectorypath, _countof(cachedirectorypath), _T("%s")_T(MODULENAME)_T("cache\\"), cachepath);
+	mir_sntprintf(cachedirectorypath, _T("%s")_T(MODULENAME)_T("cache\\"), cachepath);
 	CreateDirectory(cachedirectorypath, NULL);
-	mir_sntprintf(newcachepath, _countof(newcachepath), _T("%s")_T(MODULENAME)_T("cache\\%s.txt"), cachepath,  contactName);
+	mir_sntprintf(newcachepath, _T("%s")_T(MODULENAME)_T("cache\\%s.txt"), cachepath,  contactName);
 	// file exists?
 	if ( _taccess(newcachepath, 0) != -1) {
 		FILE *pcachefile = _tfopen(newcachepath, _T("r"));