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

5 files changed, 28 insertions, 28 deletions

diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp
index 89488d3843..01a12dcdde 100644
--- a/plugins/NewXstatusNotify/src/indsnd.cpp
+++ b/plugins/NewXstatusNotify/src/indsnd.cpp
@@ -72,9 +72,9 @@ TCHAR *SelectSound(HWND hwndDlg, TCHAR *buff, size_t bufflen)
 	ofn.hInstance = hInst;

 	TCHAR filter[MAX_PATH];

 	if (GetModuleHandle(_T("bass_interface.dll")))

-		mir_sntprintf(filter, _countof(filter), _T("%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%s (*.*)%c*%c"), TranslateT("Sound files"), 0, 0, TranslateT("All files"), 0, 0);

+		mir_sntprintf(filter, _T("%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%s (*.*)%c*%c"), TranslateT("Sound files"), 0, 0, TranslateT("All files"), 0, 0);

 	else

-		mir_sntprintf(filter, _countof(filter), _T("%s (*.wav)%c*.wav%c%s (*.*)%c*%c"), TranslateT("Wave files"), 0, 0, TranslateT("All files"), 0, 0);

+		mir_sntprintf(filter, _T("%s (*.wav)%c*.wav%c%s (*.*)%c*%c"), TranslateT("Wave files"), 0, 0, TranslateT("All files"), 0, 0);

 	ofn.lpstrFilter = filter;

 	ofn.lpstrFile = buff;

 	ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_EXPLORER | OFN_NOCHANGEDIR;

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index e4091cb972..b2eead3fa9 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -88,7 +88,7 @@ BYTE GetGender(MCONTACT hContact)
 HANDLE GetIconHandle(char *szIcon)

 {

 	char szSettingName[64];

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

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

 	return IcoLib_GetIconHandle(szSettingName);

 }

 

@@ -416,8 +416,8 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus)
 	// check if that proto from which we received statuschange notification, isn't in autodisable list

 	if (opt.AutoDisable) {

 		char statusIDs[12], statusIDp[12];

-		mir_snprintf(statusIDs, _countof(statusIDs), "s%d", myStatus);

-		mir_snprintf(statusIDp, _countof(statusIDp), "p%d", myStatus);

+		mir_snprintf(statusIDs, "s%d", myStatus);

+		mir_snprintf(statusIDp, "p%d", myStatus);

 		bEnableSound = db_get_b(0, MODULE, statusIDs, 1) ? FALSE : TRUE;

 		bEnablePopup = db_get_b(0, MODULE, statusIDp, 1) ? FALSE : TRUE;

 	}

@@ -442,7 +442,7 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus)
 	if (opt.BlinkIcon && !opt.TempDisabled) {

 		HICON hIcon = opt.BlinkIcon_Status ? Skin_LoadProtoIcon(szProto, newStatus) : Skin_LoadIcon(SKINICON_OTHER_USERONLINE);

 		TCHAR str[256];

-		mir_sntprintf(str, _countof(str), TranslateT("%s is now %s"), pcli->pfnGetContactDisplayName(hContact, 0), StatusList[Index(newStatus)].lpzStandardText);

+		mir_sntprintf(str, TranslateT("%s is now %s"), pcli->pfnGetContactDisplayName(hContact, 0), StatusList[Index(newStatus)].lpzStandardText);

 		BlinkIcon(hContact, hIcon, str);

 	}

 

@@ -458,7 +458,7 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus)
 

 		GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("HH':'mm"), stzTime, _countof(stzTime));

 		GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("dd/MM/yyyy"), stzDate, _countof(stzDate));

