summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-01-13 23:37:11 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-01-13 23:37:11 (GMT)
commit095ace175d46ad92dce38752a6cfdfc7545b5ffb (patch)
treed58ade46bc353c8551ef02d5f2edab64a0f92ede
parentc9bd8ac5b1219903842bb5ad5e3f52220aa60701 (diff)
downloadtcl-095ace175d46ad92dce38752a6cfdfc7545b5ffb.zip
tcl-095ace175d46ad92dce38752a6cfdfc7545b5ffb.tar.gz
tcl-095ace175d46ad92dce38752a6cfdfc7545b5ffb.tar.bz2
* generic/tclCmdMZ.c (Tcl_SwitchObjCmd): Silence compiler warnings.
-rw-r--r--ChangeLog3
-rw-r--r--generic/tclCmdMZ.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6762c3c..eafe1c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2004-01-13 Don Porter <dgp@users.sourceforge.net>
+ * generic/tclCmdMZ.c (Tcl_SwitchObjCmd): Silence compiler warnings.
+
Patch 876451: restores performance of [return]. Also allows forms
such as [return -code error $msg] to be bytecompiled.
@@ -33,6 +35,7 @@
Corrected by adopting the Tcl_SetObjResult(Tcl_NewStringObj) pattern.
This stopped a segfault in test filename-11.36.
+
2004-01-13 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* generic/tclIndexObj.c (Tcl_GetIndexFromObjStruct, Tcl_WrongNumArgs):
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index f880057..7579b4e 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -15,7 +15,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCmdMZ.c,v 1.99 2004/01/13 23:15:02 dgp Exp $
+ * RCS: @(#) $Id: tclCmdMZ.c,v 1.100 2004/01/13 23:37:11 dgp Exp $
*/
#include "tclInt.h"
@@ -2656,7 +2656,7 @@ Tcl_SwitchObjCmd(dummy, interp, objc, objv)
char *string, *pattern;
Tcl_Obj *stringObj, *indexVarObj, *matchVarObj;
Tcl_Obj *CONST *savedObjv = objv;
- Tcl_RegExp regExpr;
+ Tcl_RegExp regExpr = NULL;
static CONST char *options[] = {
"-exact", "-glob", "-indexvar", "-matchvar", "-regexp", "--",
NULL
@@ -2881,7 +2881,7 @@ Tcl_SwitchObjCmd(dummy, interp, objc, objv)
if (numMatchesSaved) {
Tcl_RegExpInfo info;
- Tcl_Obj *matchesObj, *indicesObj;
+ Tcl_Obj *matchesObj, *indicesObj = NULL;
Tcl_RegExpGetInfo(regExpr, &info);
if (matchVarObj != NULL) {