diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-01-25 16:43:50 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-01-25 16:43:50 (GMT) |
| commit | c03361743edafd9fb6efa93d447864aebeb0f8d2 (patch) | |
| tree | 190f9fc30bd076a6b44f4fc3ce4c81fe740c09ec /generic/tclBasic.c | |
| parent | 35f5b6c8ede06a809769f888bd729eb9b291c5c7 (diff) | |
| download | tcl-c03361743edafd9fb6efa93d447864aebeb0f8d2.zip tcl-c03361743edafd9fb6efa93d447864aebeb0f8d2.tar.gz tcl-c03361743edafd9fb6efa93d447864aebeb0f8d2.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 30ca044..73c1c12 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -14,7 +14,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.244.2.21 2008/01/23 16:42:17 dgp Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.244.2.22 2008/01/25 16:43:50 dgp Exp $ */ #include "tclInt.h" @@ -3588,7 +3588,7 @@ TclEvalObjvInternal( */ cmdPtr->refCount++; - if (iPtr->tracePtr && (traceCode == TCL_OK)) { + if (iPtr->tracePtr && (traceCode == TCL_OK)) { traceCode = TclCheckInterpTraces(interp, command, length, cmdPtr, code, TCL_TRACE_ENTER_EXEC, objc, objv); } @@ -4097,7 +4097,7 @@ TclEvalEx( Tcl_Obj *norm = Tcl_FSGetNormalizedPath(interp, iPtr->scriptFile); - if (!norm) { + if (norm == NULL) { /* * Error message in the interp result. */ @@ -4118,8 +4118,7 @@ TclEvalEx( eeFramePtr->data.eval.path = NULL; } - eeFramePtr->level = - (iPtr->cmdFramePtr==NULL ? 1 : iPtr->cmdFramePtr->level+1); + eeFramePtr->level = iPtr->cmdFramePtr ? iPtr->cmdFramePtr->level + 1 : 1; eeFramePtr->framePtr = iPtr->framePtr; eeFramePtr->nextPtr = iPtr->cmdFramePtr; eeFramePtr->nline = 0; |