-		mir_sntprintf(stzText, _countof(stzText), TranslateT("%s, %s. %s changed status to %s (was %s)\r\n"),

+		mir_sntprintf(stzText, TranslateT("%s, %s. %s changed status to %s (was %s)\r\n"),

 			stzDate, stzTime, pcli->pfnGetContactDisplayName(hContact, 0), StatusList[Index(newStatus)].lpzStandardText,

 			StatusList[Index(oldStatus)].lpzStandardText);

 		LogToFile(stzText);

@@ -552,7 +552,7 @@ int ProcessExtraStatus(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 		}

 		else if (strstr(cws->szSetting, "text")) {

 			char dbSetting[128];

-			mir_snprintf(dbSetting, _countof(dbSetting), "%s%s", szSetting, "Msg");

+			mir_snprintf(dbSetting, "%s%s", szSetting, "Msg");

 			smi.compare = CompareStatusMsg(&smi, cws, dbSetting);

 			if (smi.compare == COMPARE_SAME) {

 				replaceStrT(smi.newstatusmsg, 0);

@@ -650,11 +650,11 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 		goto skip_notify;

 

 	char dbSetting[64];

-	mir_snprintf(dbSetting, _countof(dbSetting), "%s_enabled", szProto);

+	mir_snprintf(dbSetting, "%s_enabled", szProto);

 	// this proto is not set for status message notifications

 	if (db_get_b(NULL, MODULE, dbSetting, 1) == 0)

 		goto skip_notify;

-	mir_snprintf(dbSetting, _countof(dbSetting), "%d", IDC_CHK_STATUS_MESSAGE);

+	mir_snprintf(dbSetting, "%d", IDC_CHK_STATUS_MESSAGE);

 	// status message change notifications are disabled

 	if (db_get_b(NULL, MODULE, dbSetting, 1) == 0)

 		goto skip_notify;

@@ -665,8 +665,8 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 	// check if our status isn't on autodisable list

 	if (opt.AutoDisable) {

 		char statusIDs[12], statusIDp[12];

-		mir_snprintf(statusIDs, _countof(statusIDs), "s%d", myStatus);

-		mir_snprintf(statusIDp, _countof(statusIDp), "p%d", myStatus);

+		mir_snprintf(statusIDs, "s%d", myStatus);

+		mir_snprintf(statusIDp, "p%d", myStatus);

 		bEnableSound = db_get_b(0, MODULE, statusIDs, 1) ? FALSE : bEnableSound;

 		bEnablePopup = db_get_b(0, MODULE, statusIDp, 1) ? FALSE : bEnablePopup;

 	}

@@ -694,7 +694,7 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 		TCHAR *str;

 		if (smi.compare == COMPARE_DEL) {

 			char protoname[MAX_PATH];

-			mir_snprintf(protoname, _countof(protoname), "%s_TPopupSMsgRemoved", szProto);

+			mir_snprintf(protoname, "%s_TPopupSMsgRemoved", szProto);

 			DBVARIANT dbVar = { 0 };

 			if (db_get_ts(NULL, MODULE, protoname, &dbVar)) {

 				str = GetStr(&smi, DEFAULT_POPUP_SMSGREMOVED);

@@ -706,7 +706,7 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 		}

 		else {

 			char protoname[MAX_PATH];

-			mir_snprintf(protoname, _countof(protoname), "%s_TPopupSMsgChanged", szProto);

+			mir_snprintf(protoname, "%s_TPopupSMsgChanged", szProto);

 			DBVARIANT dbVar = { 0 };

 			if (db_get_ts(NULL, MODULE, protoname, &dbVar)) {

 				str = GetStr(&smi, DEFAULT_POPUP_SMSGCHANGED);

@@ -732,7 +732,7 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 	if (opt.BlinkIcon && opt.BlinkIcon_ForMsgs && !opt.TempDisabled) {

 		HICON hIcon = opt.BlinkIcon_Status ? Skin_LoadProtoIcon(szProto, db_get_w(hContact, szProto, "Status", ID_STATUS_ONLINE)) : Skin_LoadIcon(SKINICON_OTHER_USERONLINE);

 		TCHAR str[256];

-		mir_sntprintf(str, _countof(str), TranslateT("%s changed status message to %s"), pcli->pfnGetContactDisplayName(hContact, 0), smi.newstatusmsg);

+		mir_sntprintf(str, TranslateT("%s changed status message to %s"), pcli->pfnGetContactDisplayName(hContact, 0), smi.newstatusmsg);

 		BlinkIcon(hContact, hIcon, str);

 	}

 

@@ -759,7 +759,7 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 		else

 			str = GetStr(&smi, templates.LogSMsgChanged);

 

-		mir_sntprintf(stzText, _countof(stzText), _T("%s, %s. %s %s\r\n"), stzDate, stzTime, pcli->pfnGetContactDisplayName(hContact, 0), str);

+		mir_sntprintf(stzText, _T("%s, %s. %s %s\r\n"), stzDate, stzTime, pcli->pfnGetContactDisplayName(hContact, 0), str);

 

 		LogToFile(stzText);

 		mir_free(str);

diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index 9096d049ba..d97a4993bb 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -218,7 +218,7 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++) {

 			//Statuses notified

 			char status[8];

-			mir_snprintf(status, _countof(status), "%d", i);

+			mir_snprintf(status, "%d", i);

 			CheckDlgButton(hwndDlg, i, db_get_b(0, MODULE, status, 1) ? BST_CHECKED : BST_UNCHECKED);

 		}

 		CheckDlgButton(hwndDlg, IDC_CHK_FROMOFFLINE, opt.FromOffline ? BST_CHECKED : BST_UNCHECKED);

@@ -256,7 +256,7 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			ofn.nMaxFile = MAX_PATH;

 			ofn.hwndOwner = hwndDlg;

 			TCHAR filter[MAX_PATH];

-			mir_sntprintf(filter, _countof(filter), _T("%s (*.*)%c*.*%c%s (*.log)%c*.log%c%s (*.txt)%c*.txt%c"), TranslateT("All Files"), 0, 0, TranslateT("Log"), 0, 0, TranslateT("Text"), 0, 0);

+			mir_sntprintf(filter, _T("%s (*.*)%c*.*%c%s (*.log)%c*.log%c%s (*.txt)%c*.txt%c"), TranslateT("All Files"), 0, 0, TranslateT("Log"), 0, 0, TranslateT("Text"), 0, 0);

 			ofn.lpstrFilter = filter;

 			ofn.nFilterIndex = 2;

 			ofn.lpstrInitialDir = buff;

@@ -289,7 +289,7 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			//Notified statuses

 			for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++) {

 				char status[8];

-				mir_snprintf(status, _countof(status), "%d", i);

+				mir_snprintf(status, "%d", i);

 				db_set_b(NULL, MODULE, status, (BYTE)IsDlgButtonChecked(hwndDlg, i));

 			}

 			opt.FromOffline = IsDlgButtonChecked(hwndDlg, IDC_CHK_FROMOFFLINE);

@@ -729,7 +729,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 				DBVARIANT dbVar = { 0 };

 				char protoname[MAX_PATH] = { 0 };

-				mir_snprintf(protoname, _countof(protoname), "%s_TPopupSMsgChanged", protos[i]->szModuleName);

+				mir_snprintf(protoname, "%s_TPopupSMsgChanged", protos[i]->szModuleName);

 				if (db_get_ts(NULL, MODULE, protoname, &dbVar))

 					_tcsncpy(prototemplate->ProtoTemplateMsg, DEFAULT_POPUP_SMSGCHANGED, _countof(prototemplate->ProtoTemplateMsg));

 				else {

@@ -737,7 +737,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 					db_free(&dbVar);

 				}

 

-				mir_snprintf(protoname, _countof(protoname), "%s_TPopupSMsgRemoved", protos[i]->szModuleName);

+				mir_snprintf(protoname, "%s_TPopupSMsgRemoved", protos[i]->szModuleName);

 				if (db_get_ts(NULL, MODULE, protoname, &dbVar))

 					_tcsncpy(prototemplate->ProtoTemplateRemoved, DEFAULT_POPUP_SMSGREMOVED, _countof(prototemplate->ProtoTemplateRemoved));

 				else {

@@ -749,7 +749,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				ProtoTemplates.insert(prototemplate, ProtoTemplates.getCount());

 

 				char dbSetting[128];

-				mir_snprintf(dbSetting, _countof(dbSetting), "%s_enabled", protos[i]->szModuleName);

+				mir_snprintf(dbSetting, "%s_enabled", protos[i]->szModuleName);

 				ListView_SetCheckState(hList, lvItem.iItem, db_get_b(NULL, MODULE, dbSetting, TRUE));

 				lvItem.iItem++;

 			}

@@ -862,7 +862,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				ListView_GetItem(hList, &lvItem);

 

 				char dbSetting[128];

-				mir_snprintf(dbSetting, _countof(dbSetting), "%s_enabled", (char *)lvItem.lParam);

+				mir_snprintf(dbSetting, "%s_enabled", (char *)lvItem.lParam);

 				db_set_b(NULL, MODULE, dbSetting, (BYTE)ListView_GetCheckState(hList, lvItem.iItem));

 			}

 		}

diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp
index 98de23ac0b..7aed434811 100644
--- a/plugins/NewXstatusNotify/src/popup.cpp
+++ b/plugins/NewXstatusNotify/src/popup.cpp
@@ -85,7 +85,7 @@ static int AwayMsgHook(WPARAM, LPARAM lParam, LPARAM pObj)
 

 	TCHAR stzText[1024];

 	if (pstzLast)

-		mir_sntprintf(stzText, _countof(stzText), _T("%s\n%s"), pstzLast, tszStatus);

+		mir_sntprintf(stzText, _T("%s\n%s"), pstzLast, tszStatus);

 	else

 		_tcsncpy(stzText, tszStatus, _countof(stzText));

 	SendMessage(pdp->hWnd, WM_SETREDRAW, FALSE, 0);

diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index 644134d4da..55696fc3c4 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -226,7 +226,7 @@ void BlinkXStatusIcon(XSTATUSCHANGE *xsc)
 	HICON hIcon = NULL;

 	TCHAR str[256] = { 0 };

 	TCHAR stzType[32];

-	mir_sntprintf(str, _countof(str), TranslateT("%s changed %s"), pcli->pfnGetContactDisplayName(xsc->hContact, 0), GetStatusTypeAsString(xsc->type, stzType));

+	mir_sntprintf(str, TranslateT("%s changed %s"), pcli->pfnGetContactDisplayName(xsc->hContact, 0), GetStatusTypeAsString(xsc->type, stzType));

 

 	if (opt.BlinkIcon_Status) {

 		DBVARIANT dbv;

@@ -337,7 +337,7 @@ void LogChangeToFile(XSTATUSCHANGE *xsc)
 		Template = templates.LogXMsgRemoved; break;

 	}

 

-	mir_sntprintf(stzText, _countof(stzText), _T("%s, %s. %s %s\r\n"), stzDate, stzTime, 

+	mir_sntprintf(stzText, _T("%s, %s. %s %s\r\n"), stzDate, stzTime, 

 		pcli->pfnGetContactDisplayName(xsc->hContact, 0), ReplaceVars(xsc, Template).GetString());

 

 	LogToFile(stzText);

@@ -369,8 +369,8 @@ void ExtraStatusChanged(XSTATUSCHANGE *xsc)
 	if (opt.AutoDisable) {

 		char statusIDs[12], statusIDp[12];

 		WORD myStatus = (WORD)CallProtoService(xsc->szProto, PS_GETSTATUS, 0, 0);

-		mir_snprintf(statusIDs, _countof(statusIDs), "s%d", myStatus);

-		mir_snprintf(statusIDp, _countof(statusIDp), "p%d", myStatus);

+		mir_snprintf(statusIDs, "s%d", myStatus);

+		mir_snprintf(statusIDp, "p%d", myStatus);

 		bEnableSound = db_get_b(0, MODULE, statusIDs, 1) ? FALSE : bEnableSound;

 		bEnablePopup = db_get_b(0, MODULE, statusIDp, 1) ? FALSE : bEnablePopup;

 	}