From 36472b00443e23acf28b0dd26ddc2c2e6216d909 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Tue, 9 Dec 2014 00:59:27 +0000 Subject: code cleanup over mir_sntprintf + small bug fix git-svn-id: http://svn.miranda-ng.org/main/trunk@11295 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BuddyExpectator/src/BuddyExpectator.cpp | 8 ++++---- plugins/BuddyExpectator/src/options.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/BuddyExpectator') diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index ee86de1094..e363ee2eeb 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -230,11 +230,11 @@ bool isContactGoneFor(MCONTACT hContact, int days) ppd.lchContact = hContact; ppd.lchIcon = Skin_GetIcon("enabled_icon"); - mir_sntprintf(ppd.lptzContactName, MAX_CONTACTNAME, TranslateT("Hiding %s (%S)"), + mir_sntprintf(ppd.lptzContactName, SIZEOF(ppd.lptzContactName), TranslateT("Hiding %s (%S)"), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR), GetContactProto(hContact)); - mir_sntprintf(ppd.lptzText, MAX_SECONDLINE, TranslateT("%d days since last message"), daysSinceMessage); + mir_sntprintf(ppd.lptzText, SIZEOF(ppd.lptzText), TranslateT("%d days since last message"), daysSinceMessage); if (!options.iUsePopupColors) { ppd.colorBack = options.iPopupColorBack; @@ -288,7 +288,7 @@ void ReturnNotify(MCONTACT hContact, TCHAR *message) TCHAR* nick = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,hContact,GCDNF_TCHAR); TCHAR tmpMsg[512]; - mir_sntprintf(tmpMsg, 512, _T("%s %s"), nick, message); + mir_sntprintf(tmpMsg, SIZEOF(tmpMsg), _T("%s %s"), nick, message); cle.ptszTooltip = tmpMsg; CallServiceSync(MS_CLIST_ADDEVENT, 0, (LPARAM) &cle); @@ -326,7 +326,7 @@ void GoneNotify(MCONTACT hContact, TCHAR *message) TCHAR* nick = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,hContact,GCDNF_TCHAR); TCHAR tmpMsg[512]; - mir_sntprintf(tmpMsg, 512, _T("%s %s"), nick, message); + mir_sntprintf(tmpMsg, SIZEOF(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 9ed3b0c67e..49e319a807 100644 --- a/plugins/BuddyExpectator/src/options.cpp +++ b/plugins/BuddyExpectator/src/options.cpp @@ -326,8 +326,8 @@ static INT_PTR CALLBACK PopupOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wP ppd.lchContact = NULL; ppd.lchIcon = hIcon; _tcsncpy(ppd.lptzContactName, TranslateT("Contact name"), MAX_CONTACTNAME); - TCHAR szPreviewText[50]; - mir_sntprintf(szPreviewText,50,TranslateT("has returned after being absent since %d days"),rand() % 30); + TCHAR szPreviewText[250]; + mir_sntprintf(szPreviewText, SIZEOF(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