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/NewEventNotify/src/popup.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/NewEventNotify') diff --git a/plugins/NewEventNotify/src/popup.cpp b/plugins/NewEventNotify/src/popup.cpp index 0dad1d5e4e..089db2de2b 100644 --- a/plugins/NewEventNotify/src/popup.cpp +++ b/plugins/NewEventNotify/src/popup.cpp @@ -231,7 +231,7 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei) if (pcBlob >= pcEnd) break; } - mir_sntprintf(szBuf, _countof(szBuf), TranslateT("Received %d contacts."), nContacts); + mir_sntprintf(szBuf, TranslateT("Received %d contacts."), nContacts); comment1 = mir_tstrdup(szBuf); } commentFix = POPUP_COMMENT_CONTACTS; @@ -254,7 +254,7 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei) char *pszLast = pszFirst + mir_strlen(pszFirst) + 1; char *pszEmail = pszLast + mir_strlen(pszLast) + 1; - mir_snprintf(szUin, _countof(szUin), "%d", *((DWORD*)dbei->pBlob)); + mir_snprintf(szUin, "%d", *((DWORD*)dbei->pBlob)); if (mir_strlen(pszNick) > 0) { if (dbei->flags & DBEF_UTF) szNick = mir_utf8decodeT(pszNick); @@ -290,7 +290,7 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei) char *pszLast = pszFirst + mir_strlen(pszFirst) + 1; char *pszEmail = pszLast + mir_strlen(pszLast) + 1; - mir_snprintf(szUin, _countof(szUin), "%d", *((DWORD*)dbei->pBlob)); + mir_snprintf(szUin, "%d", *((DWORD*)dbei->pBlob)); if (mir_strlen(pszNick) > 0) { if (dbei->flags & DBEF_UTF) szNick = mir_utf8decodeT(pszNick); @@ -540,12 +540,12 @@ int PopupUpdate(MCONTACT hContact, MEVENT hEvent) TCHAR lpzText[MAX_SECONDLINE*2] = _T("\0\0"); if (pdata->pluginOptions->bShowHeaders) - mir_sntprintf(lpzText, _countof(lpzText), TranslateT("[b]Number of new message(s): %d[/b]\n"), pdata->countEvent); + mir_sntprintf(lpzText, TranslateT("[b]Number of new message(s): %d[/b]\n"), pdata->countEvent); int doReverse = pdata->pluginOptions->bShowON; if ((pdata->firstShowEventData != pdata->firstEventData && doReverse) || (pdata->firstShowEventData != pdata->lastEventData && !doReverse)) - mir_sntprintf(lpzText, _countof(lpzText), _T("%s...\n"), lpzText); + mir_sntprintf(lpzText, _T("%s...\n"), lpzText); //take the active event as starting one EVENT_DATA_EX *eventData = pdata->firstShowEventData; @@ -578,12 +578,12 @@ int PopupUpdate(MCONTACT hContact, MEVENT hEvent) mir_tstrncat(formatTime, _T(" %H:%M"), _countof(formatTime) - mir_tstrlen(formatTime)); time_t localTime = dbe.timestamp; _tcsftime(timestamp, _countof(timestamp), formatTime, localtime(&localTime)); - mir_sntprintf(lpzText, _countof(lpzText), _T("%s[b][i]%s[/i][/b]\n"), lpzText, timestamp); + mir_sntprintf(lpzText, _T("%s[b][i]%s[/i][/b]\n"), lpzText, timestamp); } // prepare event preview TCHAR* szEventPreview = GetEventPreview(&dbe); - mir_sntprintf(lpzText, _countof(lpzText), _T("%s%s"), lpzText, szEventPreview); + mir_sntprintf(lpzText, _T("%s%s"), lpzText, szEventPreview); mir_free(szEventPreview); if (dbe.pBlob) @@ -595,11 +595,11 @@ int PopupUpdate(MCONTACT hContact, MEVENT hEvent) else if ((iEvent >= pdata->pluginOptions->iNumberMsg && pdata->pluginOptions->iNumberMsg) || !eventData->prev) break; - mir_sntprintf(lpzText, _countof(lpzText), _T("%s\n"), lpzText); + mir_sntprintf(lpzText, _T("%s\n"), lpzText); } if ((doReverse && eventData->next) || (!doReverse && eventData->prev)) - mir_sntprintf(lpzText, _countof(lpzText), _T("%s\n..."), lpzText); + mir_sntprintf(lpzText, _T("%s\n..."), lpzText); PUChangeTextT(pdata->hWnd, lpzText); return 0; -- cgit v1.2.3