Add time/date macros for code clarity:

	#define DAYS_PER_YEAR   365.25
	#define MONTHS_PER_YEAR 12
	#define DAYS_PER_MONTH  30
	#define HOURS_PER_DAY   24

5 files changed, 69 insertions, 59 deletions

diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index 7340764970d..0a480b658a4 100644
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -678,7 +678,7 @@ PGTYPESdate_defmt_asc(date *d, char *fmt, char *str)
 		return -1;
 	}
 
-	if (tm.tm_mon < 1 || tm.tm_mon > 12)
+	if (tm.tm_mon < 1 || tm.tm_mon > MONTHS_PER_YEAR)
 	{
 		errno = PGTYPES_DATE_BAD_MONTH;
 		return -1;
diff --git a/src/interfaces/ecpg/pgtypeslib/dt.h b/src/interfaces/ecpg/pgtypeslib/dt.h
index c85a7cce683..cda88000456 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt.h
+++ b/src/interfaces/ecpg/pgtypeslib/dt.h
@@ -216,7 +216,17 @@ do { \
 } while(0)
 #endif
 
+/* in both timestamp.h and ecpg/dt.h */
+#define DAYS_PER_YEAR	365.25
+#define MONTHS_PER_YEAR	12
+/* average days per month */
+#define DAYS_PER_MONTH	30
+#define HOURS_PER_DAY	24
+
 #define SECS_PER_DAY	86400
+#define SECS_PER_HOUR   3600
+#define SECS_PER_MINUTE 60
+
 #ifdef HAVE_INT64_TIMESTAMP
 #define USECS_PER_DAY	INT64CONST(86400000000)
 #define USECS_PER_HOUR	INT64CONST(3600000000)
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index 617d7eef3e4..65a70cdc874 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -688,7 +688,7 @@ DecodeSpecial(int field, char *lowtoken, int *val)
 int
 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 > MONTHS_PER_YEAR)
 		return -1;
 
 	switch (style)
@@ -813,8 +813,8 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
 			 */
 			if (tzp != NULL && tm->tm_isdst >= 0)
 			{
-				hour = -(*tzp / 3600);
-				min = (abs(*tzp) / 60) % 60;
+				hour = -(*tzp / SECS_PER_HOUR);
+				min = (abs(*tzp) / SECS_PER_MINUTE) % SECS_PER_MINUTE;
 				sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
 			}
 			break;
@@ -861,8 +861,8 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
 					sprintf(str + strlen(str), " %.*s", MAXTZLEN, *tzn);
 				else
 				{
-					hour = -(*tzp / 3600);
-					min = (abs(*tzp) / 60) % 60;
+					hour = -(*tzp / SECS_PER_HOUR);
+					min = (abs(*tzp) / SECS_PER_MINUTE) % SECS_PER_MINUTE;
 					sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
 				}
 			}
@@ -907,8 +907,8 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
 					sprintf(str + strlen(str), " %.*s", MAXTZLEN, *tzn);
 				else
 				{
-					hour = -(*tzp / 3600);
-					min = (abs(*tzp) / 60) % 60;
+					hour = -(*tzp / SECS_PER_HOUR);
+					min = (abs(*tzp) / SECS_PER_MINUTE) % SECS_PER_MINUTE;
 					sprintf(str + strlen(str), (min != 0) ? "%+03d:%02d" : "%+03d", hour, min);
 				}
 			}
@@ -970,8 +970,8 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, cha
 					 * rejected by the date/time parser later. - thomas
 					 * 2001-10-19
 					 */
-					hour = -(*tzp / 3600);
-					min = (abs(*tzp) / 60) % 60;
+					hour = -(*tzp / SECS_PER_HOUR);
+					min = (abs(*tzp) / SECS_PER_MINUTE) % SECS_PER_MINUTE;
 					sprintf(str + strlen(str), (min != 0) ? " %+03d:%02d" : " %+03d", hour, min);
 				}
 			}
