|
From: Karsten W. <kar...@us...> - 2006-03-10 22:27:03
|
Update of /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2899/Common/IowaRuntime/Source Modified Files: Tag: pre_int64_branch iowascript.c Log Message: long overdue commit update Index: iowascript.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowascript.c,v retrieving revision 1.3.6.1 retrieving revision 1.3.6.2 diff -C2 -d -r1.3.6.1 -r1.3.6.2 *** iowascript.c 14 Feb 2006 11:36:00 -0000 1.3.6.1 --- iowascript.c 10 Mar 2006 22:26:57 -0000 1.3.6.2 *************** *** 509,522 **** if (flgetreturn) ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ - copydatahandle (&resultdesc, hreturns); ! #else ! ! *hreturns = resultdesc.dataHandle; ! #endif else AEDisposeDesc (&resultdesc); --- 509,523 ---- if (flgetreturn) ! { #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ copydatahandle (&resultdesc, hreturns); ! #if AEDISPOSAL == 1 ! // possible memleak here ! AEDisposeDesc(&resultdesc); ! #endif #else ! *hreturns = resultdesc.dataHandle; #endif + } else AEDisposeDesc (&resultdesc); *************** *** 535,551 **** if (ec == noErr) { ! ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! datahandletostring (&errordesc, errorstring); ! ! #else ! ! texthandletostring (errordesc.dataHandle, errorstring); ! ! #endif ! AEDisposeDesc (&errordesc); ! } else copystring ("\pThe script generated an error, but no message was provided.", errorstring); --- 536,547 ---- if (ec == noErr) { ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! datahandletostring (&errordesc, errorstring); ! #else ! texthandletostring (errordesc.dataHandle, errorstring); ! #endif ! AEDisposeDesc (&errordesc); ! } else copystring ("\pThe script generated an error, but no message was provided.", errorstring); |