Removed unused variable to reduce compiler warnings. [Bug 664745]

2 files changed, 33 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index c83cdda..f6445ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2003-05-13  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
+
+	* generic/tclEvent.c (Tcl_Finalize): Removed unused variable to
+	reduce compiler warnings.  [Bug 664745]
+
 2003-05-13  Joe Mistachkin  <joe@mistachkin.com>
 
-        * generic/tcl.decls:  Changed Tcl_JoinThread parameter name from 
-        * generic/tclDecls.h: "id" to "threadId". [Bug 732477]
-        * unix/tclUnixThrd.c:
-        * win/tclWinThrd.c: 
-        * mac/tclMacThrd.c:
+	* generic/tcl.decls:  Changed Tcl_JoinThread parameter name from 
+	* generic/tclDecls.h: "id" to "threadId". [Bug 732477]
+	* unix/tclUnixThrd.c:
+	* win/tclWinThrd.c: 
+	* mac/tclMacThrd.c:
 
 2003-05-13  Daniel Steffen  <das@users.sourceforge.net>
 
@@ -68,17 +73,17 @@
 2003-05-09  Joe Mistachkin <joe@mistachkin.com>
 
 	* generic/tclThreadAlloc.c (TclFreeAllocCache): Fixed memory leak
-        caused by treating cachePtr as a TLS index [Bug 731754].
+	caused by treating cachePtr as a TLS index [Bug 731754].
 
 	* win/tclAppInit.c (Tcl_AppInit): Fixed memory leaks caused by not
-        freeing the memory allocated by setargv and the async handler created
-        by Tcl_AppInit. An exit handler has been created that takes care of
-        both leaks. In addition, Tcl_AppInit now uses ckalloc instead of
-        Tcl_Alloc to allow for easier leak tracking and to be more consistent
-        with the rest of the Tcl core [Bugs 733156, 733221].
+	freeing the memory allocated by setargv and the async handler created
+	by Tcl_AppInit. An exit handler has been created that takes care of
+	both leaks. In addition, Tcl_AppInit now uses ckalloc instead of
+	Tcl_Alloc to allow for easier leak tracking and to be more consistent
+	with the rest of the Tcl core [Bugs 733156, 733221].
 
 	* tools/encoding/txt2enc.c (main): Fixed memory leak caused by failing
-        to free the memory used by the toUnicode array of strings [Bug 733221].
+	to free the memory used by the toUnicode array of strings [Bug 733221].
 
 2003-05-05  Don Porter  <dgp@users.sourceforge.net>
 
@@ -308,7 +313,7 @@
 	* tests/foreach.test:
 
 2003-03-26  Don Porter	<dgp@users.sourceforge.net>
-  
+
 	* doc/tcltest.n:
 	* library/tcltest/tcltest.tcl:	Added reporting during
 	[configure -debug 1] operations to warn about multiple uses of
@@ -816,7 +821,7 @@
 	does not build and people are filing bug reports
 	under the mistaken impression that someone is
 	actually maintaining the Cygwin port. A post to
- 	comp.lang.tcl asking someone to volunteer as an
+	comp.lang.tcl asking someone to volunteer as an
 	area maintainer has generated no results.
 	Closing bugs 680840, 630199, and 634772 and
 	marking as "Won't fix".
@@ -1021,7 +1026,7 @@
 	mysterious error that would show up when
 	exec'ing a 16 bit application under Win95
 	or Win98 when Tcl was compiled with symbols.
- 	The error seemed to indicate that the executable
+	The error seemed to indicate that the executable
 	could not be found, but it was actually the
 	Tcl pipe dll that could not be found.
 
@@ -1108,7 +1113,7 @@
 	* generic/tclIO.c: Add 'Tcl_GetString()' to ensure the object has
 	a valid 'objPtr->bytes' field before manipulating it directly.
 	
-        This fixes [Bug 635200] and [Bug 671138], but may reduce performance
+	This fixes [Bug 635200] and [Bug 671138], but may reduce performance
 	of Unicode string handling in some cases. A further patch will
 	be applied to address this, once the code is known to be correct.
 
@@ -2610,14 +2615,14 @@
 2002-07-29  Reinhard Max  <max@suse.de>
 
 	* unix/tcl.m4 (SC_SERIAL_PORT): Fixed detection for cases when
-                                        configure's stdin is not a tty.
+					configure's stdin is not a tty.
 	
 	* unix/tclUnixPort.h: 
-	* generic/tclIOSock.c:          Changed size_t to socklen_t in
-                                        socket-related function calls.
+	* generic/tclIOSock.c:		Changed size_t to socklen_t in
+					socket-related function calls.
 
-	* unix/configure.in:            Added test and fallback definition
-                                        for socklen_t.
+	* unix/configure.in:		Added test and fallback definition
+					for socklen_t.
 	
 	* unix/configure:               generated.
 
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 60b7d7f..305a1e4 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.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: tclEvent.c,v 1.28 2003/02/22 09:23:16 vasiljevic Exp $
+ * RCS: @(#) $Id: tclEvent.c,v 1.28.2.1 2003/05/13 12:44:07 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -763,13 +763,17 @@ void
 Tcl_Finalize()
 {
     ExitHandler *exitPtr;
-    ThreadSpecificData *tsdPtr;
 
     TclpInitLock();
     if (subsystemsInitialized != 0) {
 	subsystemsInitialized = 0;
 
-	tsdPtr = TCL_TSD_INIT(&dataKey);
+	/*
+	 * Ensure the thread-specific data is initialised as it is
+	 * used in Tcl_FinalizeThread()
+	 */
+
+	(void) TCL_TSD_INIT(&dataKey);
 
 	/*
 	 * Invoke exit handlers first.