@@ -1055,7 +1055,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn)
 #elif defined(HAVE_INT_TIMEZONE)
 	if (tzp != NULL)
 	{
-		*tzp = (tm->tm_isdst > 0) ? TIMEZONE_GLOBAL - 3600 : TIMEZONE_GLOBAL;
+		*tzp = (tm->tm_isdst > 0) ? TIMEZONE_GLOBAL - SECS_PER_HOUR : TIMEZONE_GLOBAL;
 
 		if (tzn != NULL)
 		{
@@ -1138,7 +1138,7 @@ DetermineLocalTimeZone(struct tm * tm)
 			/* tm_gmtoff is Sun/DEC-ism */
 			tz = -(tmp->tm_gmtoff);
 #elif defined(HAVE_INT_TIMEZONE)
-			tz = (tmp->tm_isdst > 0) ? TIMEZONE_GLOBAL - 3600 : TIMEZONE_GLOBAL;
+			tz = (tmp->tm_isdst > 0) ? TIMEZONE_GLOBAL - SECS_PER_HOUR : TIMEZONE_GLOBAL;
 #endif   /* HAVE_INT_TIMEZONE */
 		}
 		else
@@ -1161,7 +1161,7 @@ DetermineLocalTimeZone(struct tm * tm)
 
 			day = (date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) -
 				   date2j(1970, 1, 1));
-			mysec = tm->tm_sec + (tm->tm_min + (day * 24 + tm->tm_hour) * 60) * 60;
+			mysec = tm->tm_sec + (tm->tm_min + (day * HOURS_PER_DAY + tm->tm_hour) * SECS_PER_MINUTE) * SECS_PER_MINUTE;
 			mytime = (time_t) mysec;
 
 			/*
@@ -1171,7 +1171,7 @@ DetermineLocalTimeZone(struct tm * tm)
 			tmp = localtime(&mytime);
 			day = (date2j(tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday) -
 				   date2j(1970, 1, 1));
-			locsec = tmp->tm_sec + (tmp->tm_min + (day * 24 + tmp->tm_hour) * 60) * 60;
+			locsec = tmp->tm_sec + (tmp->tm_min + (day * HOURS_PER_DAY + tmp->tm_hour) * SECS_PER_MINUTE) * SECS_PER_MINUTE;
 
 			/*
 			 * The local time offset corresponding to that GMT time is now
@@ -1201,7 +1201,7 @@ DetermineLocalTimeZone(struct tm * tm)
 			tmp = localtime(&mytime);
 			day = (date2j(tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday) -
 				   date2j(1970, 1, 1));
-			locsec = tmp->tm_sec + (tmp->tm_min + (day * 24 + tmp->tm_hour) * 60) * 60;
+			locsec = tmp->tm_sec + (tmp->tm_min + (day * HOURS_PER_DAY + tmp->tm_hour) * SECS_PER_MINUTE) * SECS_PER_MINUTE;
 			delta2 = mysec - locsec;
 			if (delta2 != delta1)
 			{
@@ -1210,7 +1210,7 @@ DetermineLocalTimeZone(struct tm * tm)
 				tmp = localtime(&mytime);
 				day = (date2j(tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday) -
 					   date2j(1970, 1, 1));
-				locsec = tmp->tm_sec + (tmp->tm_min + (day * 24 + tmp->tm_hour) * 60) * 60;
+				locsec = tmp->tm_sec + (tmp->tm_min + (day * HOURS_PER_DAY + tmp->tm_hour) * SECS_PER_MINUTE) * SECS_PER_MINUTE;
 				delta2 = mysec - locsec;
 			}
 			tm->tm_isdst = tmp->tm_isdst;
@@ -1250,10 +1250,10 @@ dt2time(double jd, int *hour, int *min, int *sec, fsec_t *fsec)
 	*sec = time / USECS_PER_SEC;
 	*fsec = time - (*sec * USECS_PER_SEC);
 #else
-	*hour = time / 3600;
-	time -= (*hour) * 3600;
-	*min = time / 60;
-	time -= (*min) * 60;
+	*hour = time / SECS_PER_HOUR;
+	time -= (*hour) * SECS_PER_HOUR;
+	*min = time / SECS_PER_MINUTE;
+	time -= (*min) * SECS_PER_MINUTE;
 	*sec = time;
 	*fsec = JROUND(time - *sec);
 #endif
@@ -1437,7 +1437,7 @@ int *tmask, struct tm * tm, fsec_t *fsec, int *is2digits, bool EuroDates)
 	}
 
 	/* already have year? then could be month */
