rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove more extraneous parentheses in date/time functions.

This commit is contained in:
Bruce Momjian 2005-05-24 02:09:45 +00:00
parent a99b2852ca
commit 09ff9dbe2b
9 changed files with 391 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.107 2005/05/23 21:54:01 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.108 2005/05/24 02:09:45 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -921,10 +921,10 @@ static int
tm2time(struct pg_tm * tm, fsec_t fsec, TimeADT *result) tm2time(struct pg_tm * tm, fsec_t fsec, TimeADT *result)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*result = ((((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec) *result = ((((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec)
* USECS_PER_SEC) + fsec); * USECS_PER_SEC) + fsec;
#else #else
*result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec); *result = ((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec + fsec;
#endif #endif
return 0; return 0;
} }
@ -938,12 +938,12 @@ static int
time2tm(TimeADT time, struct pg_tm * tm, fsec_t *fsec) time2tm(TimeADT time, struct pg_tm * tm, fsec_t *fsec)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
tm->tm_hour = (time / USECS_PER_HOUR); tm->tm_hour = time / USECS_PER_HOUR;
time -= (tm->tm_hour * USECS_PER_HOUR); time -= tm->tm_hour * USECS_PER_HOUR;
tm->tm_min = (time / USECS_PER_MINUTE); tm->tm_min = time / USECS_PER_MINUTE;
time -= (tm->tm_min * USECS_PER_MINUTE); time -= tm->tm_min * USECS_PER_MINUTE;
tm->tm_sec = (time / USECS_PER_SEC); tm->tm_sec = time / USECS_PER_SEC;
time -= (tm->tm_sec * USECS_PER_SEC); time -= tm->tm_sec * USECS_PER_SEC;
*fsec = time; *fsec = time;
#else #else
double trem; double trem;
@ -1077,7 +1077,7 @@ AdjustTimeForTypmod(TimeADT *time, int32 typmod)
}; };
#endif #endif
if ((typmod >= 0) && (typmod <= MAX_TIME_PRECISION)) if (typmod >= 0 && typmod <= MAX_TIME_PRECISION)
{ {
/* /*
* Note: this round-to-nearest code is not completely consistent * Note: this round-to-nearest code is not completely consistent
@ -1089,17 +1089,17 @@ AdjustTimeForTypmod(TimeADT *time, int32 typmod)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if (*time >= INT64CONST(0)) if (*time >= INT64CONST(0))
{ {
*time = (((*time + TimeOffsets[typmod]) / TimeScales[typmod]) *time = ((*time + TimeOffsets[typmod]) / TimeScales[typmod]) *
* TimeScales[typmod]); TimeScales[typmod];
} }
else else
{ {
*time = -((((-*time) + TimeOffsets[typmod]) / TimeScales[typmod]) *time = -((((-*time) + TimeOffsets[typmod]) / TimeScales[typmod]) *
* TimeScales[typmod]); TimeScales[typmod]);
} }
#else #else
*time = (rint(((double) *time) * TimeScales[typmod]) *time = rint((double)*time * TimeScales[typmod])
/ TimeScales[typmod]); / TimeScales[typmod];
#endif #endif
} }
} }
@ -1342,10 +1342,10 @@ timestamp_time(PG_FUNCTION_ARGS)
* Could also do this with time = (timestamp / USECS_PER_DAY * * Could also do this with time = (timestamp / USECS_PER_DAY *
* USECS_PER_DAY) - timestamp; * USECS_PER_DAY) - timestamp;
*/ */
result = ((((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec) result = ((((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec) *
* USECS_PER_SEC) + fsec); USECS_PER_SEC) + fsec;
#else #else
result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec); result = ((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec + fsec;
#endif #endif
PG_RETURN_TIMEADT(result); PG_RETURN_TIMEADT(result);
@ -1379,10 +1379,10 @@ timestamptz_time(PG_FUNCTION_ARGS)
* Could also do this with time = (timestamp / USECS_PER_DAY * * Could also do this with time = (timestamp / USECS_PER_DAY *
* USECS_PER_DAY) - timestamp; * USECS_PER_DAY) - timestamp;
*/ */
result = ((((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec) result = ((((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec) *
* USECS_PER_SEC) + fsec); USECS_PER_SEC) + fsec;
#else #else
result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec); result = ((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec + fsec;
#endif #endif
PG_RETURN_TIMEADT(result); PG_RETURN_TIMEADT(result);
@ -1624,26 +1624,25 @@ time_part(PG_FUNCTION_ARGS)
{ {
case DTK_MICROSEC: case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = ((tm->tm_sec * USECS_PER_SEC) + fsec); result = tm->tm_sec * USECS_PER_SEC + fsec;
#else #else
result = ((tm->tm_sec + fsec) * 1000000); result = (tm->tm_sec + fsec) * 1000000;
#endif #endif
break; break;
case DTK_MILLISEC: case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = ((tm->tm_sec * INT64CONST(1000)) result = tm->tm_sec * INT64CONST(1000) + fsec / INT64CONST(1000);
+ (fsec / INT64CONST(1000)));
#else #else
result = ((tm->tm_sec + fsec) * 1000); result = (tm->tm_sec + fsec) * 1000;
#endif #endif
break; break;
case DTK_SECOND: case DTK_SECOND:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = (tm->tm_sec + (fsec / USECS_PER_SEC)); result = tm->tm_sec + fsec / USECS_PER_SEC;
#else #else
result = (tm->tm_sec + fsec); result = tm->tm_sec + fsec;
#endif #endif
break; break;
@ -1675,7 +1674,7 @@ time_part(PG_FUNCTION_ARGS)
result = 0; result = 0;
} }
} }
else if ((type == RESERV) && (val == DTK_EPOCH)) else if (type == RESERV && val == DTK_EPOCH)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = (time / 1000000e0); result = (time / 1000000e0);
@ -1708,10 +1707,10 @@ static int
tm2timetz(struct pg_tm * tm, fsec_t fsec, int tz, TimeTzADT *result) tm2timetz(struct pg_tm * tm, fsec_t fsec, int tz, TimeTzADT *result)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result->time = ((((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec) result->time = ((((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec) *
* USECS_PER_SEC) + fsec); USECS_PER_SEC) + fsec;
#else #else
result->time = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec + fsec); result->time = ((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec + fsec;
#endif #endif
result->zone = tz; result->zone = tz;
@ -1823,12 +1822,12 @@ timetz2tm(TimeTzADT *time, struct pg_tm * tm, fsec_t *fsec, int *tzp)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
int64 trem = time->time; int64 trem = time->time;
tm->tm_hour = (trem / USECS_PER_HOUR); tm->tm_hour = trem / USECS_PER_HOUR;
trem -= (tm->tm_hour * USECS_PER_HOUR); trem -= tm->tm_hour * USECS_PER_HOUR;
tm->tm_min = (trem / USECS_PER_MINUTE); tm->tm_min = trem / USECS_PER_MINUTE;
trem -= (tm->tm_min * USECS_PER_MINUTE); trem -= tm->tm_min * USECS_PER_MINUTE;
tm->tm_sec = (trem / USECS_PER_SEC); tm->tm_sec = trem / USECS_PER_SEC;
*fsec = (trem - (tm->tm_sec * USECS_PER_SEC)); *fsec = trem - tm->tm_sec * USECS_PER_SEC;
#else #else
double trem = time->time; double trem = time->time;
@ -2281,10 +2280,9 @@ datetimetz_timestamptz(PG_FUNCTION_ARGS)
TimestampTz result; TimestampTz result;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = (((date *USECS_PER_DAY) +time->time) result = (date * USECS_PER_DAY + time->time) + time->zone * USECS_PER_SEC;
+ (time->zone * USECS_PER_SEC));
#else #else
result = (((date *(double)SECS_PER_DAY) +time->time) + time->zone); result = date * (double)SECS_PER_DAY + time->time + time->zone;
#endif #endif
PG_RETURN_TIMESTAMP(result); PG_RETURN_TIMESTAMP(result);
@ -2400,26 +2398,25 @@ timetz_part(PG_FUNCTION_ARGS)
case DTK_MICROSEC: case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = ((tm->tm_sec * USECS_PER_SEC) + fsec); result = tm->tm_sec * USECS_PER_SEC + fsec;
#else #else
result = ((tm->tm_sec + fsec) * 1000000); result = (tm->tm_sec + fsec) * 1000000;
#endif #endif
break; break;
case DTK_MILLISEC: case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = ((tm->tm_sec * INT64CONST(1000)) result = tm->tm_sec * INT64CONST(1000) + fsec / INT64CONST(1000);
+ (fsec / INT64CONST(1000)));
#else #else
result = ((tm->tm_sec + fsec) * 1000); result = (tm->tm_sec + fsec) * 1000;
#endif #endif
break; break;
case DTK_SECOND: case DTK_SECOND:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = (tm->tm_sec + (fsec / USECS_PER_SEC)); result = tm->tm_sec + fsec / USECS_PER_SEC;
#else #else
result = (tm->tm_sec + fsec); result = tm->tm_sec + fsec;
#endif #endif
break; break;
@ -2448,12 +2445,12 @@ timetz_part(PG_FUNCTION_ARGS)
result = 0; result = 0;
} }
} }
else if ((type == RESERV) && (val == DTK_EPOCH)) else if (type == RESERV && val == DTK_EPOCH)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = ((time->time / 1000000e0) + time->zone); result = time->time / 1000000e0 + time->zone;
#else #else
result = (time->time + time->zone); result = time->time + time->zone;
#endif #endif
} }
else else
@ -2492,11 +2489,11 @@ timetz_zone(PG_FUNCTION_ARGS)
result = (TimeTzADT *) palloc(sizeof(TimeTzADT)); result = (TimeTzADT *) palloc(sizeof(TimeTzADT));
if ((type == TZ) || (type == DTZ)) if (type == TZ || type == DTZ)
{ {
tz = val * 60; tz = val * 60;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result->time = time->time + ((time->zone - tz) * USECS_PER_SEC); result->time = time->time + (time->zone - tz) * USECS_PER_SEC;
while (result->time < INT64CONST(0)) while (result->time < INT64CONST(0))
result->time += USECS_PER_DAY; result->time += USECS_PER_DAY;
while (result->time >= USECS_PER_DAY) while (result->time >= USECS_PER_DAY)
@ -2550,7 +2547,7 @@ timetz_izone(PG_FUNCTION_ARGS)
result = (TimeTzADT *) palloc(sizeof(TimeTzADT)); result = (TimeTzADT *) palloc(sizeof(TimeTzADT));
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result->time = time->time + ((time->zone - tz) * USECS_PER_SEC); result->time = time->time + (time->zone - tz) * USECS_PER_SEC;
while (result->time < INT64CONST(0)) while (result->time < INT64CONST(0))
result->time += USECS_PER_DAY; result->time += USECS_PER_DAY;
while (result->time >= USECS_PER_DAY) while (result->time >= USECS_PER_DAY)

58
src/backend/utils/adt/datetime.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.143 2005/05/23 21:54:01 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.144 2005/05/24 02:09:45 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -3020,7 +3020,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
return DTERR_BAD_FORMAT; return DTERR_BAD_FORMAT;
if (*field[i] == '-') if (*field[i] == '-')
fval = -(fval); fval = -fval;
} }
else if (*cp == '\0') else if (*cp == '\0')
fval = 0; fval = 0;
@ -3033,24 +3033,24 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
{ {
case DTK_MICROSEC: case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += (val + fval); *fsec += val + fval;
#else #else
*fsec += ((val + fval) * 1e-6); *fsec += (val + fval) * 1e-6;
#endif #endif
break; break;
case DTK_MILLISEC: case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += ((val + fval) * 1000); *fsec += (val + fval) * 1000;
#else #else
*fsec += ((val + fval) * 1e-3); *fsec += (val + fval) * 1e-3;
#endif #endif
break; break;
case DTK_SECOND: case DTK_SECOND:
tm->tm_sec += val; tm->tm_sec += val;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += (fval * 1000000); *fsec += fval * 1000000;
#else #else
*fsec += fval; *fsec += fval;
#endif #endif
@ -3067,9 +3067,9 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
sec = fval; sec = fval;
tm->tm_sec += sec; tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += ((fval - sec) * 1000000); *fsec += (fval - sec) * 1000000;
#else #else
*fsec += (fval - sec); *fsec += fval - sec;
#endif #endif
} }
tmask = DTK_M(MINUTE); tmask = DTK_M(MINUTE);
@ -3085,9 +3085,9 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
sec = fval; sec = fval;
tm->tm_sec += sec; tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += ((fval - sec) * 1000000); *fsec += (fval - sec) * 1000000;
#else #else
*fsec += (fval - sec); *fsec += fval - sec;
#endif #endif
} }
tmask = DTK_M(HOUR); tmask = DTK_M(HOUR);
@ -3103,9 +3103,9 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
sec = fval; sec = fval;
tm->tm_sec += sec; tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += ((fval - sec) * 1000000); *fsec += (fval - sec) * 1000000;
#else #else
*fsec += (fval - sec); *fsec += fval - sec;
#endif #endif
} }
tmask = (fmask & DTK_M(DAY)) ? 0 : DTK_M(DAY); tmask = (fmask & DTK_M(DAY)) ? 0 : DTK_M(DAY);
@ -3117,13 +3117,13 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
{ {
int sec; int sec;
fval *= (7 * SECS_PER_DAY); fval *= 7 * SECS_PER_DAY;
sec = fval; sec = fval;
tm->tm_sec += sec; tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += ((fval - sec) * 1000000); *fsec += (fval - sec) * 1000000;
#else #else
*fsec += (fval - sec); *fsec += fval - sec;
#endif #endif
} }
tmask = (fmask & DTK_M(DAY)) ? 0 : DTK_M(DAY); tmask = (fmask & DTK_M(DAY)) ? 0 : DTK_M(DAY);
@ -3135,13 +3135,13 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
{ {
int sec; int sec;
fval *= (30 * SECS_PER_DAY); fval *= 30 * SECS_PER_DAY;
sec = fval; sec = fval;
tm->tm_sec += sec; tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += ((fval - sec) * 1000000); *fsec += (fval - sec) * 1000000;
#else #else
*fsec += (fval - sec); *fsec += fval - sec;
#endif #endif
} }
tmask = DTK_M(MONTH); tmask = DTK_M(MONTH);
@ -3150,28 +3150,28 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
case DTK_YEAR: case DTK_YEAR:
tm->tm_year += val; tm->tm_year += val;
if (fval != 0) if (fval != 0)
tm->tm_mon += (fval * 12); tm->tm_mon += fval * 12;
tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR); tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break; break;
case DTK_DECADE: case DTK_DECADE:
tm->tm_year += val * 10; tm->tm_year += val * 10;
if (fval != 0) if (fval != 0)
tm->tm_mon += (fval * 120); tm->tm_mon += fval * 120;
tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR); tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break; break;
case DTK_CENTURY: case DTK_CENTURY:
tm->tm_year += val * 100; tm->tm_year += val * 100;
if (fval != 0) if (fval != 0)
tm->tm_mon += (fval * 1200); tm->tm_mon += fval * 1200;
tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR); tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break; break;
case DTK_MILLENNIUM: case DTK_MILLENNIUM:
tm->tm_year += val * 1000; tm->tm_year += val * 1000;
if (fval != 0) if (fval != 0)
tm->tm_mon += (fval * 12000); tm->tm_mon += fval * 12000;
tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR); tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break; break;
@ -3233,12 +3233,12 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct pg_tm * tm,
if (is_before) if (is_before)
{ {
*fsec = -(*fsec); *fsec = -(*fsec);
tm->tm_sec = -(tm->tm_sec); tm->tm_sec = -tm->tm_sec;
tm->tm_min = -(tm->tm_min); tm->tm_min = -tm->tm_min;
tm->tm_hour = -(tm->tm_hour); tm->tm_hour = -tm->tm_hour;
tm->tm_mday = -(tm->tm_mday); tm->tm_mday = -tm->tm_mday;
tm->tm_mon = -(tm->tm_mon); tm->tm_mon = -tm->tm_mon;
tm->tm_year = -(tm->tm_year); tm->tm_year = -tm->tm_year;
} }
/* ensure that at least one time field has been found */ /* ensure that at least one time field has been found */

