diff options
author | dgp <dgp@users.sourceforge.net> | 2002-02-08 02:52:54 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2002-02-08 02:52:54 (GMT) |
commit | 699c1642cb20fb2195b33c4fd04a2ec582507776 (patch) | |
tree | 078abed0538e74a4b78aa55d46462fe102978f63 /generic/tclEnv.c | |
parent | c11c702cfe6d98893a8ac09baefbf98a868f6b32 (diff) | |
download | tcl-699c1642cb20fb2195b33c4fd04a2ec582507776.zip tcl-699c1642cb20fb2195b33c4fd04a2ec582507776.tar.gz tcl-699c1642cb20fb2195b33c4fd04a2ec582507776.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.
Diffstat (limited to 'generic/tclEnv.c')
-rw-r--r-- | generic/tclEnv.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tclEnv.c b/generic/tclEnv.c index 792835c..c4f6ea2 100644 --- a/generic/tclEnv.c +++ b/generic/tclEnv.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclEnv.c,v 1.11 2002/01/26 01:10:08 dgp Exp $ + * RCS: @(#) $Id: tclEnv.c,v 1.12 2002/02/08 02:52:54 dgp Exp $ */ #include "tclInt.h" @@ -84,8 +84,7 @@ TclSetupEnv(interp) * managed. */ { Tcl_DString envString; - CONST char *p1; - char *p2; + char *p1, *p2; int i; /* @@ -134,8 +133,7 @@ TclSetupEnv(interp) } p2++; p2[-1] = '\0'; - Tcl_SetVar2(interp, "env", Tcl_DStringValue(&envString), p2, - TCL_GLOBAL_ONLY); + Tcl_SetVar2(interp, "env", p1, p2, TCL_GLOBAL_ONLY); Tcl_DStringFree(&envString); } Tcl_MutexUnlock(&envMutex); |