merge trunk.

Remove now unused internal functions.

3 files changed, 0 insertions, 41 deletions

diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 8ada6d2..7f65262 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -4186,7 +4186,6 @@ TEBCresume(
 		} else if (flags & TCL_LEAVE_ERR_MSG) {
 		    goto slowUnsetArray;
 		}
-		varPtr->value.objPtr = NULL;
 		TRACE_APPEND(("OK\n"));
 		NEXT_INST_F(6, 1, 0);
 	    } else if (!varPtr && !(flags & TCL_LEAVE_ERR_MSG)) {
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 54ecc0b..356d250 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3059,9 +3059,6 @@ MODULE_SCOPE void	TclpInitUnlock(void);
 MODULE_SCOPE Tcl_Obj *	TclpObjListVolumes(void);
 MODULE_SCOPE void	TclpMasterLock(void);
 MODULE_SCOPE void	TclpMasterUnlock(void);
-MODULE_SCOPE void	TclpMutexLock(void);
-MODULE_SCOPE void	TclpMutexUnlock(void);
-MODULE_SCOPE void	TclMutexUnlockAndFinalize(Tcl_Mutex *mutex);
 MODULE_SCOPE int	TclpMatchFiles(Tcl_Interp *interp, char *separators,
 			    Tcl_DString *dirPtr, char *pattern, char *tail);
 MODULE_SCOPE int	TclpObjNormalizePath(Tcl_Interp *interp,
diff --git a/generic/tclThread.c b/generic/tclThread.c
index c2112b7..198fa6a 100644
--- a/generic/tclThread.c
+++ b/generic/tclThread.c
@@ -284,43 +284,6 @@ Tcl_MutexFinalize(
 /*
  *----------------------------------------------------------------------
  *
- * TclMutexUnlockAndFinalize --
- *
- *	This procedure is invoked to unlock and then finalize a mutex.
- *	The mutex must have been locked by Tcl_MutexLock.  It is also
- *	removed from the list of remembered objects.  The mutex can no
- *	longer be used after calling this procedure.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Remove the mutex from the list.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclMutexUnlockAndFinalize(
-    Tcl_Mutex *mutexPtr)
-{
-    Tcl_Mutex mutex;
-    TclpMasterLock();
-    TclpMutexLock();
-#ifdef TCL_THREADS
-    mutex = *mutexPtr;
-    *mutexPtr = NULL; /* Force it to be created again. */
-    Tcl_MutexUnlock(&mutex);
-    TclpFinalizeMutex(&mutex);
-#endif
-    ForgetSyncObject(mutexPtr, &mutexRecord);
-    TclpMutexUnlock();
-    TclpMasterUnlock();
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TclRememberCondition
  *
  *	Keep a list of condition variables used during finalization.