summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclCompile.c8
-rw-r--r--generic/tclExecute.c6
3 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 72bb395..cf8b088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-08 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclCompile.c:
+ * generic/tclExecute.c: handle warning [Bug 969066]
+
2004-06-08 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* generic/tclHash.c (RebuildTable): Move declaration of variable
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 0f1e615..58627d1 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.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: tclCompile.c,v 1.66 2004/05/16 17:25:48 msofer Exp $
+ * RCS: @(#) $Id: tclCompile.c,v 1.67 2004/06/08 19:27:01 msofer Exp $
*/
#include "tclInt.h"
@@ -1634,7 +1634,9 @@ TclInitByteCodeObj(objPtr, envPtr)
size_t codeBytes, objArrayBytes, exceptArrayBytes, cmdLocBytes;
size_t auxDataArrayBytes, structureSize;
register unsigned char *p;
+#ifdef TCL_COMPILE_DEBUG
unsigned char *nextPtr;
+#endif
int numLitObjects = envPtr->literalArrayNext;
Namespace *namespacePtr;
int i;
@@ -1715,8 +1717,10 @@ TclInitByteCodeObj(objPtr, envPtr)
}
p += auxDataArrayBytes;
+#ifndef TCL_COMPILE_DEBUG
+ EncodeCmdLocMap(envPtr, codePtr, (unsigned char *) p);
+#else
nextPtr = EncodeCmdLocMap(envPtr, codePtr, (unsigned char *) p);
-#ifdef TCL_COMPILE_DEBUG
if (((size_t)(nextPtr - p)) != cmdLocBytes) {
Tcl_Panic("TclInitByteCodeObj: encoded cmd location bytes %d != expected size %d\n", (nextPtr - p), cmdLocBytes);
}
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index cd93261..3932673 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.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: tclExecute.c,v 1.142 2004/05/27 20:44:36 msofer Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.143 2004/06/08 19:27:01 msofer Exp $
*/
#ifdef STDC_HEADERS
@@ -3989,7 +3989,7 @@ TclExecuteByteCode(interp, codePtr)
* from the string rep.
*/
int length;
- long i;
+ long i; /* Set but never used, needed in GET_WIDE_OR_INT */
Tcl_WideInt w;
char *s = Tcl_GetStringFromObj(valuePtr, &length);
@@ -5406,7 +5406,7 @@ VerifyExprObjType(interp, objPtr)
char *s = Tcl_GetStringFromObj(objPtr, &length);
if (TclLooksLikeInt(s, length)) {
- long i;
+ long i; /* Set but never used, needed in GET_WIDE_OR_INT */
Tcl_WideInt w;
GET_WIDE_OR_INT(result, objPtr, i, w);
} else {