code cleanup over mir_sntprintf + small bug fix

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

6 files changed, 53 insertions, 58 deletions

diff --git a/plugins/MirOTR/MirOTR/src/dialogs.cpp b/plugins/MirOTR/MirOTR/src/dialogs.cpp
index feb94572be..e493869af3 100644
--- a/plugins/MirOTR/MirOTR/src/dialogs.cpp
+++ b/plugins/MirOTR/MirOTR/src/dialogs.cpp
@@ -35,9 +35,9 @@ INT_PTR CALLBACK DlgSMPUpdateProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 			TCHAR title[512], *proto = mir_a2t(contact_get_proto((MCONTACT)context->app_data));

 			const TCHAR *name =contact_get_nameT((MCONTACT)context->app_data);

-			mir_sntprintf(title, 512, TranslateT(LANG_SMP_PROGRESS_TITLE), name, proto);

+			mir_sntprintf(title, SIZEOF(title), TranslateT(LANG_SMP_PROGRESS_TITLE), name, proto);

 			SendMessage(hwndDlg, WM_SETTEXT, 0, (LPARAM)title);

-			mir_sntprintf(title, 512, TranslateT(LANG_SMP_PROGRESS_DESC), name, proto);

+			mir_sntprintf(title, SIZEOF(title), TranslateT(LANG_SMP_PROGRESS_DESC), name, proto);

 			mir_free(proto);

 			SetDlgItemText(hwndDlg, IDC_STC_SMP_HEADPRO, title);

 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)context);

@@ -169,14 +169,14 @@ INT_PTR CALLBACK DlgSMPResponseProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			smp_for_contact[context->app_data].responder = data->responder;

 

 			TCHAR buff[512], *proto = mir_a2t(contact_get_proto((MCONTACT)context->app_data));

-			mir_sntprintf(buff, 512, TranslateT(LANG_SMP_VERIFY_TITLE), contact_get_nameT((MCONTACT)context->app_data), proto);

+			mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SMP_VERIFY_TITLE), contact_get_nameT((MCONTACT)context->app_data), proto);

 			mir_free(proto);

 			SendMessage(hwndDlg, WM_SETTEXT, 0, (LPARAM)buff);

 			SetDlgItemText(hwndDlg, IDC_STC_SMP_HEAD, buff);

 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)context);

 

 			if (data->question) {

-				mir_sntprintf(buff, 512, TranslateT(LANG_OTR_SMPQUESTION_RESPOND_DESC), contact_get_nameT((MCONTACT)context->app_data));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_RESPOND_DESC), contact_get_nameT((MCONTACT)context->app_data));

 

 				SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

 

@@ -195,7 +195,7 @@ INT_PTR CALLBACK DlgSMPResponseProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 				mir_free(data->question);

 			} else {

-				mir_sntprintf(buff, 512, TranslateT(LANG_OTR_SMPPASSWORD_RESPOND_DESC), contact_get_nameT((MCONTACT)context->app_data));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPPASSWORD_RESPOND_DESC), contact_get_nameT((MCONTACT)context->app_data));

 

 				SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

 

@@ -316,7 +316,7 @@ INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			}

 

 			TCHAR title[512], *proto = mir_a2t(contact_get_proto((MCONTACT)context->app_data));

-			mir_sntprintf(title, 512, TranslateT(LANG_SMP_VERIFY_TITLE), contact_get_nameT((MCONTACT)context->app_data), proto);

+			mir_sntprintf(title, SIZEOF(title), TranslateT(LANG_SMP_VERIFY_TITLE), contact_get_nameT((MCONTACT)context->app_data), proto);

 			mir_free(proto);

 			SendMessage(hwndDlg, WM_SETTEXT, 0, (LPARAM)title);

 			SetDlgItemText(hwndDlg, IDC_STC_SMP_HEAD, title);

@@ -370,9 +370,9 @@ INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			}

 			TCHAR buff[1024];

 			if (!fp->trust || fp->trust[0] == '\0')

-				mir_sntprintf(buff, 512, TranslateT(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT((MCONTACT)context->app_data));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT((MCONTACT)context->app_data));

 			else

-				mir_sntprintf(buff, 512, TranslateT(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT((MCONTACT)context->app_data));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT((MCONTACT)context->app_data));

 

 			SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

 

