diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2008-07-13 22:42:24 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2008-07-13 22:42:24 (GMT) |
| commit | 28f4419947aa4b448501687014bb415dc7096511 (patch) | |
| tree | 684a1e8c4ae327a946e10e76f2424a46ce9e0035 | |
| parent | 5317c96fe29f6bfe0a3c6c5b717a083452f4d4e6 (diff) | |
| download | tcl-28f4419947aa4b448501687014bb415dc7096511.zip tcl-28f4419947aa4b448501687014bb415dc7096511.tar.gz tcl-28f4419947aa4b448501687014bb415dc7096511.tar.bz2 | |
* generic/tclBasic.c: TclResetCancellation() calls were misplaced
(merge mishap); stray //. Thanks patthoyts.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | generic/tclBasic.c | 9 |
2 files changed, 6 insertions, 6 deletions
@@ -1,5 +1,8 @@ 2008-07-14 Miguel Sofer <msofer@users.sf.net> + * generic/tclBasic.c: TclResetCancellation() calls were misplaced + (merge mishap); stray //. Thanks patthoyts. + * generic/tclInt.h: the new macros TclSmallAlloc and TclSmallFree were badly defined under mem debugging [Bug 2017240] (thx das) diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 0eabf22..174a74f 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -16,7 +16,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclBasic.c,v 1.306 2008/07/13 15:56:46 das Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.307 2008/07/13 22:42:25 msofer Exp $ */ #include "tclInt.h" @@ -3930,6 +3930,7 @@ Tcl_EvalObjv( TEBC_CALL(iPtr) = 0; restartAtTop: + TclResetCancellation(interp, 0); iPtr->numLevels++; result = TclInterpReady(interp); @@ -4228,12 +4229,10 @@ int TclEvalObjv_NR2( (void) Tcl_GetObjResult(interp); } - TclResetCancellation(interp, 0); - while (TOP_RECORD(iPtr) != rootPtr) { POP_RECORD(iPtr, recordPtr); - while (recordPtr->callbackPtr) {// + while (recordPtr->callbackPtr) { TEOV_callback *callbackPtr = recordPtr->callbackPtr; result = (*callbackPtr->procPtr)(&callbackPtr->data0, interp, result); @@ -4577,8 +4576,6 @@ TEOV_RunLeaveTraces( int result) { Interp *iPtr = (Interp *) interp; - - TclResetCancellation(interp, 0); char *command; int length, objc; Tcl_Obj **objv; |