64
src/backend/utils/adt/nabstime.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.130 2005/05/23 21:54:02 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.131 2005/05/24 02:09:45 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -27,7 +27,7 @@
#include "miscadmin.h" #include "miscadmin.h"
#include "pgtime.h" #include "pgtime.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/timestamp.h"
#define MIN_DAYNUM -24856 /* December 13, 1901 */ #define MIN_DAYNUM -24856 /* December 13, 1901 */
#define MAX_DAYNUM 24854 /* January 18, 2038 */ #define MAX_DAYNUM 24854 /* January 18, 2038 */
@ -191,7 +191,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct pg_tm * tm, char **tzn)
if (HasCTZSet && (tzp != NULL)) if (HasCTZSet && (tzp != NULL))
time -= CTimeZone; time -= CTimeZone;
if ((!HasCTZSet) && (tzp != NULL)) if (!HasCTZSet && tzp != NULL)
tx = pg_localtime(&time,global_timezone); tx = pg_localtime(&time,global_timezone);
else else
tx = pg_gmtime(&time); tx = pg_gmtime(&time);
@ -273,7 +273,7 @@ tm2abstime(struct pg_tm * tm, int tz)
day = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - UNIX_EPOCH_JDATE; day = date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - UNIX_EPOCH_JDATE;
/* check for time out of range */ /* check for time out of range */
if ((day < MIN_DAYNUM) || (day > MAX_DAYNUM)) if (day < MIN_DAYNUM || day > MAX_DAYNUM)
return INVALID_ABSTIME; return INVALID_ABSTIME;
/* convert to seconds */ /* convert to seconds */
@ -432,9 +432,9 @@ abstime_finite(PG_FUNCTION_ARGS)
{ {
AbsoluteTime abstime = PG_GETARG_ABSOLUTETIME(0); AbsoluteTime abstime = PG_GETARG_ABSOLUTETIME(0);
PG_RETURN_BOOL((abstime != INVALID_ABSTIME) && PG_RETURN_BOOL(abstime != INVALID_ABSTIME &&
(abstime != NOSTART_ABSTIME) && abstime != NOSTART_ABSTIME &&
(abstime != NOEND_ABSTIME)); abstime != NOEND_ABSTIME);
} }
@ -729,8 +729,8 @@ reltimein(PG_FUNCTION_ARGS)
switch (dtype) switch (dtype)
{ {
case DTK_DELTA: case DTK_DELTA:
result = ((((tm->tm_hour * 60) + tm->tm_min) * 60) + tm->tm_sec); result = ((tm->tm_hour * 60 + tm->tm_min) * 60) + tm->tm_sec;
result += ((tm->tm_year * 36525 * 864) + (((tm->tm_mon * 30) + tm->tm_mday) * SECS_PER_DAY)); result += tm->tm_year * 36525 * 864 + ((tm->tm_mon * 30) + tm->tm_mday) * SECS_PER_DAY;
break; break;
default: default:
@ -946,14 +946,14 @@ interval_reltime(PG_FUNCTION_ARGS)
} }
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
span = ((((INT64CONST(365250000) * year) + (INT64CONST(30000000) * month)) span = ((INT64CONST(365250000) * year + INT64CONST(30000000) * month) *
* INT64CONST(SECS_PER_DAY)) + interval->time); INT64CONST(86400)) + interval->time;
span /= USECS_PER_SEC; span /= USECS_PER_SEC;
#else #else
span = (((((double) 365.25 * year) + ((double) 30 * month)) * SECS_PER_DAY) + interval->time); span = (365.25 * year + 30.0 * month) * SECS_PER_DAY + interval->time;
#endif #endif
if ((span < INT_MIN) || (span > INT_MAX)) if (span < INT_MIN || span > INT_MAX)
time = INVALID_RELTIME; time = INVALID_RELTIME;
else else
time = span; time = span;
@ -991,12 +991,12 @@ reltime_interval(PG_FUNCTION_ARGS)
result->time = (reltime * USECS_PER_SEC); result->time = (reltime * USECS_PER_SEC);
#else #else
TMODULO(reltime, year, (36525 * 864)); TMODULO(reltime, year, 36525 * 864);
TMODULO(reltime, month, (30 * SECS_PER_DAY)); TMODULO(reltime, month, 30 * SECS_PER_DAY);
result->time = reltime; result->time = reltime;
#endif #endif
result->month = ((12 * year) + month); result->month = 12 * year + month;
break; break;
} }
@ -1049,8 +1049,8 @@ timepl(PG_FUNCTION_ARGS)
if (AbsoluteTimeIsReal(t1) && if (AbsoluteTimeIsReal(t1) &&
RelativeTimeIsValid(t2) && RelativeTimeIsValid(t2) &&
((t2 > 0) ? (t1 < NOEND_ABSTIME - t2) ((t2 > 0 && t1 < NOEND_ABSTIME - t2) ||
: (t1 > NOSTART_ABSTIME - t2))) /* prevent overflow */ (t2 <= 0 && t1 > NOSTART_ABSTIME - t2))) /* prevent overflow */
PG_RETURN_ABSOLUTETIME(t1 + t2); PG_RETURN_ABSOLUTETIME(t1 + t2);
PG_RETURN_ABSOLUTETIME(INVALID_ABSTIME); PG_RETURN_ABSOLUTETIME(INVALID_ABSTIME);
@ -1068,8 +1068,8 @@ timemi(PG_FUNCTION_ARGS)
if (AbsoluteTimeIsReal(t1) && if (AbsoluteTimeIsReal(t1) &&
RelativeTimeIsValid(t2) && RelativeTimeIsValid(t2) &&
((t2 > 0) ? (t1 > NOSTART_ABSTIME + t2) ((t2 > 0 && t1 > NOSTART_ABSTIME + t2) ||
: (t1 < NOEND_ABSTIME + t2))) /* prevent overflow */ (t2 <= 0 && t1 < NOEND_ABSTIME + t2))) /* prevent overflow */
PG_RETURN_ABSOLUTETIME(t1 - t2); PG_RETURN_ABSOLUTETIME(t1 - t2);
PG_RETURN_ABSOLUTETIME(INVALID_ABSTIME); PG_RETURN_ABSOLUTETIME(INVALID_ABSTIME);
@ -1272,12 +1272,12 @@ tinterval_cmp_internal(TimeInterval a, TimeInterval b)
* non-INVALID. This is somewhat arbitrary; the important thing is to * non-INVALID. This is somewhat arbitrary; the important thing is to
* have a consistent sort order. * have a consistent sort order.
*/ */
a_invalid = ((a->status == T_INTERVAL_INVAL) || a_invalid = a->status == T_INTERVAL_INVAL ||
(a->data[0] == INVALID_ABSTIME) || a->data[0] == INVALID_ABSTIME ||
(a->data[1] == INVALID_ABSTIME)); a->data[1] == INVALID_ABSTIME;
b_invalid = ((b->status == T_INTERVAL_INVAL) || b_invalid = b->status == T_INTERVAL_INVAL ||
(b->data[0] == INVALID_ABSTIME) || b->data[0] == INVALID_ABSTIME ||
(b->data[1] == INVALID_ABSTIME)); b->data[1] == INVALID_ABSTIME;
if (a_invalid) if (a_invalid)
{ {
@ -1390,7 +1390,7 @@ tintervalleneq(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false); PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel, rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i))); TimeIntervalGetDatum(i)));
PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt == t)); PG_RETURN_BOOL(rt != INVALID_RELTIME && rt == t);
} }
Datum Datum
@ -1404,7 +1404,7 @@ tintervallenne(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false); PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel, rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i))); TimeIntervalGetDatum(i)));
PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt != t)); PG_RETURN_BOOL(rt != INVALID_RELTIME && rt != t);
} }
Datum Datum
@ -1418,7 +1418,7 @@ tintervallenlt(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false); PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel, rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i))); TimeIntervalGetDatum(i)));
PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt < t)); PG_RETURN_BOOL(rt != INVALID_RELTIME && rt < t);
} }
Datum Datum
@ -1432,7 +1432,7 @@ tintervallengt(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false); PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel, rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i))); TimeIntervalGetDatum(i)));
PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt > t)); PG_RETURN_BOOL(rt != INVALID_RELTIME && rt > t);
} }
Datum Datum
@ -1446,7 +1446,7 @@ tintervallenle(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false); PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel, rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i))); TimeIntervalGetDatum(i)));
PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt <= t)); PG_RETURN_BOOL(rt != INVALID_RELTIME && rt <= t);
} }
Datum Datum
@ -1460,7 +1460,7 @@ tintervallenge(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false); PG_RETURN_BOOL(false);
rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel, rt = DatumGetRelativeTime(DirectFunctionCall1(tintervalrel,
TimeIntervalGetDatum(i))); TimeIntervalGetDatum(i)));
PG_RETURN_BOOL((rt != INVALID_RELTIME) && (rt >= t)); PG_RETURN_BOOL(rt != INVALID_RELTIME && rt >= t);
} }
/* /*

81
src/backend/utils/adt/timestamp.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.122 2005/05/23 21:54:02 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.123 2005/05/24 02:09:45 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -280,8 +280,8 @@ AdjustTimestampForTypmod(Timestamp *time, int32 typmod)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if (*time >= INT64CONST(0)) if (*time >= INT64CONST(0))
{ {
*time = (((*time + TimestampOffsets[typmod]) / TimestampScales[typmod]) *time = ((*time + TimestampOffsets[typmod]) / TimestampScales[typmod]) *
* TimestampScales[typmod]); TimestampScales[typmod];
} }
else else
{ {
@ -289,8 +289,7 @@ AdjustTimestampForTypmod(Timestamp *time, int32 typmod)
* TimestampScales[typmod]); * TimestampScales[typmod]);
} }
#else #else
*time = (rint(((double) *time) * TimestampScales[typmod]) *time = rint((double)*time * TimestampScales[typmod]) / TimestampScales[typmod];
/ TimestampScales[typmod]);
#endif #endif
} }
} }
@ -891,7 +890,7 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if (interval->time >= INT64CONST(0)) if (interval->time >= INT64CONST(0))
{ {
interval->time = (((interval->time + interval->time = ((interval->time +
IntervalOffsets[precision]) / IntervalOffsets[precision]) /
IntervalScales[precision]) * IntervalScales[precision]) *
IntervalScales[precision]; IntervalScales[precision];
@ -1212,15 +1211,15 @@ tm2interval(struct pg_tm * tm, fsec_t fsec, Interval *span)
{ {
span->month = tm->tm_year * 12 + tm->tm_mon; span->month = tm->tm_year * 12 + tm->tm_mon;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
span->time = ((((((((tm->tm_mday * INT64CONST(24)) span->time = (((((((tm->tm_mday * INT64CONST(24)) +
+ tm->tm_hour) * INT64CONST(60)) tm->tm_hour) * INT64CONST(60)) +
+ tm->tm_min) * INT64CONST(60)) tm->tm_min) * INT64CONST(60)) +
+ tm->tm_sec) * USECS_PER_SEC) + fsec); tm->tm_sec) * USECS_PER_SEC) + fsec;
#else #else
span->time = ((((((tm->tm_mday * 24.0) span->time = (((((tm->tm_mday * 24.0) +
+ tm->tm_hour) * 60.0) tm->tm_hour) * 60.0) +
+ tm->tm_min) * 60.0) tm->tm_min) * 60.0) +
+ tm->tm_sec); tm->tm_sec;
span->time = JROUND(span->time + fsec); span->time = JROUND(span->time + fsec);
#endif #endif
@ -1231,14 +1230,14 @@ tm2interval(struct pg_tm * tm, fsec_t fsec, Interval *span)
static int64 static int64
time2t(const int hour, const int min, const int sec, const fsec_t fsec) time2t(const int hour, const int min, const int sec, const fsec_t fsec)
{ {
return ((((((hour * 60) + min) * 60) + sec) * USECS_PER_SEC) + fsec); return (((((hour * 60) + min) * 60) + sec) * USECS_PER_SEC) + fsec;
} /* time2t() */ } /* time2t() */
#else #else
static double static double
time2t(const int hour, const int min, const int sec, const fsec_t fsec) time2t(const int hour, const int min, const int sec, const fsec_t fsec)
{ {
return ((((hour * 60) + min) * 60) + sec + fsec); return (((hour * 60) + min) * 60) + sec + fsec;
} /* time2t() */ } /* time2t() */
#endif #endif
@ -1324,7 +1323,7 @@ int
timestamp_cmp_internal(Timestamp dt1, Timestamp dt2) timestamp_cmp_internal(Timestamp dt1, Timestamp dt2)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
return ((dt1 < dt2) ? -1 : ((dt1 > dt2) ? 1 : 0)); return (dt1 < dt2) ? -1 : ((dt1 > dt2) ? 1 : 0);
#else #else
/* /*
@ -1935,13 +1934,13 @@ timestamp_pl_interval(PG_FUNCTION_ARGS)
tm->tm_mon += span->month; tm->tm_mon += span->month;
if (tm->tm_mon > 12) if (tm->tm_mon > 12)
{ {
tm->tm_year += ((tm->tm_mon - 1) / 12); tm->tm_year += (tm->tm_mon - 1) / 12;
tm->tm_mon = (((tm->tm_mon - 1) % 12) + 1); tm->tm_mon = ((tm->tm_mon - 1) % 12) + 1;
} }
else if (tm->tm_mon < 1) else if (tm->tm_mon < 1)
{ {
tm->tm_year += ((tm->tm_mon / 12) - 1); tm->tm_year += tm->tm_mon / 12 - 1;
tm->tm_mon = ((tm->tm_mon % 12) + 12); tm->tm_mon = tm->tm_mon % 12 + 12;
} }
/* adjust for end of month boundary problems... */ /* adjust for end of month boundary problems... */
@ -2014,13 +2013,13 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS)
tm->tm_mon += span->month; tm->tm_mon += span->month;
if (tm->tm_mon > 12) if (tm->tm_mon > 12)
{ {
tm->tm_year += ((tm->tm_mon - 1) / 12); tm->tm_year += (tm->tm_mon - 1) / 12;
tm->tm_mon = (((tm->tm_mon - 1) % 12) + 1); tm->tm_mon = ((tm->tm_mon - 1) % 12) + 1;
} }
else if (tm->tm_mon < 1) else if (tm->tm_mon < 1)
{ {
tm->tm_year += ((tm->tm_mon / 12) - 1); tm->tm_year += tm->tm_mon / 12 - 1;
tm->tm_mon = ((tm->tm_mon % 12) + 12); tm->tm_mon = tm->tm_mon % 12 + 12;
} }
/* adjust for end of month boundary problems... */ /* adjust for end of month boundary problems... */
@ -2337,12 +2336,12 @@ timestamp_age(PG_FUNCTION_ARGS)
timestamp2tm(dt2, NULL, tm2, &fsec2, NULL) == 0) timestamp2tm(dt2, NULL, tm2, &fsec2, NULL) == 0)
{ {
fsec = (fsec1 - fsec2); fsec = (fsec1 - fsec2);
tm->tm_sec = (tm1->tm_sec - tm2->tm_sec); tm->tm_sec = tm1->tm_sec - tm2->tm_sec;
tm->tm_min = (tm1->tm_min - tm2->tm_min); tm->tm_min = tm1->tm_min - tm2->tm_min;
tm->tm_hour = (tm1->tm_hour - tm2->tm_hour); tm->tm_hour = tm1->tm_hour - tm2->tm_hour;
tm->tm_mday = (tm1->tm_mday - tm2->tm_mday); tm->tm_mday = tm1->tm_mday - tm2->tm_mday;
tm->tm_mon = (tm1->tm_mon - tm2->tm_mon); tm->tm_mon = tm1->tm_mon - tm2->tm_mon;
tm->tm_year = (tm1->tm_year - tm2->tm_year); tm->tm_year = tm1->tm_year - tm2->tm_year;
/* flip sign if necessary... */ /* flip sign if necessary... */
if (dt1 < dt2) if (dt1 < dt2)
@ -2450,13 +2449,13 @@ timestamptz_age(PG_FUNCTION_ARGS)
if (timestamp2tm(dt1, &tz1, tm1, &fsec1, &tzn) == 0 && if (timestamp2tm(dt1, &tz1, tm1, &fsec1, &tzn) == 0 &&
timestamp2tm(dt2, &tz2, tm2, &fsec2, &tzn) == 0) timestamp2tm(dt2, &tz2, tm2, &fsec2, &tzn) == 0)
{ {
fsec = (fsec1 - fsec2); fsec = fsec1 - fsec2;
tm->tm_sec = (tm1->tm_sec - tm2->tm_sec); tm->tm_sec = tm1->tm_sec - tm2->tm_sec;
tm->tm_min = (tm1->tm_min - tm2->tm_min); tm->tm_min = tm1->tm_min - tm2->tm_min;
tm->tm_hour = (tm1->tm_hour - tm2->tm_hour); tm->tm_hour = tm1->tm_hour - tm2->tm_hour;
tm->tm_mday = (tm1->tm_mday - tm2->tm_mday); tm->tm_mday = tm1->tm_mday - tm2->tm_mday;
tm->tm_mon = (tm1->tm_mon - tm2->tm_mon); tm->tm_mon = tm1->tm_mon - tm2->tm_mon;
tm->tm_year = (tm1->tm_year - tm2->tm_year); tm->tm_year = tm1->tm_year - tm2->tm_year;
/* flip sign if necessary... */ /* flip sign if necessary... */
if (dt1 < dt2) if (dt1 < dt2)
@ -3048,7 +3047,7 @@ interval_trunc(PG_FUNCTION_ARGS)
case DTK_YEAR: case DTK_YEAR:
tm->tm_mon = 0; tm->tm_mon = 0;
case DTK_QUARTER: case DTK_QUARTER:
tm->tm_mon = (3 * (tm->tm_mon / 3)); tm->tm_mon = 3 * (tm->tm_mon / 3);
case DTK_MONTH: case DTK_MONTH:
tm->tm_mday = 0; tm->tm_mday = 0;
case DTK_DAY: case DTK_DAY:
@ -3357,7 +3356,7 @@ timestamp_part(PG_FUNCTION_ARGS)
* ---- * ----
*/ */
if (tm->tm_year > 0) if (tm->tm_year > 0)
result = ((tm->tm_year + 99) / 100); result = (tm->tm_year + 99) / 100;
else else
/* caution: C division may have negative remainder */ /* caution: C division may have negative remainder */
result = -((99 - (tm->tm_year - 1)) / 100); result = -((99 - (tm->tm_year - 1)) / 100);
@ -3419,7 +3418,7 @@ timestamp_part(PG_FUNCTION_ARGS)
errmsg("timestamp out of range"))); errmsg("timestamp out of range")));
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
result = ((timestamptz - SetEpochTimestamp()) / 1000000e0); result = (timestamptz - SetEpochTimestamp()) / 1000000e0;
#else #else
result = timestamptz - SetEpochTimestamp(); result = timestamptz - SetEpochTimestamp();
#endif #endif

