diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-12 21:33:48 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-12 21:33:48 (GMT) |
commit | 9923d0e4e6ea62c2086d396031cfe3d16abfbe06 (patch) | |
tree | 6af6d4bf892d26919e5fa95bfce75a397d9a66d6 /generic/tclIOUtil.c | |
parent | 648f2bd64be3781ac7d0dc2777e5a77ff9d21e70 (diff) | |
parent | 3b079f137c6a1a8776a9696cbbac0ff4d4b9cedc (diff) | |
download | tcl-9923d0e4e6ea62c2086d396031cfe3d16abfbe06.zip tcl-9923d0e4e6ea62c2086d396031cfe3d16abfbe06.tar.gz tcl-9923d0e4e6ea62c2086d396031cfe3d16abfbe06.tar.bz2 |
Merge 9.0
Diffstat (limited to 'generic/tclIOUtil.c')
-rw-r--r-- | generic/tclIOUtil.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index df218b3..df2d510 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -1067,7 +1067,7 @@ Tcl_FSMatchInDirectory( * resultPtr and tmpResultPtr are guaranteed to be distinct. */ - ret = TclListObjGetElementsM(interp, tmpResultPtr, + ret = TclListObjGetElements(interp, tmpResultPtr, &resLength, &elemsPtr); for (i=0 ; ret==TCL_OK && i<resLength ; i++) { ret = Tcl_ListObjAppendElement(interp, resultPtr, @@ -1115,10 +1115,10 @@ FsAddMountsToGlobResult( return; } - if (TclListObjLengthM(NULL, mounts, &mLength) != TCL_OK || mLength == 0) { + if (TclListObjLength(NULL, mounts, &mLength) != TCL_OK || mLength == 0) { goto endOfMounts; } - if (TclListObjLengthM(NULL, resultPtr, &gLength) != TCL_OK) { + if (TclListObjLength(NULL, resultPtr, &gLength) != TCL_OK) { goto endOfMounts; } for (i=0 ; i<mLength ; i++) { @@ -2483,7 +2483,7 @@ TclFSFileAttrIndex( Tcl_Size i, objc; Tcl_Obj **objv; - if (TclListObjGetElementsM(NULL, listObj, &objc, &objv) != TCL_OK) { + if (TclListObjGetElements(NULL, listObj, &objc, &objv) != TCL_OK) { TclDecrRefCount(listObj); return TCL_ERROR; } @@ -3870,7 +3870,7 @@ Tcl_FSSplitPath( } if (lenPtr != NULL) { - TclListObjLengthM(NULL, result, lenPtr); + TclListObjLength(NULL, result, lenPtr); } return result; } @@ -3993,7 +3993,7 @@ TclFSNonnativePathType( Tcl_Obj *thisFsVolumes = fsRecPtr->fsPtr->listVolumesProc(); if (thisFsVolumes != NULL) { - if (TclListObjLengthM(NULL, thisFsVolumes, &numVolumes) + if (TclListObjLength(NULL, thisFsVolumes, &numVolumes) != TCL_OK) { /* * This is VERY bad; the listVolumesProc didn't return a |