From 2a815f8820ca402626bd283dd5b75744ddeb9812 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 23 May 2015 18:55:59 +0000 Subject: mir_tstrncpy <> _tcsncpy git-svn-id: http://svn.miranda-ng.org/main/trunk@13791 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_chat.cpp | 8 ++++---- protocols/MSN/src/msn_libstr.cpp | 2 +- protocols/MSN/src/msn_p2p.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/MSN/src') diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp index 8f3e6e0ba6..4e9b439eb7 100644 --- a/protocols/MSN/src/msn_chat.cpp +++ b/protocols/MSN/src/msn_chat.cpp @@ -47,14 +47,14 @@ int CMsnProto::MSN_ChatInit(GCThreadData *info, const char *pszID, const char *p { char *szNet, *szEmail; - mir_tstrncpy(info->mChatID, _A2T(pszID), SIZEOF(info->mChatID)); + _tcsncpy(info->mChatID, _A2T(pszID), SIZEOF(info->mChatID)); parseWLID(NEWSTR_ALLOCA(pszID), &szNet, &szEmail, NULL); info->netId = atoi(szNet); - mir_strncpy(info->szEmail, szEmail, sizeof(info->szEmail)); + strncpy(info->szEmail, szEmail, sizeof(info->szEmail)); TCHAR szName[512]; InterlockedIncrement(&m_chatID); - if (*pszTopic) mir_tstrncpy(szName, _A2T(pszTopic), SIZEOF(szName)); + if (*pszTopic) _tcsncpy(szName, _A2T(pszTopic), SIZEOF(szName)); else mir_sntprintf(szName, SIZEOF(szName), _T("%s %s%d"), m_tszUserName, TranslateT("Chat #"), m_chatID); @@ -123,7 +123,7 @@ void CMsnProto::MSN_ChatStart(ezxml_t xmli) if (!gcu) { gcu = new GCUserItem; info->mJoinedContacts.insert(gcu); - mir_strncpy(gcu->WLID, mri, sizeof(gcu->WLID)); + strncpy(gcu->WLID, mri, sizeof(gcu->WLID)); } mir_tstrcpy(gcu->role, _A2T(role)); diff --git a/protocols/MSN/src/msn_libstr.cpp b/protocols/MSN/src/msn_libstr.cpp index bf45995a0f..78e9c66584 100644 --- a/protocols/MSN/src/msn_libstr.cpp +++ b/protocols/MSN/src/msn_libstr.cpp @@ -411,6 +411,6 @@ time_t MsnTSToUnixtime(const char *pszTS) char szTS[16]; if (!*pszTS) return time(NULL); - mir_strncpy(szTS, pszTS, 10); + strncpy(szTS, pszTS, 10); return (time_t)atoi(szTS); } diff --git a/protocols/MSN/src/msn_p2p.cpp b/protocols/MSN/src/msn_p2p.cpp index 6a50f7dcd4..fbaa187a5c 100644 --- a/protocols/MSN/src/msn_p2p.cpp +++ b/protocols/MSN/src/msn_p2p.cpp @@ -100,7 +100,7 @@ bool CMsnProto::p2p_createListener(filetransfer* ft, directconnection *dc, MimeH newThread->mCaller = 3; newThread->mIncomingBoundPort = sb; newThread->mIncomingPort = nlb.wPort; - mir_strncpy(newThread->mCookie, dc->callId, sizeof(newThread->mCookie)); + strncpy(newThread->mCookie, dc->callId, sizeof(newThread->mCookie)); newThread->mInitialContactWLID = mir_strdup(ft->p2p_dest); newThread->startThread(&CMsnProto::p2p_filePassiveThread, this); -- cgit v1.2.3