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

12 files changed, 49 insertions, 48 deletions

diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index 97f6d9f981..dd1959e8ee 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -66,7 +66,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)
 	return &pluginInfo;

 }

 

-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST };

 

 static IconItem iconList[] =

 {

@@ -98,7 +98,8 @@ HICON GetIcolibIcon(int iconId)
 	return NULL;

 }

 

-void ReleaseIcolibIcon(HICON hIcon) {

+void ReleaseIcolibIcon(HICON hIcon)

+{

 	IcoLib_ReleaseIcon(hIcon);

 }

 

@@ -165,7 +166,7 @@ INT_PTR TlenProtocol::ContactMenuHandleSendPicture(WPARAM hContact, LPARAM)
 

 INT_PTR TlenProtocol::MenuHandleInbox(WPARAM, LPARAM)

 {

-	char szFileName[ MAX_PATH ];

+	char szFileName[MAX_PATH];

 	DBVARIANT dbv;

 	NETLIBHTTPREQUEST req;

 	NETLIBHTTPHEADER headers[2];

@@ -185,7 +186,7 @@ INT_PTR TlenProtocol::MenuHandleInbox(WPARAM, LPARAM)
 

 	memset(&cookie, 0, sizeof(cookie));

 	if (login != NULL && password != NULL) {

-		mir_snprintf( form, _countof(form), "username=%s&password=%s", login, password);

+		mir_snprintf(form, "username=%s&password=%s", login, password);

 		headers[0].szName = "Content-Type";

 		headers[0].szValue = "application/x-www-form-urlencoded";

 		memset(&req, 0, sizeof(req));

@@ -199,9 +200,9 @@ INT_PTR TlenProtocol::MenuHandleInbox(WPARAM, LPARAM)
 		req.szUrl = "http://poczta.o2.pl/login.html";

 		resp = (NETLIBHTTPREQUEST *)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)m_hNetlibUser, (LPARAM)&req);

 		if (resp != NULL) {

-			if (resp->resultCode/100 == 2 || resp->resultCode == 302) {

+			if (resp->resultCode / 100 == 2 || resp->resultCode == 302) {

 				int i;

-				for (i=0; i<resp->headersCount; i++ ) {

+				for (i = 0; i < resp->headersCount; i++) {

 					if (strcmpi(resp->headers[i].szName, "Set-Cookie") == 0) {

 						char *start = strstr(resp->headers[i].szValue, "ssid=");

 						if (start != NULL) {

@@ -221,8 +222,8 @@ INT_PTR TlenProtocol::MenuHandleInbox(WPARAM, LPARAM)
 	}

 	mir_free(login);

 	mir_free(password);

-	

-	mir_snprintf(szFileName, _countof(szFileName), "http://poczta.o2.pl/login.html?sid=%s", cookie);

+

+	mir_snprintf(szFileName, "http://poczta.o2.pl/login.html?sid=%s", cookie);

 	Utils_OpenUrl(szFileName);

 	return 0;

 }

@@ -329,7 +330,7 @@ void TlenProtocol::initMenuItems()
 

 TlenProtocol* tlenProtoInit(const char* pszProtoName, const TCHAR* tszUserName)

 {

-	TlenProtocol* ppro = new TlenProtocol( pszProtoName, tszUserName );

+	TlenProtocol* ppro = new TlenProtocol(pszProtoName, tszUserName);

 	return ppro;

 }

 

@@ -341,12 +342,12 @@ static int tlenProtoUninit(TlenProtocol* ppro)
 

 extern "C" int __declspec(dllexport) Load(void)

 {

-	mir_getLP( &pluginInfo );

+	mir_getLP(&pluginInfo);

 	mir_getCLI();

 

 	DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &hMainThread, THREAD_SET_CONTEXT, FALSE, 0);

 

-	srand((unsigned) time(NULL));

+	srand((unsigned)time(NULL));

 

 	TlenRegisterIcons();

 

@@ -354,8 +355,8 @@ extern "C" int __declspec(dllexport) Load(void)
 	PROTOCOLDESCRIPTOR pd = { 0 };

 	pd.cbSize = sizeof(pd);

 	pd.szName = "TLEN";

-	pd.fnInit = ( pfnInitProto )tlenProtoInit;

-	pd.fnUninit = ( pfnUninitProto )tlenProtoUninit;

+	pd.fnInit = (pfnInitProto)tlenProtoInit;

+	pd.fnUninit = (pfnUninitProto)tlenProtoUninit;

 	pd.type = PROTOTYPE_PROTOCOL;

 	Proto_RegisterModule(&pd);

 	return 0;

diff --git a/protocols/Tlen/src/tlen_avatar.cpp b/protocols/Tlen/src/tlen_avatar.cpp
index 44d6134e7c..baa05c1f2f 100644
--- a/protocols/Tlen/src/tlen_avatar.cpp
+++ b/protocols/Tlen/src/tlen_avatar.cpp
@@ -42,7 +42,7 @@ void TlenGetAvatarFileName(TlenProtocol *proto, TLEN_LIST_ITEM *item, TCHAR* pts
 		else {
 			proto->debugLog(_T("getAvatarFilename(): Can not create directory for avatar cache: %s. errno=%d: %s"), ptszDest, errno, strerror(errno));
 			TCHAR buffer[512];
-			mir_sntprintf(buffer, _countof(buffer), TranslateT("Cannot create avatars cache directory. ERROR: %d: %s\n%s"), errno, _tcserror(errno), ptszDest);
+			mir_sntprintf(buffer, TranslateT("Cannot create avatars cache directory. ERROR: %d: %s\n%s"), errno, _tcserror(errno), ptszDest);
 			PUShowMessageT(buffer, SM_WARNING);
 		}
 	}
@@ -111,7 +111,7 @@ static void SetAvatar(TlenProtocol *proto, MCONTACT hContact, TLEN_LIST_ITEM *it
 		db_set_dw(hContact, proto->m_szModuleName, "AvatarFormat",  format);
 	} else {
 		TCHAR buffer[128];
-		mir_sntprintf(buffer, _countof(buffer), TranslateT("Cannot save new avatar file \"%s\" Error:\n\t%s (Error: %d)"), filename, _tcserror(errno), errno);
+		mir_sntprintf(buffer, TranslateT("Cannot save new avatar file \"%s\" Error:\n\t%s (Error: %d)"), filename, _tcserror(errno), errno);
 		PUShowMessageT(buffer, SM_WARNING);
 		proto->debugLog(buffer);
 		return;
diff --git a/protocols/Tlen/src/tlen_file.cpp b/protocols/Tlen/src/tlen_file.cpp
index 887ef89994..f97f47efae 100644
--- a/protocols/Tlen/src/tlen_file.cpp
+++ b/protocols/Tlen/src/tlen_file.cpp
@@ -551,7 +551,7 @@ void TlenProcessF(XmlNode *node, ThreadData *info)
 	char *from = TlenXmlGetAttrValue(node, "f");

 	if (from != NULL) {

 		if (strchr(from, '@') == NULL)

-			mir_snprintf(jid, _countof(jid), "%s@%s", from, info->server);

+			mir_snprintf(jid, "%s@%s", from, info->server);

 		else

 			strncpy_s(jid, from, _TRUNCATE);

 

@@ -577,7 +577,7 @@ void TlenProcessF(XmlNode *node, ThreadData *info)
 						else mir_strcpy(szFilename, Translate("1 File"));

 					}

 					else if (numFiles > 1)

-						mir_snprintf(szFilename, _countof(szFilename), Translate("%d Files"), numFiles);

+						mir_snprintf(szFilename, Translate("%d Files"), numFiles);

 				}

 

 				if (szFilename[0] != '\0' && ft->iqId != NULL) {

diff --git a/protocols/Tlen/src/tlen_iqid.cpp b/protocols/Tlen/src/tlen_iqid.cpp
index 2f2d7ba943..786c642758 100644
--- a/protocols/Tlen/src/tlen_iqid.cpp
+++ b/protocols/Tlen/src/tlen_iqid.cpp
@@ -54,7 +54,7 @@ void TlenIqResultAuth(TlenProtocol *proto, XmlNode *iqNode)
 		char text[128];

 

 		TlenSend(proto, "</s>");

-		mir_snprintf(text, _countof(text), Translate("Authentication failed for %s@%s."), proto->threadData->username, proto->threadData->server);

+		mir_snprintf(text, Translate("Authentication failed for %s@%s."), proto->threadData->username, proto->threadData->server);

 		MessageBoxA(NULL, text, Translate("Tlen Authentication"), MB_OK|MB_ICONSTOP|MB_SETFOREGROUND);

 		ProtoBroadcastAck(proto->m_szModuleName, NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, NULL, LOGINERR_WRONGPASSWORD);

 		proto->threadData = NULL;	// To disallow auto reconnect

@@ -258,7 +258,7 @@ void TlenIqResultVcard(TlenProtocol *proto, XmlNode *iqNode)
 			if (strchr(jid, '@') != NULL) {

 				strncpy_s(text, jid, _TRUNCATE);

 			} else {

-				mir_snprintf(text, _countof(text),  "%s@%s", jid, dbv.pszVal);	// Add @tlen.pl

+				mir_snprintf(text,  "%s@%s", jid, dbv.pszVal);	// Add @tlen.pl

 			}

 			db_free(&dbv);

 			if ((hContact=TlenHContactFromJID(proto, text)) == NULL) {

@@ -419,7 +419,7 @@ void TlenIqResultSearch(TlenProtocol *proto, XmlNode *iqNode)
 						if (strchr(jid, '@') != NULL) {

 							strncpy_s(jsr.jid, jid, _TRUNCATE);

 						} else {

-							mir_snprintf(jsr.jid, _countof(jsr.jid), "%s@%s", jid, dbv.pszVal);

+							mir_snprintf(jsr.jid, "%s@%s", jid, dbv.pszVal);

 						}

 						jsr.jid[sizeof(jsr.jid)-1] = '\0';

 						jsr.hdr.id.t = mir_a2t(jid);

@@ -467,7 +467,7 @@ void TlenIqResultSearch(TlenProtocol *proto, XmlNode *iqNode)
 					if (strchr(proto->searchJID, '@') != NULL)

 						strncpy_s(jsr.jid, proto->searchJID, _TRUNCATE);

 					else

-						mir_snprintf(jsr.jid, _countof(jsr.jid), "%s@%s", proto->searchJID, dbv.pszVal);

+						mir_snprintf(jsr.jid, "%s@%s", proto->searchJID, dbv.pszVal);

 

 					jsr.hdr.nick.t = jsr.hdr.firstName.t = jsr.hdr.lastName.t = jsr.hdr.email.t = jsr.hdr.id.t = TEXT("");

 					ProtoBroadcastAck(proto->m_szModuleName, NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE) id, (LPARAM) &jsr);

diff --git a/protocols/Tlen/src/tlen_muc.cpp b/protocols/Tlen/src/tlen_muc.cpp
index 888d71c5a1..b429c2fee6 100644
--- a/protocols/Tlen/src/tlen_muc.cpp
+++ b/protocols/Tlen/src/tlen_muc.cpp
@@ -70,7 +70,7 @@ static char *getDisplayName(TlenProtocol *proto, const char *id)
 	MCONTACT hContact;

 	DBVARIANT dbv;

 	if (!db_get(NULL, proto->m_szModuleName, "LoginServer", &dbv)) {

-		mir_snprintf(jid, _countof(jid), "%s@%s", id, dbv.pszVal);

+		mir_snprintf(jid, "%s@%s", id, dbv.pszVal);

 		db_free(&dbv);

 		if (((hContact=TlenHContactFromJID(proto, jid)) != NULL) || !mir_strcmp(id, proto->threadData->username)) {

 			CONTACTINFO ci = { sizeof(ci) };

@@ -107,7 +107,7 @@ int TlenMUCRecvInvitation(TlenProtocol *proto, const char *roomId, const char*,
 		char jid[256];

 		DBVARIANT dbv;

 		if (!db_get(NULL, proto->m_szModuleName, "LoginServer", &dbv)) {

-			mir_snprintf(jid, _countof(jid), "%s@%s", from, dbv.pszVal);

+			mir_snprintf(jid, "%s@%s", from, dbv.pszVal);

 			db_free(&dbv);

 		} else {

 			mir_strcpy(jid, from);

@@ -119,7 +119,7 @@ int TlenMUCRecvInvitation(TlenProtocol *proto, const char *roomId, const char*,
 		TLEN_LIST_ITEM *item;

 		DBVARIANT dbv;

 		if (!db_get(NULL, proto->m_szModuleName, "LoginServer", &dbv)) {

-			mir_snprintf(jid, _countof(jid), "%s@%s", from, dbv.pszVal);

+			mir_snprintf(jid, "%s@%s", from, dbv.pszVal);

 			db_free(&dbv);

 		} else {

 			mir_strcpy(jid, from);

@@ -190,7 +190,7 @@ static int TlenMUCSendQuery(TlenProtocol *proto, int type, const char *parent, i
 	if (type == 3) { // find chat room by name

 		char serialId[32];

 		TLEN_LIST_ITEM *item;

-		mir_snprintf(serialId, _countof(serialId), TLEN_IQID"%d", TlenSerialNext(proto));

+		mir_snprintf(serialId, TLEN_IQID"%d", TlenSerialNext(proto));

 		item = TlenListAdd(proto, LIST_SEARCH, serialId);

 		item->roomName = mir_strdup(parent);

 		TlenSend(proto, "<iq to='c' type='3' n='%s' id='%s'/>", parent, serialId);

@@ -236,7 +236,7 @@ INT_PTR TlenProtocol::MUCContactMenuHandleMUC(WPARAM wParam, LPARAM)
 	if ((hContact=wParam) != NULL && isOnline) {

 		if (!db_get(hContact, m_szModuleName, "jid", &dbv)) {

 			char serialId[32];

-			mir_snprintf(serialId, _countof(serialId), TLEN_IQID"%d", TlenSerialNext(this));

+			mir_snprintf(serialId, TLEN_IQID"%d", TlenSerialNext(this));

 			item = TlenListAdd(this, LIST_INVITATIONS, serialId);

 			item->nick = mir_strdup(dbv.pszVal);

 			TlenSend(this, "<p to='c' tp='c' id='%s'/>", serialId);

diff --git a/protocols/Tlen/src/tlen_opt.cpp b/protocols/Tlen/src/tlen_opt.cpp
index d904537185..fe413beb9b 100644
--- a/protocols/Tlen/src/tlen_opt.cpp
+++ b/protocols/Tlen/src/tlen_opt.cpp
@@ -656,7 +656,7 @@ static INT_PTR CALLBACK TlenPopupsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 					} else {
 						delay=GetDlgItemInt(hwndDlg, IDC_DELAY, NULL, FALSE);
 					}
-					mir_sntprintf(title, _countof(title), TranslateT("%S mail"), proto->m_szModuleName);
+					mir_sntprintf(title, TranslateT("%S mail"), proto->m_szModuleName);
 					MailPopupPreview((DWORD) SendDlgItemMessage(hwndDlg,IDC_COLORBKG,CPM_GETCOLOUR,0,0),
 									(DWORD) SendDlgItemMessage(hwndDlg,IDC_COLORTXT,CPM_GETCOLOUR,0,0),
 									title,
diff --git a/protocols/Tlen/src/tlen_p2p_new.cpp b/protocols/Tlen/src/tlen_p2p_new.cpp
index 7c7c7ecd50..a2155c16e5 100644
--- a/protocols/Tlen/src/tlen_p2p_new.cpp
+++ b/protocols/Tlen/src/tlen_p2p_new.cpp
@@ -185,7 +185,7 @@ void TlenBindUDPSocket(TLEN_FILE_TRANSFER *ft)
 				char host_name[256];

 				gethostname(host_name, sizeof(host_name));

 				hp = gethostbyname(host_name);

-				mir_snprintf(host_name, _countof(host_name), "%u.%u.%u.%u", (unsigned char)hp->h_addr_list[0][0],

+				mir_snprintf(host_name, "%u.%u.%u.%u", (unsigned char)hp->h_addr_list[0][0],

 															(unsigned char)hp->h_addr_list[0][1],

 															(unsigned char)hp->h_addr_list[0][2],

 															(unsigned char)hp->h_addr_list[0][3]);

@@ -259,7 +259,7 @@ void __cdecl TlenProcessP2P(XmlNode *node, ThreadData *info) {
 					if ((item=TlenListAdd(ft->proto, LIST_FILE, ft->iqId)) != NULL) {

 						char fileInfo[128];

 						item->ft = ft;

-						mir_snprintf(fileInfo, _countof(fileInfo), "%s file(s), %s bytes", c, s);

+						mir_snprintf(fileInfo, "%s file(s), %s bytes", c, s);

 						TCHAR* filenameT = mir_utf8decodeT((char*)fileInfo);

 						PROTORECVFILET pre = { 0 };

 						pre.dwFlags = PRFF_TCHAR;

diff --git a/protocols/Tlen/src/tlen_picture.cpp b/protocols/Tlen/src/tlen_picture.cpp
index 1b08824840..840bc0134c 100644
--- a/protocols/Tlen/src/tlen_picture.cpp
+++ b/protocols/Tlen/src/tlen_picture.cpp
@@ -34,7 +34,7 @@ static void LogPictureMessage(TlenProtocol *proto, const char *jid, const char *
 {

 	char message[1024];

 	const char *msg = isSent ? LPGEN("Image sent file://%s") : LPGEN("Image received file://%s");

-	mir_snprintf(message, _countof(message), Translate(msg), filename);

+	mir_snprintf(message, Translate(msg), filename);

 	TlenLogMessage(proto, TlenHContactFromJID(proto, jid), isSent ? DBEF_SENT : 0, message);

 }

 

@@ -49,7 +49,7 @@ static void TlenPsPostThread(void *ptr) {
 		DWORD ret;

 		item->ft->s = socket;

 		item->ft->hFileEvent = CreateEvent(NULL, FALSE, FALSE, NULL);

-		ret = mir_snprintf(header, _countof(header), "<pic auth='%s' t='p' to='%s' size='%d' idt='%s'/>", proto->threadData->username, item->ft->jid, item->ft->fileTotalSize, item->jid);

+		ret = mir_snprintf(header, "<pic auth='%s' t='p' to='%s' size='%d' idt='%s'/>", proto->threadData->username, item->ft->jid, item->ft->fileTotalSize, item->jid);

 		TlenWsSend(proto, socket, header, (int)ret);

 		ret = WaitForSingleObject(item->ft->hFileEvent, 1000 * 60 * 5);

 		if (ret == WAIT_OBJECT_0) {

@@ -58,7 +58,7 @@ static void TlenPsPostThread(void *ptr) {
 				int i;

 				char header[512];

 				char fileBuffer[2048];

-				i = mir_snprintf(header, _countof(header), "<pic st='%s' idt='%s'/>", item->ft->iqId, item->jid);

+				i = mir_snprintf(header, "<pic st='%s' idt='%s'/>", item->ft->iqId, item->jid);

 				TlenWsSend(proto, socket, header, i);

 				proto->debugLogA("Sending picture data...");

 				for (i = item->ft->filesSize[0]; i > 0; ) {

@@ -114,7 +114,7 @@ static void TlenPsGetThread(void *ptr) {
 			char header[512];

 			char fileBuffer[2048];

 			TlenXmlInitState(&xmlState);

-			int header_len = mir_snprintf(header, _countof(header), "<pic auth='%s' t='g' to='%s' pid='1001' idt='%s' rt='%s'/>", proto->threadData->username, item->ft->jid, item->jid, item->ft->id2);

+			int header_len = mir_snprintf(header, "<pic auth='%s' t='g' to='%s' pid='1001' idt='%s' rt='%s'/>", proto->threadData->username, item->ft->jid, item->jid, item->ft->id2);

 			TlenWsSend(proto, socket, header, header_len);

 			proto->debugLogA("Reveiving picture data...");

 			{

@@ -221,7 +221,7 @@ void TlenProcessPic(XmlNode *node, TlenProtocol *proto) {
 			char fileName[MAX_PATH];

 			char *ext = TlenXmlGetAttrValue(node, "ext");

 			char *tmpPath = Utils_ReplaceVars( "%miranda_userdata%" );

-			int tPathLen = mir_snprintf(fileName, _countof(fileName), "%s\\Images\\Tlen", tmpPath);

+			int tPathLen = mir_snprintf(fileName, "%s\\Images\\Tlen", tmpPath);

 			long oldSize = 0, lSize = atol(size);

 			DWORD dwAttributes = GetFileAttributesA( fileName );

 			if ( dwAttributes == 0xffffffff || ( dwAttributes & FILE_ATTRIBUTE_DIRECTORY ) == 0 )

@@ -285,7 +285,7 @@ BOOL SendPicture(TlenProtocol *proto, MCONTACT hContact) {
 					char fileBuffer[2048];

 					int id = TlenSerialNext(proto);

 					T2Utf szFileName(tszFileName);

-					mir_snprintf(idStr, _countof(idStr), "%d", id);

+					mir_snprintf(idStr, "%d", id);

 					item = TlenListAdd(proto, LIST_PICTURE, idStr);

 					item->ft = TlenFileCreateFT(proto, jid);

 					item->ft->files = (char **) mir_alloc(sizeof(char *));

diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp
index 5108cba8cc..c8aaed11fe 100644
--- a/protocols/Tlen/src/tlen_svc.cpp
+++ b/protocols/Tlen/src/tlen_svc.cpp
@@ -803,7 +803,7 @@ HANDLE TlenProtocol::SendFile(MCONTACT hContact, const TCHAR* szDescription, TCH
 	db_free(&dbv);

 

 	int id = TlenSerialNext(this);

-	mir_snprintf(idStr, _countof(idStr), "%d", id);

+	mir_snprintf(idStr, "%d", id);

 	TLEN_LIST_ITEM *item = TlenListAdd(this, LIST_FILE, idStr);

 	if (item != NULL) {

 		ft->iqId = mir_strdup(idStr);

diff --git a/protocols/Tlen/src/tlen_thread.cpp b/protocols/Tlen/src/tlen_thread.cpp
index 3a736cc836..3567701282 100644
--- a/protocols/Tlen/src/tlen_thread.cpp
+++ b/protocols/Tlen/src/tlen_thread.cpp
@@ -72,7 +72,7 @@ static INT_PTR CALLBACK TlenPasswordDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara
 	switch (msg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

-		mir_snprintf(text, _countof(text), Translate("Enter password for %s"), (char *) lParam);

+		mir_snprintf(text, Translate("Enter password for %s"), (char *) lParam);

 		SetDlgItemTextA(hwndDlg, IDC_JID, text);

 		return TRUE;

 	case WM_COMMAND:

@@ -207,7 +207,7 @@ void __cdecl TlenServerThread(ThreadData *info)
 		return;

 	}

 	

-	mir_snprintf(jidStr, _countof(jidStr), "%s@%s", info->username, info->server);

+	mir_snprintf(jidStr, "%s@%s", info->username, info->server);

 	db_set_s(NULL, info->proto->m_szModuleName, "jid", jidStr);

 

 	if (!db_get(NULL, info->proto->m_szModuleName, "ManualHost", &dbv)) {

@@ -400,7 +400,7 @@ static void TlenSendAuth(TlenProtocol *proto) {
 	int iqId;

 	char text[128];

 	char *str = TlenPasswordHash(proto->threadData->password);

-	mir_snprintf(text, _countof(text), "%s%s", proto->threadData->streamId, str);

+	mir_snprintf(text, "%s%s", proto->threadData->streamId, str);

 	mir_free(str);

 	str = TlenSha1(text);

 	char *p=TlenTextEncode(proto->threadData->username);

@@ -913,7 +913,7 @@ static void TlenProcessW(XmlNode *node, ThreadData *info)
 	char *f = TlenXmlGetAttrValue(node, "f");

 	if (f != NULL) {

 		char webContactName[128];

-		mir_snprintf(webContactName, _countof(webContactName), Translate("%s Web Messages"), info->proto->m_szModuleName);

+		mir_snprintf(webContactName, Translate("%s Web Messages"), info->proto->m_szModuleName);

 		MCONTACT hContact = TlenHContactFromJID(info->proto, webContactName);

 		if (hContact == NULL) {

 			hContact = TlenDBCreateContact(info->proto, webContactName, webContactName, TRUE);

@@ -1204,7 +1204,7 @@ static void TlenProcessV(XmlNode *node, ThreadData *info)
 	char *from=TlenXmlGetAttrValue(node, "f");

 	if (from != NULL) {

 		if (strchr(from, '@') == NULL) {

-			mir_snprintf(jid, _countof(jid), "%s@%s", from, info->server);

+			mir_snprintf(jid, "%s@%s", from, info->server);

 		} else {

 			strncpy_s(jid, from, _TRUNCATE);

 		}

diff --git a/protocols/Tlen/src/tlen_voice.cpp b/protocols/Tlen/src/tlen_voice.cpp
index 8b31557e48..00d0afacb8 100644
--- a/protocols/Tlen/src/tlen_voice.cpp
+++ b/protocols/Tlen/src/tlen_voice.cpp
@@ -493,7 +493,7 @@ static void TlenVoiceReceiveParse(TLEN_FILE_TRANSFER *ft)
 		}

 		{

 			char ttt[2048];

-			mir_snprintf(ttt, _countof(ttt), "%s %d %d ", statusTxt, ft->proto->framesAvailableForPlayback, ft->proto->availOverrunValue);

+			mir_snprintf(ttt, "%s %d %d ", statusTxt, ft->proto->framesAvailableForPlayback, ft->proto->availOverrunValue);

 			SetDlgItemTextA(ft->proto->voiceDlgHWND, IDC_STATUS, ttt);

 		}

 		TlenP2PPacketFree(packet);

@@ -683,7 +683,7 @@ INT_PTR TlenProtocol::VoiceContactMenuHandleVoice(WPARAM wParam, LPARAM)
 		DBVARIANT dbv;

 		if (!db_get(hContact, m_szModuleName, "jid", &dbv)) {

 			char serialId[32];

-			mir_snprintf(serialId, _countof(serialId), "%d", TlenSerialNext(this));

+			mir_snprintf(serialId, "%d", TlenSerialNext(this));

 			TLEN_LIST_ITEM *item = TlenListAdd(this, LIST_VOICE, serialId);

 			if (item != NULL) {

 				TLEN_FILE_TRANSFER *ft = TlenFileCreateFT(this, dbv.pszVal);

@@ -931,7 +931,7 @@ static char *getDisplayName(TlenProtocol *proto, const char *id)
 	MCONTACT hContact;

 	DBVARIANT dbv;

 	if (!db_get(NULL, proto->m_szModuleName, "LoginServer", &dbv)) {

-		mir_snprintf(jid, _countof(jid), "%s@%s", id, dbv.pszVal);

+		mir_snprintf(jid, "%s@%s", id, dbv.pszVal);

 		db_free(&dbv);

 		if ((hContact = TlenHContactFromJID(proto, jid)) != NULL)

 			return mir_strdup((char *)pcli->pfnGetContactDisplayName(hContact, 0));

@@ -1012,7 +1012,7 @@ int TlenVoiceAccept(TlenProtocol *proto, const char *id, const char *from)
 				char jid[256];

 				DBVARIANT dbv;

 				if (!db_get(NULL, proto->m_szModuleName, "LoginServer", &dbv)) {

-					mir_snprintf(jid, _countof(jid), "%s@%s", from, dbv.pszVal);

+					mir_snprintf(jid, "%s@%s", from, dbv.pszVal);

 					db_free(&dbv);

 				}

 				else {

@@ -1025,7 +1025,7 @@ int TlenVoiceAccept(TlenProtocol *proto, const char *id, const char *from)
 				char jid[256];

 				DBVARIANT dbv;

 				if (!db_get(NULL, proto->m_szModuleName, "LoginServer", &dbv)) {

-					mir_snprintf(jid, _countof(jid), "%s@%s", from, dbv.pszVal);

+					mir_snprintf(jid, "%s@%s", from, dbv.pszVal);

 					db_free(&dbv);

 				}

 				else {

diff --git a/protocols/Tlen/src/tlen_ws.cpp b/protocols/Tlen/src/tlen_ws.cpp
index 8b0a40554f..10d7042ae9 100644
--- a/protocols/Tlen/src/tlen_ws.cpp
+++ b/protocols/Tlen/src/tlen_ws.cpp
@@ -32,13 +32,13 @@ BOOL TlenWsInit(TlenProtocol *proto)
 

 	nlu.cbSize = sizeof(nlu);

 	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_TCHAR;	// | NUF_HTTPGATEWAY;

-	mir_sntprintf(name, _countof(name), TranslateT("%s connection"), proto->m_tszUserName);

+	mir_sntprintf(name, TranslateT("%s connection"), proto->m_tszUserName);

 	nlu.ptszDescriptiveName = name;

 	nlu.szSettingsModule = proto->m_szModuleName;

 	proto->m_hNetlibUser = (HANDLE) CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM) &nlu);

 

 	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_NOOPTIONS | NUF_TCHAR;

-	mir_sntprintf(name, _countof(name), TranslateT("%s SOCKS connection"), proto->m_tszUserName);

+	mir_sntprintf(name, TranslateT("%s SOCKS connection"), proto->m_tszUserName);

 	nlu.ptszDescriptiveName = name;

 	proto->hFileNetlibUser = (HANDLE) CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM) &nlu);

 	nlus.cbSize = sizeof(nlus);