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/SplashScreen/src/debug.h | 2 +- plugins/SplashScreen/src/main.cpp | 12 ++++++------ plugins/SplashScreen/src/options.cpp | 4 ++-- plugins/SplashScreen/src/services.cpp | 2 +- plugins/SplashScreen/src/splash.cpp | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins/SplashScreen') diff --git a/plugins/SplashScreen/src/debug.h b/plugins/SplashScreen/src/debug.h index c9afe39df8..5a475e9286 100644 --- a/plugins/SplashScreen/src/debug.h +++ b/plugins/SplashScreen/src/debug.h @@ -17,7 +17,7 @@ int inline _DebugPopup(MCONTACT hContact, TCHAR *fmt, ...) TCHAR debug[1024]; va_start(va, fmt); - mir_sntprintf(debug, _countof(debug), fmt, va); + mir_sntprintf(debug, fmt, va); if(CallService(MS_POPUP_QUERY, PUQS_GETSTATUS, 0) == 1) { POPUPDATAT ppd = { 0 }; diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp index 88dd563466..608416ab05 100644 --- a/plugins/SplashScreen/src/main.cpp +++ b/plugins/SplashScreen/src/main.cpp @@ -65,11 +65,11 @@ void SplashMain() if (bstartup) { // Retrive path to exe of current running Miranda is located szMirDir = Utils_ReplaceVarsT(_T("%miranda_path%")); - mir_sntprintf(szhAdvaimgPath, _countof(szhAdvaimgPath), _T("%s\\plugins\\advaimg.dll"), szMirDir); + mir_sntprintf(szhAdvaimgPath, _T("%s\\plugins\\advaimg.dll"), szMirDir); CallService(MS_SYSTEM_GETVERSIONTEXT, MAX_PATH, (LPARAM)szVersion); #ifdef _DEBUG - mir_sntprintf(szLogFile, _countof(szLogFile), _T("%s\\%s.log"), szMirDir, _T(__PLUGIN_NAME)); + mir_sntprintf(szLogFile, _T("%s\\%s.log"), szMirDir, _T(__PLUGIN_NAME)); initLog(); TCHAR *mirandaVerString = mir_a2t(szVersion); logMessage(_T("Miranda version"), mirandaVerString); @@ -104,7 +104,7 @@ void SplashMain() TCHAR *pos3 = 0; pos3 = _tcsrchr(inBuf, _T(':')); if (pos3 == NULL) - mir_sntprintf(szSplashFile, _countof(szSplashFile), _T("%s\\%s"), szMirDir, inBuf); + mir_sntprintf(szSplashFile, _T("%s\\%s"), szMirDir, inBuf); else mir_tstrcpy(szSplashFile, inBuf); @@ -122,7 +122,7 @@ void SplashMain() TCHAR *pos2; pos2 = _tcschr(inBuf, _T(':')); if (pos2 == NULL) - mir_sntprintf(szSoundFile, _countof(szSoundFile), _T("%s\\%s"), szMirDir, inBuf); + mir_sntprintf(szSoundFile, _T("%s\\%s"), szMirDir, inBuf); else mir_tstrcpy(szSoundFile, inBuf); @@ -145,7 +145,7 @@ void SplashMain() p = _tcsrchr(szSplashDir, _T('\\')); if (p) *p = 0; // create the search filter - mir_sntprintf(szSearch, _countof(szSearch), _T("%s\\*.*"), szSplashDir); + mir_sntprintf(szSearch, _T("%s\\*.*"), szSplashDir); // FFFN will return filenames HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATA ffd; @@ -179,7 +179,7 @@ void SplashMain() int r = 0; if (filescount) r = (rand() % filescount) + 1; - mir_sntprintf(szSplashFile, _countof(szSplashFile), _T("%s\\%s"), szSplashDir, files[r - 1]); + mir_sntprintf(szSplashFile, _T("%s\\%s"), szSplashDir, files[r - 1]); #ifdef _DEBUG logMessage(_T("final file"), szSplashFile); diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp index 70f0b2bb3e..536af1505a 100644 --- a/plugins/SplashScreen/src/options.cpp +++ b/plugins/SplashScreen/src/options.cpp @@ -181,7 +181,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } TCHAR tmp[MAX_PATH]; - mir_sntprintf(tmp, _countof(tmp), _T("%s (*.png, *.bmp)%c*.png;*.bmp%c%c"), TranslateT("Graphic files"), 0, 0, 0); + mir_sntprintf(tmp, _T("%s (*.png, *.bmp)%c*.png;*.bmp%c%c"), TranslateT("Graphic files"), 0, 0, 0); OPENFILENAME ofn = { 0 }; ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; @@ -239,7 +239,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP OPENFILENAME ofn = { 0 }; ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; TCHAR tmp[MAX_PATH]; - mir_sntprintf(tmp, _countof(tmp), _T("%s (*.wav, *.mp3)%c*.wav;*.mp3%c%c"), TranslateT("Sound Files"), 0, 0, 0); + mir_sntprintf(tmp, _T("%s (*.wav, *.mp3)%c*.wav;*.mp3%c%c"), TranslateT("Sound Files"), 0, 0, 0); ofn.lpstrFilter = tmp; ofn.hwndOwner = 0; ofn.lpstrFile = szTempPath; diff --git a/plugins/SplashScreen/src/services.cpp b/plugins/SplashScreen/src/services.cpp index 6e3497cb6d..b89daaa23d 100644 --- a/plugins/SplashScreen/src/services.cpp +++ b/plugins/SplashScreen/src/services.cpp @@ -31,7 +31,7 @@ INT_PTR ShowSplashService(WPARAM wparam, LPARAM lparam) TCHAR *pos = _tcsrchr(filename, _T(':')); if (pos == NULL) - mir_sntprintf(szSplashFile, _countof(szSplashFile), _T("%s\\%s"), szMirDir, filename); + mir_sntprintf(szSplashFile, _T("%s\\%s"), szMirDir, filename); else mir_tstrcpy(szSplashFile, filename); diff --git a/plugins/SplashScreen/src/splash.cpp b/plugins/SplashScreen/src/splash.cpp index 6550f5fda0..cab40ef640 100644 --- a/plugins/SplashScreen/src/splash.cpp +++ b/plugins/SplashScreen/src/splash.cpp @@ -42,9 +42,9 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM #ifdef _DEBUG TCHAR b[40]; - mir_sntprintf(b, _countof(b), _T("%d"), wParam); + mir_sntprintf(b, _T("%d"), wParam); logMessage(_T("Timer ID"), b); - mir_sntprintf(b, _countof(b), _T("%d"), options.showtime); + mir_sntprintf(b, _T("%d"), options.showtime); logMessage(_T("ShowTime value"), b); #endif @@ -229,7 +229,7 @@ void __cdecl SplashThread(void *arg) TCHAR verString[256] = { 0 }; TCHAR *mirandaVerString = mir_a2t(szVersion); - mir_sntprintf(verString, _countof(verString), _T("%s%s"), szPrefix, mirandaVerString); + mir_sntprintf(verString, _T("%s%s"), szPrefix, mirandaVerString); mir_free(mirandaVerString); LOGFONT lf = { 0 }; lf.lfHeight = 14; @@ -327,7 +327,7 @@ BOOL ShowSplash(BOOL bpreview) timeout = options.showtime; #ifdef _DEBUG TCHAR b[40]; - mir_sntprintf(b, _countof(b), _T("%d"), options.showtime); + mir_sntprintf(b, _T("%d"), options.showtime); logMessage(_T("Timeout"), b); #endif } -- cgit v1.2.3