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

15 files changed, 51 insertions, 52 deletions

diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index d52a7dd44f..caa4bc5a95 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -219,7 +219,7 @@ void SvcFlagsLoadModule()
 		langid = 1;

 

 	char szId[20];

-	mir_snprintf(szId, _countof(szId), (langid == 0xFFFF) ? "%s_0x%X" : "%s_%i", "flags", langid); /* buffer safe */

+	mir_snprintf(szId, (langid == 0xFFFF) ? "%s_0x%X" : "%s_%i", "flags", langid); /* buffer safe */

 	hExtraIconSvc = ExtraIcon_RegisterIcolib("Flags", LPGEN("Flags (uinfoex)"), szId);

 }

 

diff --git a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
index 3468fcb749..63de971663 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
@@ -133,7 +133,7 @@ HICON LoadFlag(int countryNumber)
 		szCountry = (char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER,countryNumber=0xFFFF,0);

 

 	char szId[20];

-	mir_snprintf(szId, _countof(szId), (countryNumber == 0xFFFF) ? "%s_0x%X" : "%s_%i", "flags", countryNumber); /* buffer safe */

+	mir_snprintf(szId, (countryNumber == 0xFFFF) ? "%s_0x%X" : "%s_%i", "flags", countryNumber); /* buffer safe */

 	return IcoLib_GetIcon(szId);

 }

 

