diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-17 11:13:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-07-17 11:13:33 (GMT) |
| commit | 8ca73e50abb36b0005e07753db3412bcc7d8cd07 (patch) | |
| tree | 76a1601fc256cf9c045fc1450fc365f85f6e1b68 /generic | |
| parent | b4012447b017cbf05b19ee4d45eb25fc3750d75f (diff) | |
| parent | 56e784cb1b7a6e78689cfa75df0e0dbaf51657d0 (diff) | |
| download | tcl-8ca73e50abb36b0005e07753db3412bcc7d8cd07.zip tcl-8ca73e50abb36b0005e07753db3412bcc7d8cd07.tar.gz tcl-8ca73e50abb36b0005e07753db3412bcc7d8cd07.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 4addffe..de8cd32 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -2250,23 +2250,23 @@ TclSetChildCancelFlags( 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((const char *)Tcl_GetHashKey(&iiPtr->master.slaveTable, iiPtr->slave.slaveEntryPtr), -1)); return TCL_OK; |