From 7dad3543a2b848f6547b291f812c9643dc0b85f2 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 30 Jun 2012 16:17:46 +0000
Subject: Variables moved to mir_* memory allocation routines

git-svn-id: http://svn.miranda-ng.org/main/trunk@696 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Variables/trigger_variables.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/Variables/trigger_variables.cpp')

diff --git a/plugins/Variables/trigger_variables.cpp b/plugins/Variables/trigger_variables.cpp
index 16333b29e6..57ddfaff79 100644
--- a/plugins/Variables/trigger_variables.cpp
+++ b/plugins/Variables/trigger_variables.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.
@@ -35,7 +35,7 @@ static int addToCache(DWORD triggerID) {
 
 	for (i=0;i<tvcCount;i++) {
 		if (tvc[i].triggerID == triggerID) {
-			free(tvc[i].parsedText);
+			mir_free(tvc[i].parsedText);
 			MoveMemory(&tvc[i], &tvc[tvcCount-1], sizeof(TRG_VAR_CACHE));
 			tvcCount -= 1;
 		}
@@ -67,7 +67,7 @@ static int removeFromCache(DWORD triggerID) {
 
 	for (i=0;i<tvcCount;i++) {
 		if (tvc[i].triggerID == triggerID) {
-			free(tvc[i].parsedText);
+			mir_free(tvc[i].parsedText);
 			MoveMemory(&tvc[i], &tvc[tvcCount-1], sizeof(TRG_VAR_CACHE));
 			tvcCount -= 1;
 		}
@@ -101,7 +101,7 @@ static VOID CALLBACK checkStringsTimer(HWND hwnd,UINT message,UINT_PTR idEvent,D
 					continue;
 				}
 				if (!_tcscmp(tvc[i].parsedText, parsedText)) {
-					free(parsedText);
+					mir_free(parsedText);
 					continue;
 				}
 				else {
@@ -118,7 +118,7 @@ static VOID CALLBACK checkStringsTimer(HWND hwnd,UINT message,UINT_PTR idEvent,D
 					ri.td = &td;
 					
 					CallService(MS_TRIGGER_REPORTEVENT, 0, (LPARAM)&ri);
-					free(tvc[i].parsedText);
+					mir_free(tvc[i].parsedText);
 					tvc[i].parsedText = parsedText;
 				}
 				DBFreeVariant(&dbv);
@@ -163,7 +163,7 @@ INT_PTR CALLBACK DlgProcOptsStringChange(HWND hwndDlg, UINT msg, WPARAM wParam,
 		tszFormatText = Hlp_GetDlgItemText(hwndDlg, IDC_FORMATTEXT);
 		if (tszFormatText != NULL) {
 			DBWriteTriggerSettingTString(triggerID, NULL, MODULENAME, SETTING_TRIGGERTEXT, tszFormatText);
-			free(tszFormatText);
+			mir_free(tszFormatText);
 		}
 		addToCache(triggerID);
 		break;
-- 
cgit v1.2.3