diff options
| author | cvs2fossil <cvs2fossil@noemail.net> | 2000-03-30 04:36:09 (GMT) |
|---|---|---|
| committer | cvs2fossil <cvs2fossil@noemail.net> | 2000-03-30 04:36:09 (GMT) |
| commit | 1c352844e43ccea7943822e959ad2bb4d625c64b (patch) | |
| tree | 45e3bfe70409c0a79811234e3425c468fd87cc6c /generic | |
| parent | 79acf4143b91b7505f32e41e84c3664e4b14a2d6 (diff) | |
| download | tcl-scriptics-sc-2-0-b5.zip tcl-scriptics-sc-2-0-b5.tar.gz tcl-scriptics-sc-2-0-b5.tar.bz2 | |
Created branch scriptics-sc-2-0-b5-syntheticscriptics-sc-2-0-b5
FossilOrigin-Name: 80dddef3efc9c9b7d47ed89187d4be7987e7ddaa
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclClock.c | 18 | ||||
| -rw-r--r-- | generic/tclCompile.c | 21 |
2 files changed, 4 insertions, 35 deletions
diff --git a/generic/tclClock.c b/generic/tclClock.c index 8b2bc53..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.9 2000/03/30 04:36:11 hobbs Exp $ + * RCS: @(#) $Id: tclClock.c,v 1.8 2000/01/26 03:37:40 hobbs Exp $ */ #include "tcl.h" @@ -282,13 +282,6 @@ FormatClock(interp, clockVal, useGMT, format) Tcl_MutexUnlock(&clockMutex); #endif - /* - * If the user gave us -format "", just return now - */ - if (*format == '\0') { - return TCL_OK; - } - #ifndef HAVE_TM_ZONE /* * This is a kludge for systems not having the timezone string in @@ -347,14 +340,7 @@ FormatClock(interp, clockVal, useGMT, format) tzset(); } #endif - - if (result == 0) { - /* - * A zero return is the error case (can also mean the strftime - * didn't get enough space to write into). We know it doesn't - * mean that we wrote zero chars because the check for an empty - * format string is above. - */ + if ((result == 0) && (*format != '\0')) { Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "bad format string \"", format, "\"", (char *) NULL); return TCL_ERROR; diff --git a/generic/tclCompile.c b/generic/tclCompile.c index 7a9f64d..ed7500f 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCompile.c,v 1.20 2000/03/30 04:36:11 hobbs Exp $ + * RCS: @(#) $Id: tclCompile.c,v 1.19 1999/12/12 02:26:41 hobbs Exp $ */ #include "tclInt.h" @@ -553,26 +553,9 @@ TclCleanupByteCode(codePtr) * only need to 1) decrement the ref counts of the LiteralEntry's in * its literal array, 2) call the free procs for the auxiliary data * items, and 3) free the ByteCode structure's heap object. - * - * The case for TCL_BYTECODE_PRECOMPILED (precompiled ByteCodes, - * like those generated from tbcload) is special, as they doesn't - * make use of the global literal table. They instead maintain - * private references to their literals which must be decremented. */ - if (codePtr->flags & TCL_BYTECODE_PRECOMPILED) { - register Tcl_Obj *objPtr; - - objArrayPtr = codePtr->objArrayPtr; - for (i = 0; i < numLitObjects; i++) { - objPtr = *objArrayPtr; - if (objPtr) { - Tcl_DecrRefCount(objPtr); - } - objArrayPtr++; - } - codePtr->numLitObjects = 0; - } else if (interp != NULL) { + if (interp != NULL) { /* * If the interp has already been freed, then Tcl will have already * forcefully released all the literals used by ByteCodes compiled |