diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-08-02 12:08:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-08-02 12:08:37 (GMT) |
| commit | 68c14126f5f9f31f14ddbcd054764da66e76b7fd (patch) | |
| tree | 77b059089eb70cf671ae3bf5930fda9cf184e04b /generic/tclInterp.c | |
| parent | 4701d29f7b3a90bcee569fca67f550b55fed97c9 (diff) | |
| parent | fcdd3afc5ee7b8e46352738cb0262168fa9bb6c7 (diff) | |
| download | tcl-68c14126f5f9f31f14ddbcd054764da66e76b7fd.zip tcl-68c14126f5f9f31f14ddbcd054764da66e76b7fd.tar.gz tcl-68c14126f5f9f31f14ddbcd054764da66e76b7fd.tar.bz2 | |
merge trunk
FossilOrigin-Name: d62cfbac77889f80bf19f470509d0f8dae355e94
Diffstat (limited to 'generic/tclInterp.c')
| -rw-r--r-- | generic/tclInterp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 5b6d14f..5bae041 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -2154,17 +2154,19 @@ Tcl_GetInterpPath( InterpInfo *iiPtr; if (targetInterp == askingInterp) { + Tcl_SetObjResult(askingInterp, 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(askingInterp, iiPtr->slave.masterInterp) != TCL_OK){ return TCL_ERROR; } - Tcl_AppendElement(askingInterp, Tcl_GetHashKey(&iiPtr->master.slaveTable, - iiPtr->slave.slaveEntryPtr)); + Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(askingInterp), + Tcl_NewStringObj(Tcl_GetHashKey(&iiPtr->master.slaveTable, + iiPtr->slave.slaveEntryPtr), -1)); return TCL_OK; } |