|
8 | 8 | * |
9 | 9 | * |
10 | 10 | * IDENTIFICATION |
11 | | - * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.139 2005/04/20 17:14:50 tgl Exp $ |
| 11 | + * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.140 2005/05/21 03:38:05 momjian Exp $ |
12 | 12 | * |
13 | 13 | *------------------------------------------------------------------------- |
14 | 14 | */ |
@@ -1551,7 +1551,7 @@ DecodeDateTime(char **field, int *ftype, int nf, |
1551 | 1551 | return DTERR_FIELD_OVERFLOW; |
1552 | 1552 |
|
1553 | 1553 | /* timezone not specified? then find local timezone if possible */ |
1554 | | - if ((tzp != NULL) && (!(fmask & DTK_M(TZ)))) |
| 1554 | + if (tzp != NULL && !(fmask & DTK_M(TZ))) |
1555 | 1555 | { |
1556 | 1556 | /* |
1557 | 1557 | * daylight savings time modifier but no standard timezone? |
@@ -2205,7 +2205,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf, |
2205 | 2205 | return DTERR_BAD_FORMAT; |
2206 | 2206 |
|
2207 | 2207 | /* timezone not specified? then find local timezone if possible */ |
2208 | | - if ((tzp != NULL) && (!(fmask & DTK_M(TZ)))) |
| 2208 | + if (tzp != NULL && !(fmask & DTK_M(TZ))) |
2209 | 2209 | { |
2210 | 2210 | struct pg_tm tt, |
2211 | 2211 | *tmp = &tt; |
@@ -3533,7 +3533,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, |
3533 | 3533 | * have alpha time zone info available. tm_isdst != -1 |
3534 | 3534 | * indicates that we have a valid time zone translation. |
3535 | 3535 | */ |
3536 | | - if ((tzp != NULL) && (tm->tm_isdst >= 0)) |
| 3536 | + if (tzp != NULL && tm->tm_isdst >= 0) |
3537 | 3537 | { |
3538 | 3538 | hour = -(*tzp / 3600); |
3539 | 3539 | min = ((abs(*tzp) / 60) % 60); |
@@ -3579,7 +3579,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, |
3579 | 3579 | else |
3580 | 3580 | sprintf((str + strlen(str)), ":%02d", tm->tm_sec); |
3581 | 3581 |
|
3582 | | - if ((tzp != NULL) && (tm->tm_isdst >= 0)) |
| 3582 | + if (tzp != NULL && tm->tm_isdst >= 0) |
3583 | 3583 | { |
3584 | 3584 | if (*tzn != NULL) |
3585 | 3585 | sprintf((str + strlen(str)), " %.*s", MAXTZLEN, *tzn); |
@@ -3627,7 +3627,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, |
3627 | 3627 | else |
3628 | 3628 | sprintf((str + strlen(str)), ":%02d", tm->tm_sec); |
3629 | 3629 |
|
3630 | | - if ((tzp != NULL) && (tm->tm_isdst >= 0)) |
| 3630 | + if (tzp != NULL && tm->tm_isdst >= 0) |
3631 | 3631 | { |
3632 | 3632 | if (*tzn != NULL) |
3633 | 3633 | sprintf((str + strlen(str)), " %.*s", MAXTZLEN, *tzn); |
@@ -3686,7 +3686,7 @@ EncodeDateTime(struct pg_tm * tm, fsec_t fsec, int *tzp, char **tzn, int style, |
3686 | 3686 | sprintf((str + strlen(str)), " %04d", |
3687 | 3687 | ((tm->tm_year > 0) ? tm->tm_year : -(tm->tm_year - 1))); |
3688 | 3688 |
|
3689 | | - if ((tzp != NULL) && (tm->tm_isdst >= 0)) |
| 3689 | + if (tzp != NULL && tm->tm_isdst >= 0) |
3690 | 3690 | { |
3691 | 3691 | if (*tzn != NULL) |
3692 | 3692 | sprintf((str + strlen(str)), " %.*s", MAXTZLEN, *tzn); |
@@ -3787,7 +3787,7 @@ EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str) |
3787 | 3787 | #ifdef HAVE_INT64_TIMESTAMP |
3788 | 3788 | sprintf(cp, ":%02d", abs(tm->tm_sec)); |
3789 | 3789 | cp += strlen(cp); |
3790 | | - sprintf(cp, ".%06d", ((fsec >= 0) ? fsec : -(fsec))); |
| 3790 | + sprintf(cp, ".%06d", Abs(fsec)); |
3791 | 3791 | #else |
3792 | 3792 | fsec += tm->tm_sec; |
3793 | 3793 | sprintf(cp, ":%013.10f", fabs(fsec)); |
|
0 commit comments