8
src/interfaces/ecpg/pgtypeslib/datetime.c
View File

@ -57,8 +57,8 @@ PGTYPESdate_from_asc(char *str, char **endptr)
return INT_MIN; return INT_MIN;
} }
if ((ParseDateTime(str, lowstr, field, ftype, MAXDATEFIELDS, &nf, ptr) != 0) if (ParseDateTime(str, lowstr, field, ftype, MAXDATEFIELDS, &nf, ptr) != 0 ||
|| (DecodeDateTime(field, ftype, nf, &dtype, tm, &fsec, &tzp, EuroDates) != 0)) DecodeDateTime(field, ftype, nf, &dtype, tm, &fsec, &tzp, EuroDates) != 0)
{ {
errno = PGTYPES_DATE_BAD_DATE; errno = PGTYPES_DATE_BAD_DATE;
return INT_MIN; return INT_MIN;
@ -92,7 +92,7 @@ PGTYPESdate_to_asc(date dDate)
int DateStyle = 1; int DateStyle = 1;
bool EuroDates = FALSE; bool EuroDates = FALSE;
j2date((dDate + date2j(2000, 1, 1)), &(tm->tm_year), &(tm->tm_mon), &(tm->tm_mday)); j2date(dDate + date2j(2000, 1, 1), &(tm->tm_year), &(tm->tm_mon), &(tm->tm_mday));
EncodeDateOnly(tm, DateStyle, buf, EuroDates); EncodeDateOnly(tm, DateStyle, buf, EuroDates);
return pgtypes_strdup(buf); return pgtypes_strdup(buf);
} }
@ -200,7 +200,7 @@ PGTYPESdate_fmt_asc(date dDate, char *fmtstring, char *outbuf)
strcpy(outbuf, fmtstring); strcpy(outbuf, fmtstring);
/* get the date */ /* get the date */
j2date((dDate + date2j(2000, 1, 1)), &(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday)); j2date(dDate + date2j(2000, 1, 1), &(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday));
dow = PGTYPESdate_dayofweek(dDate); dow = PGTYPESdate_dayofweek(dDate);
for (i = 0; mapping[i].format != NULL; i++) for (i = 0; mapping[i].format != NULL; i++)

262
src/interfaces/ecpg/pgtypeslib/dt_common.c
View File

