From c370af60855db957c5b200914bf0bde743845528 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 28 Aug 2015 16:22:41 +0000 Subject: mir_sntprintf / mir_snprintf: obsoleted second parameter removed wherever possible git-svn-id: http://svn.miranda-ng.org/main/trunk@15064 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FTPFileYM/src/dialog.cpp | 2 +- plugins/FTPFileYM/src/ftpfile.cpp | 2 +- plugins/FTPFileYM/src/job_generic.cpp | 4 ++-- plugins/FTPFileYM/src/job_packer.cpp | 2 +- plugins/FTPFileYM/src/serverlist.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/FTPFileYM') diff --git a/plugins/FTPFileYM/src/dialog.cpp b/plugins/FTPFileYM/src/dialog.cpp index 6db6412c4a..e6eda61bd5 100644 --- a/plugins/FTPFileYM/src/dialog.cpp +++ b/plugins/FTPFileYM/src/dialog.cpp @@ -131,7 +131,7 @@ void UploadDialog::Tab::select() void UploadDialog::Tab::labelCompleted() { TCHAR buff[64], buff2[256]; - mir_sntprintf(buff2, _countof(buff2), _T("* %s"), Utils::getTextFragment(m_job->m_tszFileName, 20, buff)); + mir_sntprintf(buff2, _T("* %s"), Utils::getTextFragment(m_job->m_tszFileName, 20, buff)); TCITEM tab = { 0 }; tab.mask = TCIF_TEXT; diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index 8eba5013dd..d0e6b988fe 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -110,7 +110,7 @@ void InitMenuItems() for (int i = 0; i < ServerList::FTP_COUNT; i++) { if (DB::getStringF(0, MODULE, "Name%d", i, stzName)) - mir_sntprintf(stzName, _countof(stzName), TranslateT("FTP Server %d"), i + 1); + mir_sntprintf(stzName, TranslateT("FTP Server %d"), i + 1); mi.flags = CMIF_TCHAR; mi.root = (opt.bUseSubmenu) ? hMenu : 0; diff --git a/plugins/FTPFileYM/src/job_generic.cpp b/plugins/FTPFileYM/src/job_generic.cpp index 0c99989da0..f3cab81cd3 100644 --- a/plugins/FTPFileYM/src/job_generic.cpp +++ b/plugins/FTPFileYM/src/job_generic.cpp @@ -92,7 +92,7 @@ void GenericJob::getFilesFromOpenDialog() { TCHAR *ptr = m_tszFilePath + length + 1; while (ptr[0]) { - mir_sntprintf(stzFile, _countof(stzFile), _T("%s\\%s"), m_tszFilePath, ptr); + mir_sntprintf(stzFile, _T("%s\\%s"), m_tszFilePath, ptr); addFile(stzFile); ptr += mir_tstrlen(ptr) + 1; } @@ -116,7 +116,7 @@ int GenericJob::getFilesFromFolder(TCHAR *stzFolder) HANDLE hFind = FindFirstFile(_T("*.*"), &ffd); while (hFind != INVALID_HANDLE_VALUE) { if (!(ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - mir_sntprintf(stzFile, _countof(stzFile), _T("%s\\%s"), stzFolder, ffd.cFileName); + mir_sntprintf(stzFile, _T("%s\\%s"), stzFolder, ffd.cFileName); addFile(stzFile); } diff --git a/plugins/FTPFileYM/src/job_packer.cpp b/plugins/FTPFileYM/src/job_packer.cpp index f2a2942636..7d98a18fbd 100644 --- a/plugins/FTPFileYM/src/job_packer.cpp +++ b/plugins/FTPFileYM/src/job_packer.cpp @@ -58,7 +58,7 @@ void PackerJob::getZipFilePath() GetTempPath(_countof(buff), buff); - mir_sntprintf(m_tszFilePath, _countof(m_tszFilePath), _T("%s%s.zip"), buff, stzFileName); + mir_sntprintf(m_tszFilePath, _T("%s%s.zip"), buff, stzFileName); mir_tstrcpy(m_tszFileName, Utils::getFileNameFromPath(m_tszFilePath)); if (opt.bSetZipName) diff --git a/plugins/FTPFileYM/src/serverlist.cpp b/plugins/FTPFileYM/src/serverlist.cpp index 7610369e11..b5be374920 100644 --- a/plugins/FTPFileYM/src/serverlist.cpp +++ b/plugins/FTPFileYM/src/serverlist.cpp @@ -64,7 +64,7 @@ void ServerList::saveToDb() const ServerList::FTP::FTP(int index) { if (DB::getStringF(0, MODULE, "Name%d", index, m_stzName)) - mir_sntprintf(m_stzName, _countof(m_stzName), TranslateT("FTP Server %d"), index + 1); + mir_sntprintf(m_stzName, TranslateT("FTP Server %d"), index + 1); DB::getAStringF(0, MODULE, "Password%d", index, m_szPass); DB::getAStringF(0, MODULE, "Server%d", index, m_szServer); -- cgit v1.2.3