@@ -408,7 +408,7 @@ INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 								if (_tcsncmp(msg, TranslateT(LANG_SMPTYPE_QUESTION), 255)==0) {

 									if (smp_for_contact.find(context->app_data) != smp_for_contact.end()) {

 										TCHAR msg[512];

-										mir_sntprintf(msg, 512, TranslateT(LANG_SMP_IN_PROGRESS), contact_get_nameT((MCONTACT)context->app_data));

+										mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_SMP_IN_PROGRESS), contact_get_nameT((MCONTACT)context->app_data));

 										ShowError(msg);

 									}else {

 									int len = SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD1, WM_GETTEXTLENGTH, 0, 0);

@@ -432,7 +432,7 @@ INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 								}else if (_tcsncmp(msg, TranslateT(LANG_SMPTYPE_PASSWORD), 255)==0) {

 									if (smp_for_contact.find(context->app_data) != smp_for_contact.end()) {

 										TCHAR msg[512];

-										mir_sntprintf(msg, 512, TranslateT(LANG_SMP_IN_PROGRESS), contact_get_nameT((MCONTACT)context->app_data));

+										mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_SMP_IN_PROGRESS), contact_get_nameT((MCONTACT)context->app_data));

 										ShowError(msg);

 									}else {

 									int len = SendDlgItemMessage(hwndDlg, IDC_EDT_SMP_FIELD2, WM_GETTEXTLENGTH, 0, 0);

@@ -477,9 +477,9 @@ INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 							GetDlgItemText(hwndDlg, IDC_CBO_SMP_CHOOSE, buff, 255);

 							if (_tcsncmp(buff, TranslateT(LANG_SMPTYPE_QUESTION), 255)==0) {

 								if (trusted)

-									mir_sntprintf(buff, 512, TranslateT(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT((MCONTACT)context->app_data));

+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFIED_DESC), contact_get_nameT((MCONTACT)context->app_data));

 								else

-									mir_sntprintf(buff, 512, TranslateT(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT((MCONTACT)context->app_data));

+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPQUESTION_VERIFY_DESC), contact_get_nameT((MCONTACT)context->app_data));

 

 								SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

 

@@ -497,9 +497,9 @@ INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 								ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);

 							} else if (_tcsncmp(buff, TranslateT(LANG_SMPTYPE_PASSWORD), 255)==0) {

 								if (trusted)

-									mir_sntprintf(buff, 512, TranslateT(LANG_OTR_SMPPASSWORD_VERIFIED_DESC), contact_get_nameT((MCONTACT)context->app_data));

+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPPASSWORD_VERIFIED_DESC), contact_get_nameT((MCONTACT)context->app_data));

 								else

-									mir_sntprintf(buff, 512, TranslateT(LANG_OTR_SMPPASSWORD_VERIFY_DESC), contact_get_nameT((MCONTACT)context->app_data));

+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SMPPASSWORD_VERIFY_DESC), contact_get_nameT((MCONTACT)context->app_data));

 

 								SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

 

@@ -517,9 +517,9 @@ INT_PTR CALLBACK DlgProcSMPInitProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 								ShowWindow(GetDlgItem(hwndDlg, IDNO), SW_HIDE);

 							} else if (_tcsncmp(buff, TranslateT(LANG_SMPTYPE_FINGERPRINT), 255)==0) {

 								if (trusted)

-									mir_sntprintf(buff, 512, TranslateT(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT((MCONTACT)context->app_data));

+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT((MCONTACT)context->app_data));

 								else

-									mir_sntprintf(buff, 512, TranslateT(LANG_OTR_FPVERIFY_DESC), contact_get_nameT((MCONTACT)context->app_data));

+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFY_DESC), contact_get_nameT((MCONTACT)context->app_data));

 

 								SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

 

@@ -662,9 +662,9 @@ INT_PTR CALLBACK DlgProcVerifyContext(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 			}

 			TCHAR buff[512];

 			if (!fp->trust || fp->trust[0] == '\0')

-				mir_sntprintf(buff, 512, TranslateT(LANG_OTR_FPVERIFY_DESC), contact_get_nameT((MCONTACT)context->app_data));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFY_DESC), contact_get_nameT((MCONTACT)context->app_data));

 			else

