summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
Diffstat (limited to 'generic')
-rw-r--r--generic/tclExecute.c9
-rw-r--r--generic/tclVar.c8
2 files changed, 7 insertions, 10 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index b899085..dd174c6 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.5 1998/11/19 20:10:51 stanton Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.4 1998/09/14 18:39:58 stanton Exp $
*/
#include "tclInt.h"
@@ -3450,17 +3450,12 @@ TclGetExceptionRangeForPc(pc, catchOnly, codePtr)
ByteCode* codePtr; /* Points to the ByteCode in which to search
* for the enclosing ExceptionRange. */
{
- ExceptionRange *rangeArrayPtr;
+ ExceptionRange *rangeArrayPtr = codePtr->excRangeArrayPtr;
int numRanges = codePtr->numExcRanges;
register ExceptionRange *rangePtr;
int codeOffset = (pc - codePtr->codeStart);
register int i, level;
- if (numRanges == 0) {
- return NULL;
- }
- rangeArrayPtr = codePtr->excRangeArrayPtr;
-
for (level = codePtr->maxExcRangeDepth; level >= 0; level--) {
for (i = 0; i < numRanges; i++) {
rangePtr = &(rangeArrayPtr[i]);
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 88a5354..2bc4a3f 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclVar.c,v 1.6 1998/11/19 20:10:52 stanton Exp $
+ * RCS: @(#) $Id: tclVar.c,v 1.5 1998/09/14 18:40:02 stanton Exp $
*/
#include "tclInt.h"
@@ -191,7 +191,8 @@ TclLookupVar(interp, part1, part2, flags, msg, createPart1, createPart2,
*/
if ((flags & TCL_GLOBAL_ONLY) != 0 || iPtr->varFramePtr == NULL) {
cxtNsPtr = iPtr->globalNsPtr;
- } else {
+ }
+ else {
cxtNsPtr = iPtr->varFramePtr->nsPtr;
}
@@ -216,7 +217,8 @@ TclLookupVar(interp, part1, part2, flags, msg, createPart1, createPart2,
if (result == TCL_OK) {
varPtr = (Var *) var;
goto lookupVarPart2;
- } else if (result != TCL_CONTINUE) {
+ }
+ else if (result != TCL_CONTINUE) {
return (Var *) NULL;
}
}