_tcsncpy -> _tcsncpy_s; strncpy -> strncpy_s

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

1 files changed, 9 insertions, 9 deletions

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index a7ca0a42e8..44cc13f28a 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -143,8 +143,8 @@ void CJabberProto::OnProcessLoginRq(ThreadData* info, DWORD rq)
 

 				TCHAR room[256], *server, *p;

 				TCHAR text[128];

-				_tcsncpy(text, item->jid, SIZEOF(text));

-				_tcsncpy(room, text, SIZEOF(room));

+				_tcsncpy_s(text, item->jid, SIZEOF(text));

+				_tcsncpy_s(room, text, SIZEOF(room));

 				p = _tcstok(room, _T("@"));

 				server = _tcstok(NULL, _T("@"));

 				if (item->nick && item->nick[0] != 0)

@@ -290,7 +290,7 @@ void CJabberProto::OnIqResultBind(HXML iqNode, CJabberIqInfo *pInfo)
 				debugLog(_T("Result Bind: %s confirmed "), m_ThreadInfo->fullJID);

 			else {

 				debugLog(_T("Result Bind: %s changed to %s"), m_ThreadInfo->fullJID, szJid);

-				_tcsncpy(m_ThreadInfo->fullJID, szJid, SIZEOF(m_ThreadInfo->fullJID));

+				_tcsncpy_s(m_ThreadInfo->fullJID, szJid, SIZEOF(m_ThreadInfo->fullJID));

 			}

 		}

 		if (m_ThreadInfo->bIsSessionAvailable)

@@ -682,7 +682,7 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*)
 				jsr.hdr.firstName = sttGetText(vCardNode, "FN");

 				jsr.hdr.lastName = _T("");

 				jsr.hdr.email = sttGetText(vCardNode, "EMAIL");

-				_tcsncpy(jsr.jid, jid, SIZEOF(jsr.jid));

+				_tcsncpy_s(jsr.jid, jid, SIZEOF(jsr.jid));

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

 				ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)id, (LPARAM)&jsr);

 				ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)id, 0);

@@ -834,7 +834,7 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*)
 							else if ((o=xmlGetChild(n, "EXTADD")) != NULL && xmlGetText(o) != NULL)

 								mir_sntprintf(text, SIZEOF(text), _T("%s\r\n%s"), xmlGetText(m), xmlGetText(o));

 							else

-								_tcsncpy(text, xmlGetText(m), SIZEOF(text));

+								_tcsncpy_s(text, xmlGetText(m), SIZEOF(text));

 							text[SIZEOF(text)-1] = '\0';

 							setTString(hContact, "Street", text);

 						}

@@ -877,7 +877,7 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*)
 							else if ((o=xmlGetChild(n, "EXTADD")) != NULL && xmlGetText(o) != NULL)

 								mir_sntprintf(text, SIZEOF(text), _T("%s\r\n%s"), xmlGetText(m), xmlGetText(o));

 							else

-								_tcsncpy(text, xmlGetText(m), SIZEOF(text));

+								_tcsncpy_s(text, xmlGetText(m), SIZEOF(text));

 							text[SIZEOF(text)-1] = '\0';

 							setTString(hContact, "CompanyStreet", text);

 						}

@@ -1162,7 +1162,7 @@ void CJabberProto::OnIqResultSetSearch(HXML iqNode, CJabberIqInfo*)
 

 			if (!lstrcmp(xmlGetName(itemNode), _T("item"))) {

 				if ((jid = xmlGetAttrValue(itemNode, _T("jid"))) != NULL) {

-					_tcsncpy(jsr.jid, jid, SIZEOF(jsr.jid));

+					_tcsncpy_s(jsr.jid, jid, SIZEOF(jsr.jid));

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

 					jsr.hdr.id = (TCHAR*)jid;

 					debugLog(_T("Result jid = %s"), jid);

@@ -1238,7 +1238,7 @@ void CJabberProto::OnIqResultExtSearch(HXML iqNode, CJabberIqInfo*)
 					continue;

 

 				if (!lstrcmp(fieldName, _T("jid"))) {

-					_tcsncpy(jsr.jid, xmlGetText(n), SIZEOF(jsr.jid));

+					_tcsncpy_s(jsr.jid, xmlGetText(n), SIZEOF(jsr.jid));

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

 					debugLog(_T("Result jid = %s"), jsr.jid);

 				}

@@ -1272,7 +1272,7 @@ void CJabberProto::OnIqResultSetPassword(HXML iqNode, CJabberIqInfo *pInfo)
 		return;

 

 	if (!lstrcmp(type, _T("result"))) {

-		_tcsncpy(m_ThreadInfo->password, m_ThreadInfo->newPassword, SIZEOF(m_ThreadInfo->password));

+		_tcsncpy_s(m_ThreadInfo->password, m_ThreadInfo->newPassword, SIZEOF(m_ThreadInfo->password));

 		MessageBox(NULL, TranslateT("Password is successfully changed. Don't forget to update your password in the Jabber protocol option."), TranslateT("Change Password"), MB_OK|MB_ICONINFORMATION|MB_SETFOREGROUND);

 	}

 	else if (!lstrcmp(type, _T("error")))