-				mir_sntprintf(buff, 512, TranslateT(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT((MCONTACT)context->app_data));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_FPVERIFIED_DESC), contact_get_nameT((MCONTACT)context->app_data));

 

 			SetDlgItemText(hwndDlg, IDC_STC_SMP_INFO, buff);

 

@@ -729,8 +729,7 @@ unsigned int CALLBACK verify_context_thread(void *param)
 				otrl_context_set_trust(context->active_fingerprint, "verified");

 				otrl_privkey_write_fingerprints(otr_user_state, g_fingerprint_store_filename);

 				lib_cs_unlock();

-				mir_sntprintf(msg, 1024, TranslateT(LANG_FINGERPRINT_VERIFIED), contact_get_nameT((MCONTACT)context->app_data));

-				msg[1023] = '\0';

+				mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_FINGERPRINT_VERIFIED), contact_get_nameT((MCONTACT)context->app_data));

 				ShowMessage((MCONTACT)context->app_data, msg);

 				SetEncryptionStatus((MCONTACT)context->app_data, otr_context_get_trust(context));

 				break;

@@ -739,8 +738,7 @@ unsigned int CALLBACK verify_context_thread(void *param)
 				otrl_context_set_trust(context->active_fingerprint, NULL);

 				otrl_privkey_write_fingerprints(otr_user_state, g_fingerprint_store_filename);

 				lib_cs_unlock();

-				mir_sntprintf(msg, 1024, TranslateT(LANG_FINGERPRINT_NOT_VERIFIED), contact_get_nameT((MCONTACT)context->app_data));

-				msg[1023] = '\0';

+				mir_sntprintf(msg, SIZEOF(msg), TranslateT(LANG_FINGERPRINT_NOT_VERIFIED), contact_get_nameT((MCONTACT)context->app_data));

 				ShowMessage((MCONTACT)context->app_data, msg);

 				SetEncryptionStatus((MCONTACT)context->app_data, otr_context_get_trust(context));

 				break;

diff --git a/plugins/MirOTR/MirOTR/src/options.cpp b/plugins/MirOTR/MirOTR/src/options.cpp
index c1b0024b9a..af81ed63fe 100644
--- a/plugins/MirOTR/MirOTR/src/options.cpp
+++ b/plugins/MirOTR/MirOTR/src/options.cpp
@@ -280,13 +280,12 @@ static unsigned int CALLBACK regen_key_thread(void* param)
 {

 	Thread_Push(0);

 	PROTOREGENKEYOPTIONS *opts = (PROTOREGENKEYOPTIONS *)param;

-	TCHAR *buff = (TCHAR*) mir_alloc(512*sizeof(TCHAR));

-	mir_sntprintf(buff, 512, TranslateT(LANG_OTR_ASK_NEWKEY), opts->proto);

+	TCHAR buff[512];

+

+	mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_ASK_NEWKEY), opts->proto);

 	EnableWindow(opts->refresh, FALSE);

 	if (IDYES == MessageBox(opts->refresh, buff, TranslateT(LANG_OTR_INFO), MB_ICONQUESTION|MB_YESNO))

 	{

-		mir_free(buff);

-

 		char* proto = mir_t2a(opts->proto);

 		otr_gui_create_privkey(0, proto, proto);

 		SendMessage(opts->refresh, WMU_REFRESHPROTOLIST, 0, 0);

@@ -299,8 +298,6 @@ static unsigned int CALLBACK regen_key_thread(void* param)
 		mir_free(fpt);

 		mir_free(proto);

 		*/

-	} else {

-		mir_free(buff);

 	}

 	EnableWindow(opts->refresh, TRUE);

 	delete opts;

