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 --- src/core/stdfile/src/fileexistsdlg.cpp | 2 +- src/core/stdfile/src/fileopts.cpp | 2 +- src/core/stduihist/src/history.cpp | 4 ++-- src/modules/clist/clc.cpp | 2 +- src/modules/database/database.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/core/stdfile/src/fileexistsdlg.cpp b/src/core/stdfile/src/fileexistsdlg.cpp index 1062177c7c..81b1a220ba 100644 --- a/src/core/stdfile/src/fileexistsdlg.cpp +++ b/src/core/stdfile/src/fileexistsdlg.cpp @@ -288,7 +288,7 @@ INT_PTR CALLBACK DlgProcFileExists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM ofn.hwndOwner = hwndDlg; ofn.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY; _tcsncpy(filter, TranslateT("All files"),SIZEOF(filter)-1); - _tcscat(filter, _T(" (*)")); + mir_tstrcat(filter, _T(" (*)")); pfilter = filter + mir_tstrlen(filter) + 1; mir_tstrcpy(pfilter, _T("*")); pfilter = pfilter + mir_tstrlen(pfilter) + 1; diff --git a/src/core/stdfile/src/fileopts.cpp b/src/core/stdfile/src/fileopts.cpp index 63c1cdcec1..7b56f2bdb9 100644 --- a/src/core/stdfile/src/fileopts.cpp +++ b/src/core/stdfile/src/fileopts.cpp @@ -191,7 +191,7 @@ static INT_PTR CALLBACK DlgProcFileOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L if (_tcschr(str, ' ') != NULL) { memmove(str + 1, str, ((SIZEOF(str) - 2) * sizeof(TCHAR))); str[0] = '"'; - _tcscat(str, _T("\"")); + mir_tstrcat(str, _T("\"")); } SetDlgItemText(hwndDlg, IDC_SCANCMDLINE, str); break; diff --git a/src/core/stduihist/src/history.cpp b/src/core/stduihist/src/history.cpp index a321e9f5dd..176a761ac4 100644 --- a/src/core/stduihist/src/history.cpp +++ b/src/core/stduihist/src/history.cpp @@ -55,7 +55,7 @@ static void GetUrlDescription(DBEVENTINFO *dbei, TCHAR* buf, int cbBuf) buf[ len ] = 0; if (len < cbBuf-3) - _tcscat(buf, _T("\r\n")); + mir_tstrcat(buf, _T("\r\n")); } static void GetFileDescription(DBEVENTINFO *dbei, TCHAR* buf, int cbBuf) @@ -68,7 +68,7 @@ static void GetFileDescription(DBEVENTINFO *dbei, TCHAR* buf, int cbBuf) buf[ len ] = 0; if (len < cbBuf-3) - _tcscat(buf, _T("\r\n")); + mir_tstrcat(buf, _T("\r\n")); } static void GetObjectDescription(DBEVENTINFO *dbei, TCHAR* str, int cbStr) diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp index 4f516367c4..6ab8f89aa0 100644 --- a/src/modules/clist/clc.cpp +++ b/src/modules/clist/clc.cpp @@ -832,7 +832,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, MessageBeep(MB_OK); break; } - _tcscat(dat->szQuickSearch, szNew); + mir_tstrcat(dat->szQuickSearch, szNew); } if (dat->filterSearch) diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp index 2f16ad53df..c0106c2678 100644 --- a/src/modules/database/database.cpp +++ b/src/modules/database/database.cpp @@ -139,12 +139,12 @@ static void loadProfileByShortName(const TCHAR* src, TCHAR *szProfile, size_t cc TCHAR *p = _tcsrchr(buf, '\\'); if (p) ++p; else p = buf; if (!isValidProfileName(buf) && *p) - _tcscat(buf, _T(".dat")); + mir_tstrcat(buf, _T(".dat")); TCHAR profileName[MAX_PATH], newProfileDir[MAX_PATH]; _tcsncpy_s(profileName, p, _TRUNCATE); if (!isValidProfileName(profileName) && *p) - _tcscat(profileName, _T(".dat")); + mir_tstrcat(profileName, _T(".dat")); _tcsncpy_s(profileName, p, _TRUNCATE); p = _tcsrchr(profileName, '.'); if (p) *p = 0; -- cgit v1.2.3