From efd438ad7b533ba2adb4f22a1cb358ee449db825 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 4 Jun 2015 22:23:03 +0000 Subject: new mir_sntprintf templates without SIZEOF git-svn-id: http://svn.miranda-ng.org/main/trunk@14004 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BasicHistory/src/EventList.cpp | 2 +- plugins/BasicHistory/src/Options.cpp | 6 +++--- plugins/BasicHistory/src/PlainHtmlExport.cpp | 2 +- plugins/BasicHistory/src/Searcher.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/BasicHistory/src') diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp index aadf2a73a4..786b30c178 100644 --- a/plugins/BasicHistory/src/EventList.cpp +++ b/plugins/BasicHistory/src/EventList.cpp @@ -645,7 +645,7 @@ void EventList::AddImporter(MCONTACT hContact, IImport::ImportType type, const s mir_cslock lck(csEventList); TCHAR buf[32]; - mir_sntprintf(buf, SIZEOF(buf), _T("%016llx"), (unsigned long long int)hContact); + mir_sntprintf(buf, _T("%016llx"), (unsigned long long int)hContact); ImportDiscData data; data.file = contactFileDir + buf; data.type = type; diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index 2ab17ec429..15656791ae 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -722,7 +722,7 @@ void SetEventCB(HWND hwndCB, int eventId) if (selCpIdx == -1) { TCHAR buf[24]; - mir_sntprintf(buf, SIZEOF(buf), _T("%d"), eventId); + mir_sntprintf(buf, _T("%d"), eventId); ComboBox_SetText(hwndCB, buf); } else ComboBox_SetCurSel(hwndCB, selCpIdx); @@ -777,7 +777,7 @@ void ReloadEventLB(HWND hwndLB, const FilterOptions &sel) if (selCpIdx == -1) { TCHAR buf[24]; - mir_sntprintf(buf, SIZEOF(buf), _T("%d"), *it); + mir_sntprintf(buf, _T("%d"), *it); ListBox_AddString(hwndLB, buf); } else ListBox_AddString(hwndLB, TranslateTS(EventNames[selCpIdx].name)); @@ -1283,7 +1283,7 @@ void InitCodepageCB(HWND hwndCB, unsigned int codepage, const std::wstring& name if (selCpIdx == -1) { TCHAR buf[300]; - mir_sntprintf(buf, SIZEOF(buf), _T("%d;%s"), codepage, name.c_str()); + mir_sntprintf(buf, _T("%d;%s"), codepage, name.c_str()); ComboBox_SetText(hwndCB, buf); } else ComboBox_SetCurSel(hwndCB, selCpIdx); diff --git a/plugins/BasicHistory/src/PlainHtmlExport.cpp b/plugins/BasicHistory/src/PlainHtmlExport.cpp index 6ff0203124..635416695b 100644 --- a/plugins/BasicHistory/src/PlainHtmlExport.cpp +++ b/plugins/BasicHistory/src/PlainHtmlExport.cpp @@ -75,7 +75,7 @@ void PlainHtmlExport::WriteGroup(bool isMe, const std::wstring &time, const std: { TCHAR buf[256]; EXP_FILE << _T("
\n"); - mir_sntprintf(buf, SIZEOF(buf), TranslateT("Conversation started at %s"), time.c_str()); + mir_sntprintf(buf, TranslateT("Conversation started at %s"), time.c_str()); EXP_FILE << _T("
") << buf << _T("
\n"); EXP_FILE << _T("
\n"); } diff --git a/plugins/BasicHistory/src/Searcher.cpp b/plugins/BasicHistory/src/Searcher.cpp index 88a7355350..f8f46cdc39 100644 --- a/plugins/BasicHistory/src/Searcher.cpp +++ b/plugins/BasicHistory/src/Searcher.cpp @@ -105,7 +105,7 @@ void Searcher::Find() GetWindowText(context->findWindow, str, SIZEOF(str)); if (!str[0]) { TCHAR buf[256]; - mir_sntprintf(buf, SIZEOF(buf), TranslateT("\"%s\" not found"), str); + mir_sntprintf(buf, TranslateT("\"%s\" not found"), str); MessageBox(context->hWnd, buf, TranslateT("Search"), MB_OK | MB_ICONINFORMATION); return; } @@ -299,7 +299,7 @@ void Searcher::Find() if (isStart) { TCHAR buf[256]; GetWindowText(context->findWindow, str, SIZEOF(str)); - mir_sntprintf(buf, SIZEOF(buf), TranslateT("\"%s\" not found"), str); + mir_sntprintf(buf, TranslateT("\"%s\" not found"), str); MessageBox(context->hWnd, buf, TranslateT("Search"), MB_OK | MB_ICONINFORMATION); } else MessageBox(context->hWnd, TranslateTS(onlyGroup ? LPGENT("You have reached the end of the group.") : LPGENT("You have reached the end of the history.")), TranslateT("Search"), MB_OK | MB_ICONINFORMATION); -- cgit v1.2.3