Variables moved to mir_* memory allocation routines

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

1 files changed, 5 insertions, 5 deletions

diff --git a/plugins/Variables/options.cpp b/plugins/Variables/options.cpp
index 6140bc79dd..22743d0ab5 100644
--- a/plugins/Variables/options.cpp
+++ b/plugins/Variables/options.cpp
@@ -2,7 +2,7 @@
     Variables Plugin for Miranda-IM (www.miranda-im.org)

     Copyright 2003-2006 P. Boon

 

-    This program is free software; you can redistribute it and/or modify

+    This program is mir_free software; you can redistribute it and/or modify

     it under the terms of the GNU General Public License as published by

     the Free Software Foundation; either version 2 of the License, or

     (at your option) any later version.

@@ -88,14 +88,14 @@ static INT_PTR CALLBACK SetOptsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA
 		if (((LPNMHDR)lParam)->code == PSN_APPLY) {

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

 			if (len >= 0) {

-				TCHAR *szFormatText = ( TCHAR* )calloc((len+1), sizeof(TCHAR));

+				TCHAR *szFormatText = ( TCHAR* )mir_calloc((len+1)* sizeof(TCHAR));

 				if (szFormatText == NULL)

 					break;

 

 				if (GetDlgItemText(hwndDlg, IDC_FORMATTEXT, szFormatText, len+1) != 0)

 					db_sets(SETTING_STARTUPTEXT, szFormatText);

 

-				free(szFormatText);

+				mir_free(szFormatText);

 			}

 			db_setb(SETTING_PARSEATSTARTUP, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_PARSEATSTARTUP)?1:0));

 			db_setb(SETTING_STRIPCRLF, (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_STRIPCRLF)?1:0));

@@ -111,9 +111,9 @@ static INT_PTR CALLBACK SetOptsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA
 				TCHAR *newString = variables_parsedup(string, NULL, NULL);

 				if (newString != NULL) {

 					SetWindowText(GetDlgItem(hwndDlg, IDC_RESULT), newString);

-					free(newString);

+					mir_free(newString);

 				}

-				free(string);

+				mir_free(string);

 		}	}	

 		break;