diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-05-27 15:15:31 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-05-27 15:15:31 +0000 |
| commit | 22f030302350b9fa9e8d286e2f5fb40e9c52a34b (patch) | |
| tree | 5d9e3ef437da20aa50dd0b1c9df78f6e5bcb9f20 /src/backend/utils/adt/datetime.c | |
| parent | a4374f90703baf8c74b2bcc074ead2e7253d5b9a (diff) | |
| download | postgresql-22f030302350b9fa9e8d286e2f5fb40e9c52a34b.tar.gz postgresql-22f030302350b9fa9e8d286e2f5fb40e9c52a34b.zip | |
Fix compile of entab to use stdarg.h. Clean up includes.
Marko Kreen
Diffstat (limited to 'src/backend/utils/adt/datetime.c')
| -rw-r--r-- | src/backend/utils/adt/datetime.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 119ab116bd9..f7274c037d3 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.147 2005/05/26 15:26:00 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.148 2005/05/27 15:15:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -3461,12 +3461,9 @@ EncodeTimeOnly(struct pg_tm * tm, fsec_t fsec, int *tzp, int style, char *str) #ifdef HAVE_INT64_TIMESTAMP sprintf(str + strlen(str), ":%02d.%06d", tm->tm_sec, fsec); #else - sprintf(str + strlen(str), ":%013.10f", tm->tm_sec + fsec); + sprintf(str + strlen(str), ":%012.9f", tm->tm_sec + fsec); #endif - /* chop off trailing pairs of zeros... */ - while (strcmp((str + strlen(str) - 2), "00") == 0 && - *(str + strlen(str) - 3) != '.') - *(str + strlen(str) - 2) = '\0'; + TrimTrailingZeros(str); } else sprintf(str + strlen(str), ":%02d", tm->tm_sec); @@ -3804,7 +3801,7 @@ EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str) sprintf(cp, ".%06d", Abs(fsec)); #else fsec += tm->tm_sec; - sprintf(cp, ":%013.10f", fabs(fsec)); + sprintf(cp, ":%012.9f", fabs(fsec)); #endif TrimTrailingZeros(cp); cp += strlen(cp); |