@@ -413,7 +410,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsProto(HWND hwndDlg, UINT msg, WPARAM wP
 								TCHAR buff_proto[128];

 								ListView_GetItemText(GetDlgItem(hwndDlg, IDC_LV_PROTO_PROTOS), sel, 0, buff_proto, SIZEOF(buff_proto));

 								TCHAR buff[512];

-								mir_sntprintf(buff, 512, TranslateT(LANG_OTR_ASK_REMOVEKEY), buff_proto);

+								mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_ASK_REMOVEKEY), buff_proto);

 								if (IDYES == MessageBox(hwndDlg, buff, TranslateT(LANG_OTR_INFO), MB_ICONQUESTION|MB_YESNO))

 								{

 									char* proto = mir_t2a(buff_proto);

@@ -818,7 +815,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsFinger(HWND hwndDlg, UINT msg, WPARAM w
 								if (fp->context->active_fingerprint == fp) {

 									TCHAR buff[1024], hash[45];

 									otrl_privkey_hash_to_humanT(hash, fp->fingerprint);

-									mir_sntprintf(buff, 1024, TranslateT(LANG_FINGERPRINT_STILL_IN_USE), hash, contact_get_nameT((MCONTACT)fp->context->app_data));

+									mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_FINGERPRINT_STILL_IN_USE), hash, contact_get_nameT((MCONTACT)fp->context->app_data));

 									ShowError(buff);

 								} else {

 									FPModifyMap* fpm = (FPModifyMap*) GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

@@ -847,7 +844,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsFinger(HWND hwndDlg, UINT msg, WPARAM w
 						if (it->first->context->active_fingerprint == it->first) {

 							TCHAR buff[1024], hash[45];

 							otrl_privkey_hash_to_humanT(hash, it->first->fingerprint);

-							mir_sntprintf(buff, 1024, TranslateT(LANG_FINGERPRINT_NOT_DELETED), hash, contact_get_nameT((MCONTACT)it->first->context->app_data));

+							mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_FINGERPRINT_NOT_DELETED), hash, contact_get_nameT((MCONTACT)it->first->context->app_data));

 							ShowError(buff);

 						} else {

 							otrl_context_forget_fingerprint(it->first, 1);

diff --git a/plugins/MirOTR/MirOTR/src/otr.cpp b/plugins/MirOTR/MirOTR/src/otr.cpp
index 04c7446636..f09042ef1e 100644
--- a/plugins/MirOTR/MirOTR/src/otr.cpp
+++ b/plugins/MirOTR/MirOTR/src/otr.cpp
@@ -54,7 +54,7 @@ INT_PTR CALLBACK GenKeyDlgFunc(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 				SetClassLongPtr(hWndDlg, GCLP_HICON, (LONG_PTR)LoadIcon(ICON_OTR,1) );

 				TCHAR buff[256];

 				TCHAR *proto = mir_a2t((char*)lParam);

-				mir_sntprintf(buff, 256, TranslateT(LANG_GENERATE_KEY), proto);

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_GENERATE_KEY), proto);

 				mir_free(proto);

 				SetDlgItemText(hWndDlg, IDC_GENERATE, buff);

 				GenKeyData *data = (GenKeyData *)mir_calloc(sizeof(GenKeyData));

@@ -184,7 +184,7 @@ extern "C" {
 		if(options.msg_popup) {

 			TCHAR buff[512];

 			TCHAR* proto = mir_a2t(protocol);

-			mir_sntprintf(buff, 512, TranslateT(LANG_OTR_USERMESSAGE), contact_get_nameT((MCONTACT)opdata), proto);

+			mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_USERMESSAGE), contact_get_nameT((MCONTACT)opdata), proto);

 			mir_free(proto);

 			TCHAR *msg_t = mir_utf8decodeT(msg);

 			ShowPopup(buff, TranslateTS(msg_t), 0);	

@@ -240,12 +240,12 @@ extern "C" {
 		SetEncryptionStatus((MCONTACT)opdata, trusted);

 		TCHAR buff[1024];

 		if(trusted == TRUST_PRIVATE) {

-			mir_sntprintf(buff, 1024, TranslateT(LANG_SESSION_START_OTR), contact_get_nameT((MCONTACT)opdata));

+			mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_START_OTR), contact_get_nameT((MCONTACT)opdata));

 		} else if (trusted == TRUST_UNVERIFIED) {

 			if (options.autoshow_verify) SMPInitDialog(context); //VerifyContextDialog(context);

-			mir_sntprintf(buff, 1024, TranslateT(LANG_SESSION_START_OTR_VERIFY), contact_get_nameT((MCONTACT)opdata));

+			mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_START_OTR_VERIFY), contact_get_nameT((MCONTACT)opdata));

 		} else { // should never happen

-			mir_sntprintf(buff, 1024, TranslateT(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT((MCONTACT)opdata));

+			mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT((MCONTACT)opdata));

 		}

 		// opdata is hContact

 		ShowMessage((MCONTACT)opdata, buff);

