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

4 files changed, 17 insertions, 17 deletions

diff --git a/plugins/NewsAggregator/Src/CheckFeed.cpp b/plugins/NewsAggregator/Src/CheckFeed.cpp
index a838e205b6..83a78ee173 100644
--- a/plugins/NewsAggregator/Src/CheckFeed.cpp
+++ b/plugins/NewsAggregator/Src/CheckFeed.cpp
@@ -57,7 +57,7 @@ LPCTSTR CheckFeed(TCHAR *tszURL, HWND hwndDlg)
 						HXML child = xmlGetChild(chan, j);

 						if (!mir_tstrcmpi(xmlGetName(child), _T("title"))) {

 							TCHAR mes[MAX_PATH];

-							mir_sntprintf(mes, _countof(mes), TranslateT("%s\nis a valid feed's address."), tszURL);

+							mir_sntprintf(mes, TranslateT("%s\nis a valid feed's address."), tszURL);

 							MessageBox(hwndDlg, mes, TranslateT("News Aggregator"), MB_OK | MB_ICONINFORMATION);

 							if (!mir_tstrcmpi(codepage, _T("koi8-r"))) {

 								TCHAR buf[MAX_PATH];

@@ -74,7 +74,7 @@ LPCTSTR CheckFeed(TCHAR *tszURL, HWND hwndDlg)
 						HXML child = xmlGetChild(node, j);

 						if (!mir_tstrcmpi(xmlGetName(child), _T("title"))) {

 							TCHAR mes[MAX_PATH];

-							mir_sntprintf(mes, _countof(mes), TranslateT("%s\nis a valid feed's address."), tszURL);

+							mir_sntprintf(mes, TranslateT("%s\nis a valid feed's address."), tszURL);

 							MessageBox(hwndDlg, mes, TranslateT("News Aggregator"), MB_OK | MB_ICONINFORMATION);

 							if (!mir_tstrcmpi(codepage, _T("koi8-r"))) {

 								TCHAR buf[MAX_PATH];

@@ -93,7 +93,7 @@ LPCTSTR CheckFeed(TCHAR *tszURL, HWND hwndDlg)
 	}

 	Netlib_LogfT(hNetlibUser, _T("%s is not a valid feed's address."), tszURL);

 	TCHAR mes[MAX_PATH];

-	mir_sntprintf(mes, _countof(mes), TranslateT("%s\nis not a valid feed's address."), tszURL);

+	mir_sntprintf(mes, TranslateT("%s\nis not a valid feed's address."), tszURL);

 	MessageBox(hwndDlg, mes, TranslateT("News Aggregator"), MB_OK | MB_ICONERROR);

 	return NULL;

 }

@@ -229,7 +229,7 @@ void CheckCurrentFeed(MCONTACT hContact)
 							LPCTSTR szAttrName = xmlGetAttrName(node, i);

 							if (!mir_tstrcmpi(szAttrName, _T("version"))) {

 								TCHAR ver[MAX_PATH];

-								mir_sntprintf(ver, _countof(ver), _T("RSS %s"), xmlGetAttrValue(node, szAttrName));

+								mir_sntprintf(ver, _T("RSS %s"), xmlGetAttrValue(node, szAttrName));

 								db_set_ts(hContact, MODULE, "MirVer", ver);

 								break;

 							}

@@ -346,7 +346,7 @@ void CheckCurrentFeed(MCONTACT hContact)
 

 										CMString filename = szNick;

 										filename.Replace(_T("/"), _T("_"));

-										mir_sntprintf(ai.filename, _countof(ai.filename), _T("%s\\%s.%s"), tszRoot, filename.c_str(), ext);

+										mir_sntprintf(ai.filename, _T("%s\\%s.%s"), tszRoot, filename.c_str(), ext);

 										CreateDirectoryTreeT(tszRoot);

 										if (DownloadFile(url, ai.filename)) {

 											db_set_ts(hContact, MODULE, "ImagePath", ai.filename);

@@ -487,7 +487,7 @@ void CheckCurrentFeed(MCONTACT hContact)
 										ai.format = ProtoGetAvatarFormat(ext);

 

 										TCHAR *filename = szNick;

-										mir_sntprintf(ai.filename, _countof(ai.filename), _T("%s\\%s.%s"), tszRoot, filename, ext);

+										mir_sntprintf(ai.filename, _T("%s\\%s.%s"), tszRoot, filename, ext);

 										if (DownloadFile(url, ai.filename)) {

 											db_set_ts(hContact, MODULE, "ImagePath", ai.filename);

 											ProtoBroadcastAck(MODULE, hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&ai, NULL);

@@ -632,7 +632,7 @@ void CheckCurrentFeedAvatar(MCONTACT hContact)
 								ai.format = ProtoGetAvatarFormat(ext);

 

 								TCHAR *filename = szNick;

-								mir_sntprintf(ai.filename, _countof(ai.filename), _T("%s\\%s.%s"), tszRoot, filename, ext);

+								mir_sntprintf(ai.filename, _T("%s\\%s.%s"), tszRoot, filename, ext);

 								if (DownloadFile(url, ai.filename)) {

 									db_set_ts(hContact, MODULE, "ImagePath", ai.filename);

 									ProtoBroadcastAck(MODULE, hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&ai, NULL);

@@ -665,7 +665,7 @@ void CheckCurrentFeedAvatar(MCONTACT hContact)
 								ai.format = ProtoGetAvatarFormat(ext);

 

 								TCHAR *filename = szNick;

-								mir_sntprintf(ai.filename, _countof(ai.filename), _T("%s\\%s.%s"), tszRoot, filename, ext);

+								mir_sntprintf(ai.filename, _T("%s\\%s.%s"), tszRoot, filename, ext);

 								if (DownloadFile(url, ai.filename)) {

 									db_set_ts(hContact, MODULE, "ImagePath", ai.filename);

 									ProtoBroadcastAck(MODULE, hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&ai, NULL);

diff --git a/plugins/NewsAggregator/Src/ExportImport.cpp b/plugins/NewsAggregator/Src/ExportImport.cpp
index fe4b799d76..20384c3e18 100644
--- a/plugins/NewsAggregator/Src/ExportImport.cpp
+++ b/plugins/NewsAggregator/Src/ExportImport.cpp
@@ -130,7 +130,7 @@ INT_PTR CALLBACK DlgProcImportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 												if ( !group)

 													group = (TCHAR *)xmlGetAttrValue(parent, xmlGetAttrName(parent, i));

 												else {

-													mir_sntprintf(tmpgroup, _countof(tmpgroup), _T("%s\\%s"), xmlGetAttrValue(parent, xmlGetAttrName(parent, i)), group);

+													mir_sntprintf(tmpgroup, _T("%s\\%s"), xmlGetAttrValue(parent, xmlGetAttrName(parent, i)), group);

 													group = tmpgroup;

 												}

 												break;

@@ -209,9 +209,9 @@ INT_PTR CALLBACK DlgProcImportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 					}

 					TCHAR mes[MAX_PATH];

 					if (DUPES)

-						mir_sntprintf(mes, _countof(mes), TranslateT("Imported %d feed(s)\r\nNot imported %d duplicate(s)."), count - DUPES, DUPES);

+						mir_sntprintf(mes, TranslateT("Imported %d feed(s)\r\nNot imported %d duplicate(s)."), count - DUPES, DUPES);

 					else

-						mir_sntprintf(mes, _countof(mes), TranslateT("Imported %d feed(s)."), count);

+						mir_sntprintf(mes, TranslateT("Imported %d feed(s)."), count);

 					MessageBox(hwndDlg, mes, TranslateT("News Aggregator"), MB_OK | MB_ICONINFORMATION);

 				}

 			}

@@ -228,7 +228,7 @@ INT_PTR CALLBACK DlgProcImportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				OPENFILENAME ofn = {0};

 				ofn.lStructSize = sizeof(ofn);

 				TCHAR tmp[MAX_PATH];

-				mir_sntprintf(tmp, _countof(tmp), _T("%s (*.opml, *.xml)%c*.opml;*.xml%c%c"), TranslateT("OPML files"), 0, 0, 0);

+				mir_sntprintf(tmp, _T("%s (*.opml, *.xml)%c*.opml;*.xml%c%c"), TranslateT("OPML files"), 0, 0, 0);

 				ofn.lpstrFilter = tmp;

 				ofn.hwndOwner = 0;

 				ofn.lpstrFile = FileName;

@@ -491,7 +491,7 @@ INT_PTR CALLBACK DlgProcExportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				OPENFILENAME ofn = {0};

 				ofn.lStructSize = sizeof(ofn);

 				TCHAR tmp[MAX_PATH];

-				mir_sntprintf(tmp, _countof(tmp), _T("%s (*.opml)%c*.opml%c%c"), TranslateT("OPML files"), 0, 0, 0);

+				mir_sntprintf(tmp, _T("%s (*.opml)%c*.opml%c%c"), TranslateT("OPML files"), 0, 0, 0);

 				ofn.lpstrFilter = tmp;

 				ofn.hwndOwner = 0;

 				ofn.lpstrFile = FileName;

diff --git a/plugins/NewsAggregator/Src/Icons.cpp b/plugins/NewsAggregator/Src/Icons.cpp
index 9a25f711c1..8cfd2716e2 100644
--- a/plugins/NewsAggregator/Src/Icons.cpp
+++ b/plugins/NewsAggregator/Src/Icons.cpp
@@ -39,7 +39,7 @@ void InitIcons()
 HICON LoadIconEx(const char *name, bool big)

 {

 	char szSettingName[100];

-	mir_snprintf(szSettingName, _countof(szSettingName), "%s_%s", MODULE, name);

+	mir_snprintf(szSettingName, "%s_%s", MODULE, name);

 	return IcoLib_GetIcon(szSettingName, big);

 }

 

diff --git a/plugins/NewsAggregator/Src/Options.cpp b/plugins/NewsAggregator/Src/Options.cpp
index dfdf630c21..80810f8a26 100644
--- a/plugins/NewsAggregator/Src/Options.cpp
+++ b/plugins/NewsAggregator/Src/Options.cpp
@@ -95,7 +95,7 @@ INT_PTR CALLBACK DlgProcAddFeedOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 		case IDC_TAGHELP:

 			TCHAR tszTagHelp[1024];

-			mir_sntprintf(tszTagHelp, _countof(tszTagHelp), _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),

+			mir_sntprintf(tszTagHelp, _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),

 				_T("#<title>#"), TranslateT("The title of the item."),

 				_T("#<description>#"), TranslateT("The item synopsis."),

 				_T("#<link>#"), TranslateT("The URL of the item."),

@@ -262,7 +262,7 @@ INT_PTR CALLBACK DlgProcChangeFeedOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 		case IDC_TAGHELP:

 			TCHAR tszTagHelp[1024];

-			mir_sntprintf(tszTagHelp, _countof(tszTagHelp), _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),

+			mir_sntprintf(tszTagHelp, _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),

 				_T("#<title>#"), TranslateT("The title of the item."),

 				_T("#<description>#"), TranslateT("The item synopsis."),

 				_T("#<link>#"), TranslateT("The URL of the item."),

@@ -418,7 +418,7 @@ INT_PTR CALLBACK DlgProcChangeFeedMenu(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 		case IDC_TAGHELP:

 			TCHAR tszTagHelp[1024];

-			mir_sntprintf(tszTagHelp, _countof(tszTagHelp), _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),

+			mir_sntprintf(tszTagHelp, _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),

 				_T("#<title>#"), TranslateT("The title of the item."),

 				_T("#<description>#"), TranslateT("The item synopsis."),

 				_T("#<link>#"), TranslateT("The URL of the item."),