提交 1e790e20 编写于 作者: T Thomas G. Lockhart

Fix return value for tm2datetime to properly indicate failure.

上级 b6b41172
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.20 1997/05/11 15:11:34 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.21 1997/05/13 04:26:07 thomas Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -700,7 +700,9 @@ printf( "datetime_add_span- date was %d.%02d.%02d\n", tm->tm_year, tm->tm_mon, t ...@@ -700,7 +700,9 @@ printf( "datetime_add_span- date was %d.%02d.%02d\n", tm->tm_year, tm->tm_mon, t
#ifdef DATEDEBUG #ifdef DATEDEBUG
printf( "datetime_add_span- date becomes %d.%02d.%02d\n", tm->tm_year, tm->tm_mon, tm->tm_mday); printf( "datetime_add_span- date becomes %d.%02d.%02d\n", tm->tm_year, tm->tm_mon, tm->tm_mday);
#endif #endif
tm2datetime( tm, fsec, NULL, result); if (tm2datetime( tm, fsec, NULL, result) != 0)
elog(WARN,"Unable to add datetime and timespan",NULL);
} else { } else {
DATETIME_INVALID(*result); DATETIME_INVALID(*result);
...@@ -1673,7 +1675,7 @@ tm2datetime( struct tm *tm, double fsec, int *tzp, DateTime *result) { ...@@ -1673,7 +1675,7 @@ tm2datetime( struct tm *tm, double fsec, int *tzp, DateTime *result) {
/* Julian day routines are not correct for negative Julian days */ /* Julian day routines are not correct for negative Julian days */
if (! IS_VALID_JULIAN( tm->tm_year, tm->tm_mon, tm->tm_mday)) if (! IS_VALID_JULIAN( tm->tm_year, tm->tm_mon, tm->tm_mday))
return(DT_INVALID); return(-1);
date = date2j(tm->tm_year,tm->tm_mon,tm->tm_mday) - date2j(2000,1,1); date = date2j(tm->tm_year,tm->tm_mon,tm->tm_mday) - date2j(2000,1,1);
time = time2t(tm->tm_hour,tm->tm_min,(tm->tm_sec + fsec)); time = time2t(tm->tm_hour,tm->tm_min,(tm->tm_sec + fsec));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册