@@ -256,7 +256,7 @@ extern "C" {
 	void otr_gui_gone_insecure(void *opdata, ConnContext *context) {

 		DEBUGOUT_T("OTR_GUI_GONE_INSECURE")

 		TCHAR buff[512];

-		mir_sntprintf(buff, 512, TranslateT(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT((MCONTACT)opdata));

+		mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT((MCONTACT)opdata));

 		//MessageBox(0, buff, Translate("OTR Information"), MB_OK);

 		if (!Miranda_Terminated()) {

 			ShowMessage((MCONTACT)opdata, buff);

@@ -275,22 +275,22 @@ extern "C" {
 		TCHAR buff[1024];

 		if (!is_reply) {

 			if(trusted == TRUST_PRIVATE) {

-				mir_sntprintf(buff, 1024, TranslateT(LANG_SESSION_CONTINUE_OTR), contact_get_nameT((MCONTACT)opdata));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_CONTINUE_OTR), contact_get_nameT((MCONTACT)opdata));

 			} else if (trusted == TRUST_UNVERIFIED) {

 				if (options.autoshow_verify) SMPInitDialog(context); //VerifyContextDialog(context);

-				mir_sntprintf(buff, 1024, TranslateT(LANG_SESSION_CONTINUE_OTR_VERIFY), contact_get_nameT((MCONTACT)opdata));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_CONTINUE_OTR_VERIFY), contact_get_nameT((MCONTACT)opdata));

 			} else { // should never happen

-				mir_sntprintf(buff, 1024, TranslateT(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT((MCONTACT)opdata));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT((MCONTACT)opdata));

 			}

 			// opdata is hContact

 			ShowMessage((MCONTACT)opdata, buff);

 		} else {

 			if(trusted == TRUST_PRIVATE) {

-				mir_sntprintf(buff, 1024, TranslateT(LANG_SESSION_HAS_CONTINUE_OTR), contact_get_nameT((MCONTACT)opdata));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_HAS_CONTINUE_OTR), contact_get_nameT((MCONTACT)opdata));

 			} else if (trusted == TRUST_UNVERIFIED) {

-				mir_sntprintf(buff, 1024, TranslateT(LANG_SESSION_HAS_CONTINUE_OTR_VERIFY), contact_get_nameT((MCONTACT)opdata));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_HAS_CONTINUE_OTR_VERIFY), contact_get_nameT((MCONTACT)opdata));

 			} else { // should never happen

-				mir_sntprintf(buff, 1024, TranslateT(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT((MCONTACT)opdata));

+				mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_NOT_STARTED_OTR), contact_get_nameT((MCONTACT)opdata));

 			}

 			

 		}

diff --git a/plugins/MirOTR/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/MirOTR/src/svcs_menu.cpp
index 0c636c36f0..c0596262ec 100644
--- a/plugins/MirOTR/MirOTR/src/svcs_menu.cpp
+++ b/plugins/MirOTR/MirOTR/src/svcs_menu.cpp
@@ -26,18 +26,18 @@ int StartOTR(MCONTACT hContact) {
 INT_PTR SVC_StartOTR(WPARAM hContact, LPARAM lParam)

 {

 	MCONTACT hSub;

+	TCHAR buff[512];

+

 	if((hSub = db_mc_getMostOnline(hContact)) != 0)

 		hContact = hSub;

 

 	if ( options.bHaveSecureIM && CallService("SecureIM/IsContactSecured", hContact, 0) != 0 ) {

-		TCHAR msg[512];

-		mir_sntprintf(msg, 512, TranslateT(LANG_OTR_SECUREIM_STARTED), contact_get_nameT(hContact));

-		ShowError(msg);

+		mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_OTR_SECUREIM_STARTED), contact_get_nameT(hContact));

+		ShowError(buff);

 		return 0;

 	}

 

-	TCHAR buff[512];

-	mir_sntprintf(buff, 512, TranslateT(LANG_SESSION_REQUEST_OTR), contact_get_nameT(hContact));

+	mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_REQUEST_OTR), contact_get_nameT(hContact));

 	ShowMessage(hContact, buff);

 

 	return StartOTR(hContact);

