diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-20 09:02:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-20 09:02:03 (GMT) |
| commit | a03c2cb1c243f583c43a5368dae7d90aa897f409 (patch) | |
| tree | fbb65f9cc742a3d9e4af141f35da3158e7f3c5c7 /generic | |
| parent | 9598926f42bd5ffbd6c7e9b7022f39382e8d29b8 (diff) | |
| parent | bbe2ea1d0e29301b36d42a167abfe8f11d6a60b2 (diff) | |
| download | tcl-a03c2cb1c243f583c43a5368dae7d90aa897f409.zip tcl-a03c2cb1c243f583c43a5368dae7d90aa897f409.tar.gz tcl-a03c2cb1c243f583c43a5368dae7d90aa897f409.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclInterp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 6e99913..cebb31e 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -2170,23 +2170,23 @@ TclSetSlaveCancelFlags( int Tcl_GetInterpPath( - Tcl_Interp *askingInterp, /* Interpreter to start search from. */ + Tcl_Interp *interp, /* Interpreter to start search from. */ Tcl_Interp *targetInterp) /* Interpreter to find. */ { InterpInfo *iiPtr; - if (targetInterp == askingInterp) { - Tcl_SetObjResult(askingInterp, Tcl_NewObj()); + if (targetInterp == interp) { + Tcl_SetObjResult(interp, Tcl_NewObj()); return TCL_OK; } if (targetInterp == NULL) { return TCL_ERROR; } iiPtr = (InterpInfo *) ((Interp *) targetInterp)->interpInfo; - if (Tcl_GetInterpPath(askingInterp, iiPtr->slave.masterInterp) != TCL_OK){ + if (Tcl_GetInterpPath(interp, iiPtr->slave.masterInterp) != TCL_OK){ return TCL_ERROR; } - Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(askingInterp), + Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(interp), Tcl_NewStringObj(Tcl_GetHashKey(&iiPtr->master.slaveTable, iiPtr->slave.slaveEntryPtr), -1)); return TCL_OK; |