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 /win | |
| parent | 797aa89a3070e3e505f1761759a3264ce1628101 (diff) | |
| parent | 66386bc18bd9bde161513ff164561c0e052d35b5 (diff) | |
| download | tcl-a1a443ef1d639bba76f8e66f8fa9aae4b4802e4f.zip tcl-a1a443ef1d639bba76f8e66f8fa9aae4b4802e4f.tar.gz tcl-a1a443ef1d639bba76f8e66f8fa9aae4b4802e4f.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWinFCmd.c | 6 | ||||
| -rw-r--r-- | win/tclWinFile.c | 2 | ||||
| -rw-r--r-- | win/tclWinInit.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c index e52874e..cb78330 100644 --- a/win/tclWinFCmd.c +++ b/win/tclWinFCmd.c @@ -1002,7 +1002,7 @@ TclpObjRemoveDirectory( !strcmp(Tcl_DStringValue(&ds), TclGetString(normPtr))) { *errorPtr = pathPtr; } else { - *errorPtr = TclDStringToObj(&ds); + *errorPtr = Tcl_DStringToObj(&ds); } Tcl_IncrRefCount(*errorPtr); } @@ -1715,7 +1715,7 @@ ConvertFileNameFormat( Tcl_WCharToUtfDString(nativeName, TCL_INDEX_NONE, &dsTemp); Tcl_DStringFree(&ds); - tempPath = TclDStringToObj(&dsTemp); + tempPath = Tcl_DStringToObj(&dsTemp); Tcl_ListObjReplace(NULL, splitPath, i, 1, 1, &tempPath); FindClose(handle); } @@ -2069,7 +2069,7 @@ TclpCreateTemporaryDirectory( Tcl_DStringInit(&name); Tcl_WCharToUtfDString((LPCWSTR) Tcl_DStringValue(&base), TCL_INDEX_NONE, &name); Tcl_DStringFree(&base); - return TclDStringToObj(&name); + return Tcl_DStringToObj(&name); } /* diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 3bb3117..549133c 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -2483,7 +2483,7 @@ TclpFilesystemPathType( Tcl_DStringInit(&ds); Tcl_WCharToUtfDString(volType, TCL_INDEX_NONE, &ds); - return TclDStringToObj(&ds); + return Tcl_DStringToObj(&ds); } #undef VOL_BUF_SIZE } diff --git a/win/tclWinInit.c b/win/tclWinInit.c index b7b5c0d..a7e82de 100644 --- a/win/tclWinInit.c +++ b/win/tclWinInit.c @@ -255,7 +255,7 @@ AppendEnvironment( pathv[pathc - 1] = shortlib; Tcl_DStringInit(&ds); (void) Tcl_JoinPath(pathc, pathv, &ds); - objPtr = TclDStringToObj(&ds); + objPtr = Tcl_DStringToObj(&ds); } else { objPtr = Tcl_NewStringObj(buf, TCL_INDEX_NONE); } |