Merge trunk.

Throw away TclpGetDate, TclpLocaltime and TclpGmtime and all related dead code. It makes the androwish binary (somewhat) smaller.

1 files changed, 0 insertions, 197 deletions

diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index 315bcf9..470b122 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -17,34 +17,9 @@
 #endif
 
 /*
- * TclpGetDate is coded to return a pointer to a 'struct tm'. For thread
- * safety, this structure must be in thread-specific data. The 'tmKey'
- * variable is the key to this buffer.
- */
-
-static Tcl_ThreadDataKey tmKey;
-typedef struct ThreadSpecificData {
-    struct tm gmtime_buf;
-    struct tm localtime_buf;
-} ThreadSpecificData;
-
-/*
- * If we fall back on the thread-unsafe versions of gmtime and localtime, use
- * this mutex to try to protect them.
- */
-
-TCL_DECLARE_MUTEX(tmMutex)
-
-static char *lastTZ = NULL;	/* Holds the last setting of the TZ
-				 * environment variable, or an empty string if
-				 * the variable was not set. */
-
-/*
  * Static functions declared in this file.
  */
 
-static void		SetTZIfNecessary(void);
-static void		CleanupMemory(ClientData clientData);
 static void		NativeScaleTime(Tcl_Time *timebuf,
 			    ClientData clientData);
 static void		NativeGetTime(Tcl_Time *timebuf,
@@ -248,114 +223,6 @@ Tcl_GetTime(
 /*
  *----------------------------------------------------------------------
  *
- * TclpGetDate --
- *
- *	This function converts between seconds and struct tm. If useGMT is
- *	true, then the returned date will be in Greenwich Mean Time (GMT).
- *	Otherwise, it will be in the local time zone.
- *
- * Results:
- *	Returns a static tm structure.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-struct tm *
-TclpGetDate(
-    const time_t *time,
-    int useGMT)
-{
-    if (useGMT) {
-	return TclpGmtime(time);
-    } else {
-	return TclpLocaltime(time);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGmtime --
- *
- *	Wrapper around the 'gmtime' library function to make it thread safe.
- *
- * Results:
- *	Returns a pointer to a 'struct tm' in thread-specific data.
- *
- * Side effects:
- *	Invokes gmtime or gmtime_r as appropriate.
- *
- *----------------------------------------------------------------------
- */
-
-struct tm *
-TclpGmtime(
-    const time_t *timePtr)	/* Pointer to the number of seconds since the
-				 * local system's epoch */
-{
-    /*
-     * Get a thread-local buffer to hold the returned time.
-     */
-
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&tmKey);
-
-#ifdef HAVE_GMTIME_R
-    gmtime_r(timePtr, &tsdPtr->gmtime_buf);
-#else
-    Tcl_MutexLock(&tmMutex);
-    memcpy(&tsdPtr->gmtime_buf, gmtime(timePtr), sizeof(struct tm));
-    Tcl_MutexUnlock(&tmMutex);
-#endif
-
-    return &tsdPtr->gmtime_buf;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpLocaltime --
- *
- *	Wrapper around the 'localtime' library function to make it thread
- *	safe.
- *
- * Results:
- *	Returns a pointer to a 'struct tm' in thread-specific data.
- *
- * Side effects:
- *	Invokes localtime or localtime_r as appropriate.
- *
- *----------------------------------------------------------------------
- */
-
-struct tm *
-TclpLocaltime(
-    const time_t *timePtr)	/* Pointer to the number of seconds since the
-				 * local system's epoch */
-{
-    /*
-     * Get a thread-local buffer to hold the returned time.
-     */
-
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&tmKey);
-
-    SetTZIfNecessary();
-#ifdef HAVE_LOCALTIME_R
-    localtime_r(timePtr, &tsdPtr->localtime_buf);
-#else
-    Tcl_MutexLock(&tmMutex);
-    memcpy(&tsdPtr->localtime_buf, localtime(timePtr), sizeof(struct tm));
-    Tcl_MutexUnlock(&tmMutex);
-#endif
-
-    return &tsdPtr->localtime_buf;
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * Tcl_SetTimeProc --
  *
  *	TIP #233 (Virtualized Time): Registers two handlers for the
@@ -467,70 +334,6 @@ NativeGetTime(
     timePtr->sec = tv.tv_sec;
     timePtr->usec = tv.tv_usec;
 }
-/*
- *----------------------------------------------------------------------
- *
- * SetTZIfNecessary --
- *
- *	Determines whether a call to 'tzset' is needed prior to the next call
- *	to 'localtime' or examination of the 'timezone' variable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If 'tzset' has never been called in the current process, or if the
- *	value of the environment variable TZ has changed since the last call
- *	to 'tzset', then 'tzset' is called again.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SetTZIfNecessary(void)
-{
-    const char *newTZ = getenv("TZ");
-
-    Tcl_MutexLock(&tmMutex);
-    if (newTZ == NULL) {
-	newTZ = "";
-    }
-    if (lastTZ == NULL || strcmp(lastTZ, newTZ)) {
-	tzset();
-	if (lastTZ == NULL) {
-	    Tcl_CreateExitHandler(CleanupMemory, NULL);
-	} else {
-	    ckfree(lastTZ);
-	}
-	lastTZ = ckalloc(strlen(newTZ) + 1);
-	strcpy(lastTZ, newTZ);
-    }
-    Tcl_MutexUnlock(&tmMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CleanupMemory --
- *
- *	Releases the private copy of the TZ environment variable upon exit
- *	from Tcl.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees allocated memory.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-CleanupMemory(
-    ClientData ignored)
-{
-    ckfree(lastTZ);
-}
 
 /*
  * Local Variables: