diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-20 17:51:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-20 17:51:42 (GMT) |
| commit | a1a443ef1d639bba76f8e66f8fa9aae4b4802e4f (patch) | |
| tree | f14659ed7bad541414714dedd7495931b47ebfaa /unix | |
| parent | 797aa89a3070e3e505f1761759a3264ce1628101 (diff) | |
| parent | 66386bc18bd9bde161513ff164561c0e052d35b5 (diff) | |
| download | tcl-a1a443ef1d639bba76f8e66f8fa9aae4b4802e4f.zip tcl-a1a443ef1d639bba76f8e66f8fa9aae4b4802e4f.tar.gz tcl-a1a443ef1d639bba76f8e66f8fa9aae4b4802e4f.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixFCmd.c | 4 | ||||
| -rw-r--r-- | unix/tclUnixFile.c | 4 | ||||
| -rw-r--r-- | unix/tclUnixInit.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index 8109198..b205061 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -1425,7 +1425,7 @@ GetOwnerAttribute( Tcl_DString ds; Tcl_ExternalToUtfDStringEx(NULL, pwPtr->pw_name, TCL_INDEX_NONE, TCL_ENCODING_NOCOMPLAIN, &ds); - *attributePtrPtr = TclDStringToObj(&ds); + *attributePtrPtr = Tcl_DStringToObj(&ds); } return TCL_OK; } @@ -2345,7 +2345,7 @@ TclpCreateTemporaryDirectory( Tcl_ExternalToUtfDStringEx(NULL, Tcl_DStringValue(&templ), Tcl_DStringLength(&templ), TCL_ENCODING_NOCOMPLAIN, &tmp); Tcl_DStringFree(&templ); - return TclDStringToObj(&tmp); + return Tcl_DStringToObj(&tmp); } #if defined(__CYGWIN__) diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index 780f1ea..50e82c2 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -997,7 +997,7 @@ TclpObjLink( } Tcl_ExternalToUtfDStringEx(NULL, link, length, TCL_ENCODING_NOCOMPLAIN, &ds); - linkPtr = TclDStringToObj(&ds); + linkPtr = Tcl_DStringToObj(&ds); Tcl_IncrRefCount(linkPtr); return linkPtr; } @@ -1062,7 +1062,7 @@ TclpNativeToNormalized( Tcl_DString ds; Tcl_ExternalToUtfDStringEx(NULL, (const char *) clientData, TCL_INDEX_NONE, TCL_ENCODING_NOCOMPLAIN, &ds); - return TclDStringToObj(&ds); + return Tcl_DStringToObj(&ds); } /* diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index 148caa0..995bd83 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -510,7 +510,7 @@ TclpInitLibraryPath( pathv[pathc - 1] = installLib + 4; str = Tcl_JoinPath(pathc, pathv, &ds); - Tcl_ListObjAppendElement(NULL, pathPtr, TclDStringToObj(&ds)); + Tcl_ListObjAppendElement(NULL, pathPtr, Tcl_DStringToObj(&ds)); } Tcl_Free(pathv); } |