@@ -46,18 +46,18 @@ INT_PTR SVC_StartOTR(WPARAM hContact, LPARAM lParam)
 INT_PTR SVC_RefreshOTR(WPARAM hContact, LPARAM lParam)

 {

 	MCONTACT hSub;

+	TCHAR buff[512];

+

 	if((hSub = db_mc_getMostOnline(hContact)) != 0)

 		hContact = hSub;

 

 	if ( options.bHaveSecureIM && CallService("SecureIM/IsContactSecured", hContact, 0) != 0 ) {

-		TCHAR msg[512];

-		mir_sntprintf(msg, 512, TranslateT(LANG_OTR_SECUREIM_STARTED), contact_get_nameT(hContact));

-		ShowError(msg);

+		mir_sntprintf(buff, 512, TranslateT(LANG_OTR_SECUREIM_STARTED), contact_get_nameT(hContact));

+		ShowError(buff);

 		return 0;

 	}

 	

-	TCHAR buff[512];

-	mir_sntprintf(buff, 512, TranslateT(LANG_SESSION_TRY_CONTINUE_OTR), contact_get_nameT(hContact));

+	mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_TRY_CONTINUE_OTR), contact_get_nameT(hContact));

 	ShowMessage(hContact, buff);

 

 	int res = StartOTR(hContact);

@@ -92,7 +92,7 @@ INT_PTR SVC_StopOTR(WPARAM hContact, LPARAM lParam)
 	SetEncryptionStatus(hContact, TRUST_NOT_PRIVATE);

 

 	TCHAR buff[512];

-	mir_sntprintf(buff, 512, TranslateT(LANG_SESSION_TERMINATED_OTR), contact_get_nameT(hContact));

+	mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_TERMINATED_OTR), contact_get_nameT(hContact));

 	ShowMessage(hContact, buff);

 	return 0;

 }

diff --git a/plugins/MirOTR/MirOTR/src/svcs_proto.cpp b/plugins/MirOTR/MirOTR/src/svcs_proto.cpp
index 5648e90235..78fc63744e 100644
--- a/plugins/MirOTR/MirOTR/src/svcs_proto.cpp
+++ b/plugins/MirOTR/MirOTR/src/svcs_proto.cpp
@@ -196,7 +196,7 @@ INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam){
 	if (tlv && !Miranda_Terminated()) {

 		/* Notify the user that the other side disconnected. */

 		TCHAR buff[256];

-		mir_sntprintf(buff, 256, TranslateT(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT(ccs->hContact));

+		mir_sntprintf(buff, SIZEOF(buff), TranslateT(LANG_SESSION_TERMINATED_BY_OTR), contact_get_nameT(ccs->hContact));

 		//MessageBox(0, buff, Translate("OTR Information"), MB_OK);

 		ShowMessage(ccs->hContact, buff);

 

diff --git a/plugins/MirOTR/MirOTR/src/utils.cpp b/plugins/MirOTR/MirOTR/src/utils.cpp
index 695486ff42..7b6323d86e 100644
--- a/plugins/MirOTR/MirOTR/src/utils.cpp
+++ b/plugins/MirOTR/MirOTR/src/utils.cpp
@@ -85,8 +85,8 @@ void VerifyFingerprint(ConnContext *context, bool verify) {
 

 void VerifyFingerprintMessage(ConnContext *context, bool verify) {

 	TCHAR msg[1024];

-	mir_sntprintf(msg, 1024, (verify)?TranslateT(LANG_FINGERPRINT_VERIFIED):TranslateT(LANG_FINGERPRINT_NOT_VERIFIED), contact_get_nameT((MCONTACT)context->app_data));

-	msg[1023] = '\0';

+

+	mir_sntprintf(msg, SIZEOF(msg), (verify)?TranslateT(LANG_FINGERPRINT_VERIFIED):TranslateT(LANG_FINGERPRINT_NOT_VERIFIED), contact_get_nameT((MCONTACT)context->app_data));

 	ShowMessage((MCONTACT)context->app_data, msg);

 	SetEncryptionStatus((MCONTACT)context->app_data, otr_context_get_trust(context));

 }

@@ -315,7 +315,7 @@ void ShowErrorUtf(char* msg) {
 

 void ShowMessageInline(const MCONTACT hContact, const TCHAR *msg) {

 	TCHAR buff[1024];

-	mir_sntprintf(buff, 1024, _T("%s%s"), TranslateT(LANG_INLINE_PREFIX), msg);

+	mir_sntprintf(buff, SIZEOF(buff), _T("%s%s"), TranslateT(LANG_INLINE_PREFIX), msg);

 

 	PROTORECVEVENT pre = {0};

 	pre.timestamp = time(0);