code cleanup around mir_snprintf

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

11 files changed, 43 insertions, 44 deletions

diff --git a/plugins/TabSRMM/src/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp
index b179170d7c..019a2ae6e1 100644
--- a/plugins/TabSRMM/src/chat/log.cpp
+++ b/plugins/TabSRMM/src/chat/log.cpp
@@ -817,7 +817,7 @@ static char* Log_CreateRTF(LOGSTREAMDATA *streamData)
 			if (streamData->dat->dwFlags & MWF_DIVIDERWANTED || lin->dwFlags & MWF_DIVIDERWANTED) {

 				static char szStyle_div[128] = "\0";

 				if (szStyle_div[0] == 0)

-					mir_snprintf(szStyle_div, 128, "\\f%u\\cf%u\\ul0\\b%d\\i%d\\fs%u", 17, 18, 0, 0, 5);

+					mir_snprintf(szStyle_div, SIZEOF(szStyle_div), "\\f%u\\cf%u\\ul0\\b%d\\i%d\\fs%u", 17, 18, 0, 0, 5);

 

 				lin->dwFlags |= MWF_DIVIDERWANTED;

 				if (lin->prev || !streamData->bRedraw)

diff --git a/plugins/TabSRMM/src/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp
index 994a7feabe..f692288afe 100644
--- a/plugins/TabSRMM/src/chat/main.cpp
+++ b/plugins/TabSRMM/src/chat/main.cpp
@@ -190,7 +190,7 @@ static void OnLoadSettings()
 

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

 		char szBuf[40];

-		mir_snprintf(szBuf, 20, "NickColor%d", i);

+		mir_snprintf(szBuf, SIZEOF(szBuf), "NickColor%d", i);

 		g_Settings.nickColors[i] = M.GetDword(CHAT_MODULE, szBuf, g_Settings.UserListColors[0]);

 	}

 	g_Settings.nickColors[5] = M.GetDword(CHAT_MODULE, "NickColor5", GetSysColor(COLOR_HIGHLIGHT));

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 45ddd99900..194f14fc89 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -1448,14 +1448,14 @@ panel_found:
 				pContainer->settings = &PluginConfig.globalContainerSettings;
 
 				pContainer->szRelThemeFile[0] = pContainer->szAbsThemeFile[0] = 0;
