diff options
| author | hobbs <hobbs> | 2000-01-26 03:37:40 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2000-01-26 03:37:40 (GMT) |
| commit | 3eb5dfa1d24599dedc834f002282d654e757b552 (patch) | |
| tree | bd7431bafb7dd513d0d3ef639da18cf478ec87e4 /generic/tclClock.c | |
| parent | 04bd0d9f87302a0c6dfcf3641cee54bc29c3f223 (diff) | |
| download | tcl-3eb5dfa1d24599dedc834f002282d654e757b552.zip tcl-3eb5dfa1d24599dedc834f002282d654e757b552.tar.gz tcl-3eb5dfa1d24599dedc834f002282d654e757b552.tar.bz2 | |
* generic/tclClock.c (FormatClock): inlined resultPtr, as it
conflicted with var creation for HAVE_TZSET #def [Bug: 4063]
* generic/tclCmdIL.c (Tcl_LsortObjCmd): fixed potential leak
when calling lsort -command with bad command [Bug: 4067]
* generic/tclFileName.c (Tcl_JoinPath): added support for special
QNX node id prefixes in pathnames [Bug: 4053]
Diffstat (limited to 'generic/tclClock.c')
| -rw-r--r-- | generic/tclClock.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/generic/tclClock.c b/generic/tclClock.c index ccf6638..b155b4d 100644 --- a/generic/tclClock.c +++ b/generic/tclClock.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclClock.c,v 1.7 2000/01/12 11:12:52 hobbs Exp $ + * RCS: @(#) $Id: tclClock.c,v 1.8 2000/01/26 03:37:40 hobbs Exp $ */ #include "tcl.h" @@ -261,7 +261,6 @@ FormatClock(interp, clockVal, useGMT, format) Tcl_DString buffer; int bufSize; char *p; - Tcl_Obj *resultPtr; int result; time_t tclockVal; #ifndef HAVE_TM_ZONE @@ -269,7 +268,6 @@ FormatClock(interp, clockVal, useGMT, format) char *savedTZEnv = NULL; /* lint. */ #endif - resultPtr = Tcl_GetObjResult(interp); #ifdef HAVE_TZSET /* * Some systems forgot to call tzset in localtime, make sure its done. @@ -343,12 +341,12 @@ FormatClock(interp, clockVal, useGMT, format) } #endif if ((result == 0) && (*format != '\0')) { - Tcl_AppendStringsToObj(resultPtr, "bad format string \"", format, - "\"", (char *) NULL); + Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), + "bad format string \"", format, "\"", (char *) NULL); return TCL_ERROR; } - Tcl_SetStringObj(resultPtr, buffer.string, -1); + Tcl_SetStringObj(Tcl_GetObjResult(interp), buffer.string, -1); Tcl_DStringFree(&buffer); return TCL_OK; } |