88 *
99 *
1010 * IDENTIFICATION
11- * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.154 2005/07/2104:41:43 momjian Exp $
11+ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.155 2005/07/2118:06:12 momjian Exp $
1212 *
1313 *-------------------------------------------------------------------------
1414 */
@@ -1447,7 +1447,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
14471447tm -> tm_isdst = 1 ;
14481448if (tzp == NULL )
14491449return DTERR_BAD_FORMAT ;
1450- * tzp += val * SECS_PER_MINUTE ;
1450+ * tzp += val * MINS_PER_HOUR ;
14511451break ;
14521452
14531453case DTZ :
@@ -1460,15 +1460,15 @@ DecodeDateTime(char **field, int *ftype, int nf,
14601460tm -> tm_isdst = 1 ;
14611461if (tzp == NULL )
14621462return DTERR_BAD_FORMAT ;
1463- * tzp = val * SECS_PER_MINUTE ;
1463+ * tzp = val * MINS_PER_HOUR ;
14641464ftype [i ]= DTK_TZ ;
14651465break ;
14661466
14671467case TZ :
14681468tm -> tm_isdst = 0 ;
14691469if (tzp == NULL )
14701470return DTERR_BAD_FORMAT ;
1471- * tzp = val * SECS_PER_MINUTE ;
1471+ * tzp = val * MINS_PER_HOUR ;
14721472ftype [i ]= DTK_TZ ;
14731473break ;
14741474
@@ -1667,7 +1667,7 @@ DetermineLocalTimeZone(struct pg_tm * tm)
16671667day = ((pg_time_t )date )* SECS_PER_DAY ;
16681668if (day /SECS_PER_DAY != date )
16691669gotooverflow ;
1670- sec = tm -> tm_sec + (tm -> tm_min + tm -> tm_hour * SECS_PER_MINUTE )* SECS_PER_MINUTE ;
1670+ sec = tm -> tm_sec + (tm -> tm_min + tm -> tm_hour * MINS_PER_HOUR )* SECS_PER_MINUTE ;
16711671mytime = day + sec ;
16721672/* since sec >= 0, overflow could only be from +day to -mytime */
16731673if (mytime < 0 && day > 0 )
@@ -1679,7 +1679,7 @@ DetermineLocalTimeZone(struct pg_tm * tm)
16791679 * that DST boundaries can't be closer together than 48 hours, so
16801680 * backing up 24 hours and finding the "next" boundary will work.
16811681 */
1682- prevtime = mytime - ( HOURS_PER_DAY * SECS_PER_MINUTE * SECS_PER_MINUTE ) ;
1682+ prevtime = mytime - SECS_PER_DAY ;
16831683if (mytime < 0 && prevtime > 0 )
16841684gotooverflow ;
16851685
@@ -2167,7 +2167,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
21672167tm -> tm_isdst = 1 ;
21682168if (tzp == NULL )
21692169return DTERR_BAD_FORMAT ;
2170- * tzp += val * SECS_PER_MINUTE ;
2170+ * tzp += val * MINS_PER_HOUR ;
21712171break ;
21722172
21732173case DTZ :
@@ -2180,15 +2180,15 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
21802180tm -> tm_isdst = 1 ;
21812181if (tzp == NULL )
21822182return DTERR_BAD_FORMAT ;
2183- * tzp = val * SECS_PER_MINUTE ;
2183+ * tzp = val * MINS_PER_HOUR ;
21842184ftype [i ]= DTK_TZ ;
21852185break ;
21862186
21872187case TZ :
21882188tm -> tm_isdst = 0 ;
21892189if (tzp == NULL )
21902190return DTERR_BAD_FORMAT ;
2191- * tzp = val * SECS_PER_MINUTE ;
2191+ * tzp = val * MINS_PER_HOUR ;
21922192ftype [i ]= DTK_TZ ;
21932193break ;
21942194
@@ -2833,7 +2833,7 @@ DecodeTimezone(char *str, int *tzp)
28332833if (min < 0 || min >=60 )
28342834return DTERR_TZDISP_OVERFLOW ;
28352835
2836- tz = (hr * SECS_PER_MINUTE + min )* SECS_PER_MINUTE ;
2836+ tz = (hr * MINS_PER_HOUR + min )* SECS_PER_MINUTE ;
28372837if (* str == '-' )
28382838tz = - tz ;
28392839
@@ -2890,7 +2890,7 @@ DecodePosixTimezone(char *str, int *tzp)
28902890{
28912891case DTZ :
28922892case TZ :
2893- * tzp = (val * SECS_PER_MINUTE )- tz ;
2893+ * tzp = (val * MINS_PER_HOUR )- tz ;
28942894break ;
28952895
28962896default :
@@ -3510,7 +3510,7 @@ EncodeTimeOnly(struct pg_tm * tm, fsec_t fsec, int *tzp, int style, char *str)
35103510min ;
35113511
35123512hour = - (* tzp /SECS_PER_HOUR );
3513- min = (abs (* tzp ) /SECS_PER_MINUTE ) %SECS_PER_MINUTE ;
3513+ min = (abs (* tzp ) /MINS_PER_HOUR ) %MINS_PER_HOUR ;
35143514sprintf (str + strlen (str ), (min != 0 ) ?"%+03d:%02d" :"%+03d" ,hour ,min );
35153515}
35163516
@@ -3583,7 +3583,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style,
35833583if (tzp != NULL && tm -> tm_isdst >=0 )
35843584{
35853585hour = - (* tzp /SECS_PER_HOUR );
3586- min = (abs (* tzp ) /SECS_PER_MINUTE ) %SECS_PER_MINUTE ;
3586+ min = (abs (* tzp ) /MINS_PER_HOUR ) %MINS_PER_HOUR ;
35873587sprintf (str + strlen (str ), (min != 0 ) ?"%+03d:%02d" :"%+03d" ,hour ,min );
35883588}
35893589
@@ -3633,7 +3633,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style,
36333633else
36343634{
36353635hour = - (* tzp /SECS_PER_HOUR );
3636- min = (abs (* tzp ) /SECS_PER_MINUTE ) %SECS_PER_MINUTE ;
3636+ min = (abs (* tzp ) /MINS_PER_HOUR ) %MINS_PER_HOUR ;
36373637sprintf (str + strlen (str ), (min != 0 ) ?"%+03d:%02d" :"%+03d" ,hour ,min );
36383638}
36393639}
@@ -3681,7 +3681,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style,
36813681else
36823682{
36833683hour = - (* tzp /SECS_PER_HOUR );
3684- min = (abs (* tzp ) /SECS_PER_MINUTE ) %SECS_PER_MINUTE ;
3684+ min = (abs (* tzp ) /MINS_PER_HOUR ) %MINS_PER_HOUR ;
36853685sprintf (str + strlen (str ), (min != 0 ) ?"%+03d:%02d" :"%+03d" ,hour ,min );
36863686}
36873687}
@@ -3747,7 +3747,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style,
37473747 * 2001-10-19
37483748 */
37493749hour = - (* tzp /SECS_PER_HOUR );
3750- min = (abs (* tzp ) /SECS_PER_MINUTE ) %SECS_PER_MINUTE ;
3750+ min = (abs (* tzp ) /MINS_PER_HOUR ) %MINS_PER_HOUR ;
37513751sprintf (str + strlen (str ), (min != 0 ) ?" %+03d:%02d" :" %+03d" ,hour ,min );
37523752}
37533753}