From eefe0f0d556fbf3d77602d0a99b9134505050756 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 16 Jul 2014 13:43:06 +0000 Subject: in _tcsncpy_s / _tcsncat_s / strncpy_s / strncat_s the second parameter to be omitted if the size of first one is fixed (not to contaminate sources with the excessive code) git-svn-id: http://svn.miranda-ng.org/main/trunk@9829 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WebView/src/webview_datawnd.cpp | 2 +- plugins/WebView/src/webview_opts.cpp | 6 +++--- plugins/WebView/src/webview_services.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/WebView') diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp index 084215923a..a7dee35823 100644 --- a/plugins/WebView/src/webview_datawnd.cpp +++ b/plugins/WebView/src/webview_datawnd.cpp @@ -162,7 +162,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA url[0] = '\0'; if (!db_get_ts(hContact2, MODULENAME, URL_KEY, &dbv)) { - _tcsncpy_s(url, SIZEOF(url), dbv.ptszVal, _TRUNCATE); + _tcsncpy_s(url, dbv.ptszVal, _TRUNCATE); db_free(&dbv); } SetDlgItemText(hwndDlg, IDC_OPEN_URL, FixButtonText(url, SIZEOF(url))); diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp index 9e7149908e..347ccd2bdb 100644 --- a/plugins/WebView/src/webview_opts.cpp +++ b/plugins/WebView/src/webview_opts.cpp @@ -49,15 +49,15 @@ void strdel(TCHAR *parBuffer, int len ) TCHAR* FixButtonText(TCHAR *url, size_t len) { TCHAR buttontext[256], stringbefore[256], newbuttontext[256]; - _tcsncpy_s(buttontext, SIZEOF(buttontext), url, _TRUNCATE); - _tcsncpy_s(newbuttontext, SIZEOF(newbuttontext), url, _TRUNCATE); + _tcsncpy_s(buttontext, url, _TRUNCATE); + _tcsncpy_s(newbuttontext, url, _TRUNCATE); if ( _tcschr(newbuttontext, '&') != 0) { while (true) { if ( _tcschr(newbuttontext, '&') == 0) break; - _tcsncpy_s(buttontext, SIZEOF(buttontext), newbuttontext, _TRUNCATE); + _tcsncpy_s(buttontext, newbuttontext, _TRUNCATE); TCHAR *stringafter = _tcschr(buttontext, '&'); int pos = (stringafter - buttontext); int posbefore = (stringafter - buttontext) - 1; diff --git a/plugins/WebView/src/webview_services.cpp b/plugins/WebView/src/webview_services.cpp index 0289f0a096..b8fdf9aaa2 100644 --- a/plugins/WebView/src/webview_services.cpp +++ b/plugins/WebView/src/webview_services.cpp @@ -53,7 +53,7 @@ int DBSettingChanged(WPARAM wParam, LPARAM lParam) TCHAR nick[100]; ptrT oldnick( db_get_tsa(hContact, "CList", "MyHandle")); if (oldnick != NULL) - _tcsncpy_s(nick, SIZEOF(nick), oldnick, _TRUNCATE); + _tcsncpy_s(nick, oldnick, _TRUNCATE); else nick[0] = 0; -- cgit v1.2.3