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/MyDetails/src/data.cpp | 2 +- plugins/MyDetails/src/frame.cpp | 20 ++++++++++---------- plugins/MyDetails/src/services.cpp | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins/MyDetails/src') diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp index 1bd0754b8f..638d0a928f 100644 --- a/plugins/MyDetails/src/data.cpp +++ b/plugins/MyDetails/src/data.cpp @@ -134,7 +134,7 @@ int Protocol::GetStatus() else { TCHAR *p = (tszXStatusName[0] != 0) ? TranslateTS(tszXStatusName) : TranslateT(""); if (tszXStatusMessage[0]) - mir_sntprintf(status_name, _countof(status_name), _T("%s: %s"), p, tszXStatusMessage); + mir_sntprintf(status_name, _T("%s: %s"), p, tszXStatusMessage); else lcopystr(status_name, p, _countof(status_name)); } diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp index 8bf2303ab8..f51ce6a877 100644 --- a/plugins/MyDetails/src/frame.cpp +++ b/plugins/MyDetails/src/frame.cpp @@ -1474,7 +1474,7 @@ void ShowListeningToMenu(HWND hwnd, MyDetailsFrameData *data, Protocol *proto, P // Add this proto to menu TCHAR tmp[128]; - mir_sntprintf(tmp, _countof(tmp), TranslateT("Enable listening to for %s"), proto->description); + mir_sntprintf(tmp, TranslateT("Enable listening to for %s"), proto->description); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); @@ -1712,7 +1712,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar // Add this proto to menu TCHAR tmp[128]; - mir_sntprintf(tmp, _countof(tmp), TranslateT("Set my avatar for %s..."), proto->description); + mir_sntprintf(tmp, TranslateT("Set my avatar for %s..."), proto->description); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); @@ -1752,7 +1752,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar // Add this proto to menu TCHAR tmp[128]; - mir_sntprintf(tmp, _countof(tmp), TranslateT("Set my nickname for %s..."), proto->description); + mir_sntprintf(tmp, TranslateT("Set my nickname for %s..."), proto->description); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); @@ -1800,7 +1800,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar if (protocols->CanSetStatusMsgPerProtocol()) { // Add this proto to menu - mir_sntprintf(tmp, _countof(tmp), TranslateT("Set my status message for %s..."), proto->description); + mir_sntprintf(tmp, TranslateT("Set my status message for %s..."), proto->description); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); @@ -1819,7 +1819,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar } // Add this to menu - mir_sntprintf(tmp, _countof(tmp), TranslateT("Set my status message for %s..."), pcli->pfnGetStatusModeDescription(proto->status, 0)); + mir_sntprintf(tmp, TranslateT("Set my status message for %s..."), pcli->pfnGetStatusModeDescription(proto->status, 0)); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); @@ -1882,7 +1882,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar // Add this proto to menu TCHAR tmp[128]; - mir_sntprintf(tmp, _countof(tmp), TranslateT("Enable listening to for %s"), proto->description); + mir_sntprintf(tmp, TranslateT("Enable listening to for %s"), proto->description); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); @@ -1898,7 +1898,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar InsertMenuItem(submenu, 0, TRUE, &mii); // Add this to menu - mir_sntprintf(tmp, _countof(tmp), TranslateT("Set my status message for %s..."), pcli->pfnGetStatusModeDescription(proto->status, 0)); + mir_sntprintf(tmp, TranslateT("Set my status message for %s..."), pcli->pfnGetStatusModeDescription(proto->status, 0)); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -1917,7 +1917,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar if (protocols->CanSetStatusMsgPerProtocol()) { // Add this proto to menu - mir_sntprintf(tmp, _countof(tmp), TranslateT("Set my status message for %s..."), proto->description); + mir_sntprintf(tmp, TranslateT("Set my status message for %s..."), proto->description); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -1935,7 +1935,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar InsertMenuItem(submenu, 0, TRUE, &mii); } - mir_sntprintf(tmp, _countof(tmp), TranslateT("Set my nickname for %s..."), proto->description); + mir_sntprintf(tmp, TranslateT("Set my nickname for %s..."), proto->description); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -1952,7 +1952,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar InsertMenuItem(submenu, 0, TRUE, &mii); - mir_sntprintf(tmp, _countof(tmp), TranslateT("Set my avatar for %s..."), proto->description); + mir_sntprintf(tmp, TranslateT("Set my avatar for %s..."), proto->description); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); diff --git a/plugins/MyDetails/src/services.cpp b/plugins/MyDetails/src/services.cpp index 726ae3c5c0..2cb64f53bd 100644 --- a/plugins/MyDetails/src/services.cpp +++ b/plugins/MyDetails/src/services.cpp @@ -70,7 +70,7 @@ static INT_PTR CALLBACK DlgProcSetNickname(HWND hwndDlg, UINT msg, WPARAM wParam Protocol *proto = protocols->Get(proto_num); TCHAR tmp[128]; - mir_sntprintf(tmp, _countof(tmp), TranslateT("Set my nickname for %s"), proto->description); + mir_sntprintf(tmp, TranslateT("Set my nickname for %s"), proto->description); SetWindowText(hwndDlg, tmp); @@ -332,7 +332,7 @@ static INT_PTR CALLBACK DlgProcSetStatusMessage(HWND hwndDlg, UINT msg, WPARAM w } TCHAR title[256]; - mir_sntprintf(title, _countof(title), TranslateT("Set my status message for %s"), proto->description); + mir_sntprintf(title, TranslateT("Set my status message for %s"), proto->description); SetWindowText(hwndDlg, title); SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, proto->GetStatusMsg()); @@ -341,7 +341,7 @@ static INT_PTR CALLBACK DlgProcSetStatusMessage(HWND hwndDlg, UINT msg, WPARAM w SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadProtoIcon(NULL, data->status)); TCHAR title[256]; - mir_sntprintf(title, _countof(title), TranslateT("Set my status message for %s"), pcli->pfnGetStatusModeDescription(data->status, 0)); + mir_sntprintf(title, TranslateT("Set my status message for %s"), pcli->pfnGetStatusModeDescription(data->status, 0)); SetWindowText(hwndDlg, title); SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, protocols->GetDefaultStatusMsg(data->status)); -- cgit v1.2.3