diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-17 16:27:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-17 16:27:19 (GMT) |
| commit | 59f20f23bdf80b9aa0106269a64e16715a0deb2c (patch) | |
| tree | 1c09e78560216f9c0d9d708bca172ef4dd93cc6b /generic/tclResult.c | |
| parent | c0d3b18e36ba15b38e066951ddf5adaf995be0d0 (diff) | |
| parent | 292c03d1c289ed9aae8eac6aba53c1857e4bf90d (diff) | |
| download | tcl-59f20f23bdf80b9aa0106269a64e16715a0deb2c.zip tcl-59f20f23bdf80b9aa0106269a64e16715a0deb2c.tar.gz tcl-59f20f23bdf80b9aa0106269a64e16715a0deb2c.tar.bz2 | |
Merge 9.0
Diffstat (limited to 'generic/tclResult.c')
| -rw-r--r-- | generic/tclResult.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclResult.c b/generic/tclResult.c index 82abbaa..50eebfd 100644 --- a/generic/tclResult.c +++ b/generic/tclResult.c @@ -750,12 +750,12 @@ TclProcessReturn( * if someone does [return -errorstack [info errorstack]] */ - if (TclListObjGetElements(interp, valuePtr, &valueObjc, + if (TclListObjGetElementsM(interp, valuePtr, &valueObjc, &valueObjv) == TCL_ERROR) { return TCL_ERROR; } iPtr->resetErrorStack = 0; - TclListObjLength(interp, iPtr->errorStack, &len); + TclListObjLengthM(interp, iPtr->errorStack, &len); /* * Reset while keeping the list internalrep as much as possible. @@ -912,7 +912,7 @@ TclMergeReturnOptions( if (valuePtr != NULL) { int length; - if (TCL_ERROR == TclListObjLength(NULL, valuePtr, &length )) { + if (TCL_ERROR == TclListObjLengthM(NULL, valuePtr, &length )) { /* * Value is not a list, which is illegal for -errorcode. */ @@ -934,7 +934,7 @@ TclMergeReturnOptions( if (valuePtr != NULL) { int length; - if (TCL_ERROR == TclListObjLength(NULL, valuePtr, &length )) { + if (TCL_ERROR == TclListObjLengthM(NULL, valuePtr, &length )) { /* * Value is not a list, which is illegal for -errorstack. */ @@ -1104,7 +1104,7 @@ Tcl_SetReturnOptions( Tcl_Obj **objv, *mergedOpts; Tcl_IncrRefCount(options); - if (TCL_ERROR == TclListObjGetElements(interp, options, &objc, &objv) + if (TCL_ERROR == TclListObjGetElementsM(interp, options, &objc, &objv) || (objc % 2)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "expected dict but got \"%s\"", TclGetString(options))); |