@ -544,8 +544,8 @@ DecodeUnits(int field, char *lowtoken, int *val)
int type; int type;
datetkn *tp; datetkn *tp;
if ((deltacache[field] != NULL) if (deltacache[field] != NULL &&
&& (strncmp(lowtoken, deltacache[field]->token, TOKMAXLEN) == 0)) strncmp(lowtoken, deltacache[field]->token, TOKMAXLEN) == 0)
tp = deltacache[field]; tp = deltacache[field];
else else
tp = datebsearch(lowtoken, deltatktbl, szdeltatktbl); tp = datebsearch(lowtoken, deltatktbl, szdeltatktbl);
@ -558,7 +558,7 @@ DecodeUnits(int field, char *lowtoken, int *val)
else else
{ {
type = tp->type; type = tp->type;
if ((type == TZ) || (type == DTZ)) if (type == TZ || type == DTZ)
*val = FROMVAL(tp); *val = FROMVAL(tp);
else else
*val = tp->value; *val = tp->value;
@ -626,8 +626,7 @@ j2date(int jd, int *year, int *month, int *day)
quad = julian / 1461; quad = julian / 1461;
julian -= quad * 1461; julian -= quad * 1461;
y = julian * 4 / 1461; y = julian * 4 / 1461;
julian = ((y != 0) ? ((julian + 305) % 365) : ((julian + 306) % 366)) julian = ((y != 0) ? (julian + 305) % 365 : (julian + 306) % 366) + 123;
+ 123;
y += quad * 4; y += quad * 4;
*year = y - 4800; *year = y - 4800;
quad = julian * 2141 / 65536; quad = julian * 2141 / 65536;
@ -648,8 +647,8 @@ DecodeSpecial(int field, char *lowtoken, int *val)
int type; int type;
datetkn *tp; datetkn *tp;
if ((datecache[field] != NULL) if (datecache[field] != NULL &&
&& (strncmp(lowtoken, datecache[field]->token, TOKMAXLEN) == 0)) strncmp(lowtoken, datecache[field]->token, TOKMAXLEN) == 0)
tp = datecache[field]; tp = datecache[field];
else else
{ {
@ -689,7 +688,7 @@ DecodeSpecial(int field, char *lowtoken, int *val)
int int
EncodeDateOnly(struct tm * tm, int style, char *str, bool EuroDates) EncodeDateOnly(struct tm * tm, int style, char *str, bool EuroDates)
{ {
if ((tm->tm_mon < 1) || (tm->tm_mon > 12)) if (tm->tm_mon < 1 || tm->tm_mon > 12)
return -1; return -1;
switch (style) switch (style)
@ -711,18 +710,18 @@ EncodeDateOnly(struct tm * tm, int style, char *str, bool EuroDates)
else else
sprintf(str, "%02d/%02d", tm->tm_mon, tm->tm_mday); sprintf(str, "%02d/%02d", tm->tm_mon, tm->tm_mday);
if (tm->tm_year > 0) if (tm->tm_year > 0)
sprintf((str + 5), "/%04d", tm->tm_year); sprintf(str + 5, "/%04d", tm->tm_year);
else else
sprintf((str + 5), "/%04d %s", -(tm->tm_year - 1), "BC"); sprintf(str + 5, "/%04d %s", -(tm->tm_year - 1), "BC");
break; break;
case USE_GERMAN_DATES: case USE_GERMAN_DATES:
/* German-style date format */ /* German-style date format */
sprintf(str, "%02d.%02d", tm->tm_mday, tm->tm_mon); sprintf(str, "%02d.%02d", tm->tm_mday, tm->tm_mon);
if (tm->tm_year > 0) if (tm->tm_year > 0)
sprintf((str + 5), ".%04d", tm->tm_year); sprintf(str + 5, ".%04d", tm->tm_year);
else else
sprintf((str + 5), ".%04d %s", -(tm->tm_year - 1), "BC"); sprintf(str + 5, ".%04d %s", -(tm->tm_year - 1), "BC");
break; break;
case USE_POSTGRES_DATES: case USE_POSTGRES_DATES:
@ -733,9 +732,9 @@ EncodeDateOnly(struct tm * tm, int style, char *str, bool EuroDates)
else else
sprintf(str, "%02d-%02d", tm->tm_mon, tm->tm_mday); sprintf(str, "%02d-%02d", tm->tm_mon, tm->tm_mday);
if (tm->tm_year > 0) if (tm->tm_year > 0)
sprintf((str + 5), "-%04d", tm->tm_year); sprintf(str + 5, "-%04d", tm->tm_year);
else else
sprintf((str + 5), "-%04d %s", -(tm->tm_year - 1), "BC"); sprintf(str + 5, "-%04d %s", -(tm->tm_year - 1), "BC");
break; break;
} }
@ -748,7 +747,7 @@ TrimTrailingZeros(char *str)
int len = strlen(str); int len = strlen(str);
/* chop off trailing zeros... but leave at least 2 fractional digits */ /* chop off trailing zeros... but leave at least 2 fractional digits */
while ((*(str + len - 1) == '0') && (*(str + len - 3) != '.')) while (*(str + len - 1) == '0' && *(str + len - 3) != '.')
{ {
len--; len--;
*(str + len) = '\0'; *(str + len) = '\0';
@ -779,7 +778,7 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
/* Compatible with ISO-8601 date formats */ /* Compatible with ISO-8601 date formats */
sprintf(str, "%04d-%02d-%02d %02d:%02d", sprintf(str, "%04d-%02d-%02d %02d:%02d",
((tm->tm_year > 0) ? tm->tm_year : -(tm->tm_year - 1)), (tm->tm_year > 0) ? tm->tm_year : -(tm->tm_year - 1),
tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min); tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min);
/* /*
@ -792,19 +791,19 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if (fsec != 0) if (fsec != 0)
{ {
sprintf((str + strlen(str)), ":%02d.%06d", tm->tm_sec, fsec); sprintf(str + strlen(str), ":%02d.%06d", tm->tm_sec, fsec);
#else #else
if ((fsec != 0) && (tm->tm_year > 0)) if ((fsec != 0) && (tm->tm_year > 0))
{ {
sprintf((str + strlen(str)), ":%09.6f", tm->tm_sec + fsec); sprintf(str + strlen(str), ":%09.6f", tm->tm_sec + fsec);
#endif #endif
TrimTrailingZeros(str); TrimTrailingZeros(str);
} }
else else
sprintf((str + strlen(str)), ":%02d", tm->tm_sec); sprintf(str + strlen(str), ":%02d", tm->tm_sec);
if (tm->tm_year <= 0) if (tm->tm_year <= 0)
sprintf((str + strlen(str)), " BC"); sprintf(str + strlen(str), " BC");
/* /*
* tzp == NULL indicates that we don't want *any* time zone * tzp == NULL indicates that we don't want *any* time zone
@ -812,11 +811,11 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
* have alpha time zone info available. tm_isdst != -1 * have alpha time zone info available. tm_isdst != -1
* indicates that we have a valid time zone translation. * indicates that we have a valid time zone translation.
*/ */
if ((tzp != NULL) && (tm->tm_isdst >= 0)) if (tzp != NULL && tm->tm_isdst >= 0)
{ {
hour = -(*tzp / 3600); hour = -(*tzp / 3600);
min = ((abs(*tzp) / 60) % 60); min = (abs(*tzp) / 60) % 60;
sprintf((str + strlen(str)), ((min != 0) ? "%+03d:%02d" : "%+03d"), hour, min); sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
} }
break; break;
@ -828,8 +827,8 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
else else
sprintf(str, "%02d/%02d", tm->tm_mon, tm->tm_mday); sprintf(str, "%02d/%02d", tm->tm_mon, tm->tm_mday);
sprintf((str + 5), "/%04d %02d:%02d", sprintf(str + 5, "/%04d %02d:%02d",
((tm->tm_year > 0) ? tm->tm_year : -(tm->tm_year - 1)), (tm->tm_year > 0) ? tm->tm_year : -(tm->tm_year - 1),
tm->tm_hour, tm->tm_min); tm->tm_hour, tm->tm_min);
/* /*
@ -842,29 +841,29 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if (fsec != 0) if (fsec != 0)
{ {
sprintf((str + strlen(str)), ":%02d.%06d", tm->tm_sec, fsec); sprintf(str + strlen(str), ":%02d.%06d", tm->tm_sec, fsec);
#else #else
if ((fsec != 0) && (tm->tm_year > 0)) if (fsec != 0 && tm->tm_year > 0)
{ {
sprintf((str + strlen(str)), ":%09.6f", tm->tm_sec + fsec); sprintf(str + strlen(str), ":%09.6f", tm->tm_sec + fsec);
#endif #endif
TrimTrailingZeros(str); TrimTrailingZeros(str);
} }
else else
sprintf((str + strlen(str)), ":%02d", tm->tm_sec); sprintf(str + strlen(str), ":%02d", tm->tm_sec);
if (tm->tm_year <= 0) if (tm->tm_year <= 0)
sprintf((str + strlen(str)), " BC"); sprintf(str + strlen(str), " BC");
if ((tzp != NULL) && (tm->tm_isdst >= 0)) if (tzp != NULL && tm->tm_isdst >= 0)
{ {
if (*tzn != NULL) if (*tzn != NULL)
sprintf((str + strlen(str)), " %.*s", MAXTZLEN, *tzn); sprintf(str + strlen(str), " %.*s", MAXTZLEN, *tzn);
else else
{ {
hour = -(*tzp / 3600); hour = -(*tzp / 3600);
min = ((abs(*tzp) / 60) % 60); min = (abs(*tzp) / 60) % 60;
sprintf((str + strlen(str)), ((min != 0) ? "%+03d:%02d" : "%+03d"), hour, min); sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
} }
} }
break; break;
@ -874,8 +873,8 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
sprintf(str, "%02d.%02d", tm->tm_mday, tm->tm_mon); sprintf(str, "%02d.%02d", tm->tm_mday, tm->tm_mon);
sprintf((str + 5), ".%04d %02d:%02d", sprintf(str + 5, ".%04d %02d:%02d",
((tm->tm_year > 0) ? tm->tm_year : -(tm->tm_year - 1)), (tm->tm_year > 0) ? tm->tm_year : -(tm->tm_year - 1),
tm->tm_hour, tm->tm_min); tm->tm_hour, tm->tm_min);
/* /*
@ -888,29 +887,29 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if (fsec != 0) if (fsec != 0)
{ {
sprintf((str + strlen(str)), ":%02d.%06d", tm->tm_sec, fsec); sprintf(str + strlen(str), ":%02d.%06d", tm->tm_sec, fsec);
#else #else
if ((fsec != 0) && (tm->tm_year > 0)) if (fsec != 0 && tm->tm_year > 0)
{ {
sprintf((str + strlen(str)), ":%09.6f", tm->tm_sec + fsec); sprintf(str + strlen(str), ":%09.6f", tm->tm_sec + fsec);
#endif #endif
TrimTrailingZeros(str); TrimTrailingZeros(str);
} }
else else
sprintf((str + strlen(str)), ":%02d", tm->tm_sec); sprintf(str + strlen(str), ":%02d", tm->tm_sec);
if (tm->tm_year <= 0) if (tm->tm_year <= 0)
sprintf((str + strlen(str)), " BC"); sprintf(str + strlen(str), " BC");
if ((tzp != NULL) && (tm->tm_isdst >= 0)) if (tzp != NULL && tm->tm_isdst >= 0)
{ {
if (*tzn != NULL) if (*tzn != NULL)
sprintf((str + strlen(str)), " %.*s", MAXTZLEN, *tzn); sprintf(str + strlen(str), " %.*s", MAXTZLEN, *tzn);
else else
{ {
hour = -(*tzp / 3600); hour = -(*tzp / 3600);
min = ((abs(*tzp) / 60) % 60); min = (abs(*tzp) / 60) % 60;
sprintf((str + strlen(str)), ((min != 0) ? "%+03d:%02d" : "%+03d"), hour, min); sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
} }
} }
break; break;
@ -923,14 +922,14 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
tm->tm_wday = (int) ((day + date2j(2000, 1, 1) + 1) % 7); tm->tm_wday = (int) ((day + date2j(2000, 1, 1) + 1) % 7);
strncpy(str, days[tm->tm_wday], 3); strncpy(str, days[tm->tm_wday], 3);
strcpy((str + 3), " "); strcpy(str + 3, " ");
if (EuroDates) if (EuroDates)
sprintf((str + 4), "%02d %3s", tm->tm_mday, months[tm->tm_mon - 1]); sprintf(str + 4, "%02d %3s", tm->tm_mday, months[tm->tm_mon - 1]);
else else
sprintf((str + 4), "%3s %02d", months[tm->tm_mon - 1], tm->tm_mday); sprintf(str + 4, "%3s %02d", months[tm->tm_mon - 1], tm->tm_mday);
sprintf((str + 10), " %02d:%02d", tm->tm_hour, tm->tm_min); sprintf(str + 10, " %02d:%02d", tm->tm_hour, tm->tm_min);
/* /*
* Print fractional seconds if any. The field widths here * Print fractional seconds if any. The field widths here
@ -942,26 +941,26 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if (fsec != 0) if (fsec != 0)
{ {
sprintf((str + strlen(str)), ":%02d.%06d", tm->tm_sec, fsec); sprintf(str + strlen(str), ":%02d.%06d", tm->tm_sec, fsec);
#else #else
if ((fsec != 0) && (tm->tm_year > 0)) if (fsec != 0 && tm->tm_year > 0)
{ {
sprintf((str + strlen(str)), ":%09.6f", tm->tm_sec + fsec); sprintf(str + strlen(str), ":%09.6f", tm->tm_sec + fsec);
#endif #endif
TrimTrailingZeros(str); TrimTrailingZeros(str);
} }
else else
sprintf((str + strlen(str)), ":%02d", tm->tm_sec); sprintf(str + strlen(str), ":%02d", tm->tm_sec);
sprintf((str + strlen(str)), " %04d", sprintf(str + strlen(str), " %04d",
((tm->tm_year > 0) ? tm->tm_year : -(tm->tm_year - 1))); (tm->tm_year > 0) ? tm->tm_year : -(tm->tm_year - 1));
if (tm->tm_year <= 0) if (tm->tm_year <= 0)
sprintf((str + strlen(str)), " BC"); sprintf(str + strlen(str), " BC");
if ((tzp != NULL) && (tm->tm_isdst >= 0)) if (tzp != NULL && tm->tm_isdst >= 0)
{ {
if (*tzn != NULL) if (*tzn != NULL)
sprintf((str + strlen(str)), " %.*s", MAXTZLEN, *tzn); sprintf(str + strlen(str), " %.*s", MAXTZLEN, *tzn);
else else
{ {
/* /*
@ -972,8 +971,8 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
* 2001-10-19 * 2001-10-19
*/ */
hour = -(*tzp / 3600); hour = -(*tzp / 3600);
min = ((abs(*tzp) / 60) % 60); min = (abs(*tzp) / 60) % 60;
sprintf((str + strlen(str)), ((min != 0) ? " %+03d:%02d" : " %+03d"), hour, min); sprintf(str + strlen(str), (min != 0) ? " %+03d:%02d" : " %+03d", hour, min);
} }
} }
break; break;
@ -1056,7 +1055,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn)
#elif defined(HAVE_INT_TIMEZONE) #elif defined(HAVE_INT_TIMEZONE)
if (tzp != NULL) if (tzp != NULL)
{ {
*tzp = ((tm->tm_isdst > 0) ? (TIMEZONE_GLOBAL - 3600) : TIMEZONE_GLOBAL); *tzp = (tm->tm_isdst > 0) ? TIMEZONE_GLOBAL - 3600 : TIMEZONE_GLOBAL;
if (tzn != NULL) if (tzn != NULL)
{ {
@ -1130,8 +1129,7 @@ DetermineLocalTimeZone(struct tm * tm)
/* indicate timezone unknown */ /* indicate timezone unknown */
tmp->tm_isdst = -1; tmp->tm_isdst = -1;
if (mktime(tmp) != ((time_t) -1) && if (mktime(tmp) != (time_t)-1 && tmp->tm_isdst >= 0)
tmp->tm_isdst >= 0)
{ {
/* mktime() succeeded, trust its result */ /* mktime() succeeded, trust its result */
tm->tm_isdst = tmp->tm_isdst; tm->tm_isdst = tmp->tm_isdst;
@ -1140,7 +1138,7 @@ DetermineLocalTimeZone(struct tm * tm)
/* tm_gmtoff is Sun/DEC-ism */ /* tm_gmtoff is Sun/DEC-ism */
tz = -(tmp->tm_gmtoff); tz = -(tmp->tm_gmtoff);
#elif defined(HAVE_INT_TIMEZONE) #elif defined(HAVE_INT_TIMEZONE)
tz = ((tmp->tm_isdst > 0) ? (TIMEZONE_GLOBAL - 3600) : TIMEZONE_GLOBAL); tz = (tmp->tm_isdst > 0) ? TIMEZONE_GLOBAL - 3600 : TIMEZONE_GLOBAL;
#endif /* HAVE_INT_TIMEZONE */ #endif /* HAVE_INT_TIMEZONE */
} }
else else
@ -1246,17 +1244,17 @@ dt2time(double jd, int *hour, int *min, int *sec, fsec_t *fsec)
time = jd; time = jd;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*hour = (time / USECS_PER_HOUR); *hour = time / USECS_PER_HOUR;
time -= ((*hour) * USECS_PER_HOUR); time -= (*hour) * USECS_PER_HOUR;
*min = (time / USECS_PER_MINUTE); *min = time / USECS_PER_MINUTE;
time -= ((*min) * USECS_PER_MINUTE); time -= (*min) * USECS_PER_MINUTE;
*sec = (time / USECS_PER_SEC); *sec = time / USECS_PER_SEC;
*fsec = (time - (*sec * USECS_PER_SEC)); *fsec = time - (*sec * USECS_PER_SEC);
#else #else
*hour = (time / 3600); *hour = time / 3600;
time -= ((*hour) * 3600); time -= (*hour) * 3600;
*min = (time / 60); *min = time / 60;
time -= ((*min) * 60); time -= (*min) * 60;
*sec = time; *sec = time;
*fsec = JROUND(time - *sec); *fsec = JROUND(time - *sec);
#endif #endif
@ -1290,7 +1288,7 @@ int *tmask, struct tm * tm, fsec_t *fsec, int *is2digits, bool EuroDates)
* string and then do the conversion to an integer. * string and then do the conversion to an integer.
*/ */
strcpy(fstr, (cp + 1)); strcpy(fstr, (cp + 1));
strcpy((fstr + strlen(fstr)), "000000"); strcpy(fstr + strlen(fstr), "000000");
*(fstr + 6) = '\0'; *(fstr + 6) = '\0';
*fsec = strtol(fstr, NULL, 10); *fsec = strtol(fstr, NULL, 10);
#else #else
@ -1396,7 +1394,7 @@ int *tmask, struct tm * tm, fsec_t *fsec, int *is2digits, bool EuroDates)
* More than two digits? Then could be a date or a run-together * More than two digits? Then could be a date or a run-together
* time: 2001.360 20011225 040506.789 * time: 2001.360 20011225 040506.789
*/ */
if ((cp - str) > 2) if (cp - str > 2)
return DecodeNumberField(flen, str, (fmask | DTK_DATE_M), return DecodeNumberField(flen, str, (fmask | DTK_DATE_M),
tmask, tm, fsec, is2digits, EuroDates); tmask, tm, fsec, is2digits, EuroDates);
@ -1408,12 +1406,11 @@ int *tmask, struct tm * tm, fsec_t *fsec, int *is2digits, bool EuroDates)
return -1; return -1;
/* Special case day of year? */ /* Special case day of year? */
if ((flen == 3) && (fmask & DTK_M(YEAR)) if (flen == 3 && (fmask & DTK_M(YEAR)) && val >= 1 && val <= 366)
&& ((val >= 1) && (val <= 366)))
{ {
*tmask = (DTK_M(DOY) | DTK_M(MONTH) | DTK_M(DAY)); *tmask = (DTK_M(DOY) | DTK_M(MONTH) | DTK_M(DAY));
tm->tm_yday = val; tm->tm_yday = val;
j2date((date2j(tm->tm_year, 1, 1) + tm->tm_yday - 1), j2date(date2j(tm->tm_year, 1, 1) + tm->tm_yday - 1,
&tm->tm_year, &tm->tm_mon, &tm->tm_mday); &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
} }
@ -1430,8 +1427,8 @@ int *tmask, struct tm * tm, fsec_t *fsec, int *is2digits, bool EuroDates)
*tmask = DTK_M(YEAR); *tmask = DTK_M(YEAR);
/* already have a year? then see if we can substitute... */ /* already have a year? then see if we can substitute... */
if ((fmask & DTK_M(YEAR)) && (!(fmask & DTK_M(DAY))) if ((fmask & DTK_M(YEAR)) && !(fmask & DTK_M(DAY)) &&
&& ((tm->tm_year >= 1) && (tm->tm_year <= 31))) tm->tm_year >= 1 && tm->tm_year <= 31)
{ {
tm->tm_mday = tm->tm_year; tm->tm_mday = tm->tm_year;
*tmask = DTK_M(DAY); *tmask = DTK_M(DAY);
@ -1441,28 +1438,25 @@ int *tmask, struct tm * tm, fsec_t *fsec, int *is2digits, bool EuroDates)
} }
/* already have year? then could be month */ /* already have year? then could be month */
else if ((fmask & DTK_M(YEAR)) && (!(fmask & DTK_M(MONTH))) else if ((fmask & DTK_M(YEAR)) && !(fmask & DTK_M(MONTH)) && val >= 1 && val <= 12)
&& ((val >= 1) && (val <= 12)))
{ {
*tmask = DTK_M(MONTH); *tmask = DTK_M(MONTH);
tm->tm_mon = val; tm->tm_mon = val;
} }
/* no year and EuroDates enabled? then could be day */ /* no year and EuroDates enabled? then could be day */
else if ((EuroDates || (fmask & DTK_M(MONTH))) else if ((EuroDates || (fmask & DTK_M(MONTH))) &&
&& (!(fmask & DTK_M(YEAR)) && !(fmask & DTK_M(DAY))) !(fmask & DTK_M(YEAR)) && !(fmask & DTK_M(DAY)) &&
&& ((val >= 1) && (val <= 31))) val >= 1 && val <= 31)
{ {
*tmask = DTK_M(DAY); *tmask = DTK_M(DAY);
tm->tm_mday = val; tm->tm_mday = val;
} }
else if ((!(fmask & DTK_M(MONTH))) else if (!(fmask & DTK_M(MONTH)) && val >= 1 && val <= 12)
&& ((val >= 1) && (val <= 12)))
{ {
*tmask = DTK_M(MONTH); *tmask = DTK_M(MONTH);
tm->tm_mon = val; tm->tm_mon = val;
} }
else if ((!(fmask & DTK_M(DAY))) else if (!(fmask & DTK_M(DAY)) && val >= 1 && val <= 31)
&& ((val >= 1) && (val <= 31)))
{ {
*tmask = DTK_M(DAY); *tmask = DTK_M(DAY);
tm->tm_mday = val; tm->tm_mday = val;
@ -1472,8 +1466,7 @@ int *tmask, struct tm * tm, fsec_t *fsec, int *is2digits, bool EuroDates)
* Check for 2 or 4 or more digits, but currently we reach here only * Check for 2 or 4 or more digits, but currently we reach here only
* if two digits. - thomas 2000-03-28 * if two digits. - thomas 2000-03-28
*/ */
else if (!(fmask & DTK_M(YEAR)) else if (!(fmask & DTK_M(YEAR)) && (flen >= 4 || flen == 2))
&& ((flen >= 4) || (flen == 2)))
{ {
*tmask = DTK_M(YEAR); *tmask = DTK_M(YEAR);
tm->tm_year = val; tm->tm_year = val;
@ -1507,7 +1500,7 @@ DecodeDate(char *str, int fmask, int *tmask, struct tm * tm, bool EuroDates)
char *field[MAXDATEFIELDS]; char *field[MAXDATEFIELDS];
/* parse this string... */ /* parse this string... */
while ((*str != '\0') && (nf < MAXDATEFIELDS)) while (*str != '\0' && nf < MAXDATEFIELDS)
{ {
/* skip field separators */ /* skip field separators */
while (!isalnum((unsigned char) *str)) while (!isalnum((unsigned char) *str))
@ -1656,7 +1649,7 @@ DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, fsec_t *fsec)
* integer. * integer.
*/ */
strncpy(fstr, (cp + 1), 7); strncpy(fstr, (cp + 1), 7);
strcpy((fstr + strlen(fstr)), "000000"); strcpy(fstr + strlen(fstr), "000000");
*(fstr + 6) = '\0'; *(fstr + 6) = '\0';
*fsec = strtol(fstr, &cp, 10); *fsec = strtol(fstr, &cp, 10);
#else #else
@ -1672,16 +1665,12 @@ DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, fsec_t *fsec)
/* do a sanity check */ /* do a sanity check */
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if ((tm->tm_hour < 0) if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > 59 ||
|| (tm->tm_min < 0) || (tm->tm_min > 59) tm->tm_sec < 0 || tm->tm_sec > 59 || *fsec >= USECS_PER_SEC)
|| (tm->tm_sec < 0) || (tm->tm_sec > 59)
|| (*fsec >= USECS_PER_SEC))
return -1; return -1;
#else #else
if ((tm->tm_hour < 0) if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > 59 ||
|| (tm->tm_min < 0) || (tm->tm_min > 59) tm->tm_sec < 0 || tm->tm_sec > 59 || *fsec >= 1)
|| (tm->tm_sec < 0) || (tm->tm_sec > 59)
|| (*fsec >= 1))
return -1; return -1;
#endif #endif
@ -1704,21 +1693,21 @@ DecodeTimezone(char *str, int *tzp)
int len; int len;
/* assume leading character is "+" or "-" */ /* assume leading character is "+" or "-" */
hr = strtol((str + 1), &cp, 10); hr = strtol(str + 1, &cp, 10);
/* explicit delimiter? */ /* explicit delimiter? */
if (*cp == ':') if (*cp == ':')
min = strtol((cp + 1), &cp, 10); min = strtol(cp + 1, &cp, 10);
/* otherwise, might have run things together... */ /* otherwise, might have run things together... */
else if ((*cp == '\0') && ((len = strlen(str)) > 3)) else if (*cp == '\0' && (len = strlen(str)) > 3)
{ {
min = strtol((str + len - 2), &cp, 10); min = strtol(str + len - 2, &cp, 10);
if ((min < 0) || (min >= 60)) if (min < 0 || min >= 60)
return -1; return -1;
*(str + len - 2) = '\0'; *(str + len - 2) = '\0';
hr = strtol((str + 1), &cp, 10); hr = strtol(str + 1, &cp, 10);
if ((hr < 0) || (hr > 13)) if (hr < 0 || hr > 13)
return -1; return -1;
} }
else else
@ -1749,7 +1738,7 @@ DecodePosixTimezone(char *str, int *tzp)
char delim; char delim;
cp = str; cp = str;
while ((*cp != '\0') && isalpha((unsigned char) *cp)) while (*cp != '\0' && isalpha((unsigned char) *cp))
cp++; cp++;
if (DecodeTimezone(cp, &tz) != 0) if (DecodeTimezone(cp, &tz) != 0)
@ -1818,7 +1807,7 @@ ParseDateTime(char *timestr, char *lowstr,
*lp++ = *(*endstr)++; *lp++ = *(*endstr)++;
} }
/* date field? allow embedded text month */ /* date field? allow embedded text month */
else if ((*(*endstr) == '-') || (*(*endstr) == '/') || (*(*endstr) == '.')) else if (*(*endstr) == '-' || *(*endstr) == '/' || *(*endstr) == '.')
{ {
/* save delimiting character to use later */ /* save delimiting character to use later */
char *dp = (*endstr); char *dp = (*endstr);
@ -1827,7 +1816,7 @@ ParseDateTime(char *timestr, char *lowstr,
/* second field is all digits? then no embedded text month */ /* second field is all digits? then no embedded text month */
if (isdigit((unsigned char) *(*endstr))) if (isdigit((unsigned char) *(*endstr)))
{ {
ftype[nf] = ((*dp == '.') ? DTK_NUMBER : DTK_DATE); ftype[nf] = (*dp == '.') ? DTK_NUMBER : DTK_DATE;
while (isdigit((unsigned char) *(*endstr))) while (isdigit((unsigned char) *(*endstr)))
*lp++ = *(*endstr)++; *lp++ = *(*endstr)++;
@ -1883,13 +1872,13 @@ ParseDateTime(char *timestr, char *lowstr,
* Full date string with leading text month? Could also be a * Full date string with leading text month? Could also be a
* POSIX time zone... * POSIX time zone...
*/ */
if ((*(*endstr) == '-') || (*(*endstr) == '/') || (*(*endstr) == '.')) if (*(*endstr) == '-' || *(*endstr) == '/' || *(*endstr) == '.')
{ {
char *dp = (*endstr); char *dp = (*endstr);
ftype[nf] = DTK_DATE; ftype[nf] = DTK_DATE;
*lp++ = *(*endstr)++; *lp++ = *(*endstr)++;
while (isdigit((unsigned char) *(*endstr)) || (*(*endstr) == *dp)) while (isdigit((unsigned char) *(*endstr)) || *(*endstr) == *dp)
*lp++ = *(*endstr)++; *lp++ = *(*endstr)++;
} }
} }
@ -1900,7 +1889,7 @@ ParseDateTime(char *timestr, char *lowstr,
continue; continue;
} }
/* sign? then special or numeric timezone */ /* sign? then special or numeric timezone */
else if ((*(*endstr) == '+') || (*(*endstr) == '-')) else if (*(*endstr) == '+' || *(*endstr) == '-')
{ {
*lp++ = *(*endstr)++; *lp++ = *(*endstr)++;
/* soak up leading whitespace */ /* soak up leading whitespace */
@ -2127,9 +2116,9 @@ DecodeDateTime(char **field, int *ftype, int nf,
* second field of a POSIX time: EST+3 (equivalent to * second field of a POSIX time: EST+3 (equivalent to
* PST) * PST)
*/ */
if ((i > 0) && ((fmask & DTK_M(TZ)) != 0) if (i > 0 && (fmask & DTK_M(TZ)) != 0 &&
&& (ftype[i - 1] == DTK_TZ) ftype[i - 1] == DTK_TZ &&
&& (isalpha((unsigned char) *field[i - 1]))) isalpha((unsigned char) *field[i - 1]))
{ {
*tzp -= tz; *tzp -= tz;
tmask = 0; tmask = 0;
@ -2186,8 +2175,8 @@ DecodeDateTime(char **field, int *ftype, int nf,
* already have a month and hour? then assume * already have a month and hour? then assume
* minutes * minutes
*/ */
if (((fmask & DTK_M(MONTH)) != 0) if ((fmask & DTK_M(MONTH)) != 0 &&
&& ((fmask & DTK_M(HOUR)) != 0)) (fmask & DTK_M(HOUR)) != 0)
{ {
tm->tm_min = val; tm->tm_min = val;
tmask = DTK_M(MINUTE); tmask = DTK_M(MINUTE);
@ -2289,13 +2278,13 @@ DecodeDateTime(char **field, int *ftype, int nf,
cp = strchr(field[i], '.'); cp = strchr(field[i], '.');
/* Embedded decimal and no date yet? */ /* Embedded decimal and no date yet? */
if ((cp != NULL) && !(fmask & DTK_DATE_M)) if (cp != NULL && !(fmask & DTK_DATE_M))
{ {
if (DecodeDate(field[i], fmask, &tmask, tm, EuroDates) != 0) if (DecodeDate(field[i], fmask, &tmask, tm, EuroDates) != 0)
return -1; return -1;
} }
/* embedded decimal and several digits before? */ /* embedded decimal and several digits before? */
else if ((cp != NULL) && ((flen - strlen(cp)) > 2)) else if (cp != NULL && flen - strlen(cp) > 2)
{ {
/* /*
* Interpret as a concatenated date or time Set * Interpret as a concatenated date or time Set
@ -2341,7 +2330,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
tmask = DTK_DATE_M; tmask = DTK_DATE_M;
*dtype = DTK_DATE; *dtype = DTK_DATE;
GetCurrentDateTime(tm); GetCurrentDateTime(tm);
j2date((date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - 1), j2date(date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - 1,
&tm->tm_year, &tm->tm_mon, &tm->tm_mday); &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
tm->tm_hour = 0; tm->tm_hour = 0;
tm->tm_min = 0; tm->tm_min = 0;
@ -2361,7 +2350,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
tmask = DTK_DATE_M; tmask = DTK_DATE_M;
*dtype = DTK_DATE; *dtype = DTK_DATE;
GetCurrentDateTime(tm); GetCurrentDateTime(tm);
j2date((date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) + 1), j2date(date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) + 1,
&tm->tm_year, &tm->tm_mon, &tm->tm_mday); &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
tm->tm_hour = 0; tm->tm_hour = 0;
tm->tm_min = 0; tm->tm_min = 0;
@ -2390,9 +2379,8 @@ DecodeDateTime(char **field, int *ftype, int nf,
* already have a (numeric) month? then see if we * already have a (numeric) month? then see if we
* can substitute... * can substitute...
*/ */
if ((fmask & DTK_M(MONTH)) && (!haveTextMonth) if ((fmask & DTK_M(MONTH)) && !haveTextMonth &&
&& (!(fmask & DTK_M(DAY))) !(fmask & DTK_M(DAY)) && tm->tm_mon >= 1 && tm->tm_mon <= 31)
&& ((tm->tm_mon >= 1) && (tm->tm_mon <= 31)))
{ {
tm->tm_mday = tm->tm_mon; tm->tm_mday = tm->tm_mon;
tmask = DTK_M(DAY); tmask = DTK_M(DAY);
@ -2475,10 +2463,10 @@ DecodeDateTime(char **field, int *ftype, int nf,
* DTK_TIME should be hh:mm:ss.fff * DTK_TIME should be hh:mm:ss.fff
* DTK_DATE should be hhmmss-zz * DTK_DATE should be hhmmss-zz
***/ ***/
if ((i >= (nf - 1)) if (i >= nf - 1 ||
|| ((ftype[i + 1] != DTK_NUMBER) (ftype[i + 1] != DTK_NUMBER &&
&& (ftype[i + 1] != DTK_TIME) ftype[i + 1] != DTK_TIME &&
&& (ftype[i + 1] != DTK_DATE))) ftype[i + 1] != DTK_DATE))
return -1; return -1;
ptype = val; ptype = val;
@ -2514,11 +2502,11 @@ DecodeDateTime(char **field, int *ftype, int nf,
tm->tm_year += 1900; tm->tm_year += 1900;
} }
if ((mer != HR24) && (tm->tm_hour > 12)) if (mer != HR24 && tm->tm_hour > 12)
return -1; return -1;
if ((mer == AM) && (tm->tm_hour == 12)) if (mer == AM && tm->tm_hour == 12)
tm->tm_hour = 0; tm->tm_hour = 0;
else if ((mer == PM) && (tm->tm_hour != 12)) else if (mer == PM && tm->tm_hour != 12)
tm->tm_hour += 12; tm->tm_hour += 12;
/* do additional checking for full date specs... */ /* do additional checking for full date specs... */
@ -2531,13 +2519,11 @@ DecodeDateTime(char **field, int *ftype, int nf,
* check for valid day of month, now that we know for sure the * check for valid day of month, now that we know for sure the
* month and year... * month and year...
*/ */
if ((tm->tm_mday < 1) if (tm->tm_mday < 1 || tm->tm_mday > day_tab[isleap(tm->tm_year)][tm->tm_mon - 1])
|| (tm->tm_mday > day_tab[isleap(tm->tm_year)][tm->tm_mon - 1]))
return -1; return -1;
/* timezone not specified? then find local timezone if possible */ /* timezone not specified? then find local timezone if possible */
if (((fmask & DTK_DATE_M) == DTK_DATE_M) if ((fmask & DTK_DATE_M) == DTK_DATE_M && tzp != NULL && !(fmask & DTK_M(TZ)))
&& (tzp != NULL) && (!(fmask & DTK_M(TZ))))
{ {
/* /*
* daylight savings time modifier but no standard timezone? * daylight savings time modifier but no standard timezone?

154
src/interfaces/ecpg/pgtypeslib/interval.c
View File

@ -20,8 +20,7 @@ TrimTrailingZeros(char *str)
int len = strlen(str); int len = strlen(str);
/* chop off trailing zeros... but leave at least 2 fractional digits */ /* chop off trailing zeros... but leave at least 2 fractional digits */
while ((*(str + len - 1) == '0') while (*(str + len - 1) == '0' && *(str + len - 3) != '.')
&& (*(str + len - 3) != '.'))
{ {
len--; len--;
*(str + len) = '\0'; *(str + len) = '\0';
@ -69,7 +68,7 @@ DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, fsec_t *fsec)
* integer. * integer.
*/ */
strncpy(fstr, (cp + 1), 7); strncpy(fstr, (cp + 1), 7);
strcpy((fstr + strlen(fstr)), "000000"); strcpy(fstr + strlen(fstr), "000000");
*(fstr + 6) = '\0'; *(fstr + 6) = '\0';
*fsec = strtol(fstr, &cp, 10); *fsec = strtol(fstr, &cp, 10);
#else #else
@ -85,16 +84,12 @@ DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, fsec_t *fsec)
/* do a sanity check */ /* do a sanity check */
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if ((tm->tm_hour < 0) if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > 59 ||
|| (tm->tm_min < 0) || (tm->tm_min > 59) tm->tm_sec < 0 || tm->tm_sec > 59 || *fsec >= USECS_PER_SEC)
|| (tm->tm_sec < 0) || (tm->tm_sec > 59)
|| (*fsec >= USECS_PER_SEC))
return -1; return -1;
#else #else
if ((tm->tm_hour < 0) if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > 59 ||
|| (tm->tm_min < 0) || (tm->tm_min > 59) tm->tm_sec < 0 || tm->tm_sec > 59 || *fsec >= 1)
|| (tm->tm_sec < 0) || (tm->tm_sec > 59)
|| (*fsec >= 1))
return -1; return -1;
#endif #endif
@ -159,10 +154,9 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm * tm, fse
* through to DTK_NUMBER, which *can* tolerate this. * through to DTK_NUMBER, which *can* tolerate this.
*/ */
cp = field[i] + 1; cp = field[i] + 1;
while ((*cp != '\0') && (*cp != ':') && (*cp != '.')) while (*cp != '\0' && *cp != ':' && *cp != '.')
cp++; cp++;
if ((*cp == ':') if (*cp == ':' && DecodeTime((field[i] + 1), fmask, &tmask, tm, fsec) == 0)
&& (DecodeTime((field[i] + 1), fmask, &tmask, tm, fsec) == 0))
{ {
if (*field[i] == '-') if (*field[i] == '-')
{ {
@ -217,7 +211,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm * tm, fse
return -1; return -1;
if (val < 0) if (val < 0)
fval = -(fval); fval = -fval;
} }
else if (*cp == '\0') else if (*cp == '\0')
fval = 0; fval = 0;
@ -230,24 +224,24 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm * tm, fse
{ {
case DTK_MICROSEC: case DTK_MICROSEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += (val + fval); *fsec += val + fval;
#else #else
*fsec += ((val + fval) * 1e-6); *fsec += (val + fval) * 1e-6;
#endif #endif
break; break;
case DTK_MILLISEC: case DTK_MILLISEC:
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += ((val + fval) * 1000); *fsec += (val + fval) * 1000;
#else #else
*fsec += ((val + fval) * 1e-3); *fsec += (val + fval) * 1e-3;
#endif #endif
break; break;
case DTK_SECOND: case DTK_SECOND:
tm->tm_sec += val; tm->tm_sec += val;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += (fval * 1000000); *fsec += fval * 1000000;
#else #else
*fsec += fval; *fsec += fval;
#endif #endif
@ -282,7 +276,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm * tm, fse
sec = fval; sec = fval;
tm->tm_sec += sec; tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += ((fval - sec) * 1000000); *fsec += (fval - sec) * 1000000;
#else #else
*fsec += (fval - sec); *fsec += (fval - sec);
#endif #endif
@ -300,12 +294,12 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm * tm, fse
sec = fval; sec = fval;
tm->tm_sec += sec; tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += ((fval - sec) * 1000000); *fsec += (fval - sec) * 1000000;
#else #else
*fsec += (fval - sec); *fsec += (fval - sec);
#endif #endif
} }
tmask = ((fmask & DTK_M(DAY)) ? 0 : DTK_M(DAY)); tmask = (fmask & DTK_M(DAY)) ? 0 : DTK_M(DAY);
break; break;
case DTK_WEEK: case DTK_WEEK:
@ -314,16 +308,16 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm * tm, fse
{ {
int sec; int sec;
fval *= (7 * SECS_PER_DAY); fval *= 7 * SECS_PER_DAY;
sec = fval; sec = fval;
tm->tm_sec += sec; tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += ((fval - sec) * 1000000); *fsec += (fval - sec) * 1000000;
#else #else
*fsec += (fval - sec); *fsec += (fval - sec);
#endif #endif
} }
tmask = ((fmask & DTK_M(DAY)) ? 0 : DTK_M(DAY)); tmask = (fmask & DTK_M(DAY)) ? 0 : DTK_M(DAY);
break; break;
case DTK_MONTH: case DTK_MONTH:
@ -332,11 +326,11 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm * tm, fse
{ {
int sec; int sec;
fval *= (30 * SECS_PER_DAY); fval *= 30 * SECS_PER_DAY;
sec = fval; sec = fval;
tm->tm_sec += sec; tm->tm_sec += sec;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*fsec += ((fval - sec) * 1000000); *fsec += (fval - sec) * 1000000;
#else #else
*fsec += (fval - sec); *fsec += (fval - sec);
#endif #endif
@ -347,29 +341,29 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm * tm, fse
case DTK_YEAR: case DTK_YEAR:
tm->tm_year += val; tm->tm_year += val;
if (fval != 0) if (fval != 0)
tm->tm_mon += (fval * 12); tm->tm_mon += fval * 12;
tmask = ((fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR)); tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break; break;
case DTK_DECADE: case DTK_DECADE:
tm->tm_year += val * 10; tm->tm_year += val * 10;
if (fval != 0) if (fval != 0)
tm->tm_mon += (fval * 120); tm->tm_mon += fval * 120;
tmask = ((fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR)); tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break; break;
case DTK_CENTURY: case DTK_CENTURY:
tm->tm_year += val * 100; tm->tm_year += val * 100;
if (fval != 0) if (fval != 0)
tm->tm_mon += (fval * 1200); tm->tm_mon += fval * 1200;
tmask = ((fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR)); tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break; break;
case DTK_MILLENNIUM: case DTK_MILLENNIUM:
tm->tm_year += val * 1000; tm->tm_year += val * 1000;
if (fval != 0) if (fval != 0)
tm->tm_mon += (fval * 12000); tm->tm_mon += fval * 12000;
tmask = ((fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR)); tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
break; break;
default: default:
@ -470,7 +464,7 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
if (tm->tm_year != 0) if (tm->tm_year != 0)
{ {
sprintf(cp, "%d year%s", sprintf(cp, "%d year%s",
tm->tm_year, ((tm->tm_year != 1) ? "s" : "")); tm->tm_year, (tm->tm_year != 1) ? "s" : "");
cp += strlen(cp); cp += strlen(cp);
is_before = (tm->tm_year < 0); is_before = (tm->tm_year < 0);
is_nonzero = TRUE; is_nonzero = TRUE;
@ -478,9 +472,9 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
if (tm->tm_mon != 0) if (tm->tm_mon != 0)
{ {
sprintf(cp, "%s%s%d mon%s", (is_nonzero ? " " : ""), sprintf(cp, "%s%s%d mon%s", is_nonzero ? " " : "",
((is_before && (tm->tm_mon > 0)) ? "+" : ""), (is_before && tm->tm_mon > 0) ? "+" : "",
tm->tm_mon, ((tm->tm_mon != 1) ? "s" : "")); tm->tm_mon, (tm->tm_mon != 1) ? "s" : "");
cp += strlen(cp); cp += strlen(cp);
is_before = (tm->tm_mon < 0); is_before = (tm->tm_mon < 0);
is_nonzero = TRUE; is_nonzero = TRUE;
@ -488,18 +482,18 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
if (tm->tm_mday != 0) if (tm->tm_mday != 0)
{ {
sprintf(cp, "%s%s%d day%s", (is_nonzero ? " " : ""), sprintf(cp, "%s%s%d day%s", is_nonzero ? " " : "",
((is_before && (tm->tm_mday > 0)) ? "+" : ""), (is_before && tm->tm_mday > 0) ? "+" : "",
tm->tm_mday, ((tm->tm_mday != 1) ? "s" : "")); tm->tm_mday, (tm->tm_mday != 1) ? "s" : "");
cp += strlen(cp); cp += strlen(cp);
is_before = (tm->tm_mday < 0); is_before = (tm->tm_mday < 0);
is_nonzero = TRUE; is_nonzero = TRUE;
} }
if ((!is_nonzero) || (tm->tm_hour != 0) || (tm->tm_min != 0) if (!is_nonzero || tm->tm_hour != 0 || tm->tm_min != 0 ||
|| (tm->tm_sec != 0) || (fsec != 0)) tm->tm_sec != 0 || fsec != 0)
{ {
int minus = ((tm->tm_hour < 0) || (tm->tm_min < 0) int minus = tm->tm_hour < 0 || tm->tm_min < 0 ||
|| (tm->tm_sec < 0) || (fsec < 0)); tm->tm_sec < 0 || fsec < 0;
sprintf(cp, "%s%s%02d:%02d", (is_nonzero ? " " : ""), sprintf(cp, "%s%s%02d:%02d", (is_nonzero ? " " : ""),
(minus ? "-" : (is_before ? "+" : "")), (minus ? "-" : (is_before ? "+" : "")),
@ -514,7 +508,7 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
sprintf(cp, ":%02d", abs(tm->tm_sec)); sprintf(cp, ":%02d", abs(tm->tm_sec));
cp += strlen(cp); cp += strlen(cp);
sprintf(cp, ".%06d", ((fsec >= 0) ? fsec : -(fsec))); sprintf(cp, ".%06d", (fsec >= 0) ? fsec : -(fsec));
#else #else
fsec += tm->tm_sec; fsec += tm->tm_sec;
sprintf(cp, ":%013.10f", fabs(fsec)); sprintf(cp, ":%013.10f", fabs(fsec));
@ -546,7 +540,7 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
year = -year; year = -year;
sprintf(cp, "%d year%s", year, sprintf(cp, "%d year%s", year,
((year != 1) ? "s" : "")); (year != 1) ? "s" : "");
cp += strlen(cp); cp += strlen(cp);
is_before = (tm->tm_year < 0); is_before = (tm->tm_year < 0);
is_nonzero = TRUE; is_nonzero = TRUE;
@ -556,11 +550,11 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
{ {
int mon = tm->tm_mon; int mon = tm->tm_mon;
if (is_before || ((!is_nonzero) && (tm->tm_mon < 0))) if (is_before || (!is_nonzero && tm->tm_mon < 0))
mon = -mon; mon = -mon;
sprintf(cp, "%s%d mon%s", (is_nonzero ? " " : ""), mon, sprintf(cp, "%s%d mon%s", is_nonzero ? " " : "", mon,
((mon != 1) ? "s" : "")); (mon != 1) ? "s" : "");
cp += strlen(cp); cp += strlen(cp);
if (!is_nonzero) if (!is_nonzero)
is_before = (tm->tm_mon < 0); is_before = (tm->tm_mon < 0);
@ -571,11 +565,11 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
{ {
int day = tm->tm_mday; int day = tm->tm_mday;
if (is_before || ((!is_nonzero) && (tm->tm_mday < 0))) if (is_before || (!is_nonzero && tm->tm_mday < 0))
day = -day; day = -day;
sprintf(cp, "%s%d day%s", (is_nonzero ? " " : ""), day, sprintf(cp, "%s%d day%s", is_nonzero ? " " : "", day,
((day != 1) ? "s" : "")); (day != 1) ? "s" : "");
cp += strlen(cp); cp += strlen(cp);
if (!is_nonzero) if (!is_nonzero)
is_before = (tm->tm_mday < 0); is_before = (tm->tm_mday < 0);
@ -585,11 +579,11 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
{ {
int hour = tm->tm_hour; int hour = tm->tm_hour;
if (is_before || ((!is_nonzero) && (tm->tm_hour < 0))) if (is_before || (!is_nonzero && tm->tm_hour < 0))
hour = -hour; hour = -hour;
sprintf(cp, "%s%d hour%s", (is_nonzero ? " " : ""), hour, sprintf(cp, "%s%d hour%s", is_nonzero ? " " : "", hour,
((hour != 1) ? "s" : "")); (hour != 1) ? "s" : "");
cp += strlen(cp); cp += strlen(cp);
if (!is_nonzero) if (!is_nonzero)
is_before = (tm->tm_hour < 0); is_before = (tm->tm_hour < 0);
@ -600,11 +594,11 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
{ {
int min = tm->tm_min; int min = tm->tm_min;
if (is_before || ((!is_nonzero) && (tm->tm_min < 0))) if (is_before || (!is_nonzero && tm->tm_min < 0))
min = -min; min = -min;
sprintf(cp, "%s%d min%s", (is_nonzero ? " " : ""), min, sprintf(cp, "%s%d min%s", is_nonzero ? " " : "", min,
((min != 1) ? "s" : "")); (min != 1) ? "s" : "");
cp += strlen(cp); cp += strlen(cp);
if (!is_nonzero) if (!is_nonzero)
is_before = (tm->tm_min < 0); is_before = (tm->tm_min < 0);
@ -615,10 +609,10 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
if (fsec != 0) if (fsec != 0)
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
if (is_before || ((!is_nonzero) && (tm->tm_sec < 0))) if (is_before || (!is_nonzero && tm->tm_sec < 0))
tm->tm_sec = -tm->tm_sec; tm->tm_sec = -tm->tm_sec;
sprintf(cp, "%s%d.%02d secs", (is_nonzero ? " " : ""), sprintf(cp, "%s%d.%02d secs", is_nonzero ? " " : "",
tm->tm_sec, (((int) fsec) / 10000)); tm->tm_sec, ((int) fsec) / 10000);
cp += strlen(cp); cp += strlen(cp);
if (!is_nonzero) if (!is_nonzero)
is_before = (fsec < 0); is_before = (fsec < 0);
@ -627,10 +621,10 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
fsec += tm->tm_sec; fsec += tm->tm_sec;
sec = fsec; sec = fsec;
if (is_before || ((!is_nonzero) && (fsec < 0))) if (is_before || (!is_nonzero && fsec < 0))
sec = -sec; sec = -sec;
sprintf(cp, "%s%.2f secs", (is_nonzero ? " " : ""), sec); sprintf(cp, "%s%.2f secs", is_nonzero ? " " : "", sec);
cp += strlen(cp); cp += strlen(cp);
if (!is_nonzero) if (!is_nonzero)
is_before = (fsec < 0); is_before = (fsec < 0);
@ -643,11 +637,11 @@ EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str)
{ {
int sec = tm->tm_sec; int sec = tm->tm_sec;
if (is_before || ((!is_nonzero) && (tm->tm_sec < 0))) if (is_before || (!is_nonzero && tm->tm_sec < 0))
sec = -sec; sec = -sec;
sprintf(cp, "%s%d sec%s", (is_nonzero ? " " : ""), sec, sprintf(cp, "%s%d sec%s", is_nonzero ? " " : "", sec,
((sec != 1) ? "s" : "")); (sec != 1) ? "s" : "");
cp += strlen(cp); cp += strlen(cp);
if (!is_nonzero) if (!is_nonzero)
is_before = (tm->tm_sec < 0); is_before = (tm->tm_sec < 0);
@ -722,17 +716,17 @@ interval2tm(interval span, struct tm * tm, fsec_t *fsec)
static int static int
tm2interval(struct tm * tm, fsec_t fsec, interval *span) tm2interval(struct tm * tm, fsec_t fsec, interval *span)
{ {
span->month = ((tm->tm_year * 12) + tm->tm_mon); span->month = tm->tm_year * 12 + tm->tm_mon;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
span->time = ((((((((tm->tm_mday * INT64CONST(24)) span->time = (((((((tm->tm_mday * INT64CONST(24)) +
+ tm->tm_hour) * INT64CONST(60)) tm->tm_hour) * INT64CONST(60)) +
+ tm->tm_min) * INT64CONST(60)) tm->tm_min) * INT64CONST(60)) +
+ tm->tm_sec) * USECS_PER_SEC) + fsec); tm->tm_sec) * USECS_PER_SEC) + fsec;
#else #else
span->time = ((((((tm->tm_mday * 24.0) span->time = (((((tm->tm_mday * 24.0) +
+ tm->tm_hour) * 60.0) tm->tm_hour) * 60.0) +
+ tm->tm_min) * 60.0) tm->tm_min) * 60.0) +
+ tm->tm_sec); tm->tm_sec;
span->time = JROUND(span->time + fsec); span->time = JROUND(span->time + fsec);
#endif #endif
@ -768,8 +762,8 @@ PGTYPESinterval_from_asc(char *str, char **endptr)
return NULL; return NULL;
} }
if ((ParseDateTime(str, lowstr, field, ftype, MAXDATEFIELDS, &nf, ptr) != 0) if (ParseDateTime(str, lowstr, field, ftype, MAXDATEFIELDS, &nf, ptr) != 0 ||
|| (DecodeInterval(field, ftype, nf, &dtype, tm, &fsec) != 0)) DecodeInterval(field, ftype, nf, &dtype, tm, &fsec) != 0)
{ {
errno = PGTYPES_INTVL_BAD_INTERVAL; errno = PGTYPES_INTVL_BAD_INTERVAL;
return NULL; return NULL;

4
src/interfaces/ecpg/pgtypeslib/numeric.c
View File

@ -218,7 +218,7 @@ set_var_from_str(char *str, char **ptr, numeric *dest)
char *endptr; char *endptr;
(*ptr)++; (*ptr)++;
exponent = strtol((*ptr), &endptr, 10); exponent = strtol(*ptr, &endptr, 10);
if (endptr == (*ptr)) if (endptr == (*ptr))
{ {
errno = PGTYPES_NUM_BAD_NUMERIC; errno = PGTYPES_NUM_BAD_NUMERIC;
@ -1351,7 +1351,7 @@ PGTYPESnumeric_from_long(signed long int long_val, numeric *var)
{ {
size++; size++;
reach_limit *= 10; reach_limit *= 10;
} while ((reach_limit - 1) < abs_long_val && reach_limit <= LONG_MAX / 10); } while (reach_limit - 1 < abs_long_val && reach_limit <= LONG_MAX / 10);
if (reach_limit > LONG_MAX / 10) if (reach_limit > LONG_MAX / 10)
{ {

55
src/interfaces/ecpg/pgtypeslib/timestamp.c
View File

@ -20,14 +20,14 @@ int PGTYPEStimestamp_defmt_scan(char **, char *, timestamp *, int *, int *, int
static int64 static int64
time2t(const int hour, const int min, const int sec, const fsec_t fsec) time2t(const int hour, const int min, const int sec, const fsec_t fsec)
{ {
return ((((((hour * 60) + min) * 60) + sec) * USECS_PER_SEC) + fsec); return (((((hour * 60) + min) * 60) + sec) * USECS_PER_SEC) + fsec;
} /* time2t() */ } /* time2t() */
#else #else
static double static double
time2t(const int hour, const int min, const int sec, const fsec_t fsec) time2t(const int hour, const int min, const int sec, const fsec_t fsec)
{ {
return ((((hour * 60) + min) * 60) + sec + fsec); return (((hour * 60) + min) * 60) + sec + fsec;
} /* time2t() */ } /* time2t() */
#endif #endif
@ -74,10 +74,11 @@ tm2timestamp(struct tm * tm, fsec_t fsec, int *tzp, timestamp *result)
if ((*result - time) / USECS_PER_DAY != dDate) if ((*result - time) / USECS_PER_DAY != dDate)
return -1; return -1;
/* check for just-barely overflow (okay except time-of-day wraps) */ /* check for just-barely overflow (okay except time-of-day wraps) */
if ((*result < 0) ? (dDate >= 0) : (dDate < 0)) if ((*result < 0 && dDate >= 0) ||
(*result >= 0 && dDate < 0))
return -1; return -1;
#else #else
*result = ((dDate * SECS_PER_DAY) + time); *result = dDate * SECS_PER_DAY + time;
#endif #endif
if (tzp != NULL) if (tzp != NULL)
*result = dt2local(*result, -(*tzp)); *result = dt2local(*result, -(*tzp));
@ -110,19 +111,19 @@ dt2time(timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec)
time = jd; time = jd;
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
*hour = (time / USECS_PER_HOUR); *hour = time / USECS_PER_HOUR;
time -= ((*hour) * USECS_PER_HOUR); time -= (*hour) * USECS_PER_HOUR;
*min = (time / USECS_PER_MINUTE); *min = time / USECS_PER_MINUTE;
time -= ((*min) * USECS_PER_MINUTE); time -= (*min) * USECS_PER_MINUTE;
*sec = (time / USECS_PER_SEC); *sec = time / USECS_PER_SEC;
*fsec = (time - (*sec * USECS_PER_SEC)); *fsec = time - *sec * USECS_PER_SEC;
*sec = (time / USECS_PER_SEC); *sec = time / USECS_PER_SEC;
*fsec = (time - (*sec * USECS_PER_SEC)); *fsec = time - *sec * USECS_PER_SEC;
#else #else
*hour = (time / 3600); *hour = time / 3600;
time -= ((*hour) * 3600); time -= (*hour) * 3600;
*min = (time / 60); *min = time / 60;
time -= ((*min) * 60); time -= (*min) * 60;
*sec = time; *sec = time;
*fsec = JROUND(time - *sec); *fsec = JROUND(time - *sec);
#endif #endif
@ -199,10 +200,10 @@ timestamp2tm(timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, char **tzn)
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))
{ {
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
utime = ((dt / USECS_PER_SEC) utime = dt / USECS_PER_SEC +
+ ((date0 - date2j(1970, 1, 1)) * INT64CONST(SECS_PER_DAY))); ((date0 - date2j(1970, 1, 1)) * INT64CONST(86400));
#else #else
utime = (dt + ((date0 - date2j(1970, 1, 1)) * SECS_PER_DAY)); utime = dt + (date0 - date2j(1970, 1, 1)) * SECS_PER_DAY;
#endif #endif
#if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE) #if defined(HAVE_TM_ZONE) || defined(HAVE_INT_TIMEZONE)
@ -222,7 +223,7 @@ timestamp2tm(timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, char **tzn)
if (tzn != NULL) if (tzn != NULL)
*tzn = (char *) tm->tm_zone; *tzn = (char *) tm->tm_zone;
#elif defined(HAVE_INT_TIMEZONE) #elif defined(HAVE_INT_TIMEZONE)
*tzp = ((tm->tm_isdst > 0) ? (TIMEZONE_GLOBAL - 3600) : TIMEZONE_GLOBAL); *tzp = (tm->tm_isdst > 0) ? TIMEZONE_GLOBAL - 3600 : TIMEZONE_GLOBAL;
if (tzn != NULL) if (tzn != NULL)
*tzn = TZNAME_GLOBAL[(tm->tm_isdst > 0)]; *tzn = TZNAME_GLOBAL[(tm->tm_isdst > 0)];
#endif #endif
@ -301,8 +302,8 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr)
return (noresult); return (noresult);
} }
if ((ParseDateTime(str, lowstr, field, ftype, MAXDATEFIELDS, &nf, ptr) != 0) if (ParseDateTime(str, lowstr, field, ftype, MAXDATEFIELDS, &nf, ptr) != 0 ||
|| (DecodeDateTime(field, ftype, nf, &dtype, tm, &fsec, &tz, 0) != 0)) DecodeDateTime(field, ftype, nf, &dtype, tm, &fsec, &tz, 0) != 0)
{ {
errno = PGTYPES_TS_BAD_TIMESTAMP; errno = PGTYPES_TS_BAD_TIMESTAMP;
return (noresult); return (noresult);
@ -571,7 +572,7 @@ dttofmtasc_replace(timestamp *ts, date dDate, int dow, struct tm * tm,
break; break;
case 's': case 's':
#ifdef HAVE_INT64_TIMESTAMP #ifdef HAVE_INT64_TIMESTAMP
replace_val.int64_val = ((*ts - SetEpochTimestamp()) / 1000000e0); replace_val.int64_val = (*ts - SetEpochTimestamp()) / 1000000e0;
replace_type = PGTYPES_TYPE_INT64; replace_type = PGTYPES_TYPE_INT64;
#else #else
replace_val.double_val = *ts - SetEpochTimestamp(); replace_val.double_val = *ts - SetEpochTimestamp();
@ -879,13 +880,13 @@ PGTYPEStimestamp_add_interval(timestamp *tin, interval *span, timestamp *tout)
tm->tm_mon += span->month; tm->tm_mon += span->month;
if (tm->tm_mon > 12) if (tm->tm_mon > 12)
{ {
tm->tm_year += ((tm->tm_mon - 1) / 12); tm->tm_year += (tm->tm_mon - 1) / 12;
tm->tm_mon = (((tm->tm_mon - 1) % 12) + 1); tm->tm_mon = (tm->tm_mon - 1) % 12 + 1;
} }
else if (tm->tm_mon < 1) else if (tm->tm_mon < 1)
{ {
tm->tm_year += ((tm->tm_mon / 12) - 1); tm->tm_year += tm->tm_mon / 12 - 1;
tm->tm_mon = ((tm->tm_mon % 12) + 12); tm->tm_mon = tm->tm_mon % 12 + 12;
} }