database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-22 21:53:06 +03:00
Code Activity

Eliminate unnecessary dependency on mktime(), and consequent 'Unable to

Browse Source 
convert date to tm' failures, by using DetermineLocalTimeZone() instead.
This commit is contained in:
Tom Lane
2002-09-03 19:41:28 +00:00
parent c917660a11
commit 4885dabe9d
1 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/backend/utils/adt/date.c
View File

@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.70 2002/08/04 06:44:47 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.71 2002/09/03 19:41:28 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@@ -337,45 +337,32 @@ date_timestamptz(PG_FUNCTION_ARGS)
TimestampTz result; TimestampTz result;
struct tm tt, struct tm tt,
*tm = &tt; *tm = &tt;
time_t utime;
j2date((dateVal + date2j(2000, 1, 1)), &(tm->tm_year), &(tm->tm_mon), &(tm->tm_mday)); j2date((dateVal + date2j(2000, 1, 1)),
&(tm->tm_year), &(tm->tm_mon), &(tm->tm_mday));
if (IS_VALID_UTIME(tm->tm_year, tm->tm_mon, tm->tm_mday)) if (IS_VALID_UTIME(tm->tm_year, tm->tm_mon, tm->tm_mday))
{ {
#if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE) int tz;
tm->tm_hour = 0; tm->tm_hour = 0;
tm->tm_min = 0; tm->tm_min = 0;
tm->tm_sec = 0; tm->tm_sec = 0;
tm->tm_isdst = -1; tz = DetermineLocalTimeZone(tm);
tm->tm_year -= 1900;
tm->tm_mon -= 1;
utime = mktime(tm);
if (utime == -1)
elog(ERROR, "Unable to convert date to tm");
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = ((utime * INT64CONST(1000000)) result = (dateVal * INT64CONST(86400000000))
+ ((date2j(1970, 1, 1) - date2j(2000, 1, 1)) * INT64CONST(86400000000))); + (tz * INT64CONST(1000000));
#else #else
result = utime + ((date2j(1970, 1, 1) - date2j(2000, 1, 1)) * 86400.0); result = dateVal * 86400.0 + tz;
#endif
#else
#ifdef HAVE_INT64_TIMESTAMP
result = ((dateVal * INT64CONST(86400000000))
+ (CTimeZone * INT64CONST(1000000)));
#else
result = dateVal * 86400.0 + CTimeZone;
#endif
#endif #endif
} }
else else
{ {
/* Outside of range for timezone support, so assume UTC */
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = (dateVal * INT64CONST(86400000000)); result = (dateVal * INT64CONST(86400000000));
#else #else
/* Outside of range for timezone support, so assume UTC */
result = dateVal * 86400.0; result = dateVal * 86400.0;
#endif #endif
} }