From 11c185ebb3013230538d4a48656b23bf81d31055 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 May 2015 16:43:34 +0000 Subject: replace _tcscat to mir_tstrcat git-svn-id: http://svn.miranda-ng.org/main/trunk@13778 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Gadu-Gadu/src/image.cpp | 2 +- protocols/IcqOscarJ/src/icq_avatar.cpp | 4 ++-- protocols/IcqOscarJ/src/icq_xstatus.cpp | 4 ++-- protocols/JabberG/src/jabber_form.cpp | 4 ++-- protocols/JabberG/src/jabber_iqid.cpp | 4 ++-- protocols/JabberG/src/jabber_privacy.cpp | 14 +++++++------- protocols/JabberG/src/jabber_proto.cpp | 10 +++++----- protocols/JabberG/src/jabber_thread.cpp | 12 ++++++------ 8 files changed, 27 insertions(+), 27 deletions(-) (limited to 'protocols') diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 986cbfff12..7fccf30251 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -1025,7 +1025,7 @@ void* GGPROTO::img_loadpicture(gg_event* e, TCHAR *szFileName) dat->lpszFileName = (TCHAR*)calloc(sizeof(TCHAR), mir_tstrlen(tmpFileName) + mir_tstrlen(szImgType) + 1); if (dat->lpszFileName != NULL) { mir_tstrcpy(dat->lpszFileName, tmpFileName); - _tcscat(dat->lpszFileName, szImgType); + mir_tstrcat(dat->lpszFileName, szImgType); } } } diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp index 6854c4acba..d1c9343905 100644 --- a/protocols/IcqOscarJ/src/icq_avatar.cpp +++ b/protocols/IcqOscarJ/src/icq_avatar.cpp @@ -107,7 +107,7 @@ void CIcqProto::GetAvatarFileName(int dwUin, const char *szUid, TCHAR *pszDest, szLastDot[0] = '\0'; mir_tstrcpy(pszDest + tPathLen, szBuf); - _tcscat(pszDest + tPathLen, _T("_avt")); + mir_tstrcat(pszDest + tPathLen, _T("_avt")); } } } @@ -115,7 +115,7 @@ void CIcqProto::GetAvatarFileName(int dwUin, const char *szUid, TCHAR *pszDest, void AddAvatarExt(int dwFormat, TCHAR *pszDest) { const TCHAR *ext = ProtoGetAvatarExtension(dwFormat); - _tcscat(pszDest, (*ext == 0) ? _T(".dat") : ext); + mir_tstrcat(pszDest, (*ext == 0) ? _T(".dat") : ext); } #define MD5_BLOCK_SIZE 1024*1024 /* use 1MB blocks */ diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp index ee19586cbe..1b1133c447 100644 --- a/protocols/IcqOscarJ/src/icq_xstatus.cpp +++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp @@ -123,11 +123,11 @@ static HANDLE LoadXStatusIconLibrary(TCHAR *path, const TCHAR *sub) HANDLE hLib; mir_tstrcpy(p, sub); - _tcscat(p, _T("\\xstatus_ICQ.dll")); + mir_tstrcat(p, _T("\\xstatus_ICQ.dll")); if (hLib = LoadLibrary(path)) return hLib; mir_tstrcpy(p, sub); - _tcscat(p, _T("\\xstatus_icons.dll")); + mir_tstrcat(p, _T("\\xstatus_icons.dll")); if (hLib = LoadLibrary(path)) return hLib; mir_tstrcpy(p, _T("\\")); diff --git a/protocols/JabberG/src/jabber_form.cpp b/protocols/JabberG/src/jabber_form.cpp index 2ec926fa4d..511609003a 100644 --- a/protocols/JabberG/src/jabber_form.cpp +++ b/protocols/JabberG/src/jabber_form.cpp @@ -495,8 +495,8 @@ void JabberFormCreateUI(HWND hwndStatic, HXML xNode, int *formHeight, BOOL bComp break; if (xmlGetName(v) && !mir_tstrcmp(xmlGetName(v), _T("value")) && xmlGetText(v)) { if (valueStr[0]) - _tcscat(valueStr, _T("\r\n")); - _tcscat(valueStr, xmlGetText(v)); + mir_tstrcat(valueStr, _T("\r\n")); + mir_tstrcat(valueStr, xmlGetText(v)); } } } diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index 12a822279c..afd307fdba 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -406,8 +406,8 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) szPos += mir_tstrlen(szGroupDelimeter); TCHAR *szNewGroup = (TCHAR *)mir_alloc(sizeof(TCHAR) * (mir_tstrlen(item->group) + mir_tstrlen(szPos) + 2)); mir_tstrcpy(szNewGroup, item->group); - _tcscat(szNewGroup, _T("\\")); - _tcscat(szNewGroup, szPos); + mir_tstrcat(szNewGroup, _T("\\")); + mir_tstrcat(szNewGroup, szPos); mir_free(item->group); item->group = szNewGroup; } diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index 1a38d4f043..2169b02f1d 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -1014,21 +1014,21 @@ void CJabberDlgPrivacyLists::ShowAdvancedList(CPrivacyList *pList) mir_tstrcpy(szPackets, _T("all")); else { if (dwPackets & JABBER_PL_RULE_TYPE_MESSAGE) - _tcscat(szPackets, _T("messages")); + mir_tstrcat(szPackets, _T("messages")); if (dwPackets & JABBER_PL_RULE_TYPE_PRESENCE_IN) { if (mir_tstrlen(szPackets)) - _tcscat(szPackets, _T(", ")); - _tcscat(szPackets, _T("presence-in")); + mir_tstrcat(szPackets, _T(", ")); + mir_tstrcat(szPackets, _T("presence-in")); } if (dwPackets & JABBER_PL_RULE_TYPE_PRESENCE_OUT) { if (mir_tstrlen(szPackets)) - _tcscat(szPackets, _T(", ")); - _tcscat(szPackets, _T("presence-out")); + mir_tstrcat(szPackets, _T(", ")); + mir_tstrcat(szPackets, _T("presence-out")); } if (dwPackets & JABBER_PL_RULE_TYPE_IQ) { if (mir_tstrlen(szPackets)) - _tcscat(szPackets, _T(", ")); - _tcscat(szPackets, _T("queries")); + mir_tstrcat(szPackets, _T(", ")); + mir_tstrcat(szPackets, _T("queries")); } } diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index ea0d16f51b..1ae734e4ba 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -1152,13 +1152,13 @@ void __cdecl CJabberProto::GetAwayMsgThread(void *param) for (int i = 0; i < item->arResources.getCount(); i++) { JABBER_RESOURCE_STATUS *r = item->arResources[i]; if (r->m_tszStatusMessage) { - if (str[0] != '\0') _tcscat(str, _T("\r\n")); + if (str[0] != '\0') mir_tstrcat(str, _T("\r\n")); if (msgCount > 1) { - _tcscat(str, _T("(")); - _tcscat(str, r->m_tszResourceName); - _tcscat(str, _T("): ")); + mir_tstrcat(str, _T("(")); + mir_tstrcat(str, r->m_tszResourceName); + mir_tstrcat(str, _T("): ")); } - _tcscat(str, r->m_tszStatusMessage); + mir_tstrcat(str, r->m_tszStatusMessage); } } diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 773dcb7800..ebd3e13d9d 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1069,11 +1069,11 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData *info) TCHAR *szTmp = (TCHAR *)alloca(sizeof(TCHAR) * cbLen); szTmp[0] = 0; if (szMessage) - _tcscat(szTmp, _T("Subject: ")); - _tcscat(szTmp, ptszSubject); + mir_tstrcat(szTmp, _T("Subject: ")); + mir_tstrcat(szTmp, ptszSubject); if (szMessage) { - _tcscat(szTmp, _T("\r\n")); - _tcscat(szTmp, szMessage); + mir_tstrcat(szTmp, _T("\r\n")); + mir_tstrcat(szTmp, szMessage); } szMessage = szTmp; } @@ -1268,8 +1268,8 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData *info) TCHAR *szTmp = (TCHAR *)alloca(sizeof(TCHAR)* cbLen); mir_tstrcpy(szTmp, ptszUrl); if (szMessage) { - _tcscat(szTmp, _T("\r\n")); - _tcscat(szTmp, szMessage); + mir_tstrcat(szTmp, _T("\r\n")); + mir_tstrcat(szTmp, szMessage); } szMessage = szTmp; } -- cgit v1.2.3