@@ -349,7 +349,7 @@ void InitIcons()
 			for (int i=0; i < nCountriesCount; i++) {

 				sid.description.t = mir_a2t(LPGEN(countries[i].szName));

 				/* create identifier */

-				mir_snprintf(szId, _countof(szId), (countries[i].id == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countries[i].id); /* buffer safe */

+				mir_snprintf(szId, (countries[i].id == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countries[i].id); /* buffer safe */

 				int index = CountryNumberToBitmapIndex(countries[i].id);

 				/* create icon */

 				sid.hDefaultIcon = ImageList_ExtractIcon(NULL, himl, index);

@@ -374,7 +374,7 @@ void UninitIcons()
 	for(int i=0;i<nCountriesCount;++i) {

 		// create identifier

 		char szId[20];

-		mir_snprintf(szId, _countof(szId), (countries[i].id == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countries[i].id); /* buffer safe */

+		mir_snprintf(szId, (countries[i].id == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countries[i].id); /* buffer safe */

 		IcoLib_RemoveIcon(szId);

 	}

 	mir_free(phIconHandles);  // does NULL check

diff --git a/plugins/UserInfoEx/src/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp
index 9aa6ba77f0..9567506ab3 100644
--- a/plugins/UserInfoEx/src/classMAnnivDate.cpp
+++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp
@@ -271,10 +271,10 @@ int MAnnivDate::DBGetReminderOpts(MCONTACT hContact)
 		char pszSetting[MAXSETTING];

 

 		// read reminder option

-		mir_snprintf(pszSetting, _countof(pszSetting), "Anniv%dReminder", _wID);

+		mir_snprintf(pszSetting, "Anniv%dReminder", _wID);

 		_bRemind = db_get_b(hContact, Module(), pszSetting, BST_INDETERMINATE);

 		// read offset

-		mir_snprintf(pszSetting, _countof(pszSetting), "Anniv%dOffset", _wID);

+		mir_snprintf(pszSetting, "Anniv%dOffset", _wID);

 		_wDaysEarlier = db_get_w(hContact, Module(), pszSetting, (WORD)-1);

 	}

 	else {

@@ -310,14 +310,14 @@ int MAnnivDate::DBWriteReminderOpts(MCONTACT hContact)
 	else if (_wID <= ANID_LAST) {

 		char pszSetting[MAXSETTING];

 		// read reminder option

-		mir_snprintf(pszSetting, _countof(pszSetting), "Anniv%dReminder", _wID);

+		mir_snprintf(pszSetting, "Anniv%dReminder", _wID);

 		if (_bRemind == BST_INDETERMINATE)

 			db_unset(hContact, USERINFO, pszSetting);

 		else

 			db_set_b(hContact, USERINFO, pszSetting, _bRemind);

 

 		// read offset

-		mir_snprintf(pszSetting, _countof(pszSetting), "Anniv%dOffset", _wID);

+		mir_snprintf(pszSetting, "Anniv%dOffset", _wID);

 		if (_wDaysEarlier == (WORD)-1)

 			db_unset(hContact, USERINFO, pszSetting);

 		else

@@ -627,7 +627,7 @@ int MAnnivDate::DBGetAnniversaryDate(MCONTACT hContact, WORD iIndex)
 

 	// read date and convert older versions

 	CHAR szStamp[MAXSETTING];

-	mir_snprintf(szStamp, _countof(szStamp), "Anniv%dDate", iIndex);

+	mir_snprintf(szStamp, "Anniv%dDate", iIndex);

 	int rc = DBGetDateStamp(hContact, USERINFO, szStamp);

 	if (!rc) {

 		_strModule = USERINFO;

@@ -635,7 +635,7 @@ int MAnnivDate::DBGetAnniversaryDate(MCONTACT hContact, WORD iIndex)
 		_wID = iIndex;

 

 		// read description

-		mir_snprintf(szStamp, _countof(szStamp), "Anniv%dDesc", iIndex);

+		mir_snprintf(szStamp, "Anniv%dDesc", iIndex);

 		DBVARIANT dbv;

 		if (!DB::Setting::GetTString(hContact, USERINFO, szStamp, &dbv)) {

 			_strDesc = dbv.ptszVal;

@@ -660,10 +660,10 @@ int MAnnivDate::DBWriteAnniversaryDate(MCONTACT hContact, WORD wIndex)
 		_wID = wIndex;

 

 		CHAR pszSetting[MAXSETTING];

-		mir_snprintf(pszSetting, _countof(pszSetting), "Anniv%dDate", wIndex);

+		mir_snprintf(pszSetting, "Anniv%dDate", wIndex);

 		if (!DBWriteDateStamp(hContact, USERINFO, pszSetting)) {

 			// write description

-			mir_snprintf(pszSetting, _countof(pszSetting), "Anniv%dDesc", wIndex);

+			mir_snprintf(pszSetting, "Anniv%dDesc", wIndex);

 			db_set_ts(hContact, USERINFO, pszSetting, (LPTSTR)Description());

 			return 0;

 		}

@@ -687,7 +687,7 @@ static WORD AskUser(MCONTACT hContact, MAnnivDate *pOldCustomDate, MAnnivDate *p
 	pOldCustomDate->DateFormat(szoldDate, _countof(szoldDate));

 	pNewProtoDate->DateFormat(szDate, _countof(szDate));

 

-	mir_sntprintf(szMsg, _countof(szMsg),

+	mir_sntprintf(szMsg,

 		TranslateT("%s provides a new birthday via protocol.\nIt is %s. The old one was %s.\n\nDo you want to use this as the new birthday for this contact?"),

 		DB::Contact::DisplayName(hContact), szDate, szoldDate);

 

diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp
index 331c672567..57c488a0a1 100644
--- a/plugins/UserInfoEx/src/classPsTreeItem.cpp
+++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp
@@ -88,7 +88,7 @@ CPsTreeItem::~CPsTreeItem()
 LPCSTR CPsTreeItem::PropertyKey(LPCSTR pszProperty)

 {

 	static CHAR pszSetting[MAXSETTING];

-	mir_snprintf(pszSetting, _countof(pszSetting), "{%s\\%s}_%s", _pszPrefix, _pszName, pszProperty);

+	mir_snprintf(pszSetting, "{%s\\%s}_%s", _pszPrefix, _pszName, pszProperty);

 	return pszSetting;

 }

 

@@ -121,7 +121,7 @@ LPCSTR CPsTreeItem::GlobalName()
 LPCSTR CPsTreeItem::GlobalPropertyKey(LPCSTR pszProperty)

 {

 	static CHAR pszSetting[MAXSETTING];

-	mir_snprintf(pszSetting, _countof(pszSetting), "{Global\\%s}_%s", GlobalName(), pszProperty);

+	mir_snprintf(pszSetting, "{Global\\%s}_%s", GlobalName(), pszProperty);

 	return pszSetting;

 }

 

@@ -138,7 +138,7 @@ LPCSTR CPsTreeItem::IconKey()
 	if (pszIconName)

 	{

 		static CHAR pszSetting[MAXSETTING];

-		mir_snprintf(pszSetting, _countof(pszSetting), MODNAME"_{%s}", pszIconName);

+		mir_snprintf(pszSetting, MODNAME"_{%s}", pszIconName);

 		return pszSetting;

 	}

 	return NULL;

@@ -283,7 +283,7 @@ HICON CPsTreeItem::ProtoIcon()
 	for (int i = 0; i < ProtoCount; i++) {

 		if (!mir_tstrncmpi(pa[i]->tszAccountName, _A2T(_pszName), mir_tstrlen(pa[i]->tszAccountName))) {

 			CHAR szIconID[MAX_PATH];

-			mir_snprintf(szIconID, _countof(szIconID), "core_status_%s1", pa[i]->szModuleName);

+			mir_snprintf(szIconID, "core_status_%s1", pa[i]->szModuleName);

 			HICON hIco = IcoLib_GetIcon(szIconID);

 			if (!hIco)

 				hIco = (HICON)CallProtoService(pa[i]->szModuleName, PS_LOADICON, PLI_PROTOCOL, NULL);

diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
index ec8361576f..18e1bda0e6 100644
--- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
@@ -364,7 +364,7 @@ INT_PTR CAnnivEditCtrl::DBWriteAnniversaries(MCONTACT hContact)
 	}

 	// delete reluctant items

 	do {

-		ofs = mir_snprintf(szSet0, _countof(szSet0), "Anniv%d", wIndex);

+		ofs = mir_snprintf(szSet0, "Anniv%d", wIndex);

 		ret = 1;

 		for (i = 0; i < _countof(szPrefix); i++) {

 			mir_strncpy(szSet0 + ofs, szPrefix[i], _countof(szSet0) - ofs);

diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp
index bbfa76552a..262a180124 100644
--- a/plugins/UserInfoEx/src/ctrl_contact.cpp
+++ b/plugins/UserInfoEx/src/ctrl_contact.cpp
@@ -328,7 +328,7 @@ INT_PTR CALLBACK DlgProc_Phone(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam
 

 				GetDlgItemText(hDlg, EDIT_AREA, szArea, _countof(szArea));

 				GetDlgItemText(hDlg, EDIT_NUMBER, szData, _countof(szData));

-				mir_sntprintf(szPhone, _countof(szPhone), _T("+%u (%s) %s"), nCountry, szArea, szData);

+				mir_sntprintf(szPhone, _T("+%u (%s) %s"), nCountry, szArea, szData);

 				noRecursion = 1;

 				SetDlgItemText(hDlg, EDIT_PHONE, szPhone);

 				noRecursion = 0;

@@ -780,7 +780,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 						!cbex->pItems ||

 						cbex->iSelectedItem < 0 ||

 						cbex->iSelectedItem >= cbex->numItems ||

-						FAILED(mir_sntprintf(szMsg, _countof(szMsg), TranslateT("Do you really want to delete the current selected item?\n\t%s\n\t%s"),

+						FAILED(mir_sntprintf(szMsg, TranslateT("Do you really want to delete the current selected item?\n\t%s\n\t%s"),

 						cbex->pItems[cbex->iSelectedItem].szCat, cbex->pItems[cbex->iSelectedItem].pszVal))

 			)

 				{

@@ -946,7 +946,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 

 		// set category string

 		if (!pItem->pszCat || !pItem->pszCat[0] || !mir_tstrncpy(cbex->pItems[cbex->numItems].szCat, pItem->pszCat, MAX_CAT)) {

-			mir_sntprintf(cbex->pItems[cbex->numItems].szCat, _countof(cbex->pItems[cbex->numItems].szCat), _T("%s %d"), TranslateT("Other"), ++cbex->numOther);

+			mir_sntprintf(cbex->pItems[cbex->numItems].szCat, _T("%s %d"), TranslateT("Other"), ++cbex->numOther);

 		}

 

 		// set value string

@@ -986,7 +986,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 		if (pItem->wMask & CBEXIM_CAT) {

 			// set category string

 			if (!pItem->pszCat || !pItem->pszCat[0] || !mir_tstrncpy(cbex->pItems[pItem->iItem].szCat, pItem->pszCat, _countof(cbex->pItems[pItem->iItem].szCat))) 

-				mir_sntprintf(cbex->pItems[pItem->iItem].szCat, _countof(cbex->pItems[pItem->iItem].szCat), _T("%s %d"), TranslateT("Other"), ++cbex->numOther);

+				mir_sntprintf(cbex->pItems[pItem->iItem].szCat, _T("%s %d"), TranslateT("Other"), ++cbex->numOther);

 			if (pItem->iItem == cbex->iSelectedItem)

 				SetWindowText(cbex->hBtnEdit, cbex->pItems[pItem->iItem].szCat);

 		}

@@ -1349,7 +1349,7 @@ int CtrlContactAddMyItemsFromDB(
 	cbi.pszIcon = szIcon;

 

 	for (i = 0;

-		SUCCEEDED(mir_snprintf(pszSetting, _countof(pszSetting), szFormatVal, i)) &&

+		SUCCEEDED(mir_snprintf(pszSetting, szFormatVal, i)) &&

 		(cbi.wFlags = DB::Setting::GetTStringCtrl(hContact, pszModule, pszModule, pszProto, pszSetting, &dbv));

 		i++)

 	{

@@ -1360,7 +1360,7 @@ int CtrlContactAddMyItemsFromDB(
 		dbv.ptszVal = NULL;

 

 		// read category

-		if (SUCCEEDED(mir_snprintf(pszSetting, _countof(pszSetting), szFormatCat, i))) {

+		if (SUCCEEDED(mir_snprintf(pszSetting, szFormatCat, i))) {

 			if (cbi.wFlags & CTRLF_HASCUSTOM) {

 				if (DB::Setting::GetTString(hContact, pszModule, pszSetting, &dbv))

 					dbv.type = DBVT_DELETED;

@@ -1480,13 +1480,13 @@ int CtrlContactWriteMyItemsToDB(
 			if (cbi.wFlags & CBEXIF_SMS) {

 				mir_tstrncat(szVal, _T(" SMS"), _countof(szVal) - mir_tstrlen(szVal));

 			}

-			mir_snprintf(pszSetting, _countof(pszSetting), szFormatCat, i);

+			mir_snprintf(pszSetting, szFormatCat, i);

 			if (*szCat && _tcsncmp(szCat, pszOther, ccOther)) {

 				if (db_set_ts(hContact, pszModule, pszSetting, szCat)) return 1;

 			}

 			else

 				db_unset(hContact, pszModule, pszSetting);

-			mir_snprintf(pszSetting, _countof(pszSetting), szFormatVal, i);

+			mir_snprintf(pszSetting, szFormatVal, i);

 			if (db_set_ts(hContact, pszModule, pszSetting, szVal)) return 1;

 			cbi.wFlags &= ~CTRLF_CHANGED;

 			cbi.wMask = CBEXIM_FLAGS;

diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
index f12f53c485..1e9ad4ca9b 100644
--- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
+++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
@@ -597,7 +597,7 @@ class CAnnivList
 		LVCOLUMN lvc;

 		CHAR pszSetting[MAXSETTING];

 

-		mir_snprintf(pszSetting, _countof(pszSetting), "AnnivDlg_Col%d", iSubItem);

+		mir_snprintf(pszSetting, "AnnivDlg_Col%d", iSubItem);

 		lvc.cx = db_get_w(NULL, MODNAME, pszSetting, defaultWidth);

 		lvc.mask = LVCF_WIDTH | LVCF_TEXT;

 		lvc.iSubItem = iSubItem;

@@ -876,7 +876,7 @@ public:
 				int c, cc = Header_GetItemCount(ListView_GetHeader(_hList));

 

 				for (c = 0; c < cc; c++) {

-					mir_snprintf(pszSetting, _countof(pszSetting), "AnnivDlg_Col%d", c);

+					mir_snprintf(pszSetting, "AnnivDlg_Col%d", c);

 					db_set_w(NULL, MODNAME, pszSetting, (WORD)ListView_GetColumnWidth(_hList, c));

 				}

 				DeleteAllItems();

diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp
index 8022802c2f..4704750254 100644
--- a/plugins/UserInfoEx/src/dlg_msgbox.cpp
+++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp
@@ -688,11 +688,11 @@ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPCTSTR pszTitle, LPCTSTR pszI
 INT_PTR CALLBACK MsgErr(HWND hParent, LPCTSTR pszFormat, ...)

 {

 	TCHAR tszTitle[MAX_SECONDLINE], tszMsg[MAX_SECONDLINE];

-	mir_sntprintf(tszTitle, _countof(tszMsg), _T("%s - %s"), _T(MODNAME), TranslateT("Error"));

+	mir_sntprintf(tszTitle, _T("%s - %s"), _T(MODNAME), TranslateT("Error"));

 

 	va_list vl;

 	va_start(vl, pszFormat);

-	mir_vsntprintf(tszMsg, _countof(tszMsg), TranslateTS(pszFormat), vl);

+	mir_vsntprintf(tszMsg, TranslateTS(pszFormat), vl);

 	va_end(vl);

 

 	MSGBOX mb = {0};

diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 4cb4dc7abc..ff76ea1994 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -137,7 +137,7 @@ private:
 

 				EnableWindow(GetDlgItem(_pPs->hDlg, IDOK), FALSE);

 				EnableWindow(GetDlgItem(_pPs->hDlg, IDAPPLY), FALSE);

-				mir_snprintf(_pPs->szUpdating, _countof(_pPs->szUpdating), "%s (%s)", Translate("Uploading"), (*_pPd)->szModuleName);

+				mir_snprintf(_pPs->szUpdating, "%s (%s)", Translate("Uploading"), (*_pPd)->szModuleName);

 				ShowWindow(GetDlgItem(_pPs->hDlg, TXT_UPDATING), SW_SHOW);

 				SetTimer(_pPs->hDlg, TIMERID_UPDATING, 100, NULL);

 				return 0;

@@ -1541,7 +1541,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			if (pPs->hContact != NULL) {

 				ResetUpdateInfo(pPs);

 

-				mir_snprintf(pPs->szUpdating, _countof(pPs->szUpdating), "%s (%s)", Translate("updating"), pPs->pszProto);

+				mir_snprintf(pPs->szUpdating, "%s (%s)", Translate("updating"), pPs->pszProto);

 

 				// need meta contact's subcontact information

 				if (DB::Module::IsMetaAndScan(pPs->pszProto)) {

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
index 2041202d80..ab19dba570 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
@@ -221,7 +221,7 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar
 				}

 				TranslateDialogDefault(hDlg);			//to translate oldTitle

 				GetWindowText(hDlg, oldTitle, _countof(oldTitle));

-				mir_sntprintf(newTitle, _countof(newTitle), _T("%s - %s"), name, oldTitle);

+				mir_sntprintf(newTitle, _T("%s - %s"), name, oldTitle);

 				SetWindowText(hDlg, newTitle);

 			}

 

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
index 36383cf771..67e46fc06d 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
@@ -281,7 +281,7 @@ INT_PTR svcExIm_Group_Service(WPARAM wParam, LPARAM)
 		if (SendMessage(hClist,CLM_GETITEMTYPE, (WPARAM)hItem, 0) == CLCIT_GROUP) {

 			SendMessage(hClist,CLM_GETITEMTEXT, (WPARAM)hItem, (LPARAM)ptszItem);

 			LPTSTR temp = mir_tstrdup(ptszGroup);

-			mir_sntprintf(tszGroup, _countof(tszGroup),_T("%s%s%s"), ptszItem, mir_tstrlen(temp)? _T("\\"):_T(""), temp);

+			mir_sntprintf(tszGroup, _T("%s%s%s"), ptszItem, mir_tstrlen(temp)? _T("\\"):_T(""), temp);

 			mir_free (temp);

 		}

 		hParent = SendMessage(hClist,CLM_GETNEXTITEM, (WPARAM)CLGN_PARENT, (LPARAM)hItem);

diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp
index 7b5ed883ec..6bf79fc8e7 100644
--- a/plugins/UserInfoEx/src/mir_db.cpp
+++ b/plugins/UserInfoEx/src/mir_db.cpp
@@ -362,7 +362,7 @@ void DeleteArray(MCONTACT hContact, LPCSTR pszModule, LPCSTR pszFormat, int iSta
 {

 	char pszSetting[MAXSETTING];

 	do {

-		mir_snprintf(pszSetting, _countof(pszSetting), pszFormat, iStart++);

+		mir_snprintf(pszSetting, pszFormat, iStart++);

 	}

 		while (!db_unset(hContact, pszModule, pszSetting));

 }

diff --git a/plugins/UserInfoEx/src/psp_contact.cpp b/plugins/UserInfoEx/src/psp_contact.cpp
index d08b8ec07b..da26528cb9 100644
--- a/plugins/UserInfoEx/src/psp_contact.cpp
+++ b/plugins/UserInfoEx/src/psp_contact.cpp
@@ -46,7 +46,7 @@ INT_PTR CALLBACK PSPProcContactHome(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				PSGetBoldFont(hDlg, hBoldFont);

 				SendDlgItemMessage(hDlg, IDC_PAGETITLE, WM_SETFONT, (WPARAM)hBoldFont, 0);

 

-				mir_sntprintf(szAddr, _countof(szAddr), _T("%s (%s)"), TranslateT("Address"), TranslateT("home"));

+				mir_sntprintf(szAddr, _T("%s (%s)"), TranslateT("Address"), TranslateT("home"));

 				SetDlgItemText(hDlg, IDC_PAGETITLE, szAddr);

 				SendDlgItemMessage(hDlg, BTN_GOTO, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open in browser"), MBBF_TCHAR);

 				TranslateDialogDefault(hDlg);

@@ -192,7 +192,7 @@ INT_PTR CALLBACK PSPProcContactWork(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				PSGetBoldFont(hDlg, hBoldFont);

 				SendDlgItemMessage(hDlg, IDC_PAGETITLE, WM_SETFONT, (WPARAM)hBoldFont, 0);

 

-				mir_sntprintf(szAddr, _countof(szAddr), _T("%s (%s)"), TranslateT("Address and contact"), TranslateT("company"));

+				mir_sntprintf(szAddr, _T("%s (%s)"), TranslateT("Address and contact"), TranslateT("company"));

 				SetDlgItemText(hDlg, IDC_PAGETITLE, szAddr);

 				SendDlgItemMessage(hDlg, BTN_GOTO, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open in browser"), MBBF_TCHAR);

 				TranslateDialogDefault(hDlg);

diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp
index c81ad03f01..67bbeb3249 100644
--- a/plugins/UserInfoEx/src/psp_profile.cpp
+++ b/plugins/UserInfoEx/src/psp_profile.cpp
@@ -487,12 +487,12 @@ static int ProfileList_AddItemlistFromDB(
 

 	for (i = 0, lvi.iItem = iItem; ; i++) {

 		// read the setting from db

-		mir_snprintf(pszSetting, _countof(pszSetting), szValFormat, i);

+		mir_snprintf(pszSetting, szValFormat, i);

 		if (DB::Setting::GetTString(hContact, pszModule, pszSetting, &dbvVal))

 			break;

 		if (dbvVal.type != DBVT_TCHAR)

 			continue;

-		mir_snprintf(pszSetting, _countof(pszSetting), szCatFormat, i);

+		mir_snprintf(pszSetting, szCatFormat, i);

 		DB::Setting::GetAString(hContact, pszModule, pszSetting, &dbvCat);

 		// create the itemobject

 		if (!(pItem = (LPLCITEM)mir_alloc(sizeof(LCITEM)))) {

@@ -1218,10 +1218,10 @@ INT_PTR CALLBACK PSPProcContactProfile(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR
 								if (!pItem->pszText[1] || !*pItem->pszText[1])

 									continue;

 								if (!(pItem->wFlags & (CTRLF_HASPROTO|CTRLF_HASMETA))) {

-									mir_snprintf(pszSetting, _countof(pszSetting), pFmt[iFmt].szValFmt, iItem);

+									mir_snprintf(pszSetting, pFmt[iFmt].szValFmt, iItem);

 									db_set_ts(hContact, pszModule, pszSetting, pItem->pszText[1]);

 									// save category

-									mir_snprintf(pszSetting, _countof(pszSetting), pFmt[iFmt].szCatFmt, iItem);

+									mir_snprintf(pszSetting, pFmt[iFmt].szCatFmt, iItem);

 									if (pItem->idstrList && pItem->iListItem > 0 && pItem->iListItem < pItem->idstrListCount)

 										db_set_s(hContact, pszModule, pszSetting, (LPSTR)pItem->idstrList[pItem->iListItem].pszText);

 									else if (pItem->pszText[0] && *pItem->pszText[0])

diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index f30b9ba1a4..44467f2fac 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -148,7 +148,7 @@ static HICON GetAnnivIcon(const CEvent &evt)
 		if (evt._wDaysLeft > 9)

 			hIcon = IcoLib_GetIcon(ICO_RMD_DTBX);

 		else {

-			mir_snprintf(szIcon, _countof(szIcon), MODNAME"_rmd_dtb%u", evt._wDaysLeft);

+			mir_snprintf(szIcon, MODNAME"_rmd_dtb%u", evt._wDaysLeft);

 			hIcon = IcoLib_GetIcon(szIcon);

 		}

 		break;

@@ -157,7 +157,7 @@ static HICON GetAnnivIcon(const CEvent &evt)
 		if (evt._wDaysLeft > 9)

 			hIcon = IcoLib_GetIcon(ICO_RMD_DTAX);

 		else {

-			mir_snprintf(szIcon, _countof(szIcon), MODNAME"_rmd_dta%u", evt._wDaysLeft);

+			mir_snprintf(szIcon, MODNAME"_rmd_dta%u", evt._wDaysLeft);

 			hIcon = IcoLib_GetIcon(szIcon);

 		}

 	}

@@ -183,7 +183,7 @@ static void NotifyWithExtraIcon(MCONTACT hContact, const CEvent &evt)
 			if (evt._wDaysLeft > 9)

 				icoName = ICO_RMD_DTAX;

 			else {

-				mir_snprintf(szIcon, _countof(szIcon), MODNAME"_rmd_dtb%u", evt._wDaysLeft);

+				mir_snprintf(szIcon, MODNAME"_rmd_dtb%u", evt._wDaysLeft);

 				icoName = szIcon;

 			}

 			break;

@@ -192,7 +192,7 @@ static void NotifyWithExtraIcon(MCONTACT hContact, const CEvent &evt)
 			if (evt._wDaysLeft > 9)

 				icoName = ICO_RMD_DTAX;

 			else {

-				mir_snprintf(szIcon, _countof(szIcon), MODNAME"_rmd_dta%u", evt._wDaysLeft);

+				mir_snprintf(szIcon, MODNAME"_rmd_dta%u", evt._wDaysLeft);

 				icoName = szIcon;

 			}

 			break;

@@ -255,8 +255,7 @@ static int NotifyWithPopup(MCONTACT hContact, CEvent::EType eventType, int DaysT
 

 	if (hContact) {

 		ppd.lchContact = hContact;

-		mir_sntprintf(ppd.lptzContactName, _countof(ppd.lptzContactName),

-			_T("%s - %s"), TranslateTS(pszDesc), DB::Contact::DisplayName(hContact));

+		mir_sntprintf(ppd.lptzContactName, _T("%s - %s"), TranslateTS(pszDesc), DB::Contact::DisplayName(hContact));

 	}

 	else mir_tstrncpy(ppd.lptzContactName, TranslateT("Reminder"), _countof(ppd.lptzContactName));

 

@@ -318,12 +317,12 @@ static void NotifyFlashCListIcon(MCONTACT hContact, const CEvent &evt)
 

 	switch (evt._eType) {

 	case CEvent::BIRTHDAY:

-		mir_sntprintf(szMsg, _countof(szMsg), TranslateT("%s has %s today."), DB::Contact::DisplayName(hContact), TranslateT("Birthday"));

+		mir_sntprintf(szMsg, TranslateT("%s has %s today."), DB::Contact::DisplayName(hContact), TranslateT("Birthday"));

 		cle.hIcon = IcoLib_GetIcon(ICO_COMMON_BIRTHDAY);

 		break;

 

 	case CEvent::ANNIVERSARY:

-		mir_sntprintf(szMsg, _countof(szMsg), TranslateT("%s has %s today."), DB::Contact::DisplayName(hContact), TranslateT("an anniversary"));

+		mir_sntprintf(szMsg, TranslateT("%s has %s today."), DB::Contact::DisplayName(hContact), TranslateT("an anniversary"));

 		cle.hIcon = IcoLib_GetIcon(ICO_COMMON_ANNIVERSARY);

 		break;

 

@@ -483,13 +482,13 @@ static bool CheckBirthday(MCONTACT hContact, MTime &Now, CEvent &evt, BYTE bNoti
 

 						switch (Diff) {

 						case 0:

-							cchMsg = mir_sntprintf(szMsg, _countof(szMsg), TranslateT("%s has birthday today."), DB::Contact::DisplayName(hContact));

+							cchMsg = mir_sntprintf(szMsg, TranslateT("%s has birthday today."), DB::Contact::DisplayName(hContact));

 							break;

 						case 1:

-							cchMsg = mir_sntprintf(szMsg, _countof(szMsg), TranslateT("%s has birthday tomorrow."), DB::Contact::DisplayName(hContact));

+							cchMsg = mir_sntprintf(szMsg, TranslateT("%s has birthday tomorrow."), DB::Contact::DisplayName(hContact));

 							break;

 						default:

-							cchMsg = mir_sntprintf(szMsg, _countof(szMsg), TranslateT("%s has birthday in %d days."), DB::Contact::DisplayName(hContact), Diff);

+							cchMsg = mir_sntprintf(szMsg, TranslateT("%s has birthday in %d days."), DB::Contact::DisplayName(hContact), Diff);

 						}

 						int age = mtb.Age(&Now);

 						if (age > 0)