summaryrefslogtreecommitdiffstats
path: root/generic/tclInterp.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-02 12:08:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-02 12:08:37 (GMT)
commit33bcb6e718ec30da522f10e0388743eafab975c7 (patch)
tree77b059089eb70cf671ae3bf5930fda9cf184e04b /generic/tclInterp.c
parentb368bda168f6c601da96e6caa9b6d7bc8ba98fc5 (diff)
parent3546e128c0c379f71d6fdf6678ad19cd9d0a0265 (diff)
downloadtcl-33bcb6e718ec30da522f10e0388743eafab975c7.zip
tcl-33bcb6e718ec30da522f10e0388743eafab975c7.tar.gz
tcl-33bcb6e718ec30da522f10e0388743eafab975c7.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclInterp.c')
-rw-r--r--generic/tclInterp.c8
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;
}