new mir_snprintf templates without SIZEOF

git-svn-id: http://svn.miranda-ng.org/main/trunk@14002 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 15 insertions, 15 deletions

diff --git a/protocols/IcqOscarJ/src/editstring.cpp b/protocols/IcqOscarJ/src/editstring.cpp
index f792660d52..2ea8f8eb1c 100644
--- a/protocols/IcqOscarJ/src/editstring.cpp
+++ b/protocols/IcqOscarJ/src/editstring.cpp
@@ -239,7 +239,7 @@ void ChangeInfoData::BeginStringEdit(int iItem, RECT *rc, int i, WORD wVKey)
 		szValue = "                ";

 	else if ((si.displayType & LIM_TYPE) == LI_NUMBER) {

 		szValue = str;

-		mir_snprintf(str, SIZEOF(str), "%d", sid.value);

+		mir_snprintf(str, "%d", sid.value);

 	}

 	else if (sid.value) {

 		szValue = BinaryToEscapes((char*)sid.value);

diff --git a/protocols/IcqOscarJ/src/fam_13servclist.cpp b/protocols/IcqOscarJ/src/fam_13servclist.cpp
index fd917076b1..83e28ffa0f 100644
--- a/protocols/IcqOscarJ/src/fam_13servclist.cpp
+++ b/protocols/IcqOscarJ/src/fam_13servclist.cpp
@@ -1248,7 +1248,7 @@ void CIcqProto::handleServerCListItemUpdate(const char *szRecordName, WORD wItem
 				char *nick = NickFromHandleUtf(hContact);
 
 				setByte(hContact, "Auth", 0);
-				mir_snprintf(str, SIZEOF(str), ICQTranslateUtfStatic(LPGEN("Contact \"%s\" was authorized in the server list."), msg, SIZEOF(msg)), nick);
+				mir_snprintf(str, ICQTranslateUtfStatic(LPGEN("Contact \"%s\" was authorized in the server list."), msg, SIZEOF(msg)), nick);
 				icq_LogMessage(LOG_WARNING, str);
 				SAFE_FREE(&nick);
 			}
@@ -1258,7 +1258,7 @@ void CIcqProto::handleServerCListItemUpdate(const char *szRecordName, WORD wItem
 				char *nick = NickFromHandleUtf(hContact);
 
 				setByte(hContact, "Auth", 1);
-				mir_snprintf(str, SIZEOF(str), ICQTranslateUtfStatic(LPGEN("Contact \"%s\" lost its authorization in the server list."), msg, SIZEOF(msg)), nick);
+				mir_snprintf(str, ICQTranslateUtfStatic(LPGEN("Contact \"%s\" lost its authorization in the server list."), msg, SIZEOF(msg)), nick);
 				icq_LogMessage(LOG_WARNING, str);
 				SAFE_FREE(&nick);
 			}
@@ -1348,7 +1348,7 @@ void CIcqProto::handleServerCListItemDelete(const char *szRecordName, WORD wItem
 			char msg[MAX_PATH];
 			char *nick = NickFromHandleUtf(hContact);
 
-			mir_snprintf(str, SIZEOF(str), ICQTranslateUtfStatic(LPGEN("User \"%s\" was removed from server list."), msg, SIZEOF(msg)), nick);
+			mir_snprintf(str, ICQTranslateUtfStatic(LPGEN("User \"%s\" was removed from server list."), msg, SIZEOF(msg)), nick);
 			icq_LogMessage(LOG_WARNING, str);
 			SAFE_FREE(&nick);
 		}
diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index a469c5ea39..e2a0ca4787 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -705,7 +705,7 @@ static INT_PTR CALLBACK SetXStatusDlgProc(HWND hwndDlg,UINT message,WPARAM wPara
 			char buf[MAX_PATH];

 			char *format = GetWindowTextUtf(hwndDlg);

 

-			mir_snprintf(str, SIZEOF(str), format, dat->bXStatus?ICQTranslateUtfStatic(nameXStatus[dat->bXStatus-1], buf, MAX_PATH):"");

+			mir_snprintf(str, format, dat->bXStatus?ICQTranslateUtfStatic(nameXStatus[dat->bXStatus-1], buf, MAX_PATH):"");

 			SetWindowTextUtf(hwndDlg, str);

 			SAFE_FREE(&format);

 		}

@@ -743,14 +743,14 @@ static INT_PTR CALLBACK SetXStatusDlgProc(HWND hwndDlg,UINT message,WPARAM wPara
 

 			dat->ppro->setByte(DBSETTING_XSTATUS_ID, dat->bXStatus);

 			char *szValue = GetDlgItemTextUtf(hwndDlg,IDC_XMSG);

-			mir_snprintf(szSetting, SIZEOF(szSetting), "XStatus%dMsg", dat->bXStatus);

+			mir_snprintf(szSetting, "XStatus%dMsg", dat->bXStatus);

 			db_set_utf(NULL, dat->ppro->m_szModuleName, szSetting, szValue);

 			db_set_utf(NULL, dat->ppro->m_szModuleName, DBSETTING_XSTATUS_MSG, szValue);

 			SAFE_FREE(&szValue);

 

 			if (dat->ppro->m_bXStatusEnabled) {

 				szValue = GetDlgItemTextUtf(hwndDlg,IDC_XTITLE);

-				mir_snprintf(szSetting, SIZEOF(szSetting), "XStatus%dName", dat->bXStatus);

+				mir_snprintf(szSetting, "XStatus%dName", dat->bXStatus);

 				db_set_utf(NULL, dat->ppro->m_szModuleName, szSetting, szValue);

 				db_set_utf(NULL, dat->ppro->m_szModuleName, DBSETTING_XSTATUS_NAME, szValue);

 				SAFE_FREE(&szValue);

@@ -796,13 +796,13 @@ void CIcqProto::setXStatusEx(BYTE bXStatus, BYTE bQuiet)
 		char *szName = NULL, *szMsg = NULL;

 

 		if (m_bXStatusEnabled) {

-			mir_snprintf(szSetting, SIZEOF(szSetting), "XStatus%dName", bXStatus);

+			mir_snprintf(szSetting, "XStatus%dName", bXStatus);

 			szName = getSettingStringUtf(NULL, szSetting, ICQTranslateUtfStatic(nameXStatus[bXStatus-1], str, MAX_PATH));

 		}

-		mir_snprintf(szSetting, SIZEOF(szSetting), "XStatus%dMsg", bXStatus);

+		mir_snprintf(szSetting, "XStatus%dMsg", bXStatus);

 		szMsg = getSettingStringUtf(NULL, szSetting, "");

 

-		mir_snprintf(szSetting, SIZEOF(szSetting), "XStatus%dStat", bXStatus);

+		mir_snprintf(szSetting, "XStatus%dStat", bXStatus);

 		if (!bQuiet && !getByte(szSetting, 0)) {

 			InitXStatusData init;

 			init.ppro = this;

@@ -897,7 +897,7 @@ void InitXStatusIcons()
 

 	for (int i = 0; i < XSTATUS_COUNT; i++) {

 		char szTemp[100];

-		mir_snprintf(szTemp, SIZEOF(szTemp), "icq_xstatus%d", i);

+		mir_snprintf(szTemp, "icq_xstatus%d", i);

 		sid.pszName = szTemp;

 		sid.pszDescription = (LPSTR)nameXStatus[i];

 		sid.iDefaultIndex = -(IDI_XSTATUS1+i);

diff --git a/protocols/IcqOscarJ/src/log.cpp b/protocols/IcqOscarJ/src/log.cpp
index c8439eeb6c..cd3b3297de 100644
--- a/protocols/IcqOscarJ/src/log.cpp
+++ b/protocols/IcqOscarJ/src/log.cpp
@@ -144,6 +144,6 @@ void CIcqProto::icq_LogFatalParam(const char *szMsg, WORD wError)
 	char str[MAX_PATH];

 	char buf[MAX_PATH];

 

-	mir_snprintf(buf, SIZEOF(buf), ICQTranslateUtfStatic(szMsg, str, SIZEOF(str)), wError);

+	mir_snprintf(buf, ICQTranslateUtfStatic(szMsg, str, SIZEOF(str)), wError);

 	icq_LogMessage(LOG_FATAL, buf);

 }

diff --git a/protocols/IcqOscarJ/src/userinfotab.cpp b/protocols/IcqOscarJ/src/userinfotab.cpp
index af56e712b3..00dd66fac1 100644
--- a/protocols/IcqOscarJ/src/userinfotab.cpp
+++ b/protocols/IcqOscarJ/src/userinfotab.cpp
@@ -93,7 +93,7 @@ static void SetValue(CIcqProto* ppro, HWND hwndDlg, int idCtrl, MCONTACT hContac
 				if (dbv.wVal != 0) {

 					char szExtra[80];

 

-					mir_snprintf(str, SIZEOF(str), "%d", dbv.wVal);

+					mir_snprintf(str, "%d", dbv.wVal);

 					pstr = str;

 

 					if (hContact && ppro->IsDirectConnectionOpen(hContact, DIRECTCONN_STANDARD, 1)) {

@@ -114,7 +114,7 @@ static void SetValue(CIcqProto* ppro, HWND hwndDlg, int idCtrl, MCONTACT hContac
 					if (pXName == NULL) // give default name

 						pXName = ICQTranslateUtf(nameXStatus[bXStatus - 1]);

 

-					mir_snprintf(str, SIZEOF(str), "%s (%s)", pszStatus, pXName);

+					mir_snprintf(str, "%s (%s)", pszStatus, pXName);

 					SAFE_FREE((void**)&pXName);

 				}

 				else strncpy_s(str, pszStatus, _TRUNCATE);

@@ -235,7 +235,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 					char str[MAX_PATH];

 					WORD v[4];

 					CallService(MS_SYSTEM_GETFILEVERSION, 0, (LPARAM)&v);

-					mir_snprintf(str, SIZEOF(str), "Miranda NG %d.%d.%d.%d (ICQ %s)", v[0], v[1], v[2], v[3], __VERSION_STRING_DOTS);

+					mir_snprintf(str, "Miranda NG %d.%d.%d.%d (ICQ %s)", v[0], v[1], v[2], v[3], __VERSION_STRING_DOTS);

 

 					SetValue(ppro, hwndDlg, IDC_PORT, hContact, (char*)DBVT_WORD, (char*)ppro->wListenPort, SVS_ZEROISUNSPEC);

 					SetValue(ppro, hwndDlg, IDC_VERSION, hContact, (char*)DBVT_WORD, (char*)ICQ_VERSION, SVS_ICQVERSION);