|
8 | 8 | *
|
9 | 9 | *
|
10 | 10 | * IDENTIFICATION
|
11 |
| - * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.117 2005/07/22 03:46:33 momjian Exp $ |
| 11 | + * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.118 2005/07/22 05:03:09 momjian Exp $ |
12 | 12 | *
|
13 | 13 | *-------------------------------------------------------------------------
|
14 | 14 | */
|
@@ -1093,18 +1093,13 @@ AdjustTimeForTypmod(TimeADT *time, int32 typmod)
|
1093 | 1093 | */
|
1094 | 1094 | #ifdef HAVE_INT64_TIMESTAMP
|
1095 | 1095 | if (*time >= INT64CONST(0))
|
1096 |
| - { |
1097 | 1096 | *time = ((*time + TimeOffsets[typmod]) / TimeScales[typmod]) *
|
1098 | 1097 | TimeScales[typmod];
|
1099 |
| - } |
1100 | 1098 | else
|
1101 |
| - { |
1102 | 1099 | *time = -((((-*time) + TimeOffsets[typmod]) / TimeScales[typmod]) *
|
1103 | 1100 | TimeScales[typmod]);
|
1104 |
| - } |
1105 | 1101 | #else
|
1106 |
| - *time = rint((double)*time * TimeScales[typmod]) |
1107 |
| - / TimeScales[typmod]; |
| 1102 | + *time = rint((double) * time * TimeScales[typmod]) / TimeScales[typmod]; |
1108 | 1103 | #endif
|
1109 | 1104 | }
|
1110 | 1105 | }
|
@@ -2496,9 +2491,9 @@ timetz_zone(PG_FUNCTION_ARGS)
|
2496 | 2491 | pg_time_t now;
|
2497 | 2492 |
|
2498 | 2493 | /* Find the specified timezone */
|
2499 |
| - len = (VARSIZE(zone)-VARHDRSZ>TZ_STRLEN_MAX) ? |
| 2494 | + len = (VARSIZE(zone) - VARHDRSZ > TZ_STRLEN_MAX) ? |
2500 | 2495 | TZ_STRLEN_MAX : VARSIZE(zone) - VARHDRSZ;
|
2501 |
| - memcpy(tzname,VARDATA(zone),len); |
| 2496 | + memcpy(tzname, VARDATA(zone), len); |
2502 | 2497 | tzname[len]=0;
|
2503 | 2498 | tzp = pg_tzset(tzname);
|
2504 | 2499 | if (!tzp) {
|
@@ -2537,7 +2532,7 @@ timetz_zone(PG_FUNCTION_ARGS)
|
2537 | 2532 | result->zone = tz;
|
2538 | 2533 |
|
2539 | 2534 | PG_RETURN_TIMETZADT_P(result);
|
2540 |
| -} /* timetz_zone() */ |
| 2535 | +} |
2541 | 2536 |
|
2542 | 2537 | /* timetz_izone()
|
2543 | 2538 | * Encode time with time zone type with specified time interval as time zone.
|
@@ -2582,4 +2577,4 @@ timetz_izone(PG_FUNCTION_ARGS)
|
2582 | 2577 | result->zone = tz;
|
2583 | 2578 |
|
2584 | 2579 | PG_RETURN_TIMETZADT_P(result);
|
2585 |
| -} /* timetz_izone() */ |
| 2580 | +} |
0 commit comments