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/BuddyExpectator/src/BuddyExpectator.cpp | 11 ++++------- plugins/BuddyExpectator/src/options.cpp | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'plugins/BuddyExpectator') diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index ff4a7676a5..6ef497ee08 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -231,11 +231,8 @@ bool isContactGoneFor(MCONTACT hContact, int days) ppd.lchContact = hContact; ppd.lchIcon = IcoLib_GetIcon("enabled_icon"); - mir_sntprintf(ppd.lptzContactName, _countof(ppd.lptzContactName), TranslateT("Hiding %s (%S)"), - pcli->pfnGetContactDisplayName(hContact, 0), - GetContactProto(hContact)); - - mir_sntprintf(ppd.lptzText, _countof(ppd.lptzText), TranslateT("%d days since last message"), daysSinceMessage); + mir_sntprintf(ppd.lptzContactName, TranslateT("Hiding %s (%S)"), pcli->pfnGetContactDisplayName(hContact, 0), GetContactProto(hContact)); + mir_sntprintf(ppd.lptzText, TranslateT("%d days since last message"), daysSinceMessage); if (!options.iUsePopupColors) { ppd.colorBack = options.iPopupColorBack; @@ -289,7 +286,7 @@ void ReturnNotify(MCONTACT hContact, TCHAR *message) TCHAR* nick = (TCHAR*)pcli->pfnGetContactDisplayName(hContact, 0); TCHAR tmpMsg[512]; - mir_sntprintf(tmpMsg, _countof(tmpMsg), _T("%s %s"), nick, message); + mir_sntprintf(tmpMsg, _T("%s %s"), nick, message); cle.ptszTooltip = tmpMsg; CallServiceSync(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle); @@ -327,7 +324,7 @@ void GoneNotify(MCONTACT hContact, TCHAR *message) TCHAR* nick = (TCHAR*)pcli->pfnGetContactDisplayName(hContact, 0); TCHAR tmpMsg[512]; - mir_sntprintf(tmpMsg, _countof(tmpMsg), _T("%s %s"), nick, message); + mir_sntprintf(tmpMsg, _T("%s %s"), nick, message); cle.ptszTooltip = tmpMsg; cle.flags = CLEF_TCHAR; diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp index 27337be821..49fb08103f 100644 --- a/plugins/BuddyExpectator/src/options.cpp +++ b/plugins/BuddyExpectator/src/options.cpp @@ -327,7 +327,7 @@ static INT_PTR CALLBACK PopupOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wP ppd.lchIcon = hIcon; _tcsncpy(ppd.lptzContactName, TranslateT("Contact name"), MAX_CONTACTNAME); TCHAR szPreviewText[250]; - mir_sntprintf(szPreviewText, _countof(szPreviewText), TranslateT("has returned after being absent since %d days"), rand() % 30); + mir_sntprintf(szPreviewText, TranslateT("has returned after being absent since %d days"), rand() % 30); _tcsncpy(ppd.lptzText, szPreviewText, MAX_SECONDLINE); // Get current popups colors options -- cgit v1.2.3