-	else if ((fmask & DTK_M(YEAR)) && !(fmask & DTK_M(MONTH)) && val >= 1 && val <= 12)
+	else if ((fmask & DTK_M(YEAR)) && !(fmask & DTK_M(MONTH)) && val >= 1 && val <= MONTHS_PER_YEAR)
 	{
 		*tmask = DTK_M(MONTH);
 		tm->tm_mon = val;
@@ -1450,7 +1450,7 @@ int *tmask, struct tm * tm, fsec_t *fsec, int *is2digits, bool EuroDates)
 		*tmask = DTK_M(DAY);
 		tm->tm_mday = val;
 	}
-	else if (!(fmask & DTK_M(MONTH)) && val >= 1 && val <= 12)
+	else if (!(fmask & DTK_M(MONTH)) && val >= 1 && val <= MONTHS_PER_YEAR)
 	{
 		*tmask = DTK_M(MONTH);
 		tm->tm_mon = val;
@@ -1712,7 +1712,7 @@ DecodeTimezone(char *str, int *tzp)
 	else
 		min = 0;
 
-	tz = (hr * 60 + min) * 60;
+	tz = (hr * SECS_PER_MINUTE + min) * SECS_PER_MINUTE;
 	if (*str == '-')
 		tz = -tz;
 
@@ -1752,7 +1752,7 @@ DecodePosixTimezone(char *str, int *tzp)
 	{
 		case DTZ:
 		case TZ:
-			*tzp = (val * 60) - tz;
+			*tzp = (val * SECS_PER_MINUTE) - tz;
 			break;
 
 		default:
@@ -2398,7 +2398,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
 						tm->tm_isdst = 1;
 						if (tzp == NULL)
 							return -1;
-						*tzp += val * 60;
+						*tzp += val * SECS_PER_MINUTE;
 						break;
 
 					case DTZ:
@@ -2411,7 +2411,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
 						tm->tm_isdst = 1;
 						if (tzp == NULL)
 							return -1;
-						*tzp = val * 60;
+						*tzp = val * SECS_PER_MINUTE;
 						ftype[i] = DTK_TZ;
 						break;
 
@@ -2419,7 +2419,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
 						tm->tm_isdst = 0;
 						if (tzp == NULL)
 							return -1;
-						*tzp = val * 60;
+						*tzp = val * SECS_PER_MINUTE;
 						ftype[i] = DTK_TZ;
 						break;
 
@@ -3108,7 +3108,7 @@ PGTYPEStimestamp_defmt_scan(char **str, char *fmt, timestamp *d,
 						 * timezone value of the datetktbl table is in
 						 * quarter hours
 						 */
-						*tz = -15 * 60 * datetktbl[j].value;
+						*tz = -15 * SECS_PER_MINUTE * datetktbl[j].value;
 						break;
 					}
 				}
@@ -3167,7 +3167,7 @@ PGTYPEStimestamp_defmt_scan(char **str, char *fmt, timestamp *d,
 			err = 1;
 			*hour = 0;
 		}
-		if (*month > 12)
+		if (*month > MONTHS_PER_YEAR)
 		{
 			err = 1;
 			*month = 1;
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index 0f0eb8be165..4d7ede931c8 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -254,7 +254,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm *tm, fsec
 						{
 							int			sec;
 
-							fval *= 60;
+							fval *= SECS_PER_MINUTE;
 							sec = fval;
 							tm->tm_sec += sec;
 #ifdef HAVE_INT64_TIMESTAMP
@@ -272,7 +272,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm *tm, fsec
 						{
 							int			sec;
 
-							fval *= 3600;
+							fval *= SECS_PER_HOUR;
 							sec = fval;
 							tm->tm_sec += sec;
 #ifdef HAVE_INT64_TIMESTAMP
@@ -326,7 +326,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm *tm, fsec
 						{
 							int			sec;
 
-							fval *= 30 * SECS_PER_DAY;
+							fval *= DAYS_PER_MONTH * SECS_PER_DAY;
 							sec = fval;
 							tm->tm_sec += sec;
 #ifdef HAVE_INT64_TIMESTAMP
@@ -341,28 +341,28 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm *tm, fsec
 					case DTK_YEAR:
 						tm->tm_year += val;
 						if (fval != 0)
-							tm->tm_mon += fval * 12;
+							tm->tm_mon += fval * MONTHS_PER_YEAR;
 						tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
 						break;
 
 					case DTK_DECADE:
 						tm->tm_year += val * 10;
 						if (fval != 0)
-							tm->tm_mon += fval * 120;
+							tm->tm_mon += fval * MONTHS_PER_YEAR * 10;
 						tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
 						break;
 
 					case DTK_CENTURY:
 						tm->tm_year += val * 100;
 						if (fval != 0)
-							tm->tm_mon += fval * 1200;
+							tm->tm_mon += fval * MONTHS_PER_YEAR * 100;
 						tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
 						break;
 
 					case DTK_MILLENNIUM:
 						tm->tm_year += val * 1000;
 						if (fval != 0)
-							tm->tm_mon += fval * 12000;
+							tm->tm_mon += fval * MONTHS_PER_YEAR * 1000;
 						tmask = (fmask & DTK_M(YEAR)) ? 0 : DTK_M(YEAR);
 						break;
 
@@ -680,8 +680,8 @@ interval2tm(interval span, struct tm *tm, fsec_t *fsec)
 
 	if (span.month != 0)
 	{
-		tm->tm_year = span.month / 12;
-		tm->tm_mon = span.month % 12;
+		tm->tm_year = span.month / MONTHS_PER_YEAR;
+		tm->tm_mon = span.month % MONTHS_PER_YEAR;
 
 	}
 	else
@@ -703,8 +703,8 @@ interval2tm(interval span, struct tm *tm, fsec_t *fsec)
 	*fsec = (time - (tm->tm_sec * USECS_PER_SEC));
 #else
 	TMODULO(time, tm->tm_mday, (double)SECS_PER_DAY);
-	TMODULO(time, tm->tm_hour, 3600.0);
-	TMODULO(time, tm->tm_min, 60.0);
+	TMODULO(time, tm->tm_hour, (double)SECS_PER_HOUR);
+	TMODULO(time, tm->tm_min, (double)SECS_PER_MINUTE);
 	TMODULO(time, tm->tm_sec, 1.0);
 	*fsec = time;
 #endif
@@ -715,16 +715,16 @@ interval2tm(interval span, struct tm *tm, fsec_t *fsec)
 static int
 tm2interval(struct tm *tm, fsec_t fsec, interval *span)
 {
-	span->month = tm->tm_year * 12 + tm->tm_mon;
+	span->month = tm->tm_year * MONTHS_PER_YEAR + tm->tm_mon;
 #ifdef HAVE_INT64_TIMESTAMP
-	span->time = (((((((tm->tm_mday * INT64CONST(24)) +
-						tm->tm_hour) * INT64CONST(60)) +
-					  	tm->tm_min) * INT64CONST(60)) +
+	span->time = (((((((tm->tm_mday * INT64CONST(HOURS_PER_DAY)) +
+						tm->tm_hour) * INT64CONST(SECS_PER_MINUTE)) +
+					  	tm->tm_min) * INT64CONST(SECS_PER_MINUTE)) +
 						tm->tm_sec) * USECS_PER_SEC) + fsec;
 #else
-	span->time = (((((tm->tm_mday * 24.0) +
-						tm->tm_hour) * 60.0) +
-						tm->tm_min) * 60.0) +
+	span->time = (((((tm->tm_mday * (double)HOURS_PER_DAY) +
+						tm->tm_hour) * (double)SECS_PER_MINUTE) +
+						tm->tm_min) * (double)SECS_PER_MINUTE) +
 						tm->tm_sec;
 	span->time = JROUND(span->time + fsec);
 #endif
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 13bc33642de..5382022d71a 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -20,14 +20,14 @@ int PGTYPEStimestamp_defmt_scan(char **, char *, timestamp *, int *, int *, int
 static int64
 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 * SECS_PER_MINUTE) + min) * SECS_PER_MINUTE) + sec) * USECS_PER_SEC) + fsec;
 }	/* time2t() */
 
 #else
 static double
 time2t(const int hour, const int min, const int sec, const fsec_t fsec)
 {
-	return (((hour * 60) + min) * 60) + sec + fsec;
+	return (((hour * SECS_PER_MINUTE) + min) * SECS_PER_MINUTE) + sec + fsec;
 }	/* time2t() */
 #endif
 
@@ -119,10 +119,10 @@ dt2time(timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec)
 	*sec = time / USECS_PER_SEC;
 	*fsec = time - *sec * USECS_PER_SEC;
 #else
-	*hour = time / 3600;
-	time -= (*hour) * 3600;
-	*min = time / 60;
-	time -= (*min) * 60;
+	*hour = time / SECS_PER_HOUR;
+	time -= (*hour) * SECS_PER_HOUR;
+	*min = time / SECS_PER_MINUTE;
+	time -= (*min) * SECS_PER_MINUTE;
 	*sec = time;
 	*fsec = JROUND(time - *sec);
 #endif
@@ -221,7 +221,7 @@ timestamp2tm(timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, char **tzn)
 			if (tzn != NULL)
 				*tzn = (char *) tm->tm_zone;
 #elif defined(HAVE_INT_TIMEZONE)
-			*tzp = (tm->tm_isdst > 0) ? TIMEZONE_GLOBAL - 3600 : TIMEZONE_GLOBAL;
+			*tzp = (tm->tm_isdst > 0) ? TIMEZONE_GLOBAL - SECS_PER_HOUR : TIMEZONE_GLOBAL;
 			if (tzn != NULL)
 				*tzn = TZNAME_GLOBAL[(tm->tm_isdst > 0)];
 #endif
@@ -875,15 +875,15 @@ PGTYPEStimestamp_add_interval(timestamp *tin, interval *span, timestamp *tout)
             if (timestamp2tm(*tin, NULL, tm, &fsec, NULL) !=0)
                 return -1;
             tm->tm_mon += span->month;
-            if (tm->tm_mon > 12)
+            if (tm->tm_mon > MONTHS_PER_YEAR)
             {
-                tm->tm_year += (tm->tm_mon - 1) / 12;
-                tm->tm_mon = (tm->tm_mon - 1) % 12 + 1;
+                tm->tm_year += (tm->tm_mon - 1) / MONTHS_PER_YEAR;
+                tm->tm_mon = (tm->tm_mon - 1) % MONTHS_PER_YEAR + 1;
             }
             else if (tm->tm_mon < 1)
             {
-                tm->tm_year += tm->tm_mon / 12 - 1;
-                tm->tm_mon = tm->tm_mon % 12 + 12;
+                tm->tm_year += tm->tm_mon / MONTHS_PER_YEAR - 1;
+                tm->tm_mon = tm->tm_mon % MONTHS_PER_YEAR + MONTHS_PER_YEAR;
             }