-				mir_snprintf(szCname, 40, "%s_theme", CONTAINER_PREFIX);
+				mir_snprintf(szCname, SIZEOF(szCname), "%s_theme", CONTAINER_PREFIX);
 				if (!db_get_ts(pContainer->hContactFrom, SRMSGMOD_T, szCname, &dbv))
 					szThemeName = dbv.ptszVal;
 			}
 			else {
 				Utils::ReadPrivateContainerSettings(pContainer);
 				if (szThemeName == NULL) {
-					mir_snprintf(szCname, 40, "%s%d_theme", CONTAINER_PREFIX, pContainer->iContainerIndex);
+					mir_snprintf(szCname, SIZEOF(szCname), "%s%d_theme", CONTAINER_PREFIX, pContainer->iContainerIndex);
 					if (!db_get_ts(NULL, SRMSGMOD_T, szCname, &dbv))
 						szThemeName = dbv.ptszVal;
 				}
@@ -1839,13 +1839,13 @@ panel_found:
 					}
 					else {
 						char szCName[40];
-						mir_snprintf(szCName, 40, "%s%dx", CONTAINER_PREFIX, pContainer->iContainerIndex);
+						mir_snprintf(szCName, SIZEOF(szCName), "%s%dx", CONTAINER_PREFIX, pContainer->iContainerIndex);
 						db_set_dw(0, SRMSGMOD_T, szCName, wp.rcNormalPosition.left);
-						mir_snprintf(szCName, 40, "%s%dy", CONTAINER_PREFIX, pContainer->iContainerIndex);
+						mir_snprintf(szCName, SIZEOF(szCName), "%s%dy", CONTAINER_PREFIX, pContainer->iContainerIndex);
 						db_set_dw(0, SRMSGMOD_T, szCName, wp.rcNormalPosition.top);
-						mir_snprintf(szCName, 40, "%s%dwidth", CONTAINER_PREFIX, pContainer->iContainerIndex);
+						mir_snprintf(szCName, SIZEOF(szCName), "%s%dwidth", CONTAINER_PREFIX, pContainer->iContainerIndex);
 						db_set_dw(0, SRMSGMOD_T, szCName, wp.rcNormalPosition.right - wp.rcNormalPosition.left);
-						mir_snprintf(szCName, 40, "%s%dheight", CONTAINER_PREFIX, pContainer->iContainerIndex);
+						mir_snprintf(szCName, SIZEOF(szCName), "%s%dheight", CONTAINER_PREFIX, pContainer->iContainerIndex);
 						db_set_dw(0, SRMSGMOD_T, szCName, wp.rcNormalPosition.bottom - wp.rcNormalPosition.top);
 
 						db_set_b(0, SRMSGMOD_T, "splitmax", (BYTE)((wp.showCmd == SW_SHOWMAXIMIZED) ? 1 : 0));
@@ -1864,7 +1864,7 @@ panel_found:
 						SendMessage((HWND)item.lParam, DM_QUERYHCONTACT, 0, (LPARAM)&hContact);
 
 						char szCName[40];
-						mir_snprintf(szCName, 40, "%s_theme", CONTAINER_PREFIX);
+						mir_snprintf(szCName, SIZEOF(szCName), "%s_theme", CONTAINER_PREFIX);
 						if (mir_tstrlen(pContainer->szRelThemeFile) > 1) {
 							if (pContainer->fPrivateThemeChanged == TRUE) {
 								PathToRelativeT(pContainer->szRelThemeFile, pContainer->szAbsThemeFile, M.getDataPath());
@@ -1988,7 +1988,7 @@ void TSAPI CloseOtherTabs(HWND hwndTab, TWindowData &dat)
 
 int TSAPI CutContactName(const TCHAR *oldname, TCHAR *newname, unsigned int size)
 {
-	int cutMax = PluginConfig.m_CutContactNameTo;
+	size_t cutMax = PluginConfig.m_CutContactNameTo;
 
 	if (mir_tstrlen(oldname) <= cutMax)
 		_tcsncpy_s(newname, size, oldname, _TRUNCATE);
@@ -2169,17 +2169,17 @@ void TSAPI DeleteContainer(int iIndex)
 	}
 
 	char szSetting[CONTAINER_NAMELEN + 30];
-	mir_snprintf(szSetting, CONTAINER_NAMELEN + 15, "%s%d_Flags", CONTAINER_PREFIX, iIndex);
+	mir_snprintf(szSetting, SIZEOF(szSetting), "%s%d_Flags", CONTAINER_PREFIX, iIndex);
 	db_unset(NULL, SRMSGMOD_T, szSetting);
-	mir_snprintf(szSetting, CONTAINER_NAMELEN + 15, "%s%d_Trans", CONTAINER_PREFIX, iIndex);
+	mir_snprintf(szSetting, SIZEOF(szSetting), "%s%d_Trans", CONTAINER_PREFIX, iIndex);
 	db_unset(NULL, SRMSGMOD_T, szSetting);
-	mir_snprintf(szSetting, CONTAINER_NAMELEN + 15, "%s%dwidth", CONTAINER_PREFIX, iIndex);
+	mir_snprintf(szSetting, SIZEOF(szSetting), "%s%dwidth", CONTAINER_PREFIX, iIndex);
 	db_unset(NULL, SRMSGMOD_T, szSetting);
-	mir_snprintf(szSetting, CONTAINER_NAMELEN + 15, "%s%dheight", CONTAINER_PREFIX, iIndex);
+	mir_snprintf(szSetting, SIZEOF(szSetting), "%s%dheight", CONTAINER_PREFIX, iIndex);
 	db_unset(NULL, SRMSGMOD_T, szSetting);
-	mir_snprintf(szSetting, CONTAINER_NAMELEN + 15, "%s%dx", CONTAINER_PREFIX, iIndex);
+	mir_snprintf(szSetting, SIZEOF(szSetting), "%s%dx", CONTAINER_PREFIX, iIndex);
 	db_unset(NULL, SRMSGMOD_T, szSetting);
-	mir_snprintf(szSetting, CONTAINER_NAMELEN + 15, "%s%dy", CONTAINER_PREFIX, iIndex);
+	mir_snprintf(szSetting, SIZEOF(szSetting), "%s%dy", CONTAINER_PREFIX, iIndex);
 	db_unset(NULL, SRMSGMOD_T, szSetting);
 }
 
diff --git a/plugins/TabSRMM/src/containeroptions.cpp b/plugins/TabSRMM/src/containeroptions.cpp
index 5cd8f77982..b4ee63b512 100644
--- a/plugins/TabSRMM/src/containeroptions.cpp
+++ b/plugins/TabSRMM/src/containeroptions.cpp
@@ -268,7 +268,7 @@ INT_PTR CALLBACK DlgProcContainerOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 					else {

 						if (pContainer->settings != &PluginConfig.globalContainerSettings) {

 							char szCname[40];

-							mir_snprintf(szCname, 40, "%s%d_Blob", CNT_BASEKEYNAME, pContainer->iContainerIndex);

+							mir_snprintf(szCname, SIZEOF(szCname), "%s%d_Blob", CNT_BASEKEYNAME, pContainer->iContainerIndex);

 							pContainer->settings->fPrivate = false;

 							db_set_blob(0, SRMSGMOD_T, szCname, pContainer->settings, sizeof(TContainerSettings));

 							mir_free(pContainer->settings);

diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp
index 180faa8a89..ebbccf651c 100644
--- a/plugins/TabSRMM/src/modplus.cpp
+++ b/plugins/TabSRMM/src/modplus.cpp
@@ -43,7 +43,7 @@
 static TCHAR* getMenuEntry(int i)

 {

 	char MEntry[256];

-	mir_snprintf(MEntry, 255, "MenuEntry_%u", i);

+	mir_snprintf(MEntry, SIZEOF(MEntry), "MenuEntry_%u", i);

 	return db_get_tsa(NULL, "tabmodplus", MEntry);

 }

 

diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index ad276f5bdf..91f580daf7 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -266,7 +266,7 @@ static int AppendUnicodeToBuffer(char *&buffer, size_t &cbBufferEnd, size_t &cbB
 					else {

 						char szTemp[10];

 						int colindex = GetColorIndex(GetRTFFont(LOWORD(mode) ? (MSGFONTID_MYMSG + (HIWORD(mode) ? 8 : 0)) : (MSGFONTID_YOURMSG + (HIWORD(mode) ? 8 : 0))));

-						mir_snprintf(szTemp, 4, "%02d", colindex);

+						mir_snprintf(szTemp, SIZEOF(szTemp), "%02d", colindex);

 						d[3] = szTemp[0];

 						d[4] = szTemp[1];

 						d[5] = ' ';

@@ -364,7 +364,7 @@ static int AppendToBufferWithRTF(int mode, char **buffer, int *cbBufferEnd, int
 						if (!begin) {

 							char szTemp[10];

 							int colindex = GetColorIndex(GetRTFFont(LOWORD(mode) ? (MSGFONTID_MYMSG + (HIWORD(mode) ? 8 : 0)) : (MSGFONTID_YOURMSG + (HIWORD(mode) ? 8 : 0))));

-							mir_snprintf(szTemp, 4, "%02d", colindex);

+							mir_snprintf(szTemp, SIZEOF(szTemp), "%02d", colindex);

 							(*buffer)[i + 3] = szTemp[0];

 							(*buffer)[i + 4] = szTemp[1];

 						}

@@ -458,7 +458,7 @@ static void Build_RTF_Header(char *&buffer, size_t &bufferEnd, size_t &bufferAll
 	// custom template colors...

 	for (i = 1; i <= 5; i++) {

 		char szTemp[30];

-		mir_snprintf(szTemp, 10, "cc%d", i);

+		mir_snprintf(szTemp, SIZEOF(szTemp), "cc%d", i);

 		colour = theme->custom_colors[i - 1];

 		if (colour == 0)

 			colour = RGB(1, 1, 1);

@@ -622,7 +622,7 @@ static char *Template_CreateRTFFromDbEvent(TWindowData *dat, MCONTACT hContact,
 	if (dwEffectiveFlags & MWF_DIVIDERWANTED) {

 		static char szStyle_div[128] = "\0";

 		if (szStyle_div[0] == 0)

-			mir_snprintf(szStyle_div, 128, "\\f%u\\cf%u\\ul0\\b%d\\i%d\\fs%u", H_MSGFONTID_DIVIDERS, H_MSGFONTID_DIVIDERS, 0, 0, 5);

+			mir_snprintf(szStyle_div, SIZEOF(szStyle_div), "\\f%u\\cf%u\\ul0\\b%d\\i%d\\fs%u", H_MSGFONTID_DIVIDERS, H_MSGFONTID_DIVIDERS, 0, 0, 5);

 

 		AppendToBuffer(buffer, bufferEnd, bufferAlloced, "\\sl-1\\slmult0\\highlight%d\\cf%d\\-\\par\\sl0", H_MSGFONTID_DIVIDERS, H_MSGFONTID_DIVIDERS);

 		dat->dwFlags &= ~MWF_DIVIDERWANTED;

@@ -1105,7 +1105,7 @@ skip:
 		}

 		else {

 			char temp[24];

-			mir_snprintf(temp, 24, "{\\uc1\\u%d?}", (int)ci);

+			mir_snprintf(temp, SIZEOF(temp), "{\\uc1\\u%d?}", (int)ci);

 			AppendToBuffer(buffer, bufferEnd, bufferAlloced, temp);

 			i++;

 		}

@@ -1291,7 +1291,7 @@ static void ReplaceIcons(HWND hwndDlg, TWindowData *dat, LONG startAt, int fAppe
 

 	if (dat->hHistoryEvents && dat->curHistory == dat->maxHistory) {

 		char szPattern[50];

-		mir_snprintf(szPattern, 40, "~-+%d+-~", (INT_PTR)dat->hHistoryEvents[0]);

+		mir_snprintf(szPattern, SIZEOF(szPattern), "~-+%d+-~", (INT_PTR)dat->hHistoryEvents[0]);

 

 		FINDTEXTEXA fi;

 		fi.lpstrText = szPattern;

diff --git a/plugins/TabSRMM/src/selectcontainer.cpp b/plugins/TabSRMM/src/selectcontainer.cpp
index 088d0c9940..81d7576d7f 100644
--- a/plugins/TabSRMM/src/selectcontainer.cpp
+++ b/plugins/TabSRMM/src/selectcontainer.cpp
@@ -179,7 +179,7 @@ INT_PTR CALLBACK SelectContainerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			char szValue[10];

 			TContainerData *pContainer = 0;

 			do {

-				mir_snprintf(szValue, 8, "%d", iCounter);

+				mir_snprintf(szValue, SIZEOF(szValue), "%d", iCounter);

 				if (db_get_ts(NULL, szKey, szValue, &dbv))

 					break;          // end of list

 				if (dbv.type == DBVT_ASCIIZ || dbv.type == DBVT_WCHAR) {

diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index fc800e8194..a9931f78a9 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -64,7 +64,7 @@ bool CSendLaterJob::mustDelete()
 void CSendLaterJob::cleanDB()

 {

 	if (isPersistentJob()) {

-		char	szKey[100];

+		char szKey[100];

 

 		db_unset(hContact, "SendLater", szId);

 		int iCount = db_get_dw(hContact, "SendLater", "count", 0);

@@ -73,7 +73,7 @@ void CSendLaterJob::cleanDB()
 		db_set_dw(hContact, "SendLater", "count", iCount);

 

 		// delete flags

-		mir_snprintf(szKey, 100, "$%s", szId);

+		mir_snprintf(szKey, SIZEOF(szKey), "$%s", szId);

 		db_unset(hContact, "SendLater", szKey);

 	}

 }

@@ -84,10 +84,10 @@ void CSendLaterJob::cleanDB()
 void CSendLaterJob::readFlags()

 {

 	if (isPersistentJob()) {

-		char	szKey[100];

-		DWORD	localFlags;

+		char szKey[100];

+		DWORD localFlags;

 

-		mir_snprintf(szKey, 100, "$%s", szId);

+		mir_snprintf(szKey, SIZEOF(szKey), "$%s", szId);

 		localFlags = db_get_dw(hContact, "SendLater", szKey, 0);

 

 		if (localFlags & SLF_SUSPEND)

@@ -102,9 +102,9 @@ void CSendLaterJob::writeFlags()
 {

 	if (isPersistentJob()) {

 		DWORD localFlags = (bCode == JOB_HOLD ? SLF_SUSPEND : 0);

-		char	szKey[100];

+		char szKey[100];

 

-		mir_snprintf(szKey, 100, "$%s", szId);

+		mir_snprintf(szKey, SIZEOF(szKey), "$%s", szId);

 		db_set_dw(hContact, "SendLater", szKey, localFlags);

 	}

 }

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index 6cc6dd33e4..fc8801cf85 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -142,11 +142,11 @@ static void DoSplitSendW(LPVOID param)
 	SendJob *job = sendQueue->getJobByIndex((int)param);
 	BOOL     fFirstSend = FALSE;
 	WCHAR   *wszSaved, savedChar;
-	int      iCur = 0, iSavedCur = 0, i;
+	size_t iCur = 0, iSavedCur = 0, i;
 	BOOL     fSplitting = TRUE;
 	MCONTACT hContact = job->hContact;
 	DWORD    dwFlags = job->dwFlags;
-	int      chunkSize = job->chunkSize / 2;
+	size_t chunkSize = job->chunkSize / 2;
 	char    *szProto = GetContactProto(hContact);
 
 	size_t iLen = mir_strlen(job->szSendBuffer);
@@ -812,8 +812,7 @@ int SendQueue::doSendLater(int iJobIndex, TWindowData *dat, MCONTACT hContact, b
 			time_t now = time(0);
 			TCHAR tszTimestamp[30];
 			_tcsftime(tszTimestamp, SIZEOF(tszTimestamp), _T("%Y.%m.%d - %H:%M"), _localtime32((__time32_t *)&now));
-			tszTimestamp[29] = 0;
-			mir_snprintf(szKeyName, 20, "S%d", now);
+			mir_snprintf(szKeyName, SIZEOF(szKeyName), "S%d", now);
 			mir_sntprintf(tszHeader, SIZEOF(tszHeader), TranslateT("\n(Sent delayed. Original timestamp %s)"), tszTimestamp);
 		}
 		else mir_sntprintf(tszHeader, SIZEOF(tszHeader), _T("M%d|"), time(0));
diff --git a/plugins/TabSRMM/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp
index 4b30b796dc..15eb8d0094 100644
--- a/plugins/TabSRMM/src/srmm.cpp
+++ b/plugins/TabSRMM/src/srmm.cpp
@@ -110,7 +110,7 @@ int _DebugTraceW(const wchar_t *fmt, ...)
 
 	GetLocalTime(&st);
 
-	mir_snprintf(tszTime, 50, "%02d.%02d.%04d - %02d:%02d:%02d.%04d: ", st.wDay, st.wMonth, st.wYear, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
+	mir_snprintf(tszTime, SIZEOF(tszTime), "%02d.%02d.%04d - %02d:%02d:%02d.%04d: ", st.wDay, st.wMonth, st.wYear, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
 
 
 	mir_vsntprintf(debug, ibsize - 10, fmt, va);
@@ -122,7 +122,7 @@ int _DebugTraceW(const wchar_t *fmt, ...)
 		FILE *f;
 
 		CallService(MS_DB_GETPROFILEPATH, MAX_PATH, (LPARAM)szDataPath);
-		mir_snprintf(szLogFileName, MAX_PATH, "%s\\%s", szDataPath, "tabsrmm_debug.log");
+		mir_snprintf(szLogFileName, SIZEOF(szLogFileName), "%s\\%s", szDataPath, "tabsrmm_debug.log");
 		f = fopen(szLogFileName, "a+");
 		if (f) {
 			char *szDebug = mir_utf8encodeT(debug);
@@ -156,7 +156,7 @@ int _DebugTraceA(const char *fmt, ...)
 	{
 		char szLogFileName[MAX_PATH], szDataPath[MAX_PATH];
 		CallService(MS_DB_GETPROFILEPATH, MAX_PATH, (LPARAM)szDataPath);
-		mir_snprintf(szLogFileName, MAX_PATH, "%s\\tabsrmm_debug.log", szDataPath);
+		mir_snprintf(szLogFileName, SIZEOF(szLogFileName), "%s\\tabsrmm_debug.log", szDataPath);
 		FILE *f = fopen(szLogFileName, "a+");
 		if (f) {
 			fputs(debug, f);
diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index 6fe641661b..1258284c44 100644
--- a/plugins/TabSRMM/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
@@ -682,10 +682,10 @@ void Utils::ContainerToSettings(TContainerData *pContainer)
 

 void Utils::ReadPrivateContainerSettings(TContainerData *pContainer, bool fForce)

 {

-	char	szCname[50];

+	char szCname[50];

 	TContainerSettings csTemp = {0};

 

-	mir_snprintf(szCname, 40, "%s%d_Blob", CNT_BASEKEYNAME, pContainer->iContainerIndex);

+	mir_snprintf(szCname, SIZEOF(szCname), "%s%d_Blob", CNT_BASEKEYNAME, pContainer->iContainerIndex);

 	Utils::ReadContainerSettingsFromDB(0, &csTemp, szCname);

 	if (csTemp.fPrivate || fForce) {

 		if (pContainer->settings == 0 || pContainer->settings == &PluginConfig.globalContainerSettings)

@@ -698,14 +698,14 @@ void Utils::ReadPrivateContainerSettings(TContainerData *pContainer, bool fForce
 

 void Utils::SaveContainerSettings(TContainerData *pContainer, const char *szSetting)

 {

-	char	szCName[50];

+	char szCName[50];

 

 	pContainer->dwFlags &= ~(CNT_DEFERREDCONFIGURE | CNT_CREATE_MINIMIZED | CNT_DEFERREDSIZEREQUEST | CNT_CREATE_CLONED);

 	if (pContainer->settings->fPrivate) {

-		mir_snprintf(szCName, 40, "%s%d_Blob", szSetting, pContainer->iContainerIndex);

+		mir_snprintf(szCName, SIZEOF(szCName), "%s%d_Blob", szSetting, pContainer->iContainerIndex);

 		WriteContainerSettingsToDB(0, pContainer->settings, szCName);

 	}

-	mir_snprintf(szCName, 40, "%s%d_theme", szSetting, pContainer->iContainerIndex);

+	mir_snprintf(szCName, SIZEOF(szCName), "%s%d_theme", szSetting, pContainer->iContainerIndex);

 	if (mir_tstrlen(pContainer->szRelThemeFile) > 1) {

 		if (pContainer->fPrivateThemeChanged == TRUE) {

 			PathToRelativeT(pContainer->szRelThemeFile, pContainer->szAbsThemeFile, M.getDataPath());