From c09aa99a7e9915c503064d6eb5e9dd1bdd2a673f Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 20:07:58 +0000 Subject: replace _tcscpy to mir_tstrcpy git-svn-id: http://svn.miranda-ng.org/main/trunk@13764 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FTPFileYM/src/job_delete.cpp | 2 +- plugins/FTPFileYM/src/job_generic.cpp | 4 ++-- plugins/FTPFileYM/src/job_packer.cpp | 10 +++++----- plugins/FTPFileYM/src/job_upload.cpp | 4 ++-- plugins/FTPFileYM/src/mir_db.cpp | 2 +- plugins/FTPFileYM/src/utils.cpp | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins/FTPFileYM/src') diff --git a/plugins/FTPFileYM/src/job_delete.cpp b/plugins/FTPFileYM/src/job_delete.cpp index a5310c82d6..63c50f8d88 100644 --- a/plugins/FTPFileYM/src/job_delete.cpp +++ b/plugins/FTPFileYM/src/job_delete.cpp @@ -92,7 +92,7 @@ void DeleteJob::run() else if (manDlg != NULL && this->treeItem) { TCHAR *error = mir_a2t(szError); - _tcscpy(this->treeItem->stzToolTip, error); + mir_tstrcpy(this->treeItem->stzToolTip, error); this->treeItem->setState(Manager::TreeItem::_ERROR()); FREE(error); } diff --git a/plugins/FTPFileYM/src/job_generic.cpp b/plugins/FTPFileYM/src/job_generic.cpp index f567f15610..21bddfc649 100644 --- a/plugins/FTPFileYM/src/job_generic.cpp +++ b/plugins/FTPFileYM/src/job_generic.cpp @@ -32,8 +32,8 @@ GenericJob::GenericJob(MCONTACT _hContact, int _iFtpNum, EMode _mode) : GenericJob::GenericJob(GenericJob *job) :hContact(job->hContact),iFtpNum(job->iFtpNum),mode(job->mode),status(job->status),ftp(job->ftp),tab(job->tab) { - _tcscpy(this->stzFilePath, job->stzFilePath); - _tcscpy(this->stzFileName, job->stzFileName); + mir_tstrcpy(this->stzFilePath, job->stzFilePath); + mir_tstrcpy(this->stzFileName, job->stzFileName); mir_strcpy(this->szSafeFileName, job->szSafeFileName); } diff --git a/plugins/FTPFileYM/src/job_packer.cpp b/plugins/FTPFileYM/src/job_packer.cpp index 26f1bc9ad5..05898d3f41 100644 --- a/plugins/FTPFileYM/src/job_packer.cpp +++ b/plugins/FTPFileYM/src/job_packer.cpp @@ -36,29 +36,29 @@ void PackerJob::getZipFilePath() if (this->files.size() == 1) { - _tcscpy(stzFileName, Utils::getFileNameFromPath(this->files[0])); + mir_tstrcpy(stzFileName, Utils::getFileNameFromPath(this->files[0])); pch = _tcsrchr(stzFileName, '.'); if (pch) *pch = 0; } else { - _tcscpy(buff, this->files[0]); + mir_tstrcpy(buff, this->files[0]); pch = _tcsrchr(buff, '\\'); if (pch) { *pch = 0; pch = _tcsrchr(buff, '\\'); - if (pch) _tcscpy(stzFileName, pch + 1); + if (pch) mir_tstrcpy(stzFileName, pch + 1); } } if (stzFileName[0] == '\0') - _tcscpy(stzFileName, _T("archive")); + mir_tstrcpy(stzFileName, _T("archive")); GetTempPath(SIZEOF(buff), buff); mir_sntprintf(this->stzFilePath, SIZEOF(this->stzFilePath), _T("%s%s.zip"), buff, stzFileName); - _tcscpy(this->stzFileName, Utils::getFileNameFromPath(this->stzFilePath)); + mir_tstrcpy(this->stzFileName, Utils::getFileNameFromPath(this->stzFilePath)); if (opt.bSetZipName) Utils::setFileNameDlg(this->stzFileName); diff --git a/plugins/FTPFileYM/src/job_upload.cpp b/plugins/FTPFileYM/src/job_upload.cpp index 5369763b60..ac490cf5a9 100644 --- a/plugins/FTPFileYM/src/job_upload.cpp +++ b/plugins/FTPFileYM/src/job_upload.cpp @@ -62,8 +62,8 @@ void UploadJob::addToUploadDlg() { for (UINT i = 0; i < this->files.size(); i++) { UploadJob *jobCopy = new UploadJob(this); - _tcscpy(jobCopy->stzFilePath, this->files[i]); - _tcscpy(jobCopy->stzFileName, Utils::getFileNameFromPath(jobCopy->stzFilePath)); + mir_tstrcpy(jobCopy->stzFilePath, this->files[i]); + mir_tstrcpy(jobCopy->stzFileName, Utils::getFileNameFromPath(jobCopy->stzFilePath)); Utils::makeSafeString(jobCopy->stzFileName, jobCopy->szSafeFileName); UploadDialog::Tab *newTab = new UploadDialog::Tab(jobCopy); diff --git a/plugins/FTPFileYM/src/mir_db.cpp b/plugins/FTPFileYM/src/mir_db.cpp index 82a8306ee7..4ba9ce13a3 100644 --- a/plugins/FTPFileYM/src/mir_db.cpp +++ b/plugins/FTPFileYM/src/mir_db.cpp @@ -100,7 +100,7 @@ int DB::getString(MCONTACT hContact, char *szModule, char *szSetting, TCHAR *buf DBVARIANT dbv; if (!db_get_ts(hContact, szModule, szSetting, &dbv)) { - _tcscpy(buff, dbv.ptszVal); + mir_tstrcpy(buff, dbv.ptszVal); db_free(&dbv); return 0; } diff --git a/plugins/FTPFileYM/src/utils.cpp b/plugins/FTPFileYM/src/utils.cpp index 02c5ecddb7..3cd128499b 100644 --- a/plugins/FTPFileYM/src/utils.cpp +++ b/plugins/FTPFileYM/src/utils.cpp @@ -63,7 +63,7 @@ TCHAR *Utils::getTextFragment(TCHAR *stzText, size_t length, TCHAR *buff) { if (mir_tstrlen(stzText) > length) { - _tcscpy(buff, stzText); + mir_tstrcpy(buff, stzText); buff[length - 1] = 0; _tcscat(buff, _T("...")); return buff; @@ -211,7 +211,7 @@ bool Utils::setFileNameDlgA(char *nameBuff) { TCHAR buff[64]; TCHAR *tmp = mir_a2t(nameBuff); - _tcscpy(buff, tmp); + mir_tstrcpy(buff, tmp); FREE(tmp); bool res = setFileNameDlg(buff); -- cgit v1.2.3