diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-10 20:18:48 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-10 20:18:48 (GMT) |
commit | 934e6a98376ded432d70c77b3778869bc49763d4 (patch) | |
tree | 1d8ce18dc34f3f777dcae2743ef7d0bf8198e9c0 /win/tclWinPipe.c | |
parent | 2b821c69deba46a4f4634dbbfa6b5b34b6036f9c (diff) | |
download | tcl-934e6a98376ded432d70c77b3778869bc49763d4.zip tcl-934e6a98376ded432d70c77b3778869bc49763d4.tar.gz tcl-934e6a98376ded432d70c77b3778869bc49763d4.tar.bz2 |
re-implemente changes in win/tclWinFile.c (handling -DTCL_UTF_MAX=6) using 3 new utility functions. This allows to re-use code in more places: cleaner implementation more future-proof.
Diffstat (limited to 'win/tclWinPipe.c')
-rw-r--r-- | win/tclWinPipe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c index 86b98f7..7b4769c 100644 --- a/win/tclWinPipe.c +++ b/win/tclWinPipe.c @@ -3119,15 +3119,15 @@ TclpOpenTemporaryFile( } namePtr += length * sizeof(TCHAR); if (basenameObj) { - const char *string = Tcl_GetString(basenameObj); + const char *string = TclGetStringFromObj(basenameObj, &length); - Tcl_WinUtfToTChar(string, basenameObj->length, &buf); + Tcl_WinUtfToTChar(string, length, &buf); memcpy(namePtr, Tcl_DStringValue(&buf), Tcl_DStringLength(&buf)); namePtr += Tcl_DStringLength(&buf); Tcl_DStringFree(&buf); } else { const TCHAR *baseStr = TEXT("TCL"); - int length = 3 * sizeof(TCHAR); + length = 3 * sizeof(TCHAR); memcpy(namePtr, baseStr, length); namePtr += length; |