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/tclListObj.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/tclListObj.c')
| -rw-r--r-- | generic/tclListObj.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclListObj.c b/generic/tclListObj.c index 98274ac..0c753cf 100644 --- a/generic/tclListObj.c +++ b/generic/tclListObj.c @@ -470,7 +470,7 @@ TclListObjRange( int listLen, i, newLen; List *listRepPtr; - TclListObjGetElements(NULL, listPtr, &listLen, &elemPtrs); + TclListObjGetElementsM(NULL, listPtr, &listLen, &elemPtrs); if (fromIdx < 0) { fromIdx = 0; @@ -629,7 +629,7 @@ Tcl_ListObjAppendList( * Pull the elements to append from elemListPtr. */ - if (TCL_OK != TclListObjGetElements(interp, elemListPtr, &objc, &objv)) { + if (TCL_OK != TclListObjGetElementsM(interp, elemListPtr, &objc, &objv)) { return TCL_ERROR; } @@ -1366,7 +1366,7 @@ TclLindexFlat( break; } - TclListObjGetElements(NULL, sublistCopy, &listLen, &elemPtrs); + TclListObjGetElementsM(NULL, sublistCopy, &listLen, &elemPtrs); if (TclGetIntForIndexM(interp, indexArray[i], /*endValue*/ listLen-1, &index) == TCL_OK) { @@ -1466,7 +1466,7 @@ TclLsetList( return TclLsetFlat(interp, listPtr, 1, &indexArgPtr, valuePtr); } - TclListObjGetElements(NULL, indexArgPtr, &indexCount, &indices); + TclListObjGetElementsM(NULL, indexArgPtr, &indexCount, &indices); /* * Let TclLsetFlat handle the actual lset'ting. @@ -1583,7 +1583,7 @@ TclLsetFlat( * Check for the possible error conditions... */ - if (TclListObjGetElements(interp, subListPtr, &elemCount, &elemPtrs) + if (TclListObjGetElementsM(interp, subListPtr, &elemCount, &elemPtrs) != TCL_OK) { /* ...the sublist we're indexing into isn't a list at all. */ result = TCL_ERROR; @@ -1730,7 +1730,7 @@ TclLsetFlat( */ len = -1; - TclListObjLength(NULL, subListPtr, &len); + TclListObjLengthM(NULL, subListPtr, &len); if (valuePtr == NULL) { Tcl_ListObjReplace(NULL, subListPtr, index, 1, 0, NULL); } else if (index == len) { |