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

7 files changed, 24 insertions, 24 deletions

diff --git a/protocols/Yahoo/src/chat.cpp b/protocols/Yahoo/src/chat.cpp
index 7daff87be5..f80fa58e97 100644
--- a/protocols/Yahoo/src/chat.cpp
+++ b/protocols/Yahoo/src/chat.cpp
@@ -54,7 +54,7 @@ void ext_yahoo_conf_userdecline(int id, const char*, const char *who, const char
 	TCHAR info[1024];

 	TCHAR *whot = mir_utf8decodeT(who);

 	TCHAR *msgt = mir_utf8decodeT(msg);

-	mir_sntprintf(info, _countof(info), TranslateT("%s denied invitation with message: %s"), whot, msgt ? msgt : _T(""));

+	mir_sntprintf(info, TranslateT("%s denied invitation with message: %s"), whot, msgt ? msgt : _T(""));

 	GETPROTOBYID(id)->ChatEvent(room, who, GC_EVENT_INFORMATION, info);

 	mir_free(msgt);

 	mir_free(whot);

@@ -570,7 +570,7 @@ INT_PTR CALLBACK ChatRequestDialog(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 INT_PTR __cdecl CYahooProto::CreateConference(WPARAM /*wParam*/, LPARAM /*lParam*/)

 {

 	char room[128];

-	mir_snprintf(room, _countof(room), "%s-%u", m_yahoo_id, time(NULL));

+	mir_snprintf(room, "%s-%u", m_yahoo_id, time(NULL));

 

 	InviteChatParam* param = new InviteChatParam(room, this);

 	DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_CHATROOM_INVITE), NULL,

@@ -587,7 +587,7 @@ void CALLBACK ConferenceRequestCB(PVOID pParam)
 void ext_yahoo_got_conf_invite(int id, const char *me, const char *who, const char *room, const char *msg, YList *members)

 {

 	char z[1024];

-	mir_snprintf(z, _countof(z), Translate("[miranda] Got conference invite to room: %s with msg: %s"), room ? room : "", msg ? msg : "");

+	mir_snprintf(z, Translate("[miranda] Got conference invite to room: %s with msg: %s"), room ? room : "", msg ? msg : "");

 	LOG(("[ext_yahoo_got_conf_invite] %s", z));

 

 	CYahooProto* ppro = getProtoById(id);

diff --git a/protocols/Yahoo/src/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp
index f5e9dde563..058086921e 100644
--- a/protocols/Yahoo/src/file_transfer.cpp
+++ b/protocols/Yahoo/src/file_transfer.cpp
@@ -297,7 +297,7 @@ static void dl_file(int id, INT_PTR fd, int error, const char*, unsigned long si
 		 *

 		 * Don't rely on workingDir to be right, since it's not used to check if file exists.

 		 */

-		mir_sntprintf(filefull, _countof(filefull), _T("%s\\%s"), sf->pfts.tszWorkingDir, sf->pfts.tszCurrentFile);

+		mir_sntprintf(filefull, _T("%s\\%s"), sf->pfts.tszWorkingDir, sf->pfts.tszCurrentFile);

 		FREE(sf->pfts.tszCurrentFile);

 		sf->pfts.tszCurrentFile = _tcsdup(filefull);

 

@@ -543,7 +543,7 @@ void CYahooProto::ext_got_files(const char *me, const char *who, const char *ft_
 		char z[1024];

 		yahoo_file_info *fi = (yahoo_file_info *) f->data;

 

-		mir_snprintf(z, _countof(z), "%s (%lu)\r\n", fi->filename, fi->filesize);

+		mir_snprintf(z, "%s (%lu)\r\n", fi->filename, fi->filesize);

 		mir_strcat(fn, z);

 		fc++;

 	}

diff --git a/protocols/Yahoo/src/icolib.cpp b/protocols/Yahoo/src/icolib.cpp
index f647d3887c..fc9144d14b 100644
--- a/protocols/Yahoo/src/icolib.cpp
+++ b/protocols/Yahoo/src/icolib.cpp
@@ -36,7 +36,7 @@ void CYahooProto::IconsInit(void)
 HICON CYahooProto::LoadIconEx(const char* name, bool big)

 {

 	char szSettingName[100];

-	mir_snprintf(szSettingName, _countof(szSettingName), "YAHOO_%s", name);

+	mir_snprintf(szSettingName, "YAHOO_%s", name);

 	return IcoLib_GetIcon(szSettingName, big);

 }

 

@@ -52,6 +52,6 @@ HANDLE CYahooProto::GetIconHandle(int iconId)
 void CYahooProto::ReleaseIconEx(const char* name, bool big)

 {

 	char szSettingName[100];

-	mir_snprintf(szSettingName, _countof(szSettingName), "YAHOO_%s", name);

+	mir_snprintf(szSettingName, "YAHOO_%s", name);

 	IcoLib_Release(szSettingName, big);

 }

diff --git a/protocols/Yahoo/src/im.cpp b/protocols/Yahoo/src/im.cpp
index 29d980c996..398dfda62a 100644
--- a/protocols/Yahoo/src/im.cpp
+++ b/protocols/Yahoo/src/im.cpp
@@ -40,7 +40,7 @@ void CYahooProto::ext_got_im(const char *me, const char *who, int protocol, cons
 	if (stat == 2) {

 		char z[1024];

 

-		mir_snprintf(z, _countof(z), "Error sending message to %s", who);

+		mir_snprintf(z, "Error sending message to %s", who);

 		LOG((z));

 		ShowError(TranslateT("Yahoo Error"), _A2T(z));

 		return;

diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index eb84f7dd0e..dd2ecdb1b9 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -68,7 +68,7 @@ int CYahooProto::OnModulesLoadedEx(WPARAM, LPARAM)
 	HookProtoEvent(ME_CLIST_PREBUILDCONTACTMENU, &CYahooProto::OnPrebuildContactMenu);

 

 	TCHAR tModuleDescr[100];

-	mir_sntprintf(tModuleDescr, _countof(tModuleDescr), TranslateT("%s plugin connections"), m_tszUserName);

+	mir_sntprintf(tModuleDescr, TranslateT("%s plugin connections"), m_tszUserName);

 

 	NETLIBUSER nlu = { 0 };

 	nlu.cbSize = sizeof(nlu);

diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index 158f024364..f4bc06cf05 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -224,7 +224,7 @@ void CYahooProto::OpenURL(const char *url, int autoLogin)
 		y = yahoo_urlencode(yahoo_get_cookie(m_id, "y"));

 		t = yahoo_urlencode(yahoo_get_cookie(m_id, "t"));

 		u = yahoo_urlencode(url);

-		mir_snprintf(tUrl, _countof(tUrl),

+		mir_snprintf(tUrl, 

 			"http://msg.edit.yahoo.com/config/reset_cookies?&.y=Y=%s&.t=T=%s&.ver=2&.done=http%%3a//us.rd.yahoo.com/messenger/client/%%3f%s",

 			y, t, u);

 

@@ -233,7 +233,7 @@ void CYahooProto::OpenURL(const char *url, int autoLogin)
 		FREE(u);

 	}

 	else {

-		mir_snprintf(tUrl, _countof(tUrl), url);

+		mir_snprintf(tUrl, url);

 	}

 

 	debugLogA("[YahooOpenURL] url: %s Final URL: %s", url, tUrl);

@@ -258,7 +258,7 @@ INT_PTR __cdecl CYahooProto::OnShowProfileCommand(WPARAM wParam, LPARAM)
 	if (getString(wParam, YAHOO_LOGINID, &dbv))

 		return 0;

 

-	mir_snprintf(tUrl, _countof(tUrl), "http://profiles.yahoo.com/%s", dbv.pszVal);

+	mir_snprintf(tUrl, "http://profiles.yahoo.com/%s", dbv.pszVal);

 	db_free(&dbv);

 

 	OpenURL(tUrl, 0);

@@ -284,7 +284,7 @@ INT_PTR __cdecl CYahooProto::OnShowMyProfileCommand(WPARAM, LPARAM)
 	}

 

 	char tUrl[4096];

-	mir_snprintf(tUrl, _countof(tUrl), "http://profiles.yahoo.com/%s", dbv.pszVal);

+	mir_snprintf(tUrl, "http://profiles.yahoo.com/%s", dbv.pszVal);

 	db_free(&dbv);

 

 	OpenURL(tUrl, 0);

diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index e42c892797..df465c1668 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -521,7 +521,7 @@ void CYahooProto::ext_got_audible(const char *me, const char *who, const char *a
 	}

 

 	char z[1028];

-	mir_snprintf(z, _countof(z), "[miranda-audible] %s", msg ? msg : "");

+	mir_snprintf(z, "[miranda-audible] %s", msg ? msg : "");

 	ext_got_im((char*)me, (char*)who, 0, z, 0, 0, 1, -1, NULL, 0);

 }

 

@@ -735,7 +735,7 @@ void CYahooProto::ext_contact_added(const char *myid, const char *who, const cha
 	nick[0] = '\0';

 

 	if (lname && fname)

-		mir_snprintf(nick, _countof(nick), "%s %s", fname, lname);

+		mir_snprintf(nick, "%s %s", fname, lname);

 	else if (lname)

 		strncpy_s(nick, lname, _TRUNCATE);

 	else if (fname)

@@ -926,15 +926,15 @@ void CYahooProto::ext_mail_notify(const char *from, const char *subj, int cnt)
 			TCHAR z[MAX_SECONDLINE], title[MAX_CONTACTNAME];

 

 			if (from == NULL) {

-				mir_sntprintf(title, _countof(title), _T("%s: %s"), m_tszUserName, TranslateT("New Mail"));

-				mir_sntprintf(z, _countof(z), TranslateT("You have %i unread messages"), cnt);

+				mir_sntprintf(title, _T("%s: %s"), m_tszUserName, TranslateT("New Mail"));

+				mir_sntprintf(z, TranslateT("You have %i unread messages"), cnt);

 			}

 			else {

-				mir_sntprintf(title, _countof(title), TranslateT("New Mail (%i messages)"), cnt);

+				mir_sntprintf(title, TranslateT("New Mail (%i messages)"), cnt);

 

 				ptrT tszFrom(mir_utf8decodeT(from));

 				ptrT tszSubj(mir_utf8decodeT(subj));

-				mir_sntprintf(z, _countof(z), TranslateT("From: %s\nSubject: %s"), (TCHAR*)tszFrom, (TCHAR*)tszSubj);

+				mir_sntprintf(z, TranslateT("From: %s\nSubject: %s"), (TCHAR*)tszFrom, (TCHAR*)tszSubj);

 			}

 

 			if (!ShowPopup(title, z, "http://mail.yahoo.com"))

@@ -986,7 +986,7 @@ void ext_yahoo_got_cookies(int id)
 

 		 //wsprintfA(z, "Cookie: %s; C=%s; Y=%s; T=%s", Bcookie, yahoo_get_cookie(id, "c"), yahoo_get_cookie(id, "y"), yahoo_get_cookie(id, "t"));

 		 //wsprintfA(z, "Cookie: %s; Y=%s", Bcookie, yahoo_get_cookie(id, "y"), yahoo_get_cookie(id, "t"));

-		 mir_snprintf(z, _countof(z), "Cookie: Y=%s; T=%s", yahoo_get_cookie(id, "y"), yahoo_get_cookie(id, "t"));

+		 mir_snprintf(z, "Cookie: Y=%s; T=%s", yahoo_get_cookie(id, "y"), yahoo_get_cookie(id, "t"));

 		 LOG(("Our Cookie: '%s'", z));

 		 CallService(MS_NETLIB_SETSTICKYHEADERS, (WPARAM)hnuMain, (LPARAM)z);*/

 

@@ -995,7 +995,7 @@ void ext_yahoo_got_cookies(int id)
 		char z[1024];

 

 		// need to add Cookie header to our requests or we get booted w/ "Bad Cookie" message.

-		mir_snprintf(z, _countof(z), "Cookie: Y=%s; T=%s; C=%s", yahoo_get_cookie(id, "y"), 

+		mir_snprintf(z, "Cookie: Y=%s; T=%s; C=%s", yahoo_get_cookie(id, "y"), 

 			yahoo_get_cookie(id, "t"), yahoo_get_cookie(id, "c"));    

 		LOG(("Our Cookie: '%s'", z));

 		CallService(MS_NETLIB_SETSTICKYHEADERS, (WPARAM)hNetlibUser, (LPARAM)z);

@@ -1237,7 +1237,7 @@ void CYahooProto::ext_send_http_request(enum yahoo_connection_type type, const c
 

 		if (nlhr.requestType == REQUEST_POST) {

 			httpHeaders[nlhr.headersCount].szName = "Content-Length";

-			mir_snprintf(z, _countof(z), "%d", content_length);

+			mir_snprintf(z, "%d", content_length);

 			httpHeaders[nlhr.headersCount].szValue = z;

 

 			nlhr.headersCount++;

@@ -1381,7 +1381,7 @@ char * CYahooProto::ext_send_https_request(yahoo_data *yd, const char *host, con
 	char z[4096], *result = NULL;

 	int i;

 

-	mir_snprintf(z, _countof(z), "https://%s%s", host, path);

+	mir_snprintf(z, "https://%s%s", host, path);

 	nlhr.cbSize = sizeof(nlhr);

 	nlhr.requestType = REQUEST_GET;

 	nlhr.flags = NLHRF_HTTP11 | NLHRF_NODUMPSEND | NLHRF_DUMPASTEXT; /* Use HTTP/1.1 and don't dump the requests to the log */

@@ -1454,7 +1454,7 @@ void CYahooProto::ext_login(enum yahoo_status login_mode)
 	NETLIBHTTPREQUEST nlhr = { 0 }, *nlhrReply;

 	char z[4096];

 

-	mir_snprintf(z, _countof(z), "http://%s%s", getByte("YahooJapan", 0) != 0 ? "cs1.msg.vip.ogk.yahoo.co.jp" : "vcs.msg.yahoo.com", "/capacity");

+	mir_snprintf(z, "http://%s%s", getByte("YahooJapan", 0) != 0 ? "cs1.msg.vip.ogk.yahoo.co.jp" : "vcs.msg.yahoo.com", "/capacity");

 	nlhr.cbSize = sizeof(nlhr);

 	nlhr.requestType = REQUEST_GET;

 	nlhr.flags = NLHRF_HTTP11;