diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-17 12:50:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-17 12:50:28 (GMT) |
| commit | b76f1c40a2a36ffe42405e3f45cfef5b9cc9d441 (patch) | |
| tree | 320c57b53c7d114fe3b77003877d1e5d297ec3f4 /generic/tclResult.c | |
| parent | 2c603a6a0f21a7c2eadaad5c05dde221d46699c0 (diff) | |
| parent | af999a3a2c4770f8654059f5c5b50d766cc88c7f (diff) | |
| download | tcl-b76f1c40a2a36ffe42405e3f45cfef5b9cc9d441.zip tcl-b76f1c40a2a36ffe42405e3f45cfef5b9cc9d441.tar.gz tcl-b76f1c40a2a36ffe42405e3f45cfef5b9cc9d441.tar.bz2 | |
Merge 8.7
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 acdcb70..7e108e9 100644 --- a/generic/tclResult.c +++ b/generic/tclResult.c @@ -1328,12 +1328,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. @@ -1490,7 +1490,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. */ @@ -1512,7 +1512,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. */ @@ -1682,7 +1682,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))); |