diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-04-26 07:29:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-04-26 07:29:02 (GMT) |
| commit | a4c35fb82f99d990ca1ef877cb9917c7f55151ff (patch) | |
| tree | cdd02327448cf2c0393cbf3cea4fd48bb17e52c4 /generic/tclPathObj.c | |
| parent | 81a213ed4ce77b15fbc6d5d97cc1235b689ad482 (diff) | |
| parent | e12b1646c6f675cf09d5f1a72d4ecdffa5da7396 (diff) | |
| download | tcl-a4c35fb82f99d990ca1ef877cb9917c7f55151ff.zip tcl-a4c35fb82f99d990ca1ef877cb9917c7f55151ff.tar.gz tcl-a4c35fb82f99d990ca1ef877cb9917c7f55151ff.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclPathObj.c')
| -rw-r--r-- | generic/tclPathObj.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index b5207a1..cb4d0ce 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -812,12 +812,12 @@ Tcl_FSJoinPath( int objc; Tcl_Obj **objv; - if (Tcl_ListObjLength(NULL, listObj, &objc) != TCL_OK) { + if (TclListObjLength(NULL, listObj, &objc) != TCL_OK) { return NULL; } elements = ((elements >= 0) && (elements <= objc)) ? elements : objc; - Tcl_ListObjGetElements(NULL, listObj, &objc, &objv); + TclListObjGetElements(NULL, listObj, &objc, &objv); res = TclJoinPath(elements, objv, 0); return res; } @@ -836,7 +836,8 @@ TclJoinPath( assert ( elements >= 0 ); if (elements == 0) { - return Tcl_NewObj(); + TclNewObj(res); + return res; } assert ( elements > 0 ); @@ -2312,7 +2313,7 @@ SetFsPathFromAny( Tcl_Obj **objv; Tcl_Obj *parts = TclpNativeSplitPath(pathPtr, NULL); - Tcl_ListObjGetElements(NULL, parts, &objc, &objv); + TclListObjGetElements(NULL, parts, &objc, &objv); /* * Skip '~'. It's replaced by its expansion. |