Improve comments for AdjustIntervalForTypmod.

Blank line adjustments.

diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index dfbb982..5cef002 100644 (file)
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.134 2005/06/29 22:51:56 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.135 2005/07/12 16:04:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -833,7 +833,6 @@ interval_reltime(PG_FUNCTION_ARGS)
 
 #ifdef HAVE_INT64_TIMESTAMP
        int64           span;
-
 #else
        double          span;
 #endif

diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index e8120d4..85dd419 100644 (file)
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.183 2005/06/29 22:51:56 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.184 2005/07/12 16:04:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2802,7 +2802,7 @@ convert_timevalue_to_scalar(Datum value, Oid typid)
 
 #ifdef HAVE_INT64_TIMESTAMP
                                if (interval->status != 0)
-                                       return ((interval->data[1] - interval->data[0]) *1000000.0);
+                                       return ((interval->data[1] - interval->data[0]) * 1000000.0);
 #else
                                if (interval->status != 0)
                                        return interval->data[1] - interval->data[0];

diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 6333114..74f40af 100644 (file)
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.131 2005/07/12 15:17:44 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.132 2005/07/12 16:04:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,7 +47,6 @@ TimestampTz PgStartTime;
 
 #ifdef HAVE_INT64_TIMESTAMP
 static int64 time2t(const int hour, const int min, const int sec, const fsec_t fsec);
-
 #else
 static double time2t(const int hour, const int min, const int sec, const fsec_t fsec);
 #endif
@@ -642,7 +641,10 @@ interval_scale(PG_FUNCTION_ARGS)
 
        PG_RETURN_INTERVAL_P(result);
 }
-
+/*
+ *     Adjust interval for specified precision, in both YEAR to SECOND
+ *     range and sub-second precision.
+ */
 static void
 AdjustIntervalForTypmod(Interval *interval, int32 typmod)
 {
@@ -722,7 +724,6 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
                {
 #ifdef HAVE_INT64_TIMESTAMP
                        int64           day;
-
 #else
                        double          day;
 #endif
@@ -744,7 +745,6 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
                {
 #ifdef HAVE_INT64_TIMESTAMP
                        int64           hour;
-
 #else
                        double          hour;
 #endif
@@ -887,7 +887,7 @@ AdjustIntervalForTypmod(Interval *interval, int32 typmod)
                else
                        elog(ERROR, "unrecognized interval typmod: %d", typmod);
 
-               /* Need to adjust precision? If not, don't even try! */
+               /* Need to adjust subsecond precision? */
                if (precision != INTERVAL_FULL_PRECISION)
                {
                        if (precision < 0 || precision > MAX_INTERVAL_PRECISION)
@@ -990,7 +990,6 @@ dt2time(Timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec)
 {
 #ifdef HAVE_INT64_TIMESTAMP
        int64           time;
-
 #else
        double          time;
 #endif
@@ -1171,7 +1170,6 @@ tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result)
 #ifdef HAVE_INT64_TIMESTAMP
        int date;
        int64           time;
-
 #else
        double date,
                                time;
@@ -1211,7 +1209,6 @@ interval2tm(Interval span, struct pg_tm * tm, fsec_t *fsec)
 {
 #ifdef HAVE_INT64_TIMESTAMP
        int64           time;
-
 #else
        double          time;
 #endif
@@ -1648,7 +1645,6 @@ interval_cmp_internal(Interval *interval1, Interval *interval2)
 #ifdef HAVE_INT64_TIMESTAMP
        int64           span1,
                                span2;
-
 #else
        double          span1,
                                span2;
@@ -2192,7 +2188,6 @@ interval_mul(PG_FUNCTION_ARGS)
 
 #ifdef HAVE_INT64_TIMESTAMP
        int64           months;
-
 #else
        double          months;
 #endif

diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index b412c1b..617d7ee 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -1237,7 +1237,6 @@ dt2time(double jd, int *hour, int *min, int *sec, fsec_t *fsec)
 {
 #ifdef HAVE_INT64_TIMESTAMP
        int64           time;
-
 #else
        double          time;
 #endif

diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index a5e9673..4871bde 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -416,7 +416,7 @@ DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm * tm, fse
                sec = (*fsec / USECS_PER_SEC);
                *fsec -= (sec * USECS_PER_SEC);
 #else
-               TMODULO(*fsec, sec, 1e0);
+               TMODULO(*fsec, sec, 1.0);
 #endif
                tm->tm_sec += sec;
        }
@@ -674,7 +674,6 @@ interval2tm(interval span, struct tm * tm, fsec_t *fsec)
 {
 #ifdef HAVE_INT64_TIMESTAMP
        int64           time;
-
 #else
        double          time;
 #endif
@@ -704,9 +703,9 @@ 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, 3600e0);
-       TMODULO(time, tm->tm_min, 60e0);
-       TMODULO(time, tm->tm_sec, 1e0);
+       TMODULO(time, tm->tm_hour, 3600.0);
+       TMODULO(time, tm->tm_min, 60.0);
+       TMODULO(time, tm->tm_sec, 1.0);
        *fsec = time;
 #endif
 

diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 556e573..13bc336 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -103,7 +103,6 @@ dt2time(timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec)
 {
 #ifdef HAVE_INT64_TIMESTAMP
        int64           time;
-
 #else
        double          time;
 #endif
@@ -148,7 +147,6 @@ timestamp2tm(timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, char **tzn)
        int                     dDate,
                                date0;
        int64           time;
-
 #else
        double          dDate,
                                date0;
@@ -280,7 +278,6 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr)
 
 #ifdef HAVE_INT64_TIMESTAMP
        int64           noresult = 0;
-
 #else
        double          noresult = 0.0;
 #endif
@@ -572,7 +569,7 @@ dttofmtasc_replace(timestamp *ts, date dDate, int dow, struct tm * tm,
                                        break;
                                case 's':
 #ifdef HAVE_INT64_TIMESTAMP
-                                       replace_val.int64_val = (*ts - SetEpochTimestamp()) / 1000000e0;
+                                       replace_val.int64_val = (*ts - SetEpochTimestamp()) / 1000000.0;
                                        replace_type = PGTYPES_TYPE_INT64;
 #else
                                        replace_val.double_val = *ts - SetEpochTimestamp();