diff options
| author | dgp <dgp@noemail.net> | 2002-02-08 02:52:54 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2002-02-08 02:52:54 (GMT) |
| commit | 6a12c0dadeb89e906c1fd6b83568cd7893c7405f (patch) | |
| tree | 078abed0538e74a4b78aa55d46462fe102978f63 /unix/tclUnixInit.c | |
| parent | 0c266f2183e83ccf891f58b150c0674376500a00 (diff) | |
| download | tcl-6a12c0dadeb89e906c1fd6b83568cd7893c7405f.zip tcl-6a12c0dadeb89e906c1fd6b83568cd7893c7405f.tar.gz tcl-6a12c0dadeb89e906c1fd6b83568cd7893c7405f.tar.bz2 | |
* Partial TIP 27 rollback. Following routines
restored to return (char *): Tcl_DStringAppend,
Tcl_DStringAppendElement, Tcl_JoinPath, Tcl_TranslateFileName,
Tcl_ExternalToUtfDString, Tcl_UtfToExternalDString,
Tcl_UniCharToUtfDString, Tcl_GetCwd, Tcl_WinTCharToUtf. Also
restored Tcl_WinUtfToTChar to return (TCHAR *) and
Tcl_UtfToUniCharDString to return (Tcl_UniChar *). Modified
some callers. This change recognizes that Tcl_DStrings are
de-facto white-box objects.
* generic/tclCmdMZ.c: corrected use of C++-style comment.
FossilOrigin-Name: bb1a244cde9f05a5477cf5dd8e8ab44cd978459f
Diffstat (limited to 'unix/tclUnixInit.c')
| -rw-r--r-- | unix/tclUnixInit.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index 8ff747f..309260f 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -7,7 +7,7 @@ * Copyright (c) 1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclUnixInit.c,v 1.29 2002/01/25 20:40:56 dgp Exp $ + * RCS: @(#) $Id: tclUnixInit.c,v 1.30 2002/02/08 02:52:54 dgp Exp $ */ #include "tclInt.h" @@ -451,8 +451,7 @@ TclpSetInitialEncodings() */ Tcl_DStringInit(&ds); - Tcl_DStringAppend(&ds, nl_langinfo(CODESET), -1); - encoding = Tcl_DStringValue(&ds); + encoding = Tcl_DStringAppend(&ds, nl_langinfo(CODESET), -1); Tcl_UtfToLower(Tcl_DStringValue(&ds)); #ifdef HAVE_LANGINFO_DEBUG @@ -550,9 +549,8 @@ TclpSetInitialEncodings() if (*p != '\0') { Tcl_DString ds; Tcl_DStringInit(&ds); - Tcl_DStringAppend(&ds, p, -1); + encoding = Tcl_DStringAppend(&ds, p, -1); - encoding = Tcl_DStringValue(&ds); Tcl_UtfToLower(Tcl_DStringValue(&ds)); setSysEncCode = Tcl_SetSystemEncoding(NULL, encoding); if (setSysEncCode != TCL_OK) { |