diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2011-04-04 14:18:38 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2011-04-04 14:18:38 (GMT) |
| commit | ba6cef0b6af4de02a95eb92e32d5f2c159c28c74 (patch) | |
| tree | 43fd84c72f553fe0c41055b7ed66783275bcf1b1 /generic/tclCmdAH.c | |
| parent | 817c25b9cd2d0474b1ff533d1216ae1e255f6934 (diff) | |
| parent | 0d695fcd80cec0f53ad553a4b0abacbd29aad68c (diff) | |
| download | tcl-ba6cef0b6af4de02a95eb92e32d5f2c159c28c74.zip tcl-ba6cef0b6af4de02a95eb92e32d5f2c159c28c74.tar.gz tcl-ba6cef0b6af4de02a95eb92e32d5f2c159c28c74.tar.bz2 | |
Merge to feature branch
Diffstat (limited to 'generic/tclCmdAH.c')
| -rw-r--r-- | generic/tclCmdAH.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c index b4afdef..a730d60 100644 --- a/generic/tclCmdAH.c +++ b/generic/tclCmdAH.c @@ -345,10 +345,7 @@ CatchObjCmdCallback( if (objc >= 3) { if (NULL == Tcl_ObjSetVar2(interp, varNamePtr, NULL, - Tcl_GetObjResult(interp), 0)) { - Tcl_ResetResult(interp); - Tcl_AppendResult(interp, - "couldn't save command result in variable", NULL); + Tcl_GetObjResult(interp), TCL_LEAVE_ERR_MSG)) { return TCL_ERROR; } } @@ -356,11 +353,8 @@ CatchObjCmdCallback( Tcl_Obj *options = Tcl_GetReturnOptions(interp, result); if (NULL == Tcl_ObjSetVar2(interp, optionVarNamePtr, NULL, - options, 0)) { + options, TCL_LEAVE_ERR_MSG)) { Tcl_DecrRefCount(options); - Tcl_ResetResult(interp); - Tcl_AppendResult(interp, - "couldn't save return options in variable", NULL); return TCL_ERROR; } } |