Remove unused tzn arguments for timestamp2tm()

diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 2da4e04a28b0355e5be9694b569e931a218abb41..e2236d25951e60dd0409232e78f64041523e2e9e 100644 (file)
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -969,7 +969,6 @@ timestamptz_date(PG_FUNCTION_ARGS)
                           *tm = &tt;
        fsec_t          fsec;
        int                     tz;
-       char       *tzn;
 
        if (TIMESTAMP_IS_NOBEGIN(timestamp))
                DATE_NOBEGIN(result);
@@ -977,7 +976,7 @@ timestamptz_date(PG_FUNCTION_ARGS)
                DATE_NOEND(result);
        else
        {
-               if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0)
+               if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
                        ereport(ERROR,
                                        (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
                                         errmsg("timestamp out of range")));
@@ -1576,12 +1575,11 @@ timestamptz_time(PG_FUNCTION_ARGS)
                           *tm = &tt;
        int                     tz;
        fsec_t          fsec;
-       char       *tzn;
 
        if (TIMESTAMP_NOT_FINITE(timestamp))
                PG_RETURN_NULL();
 
-       if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0)
+       if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
                ereport(ERROR,
                                (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
                                 errmsg("timestamp out of range")));
@@ -2450,12 +2448,11 @@ timestamptz_timetz(PG_FUNCTION_ARGS)
                           *tm = &tt;
        int                     tz;
        fsec_t          fsec;
-       char       *tzn;
 
        if (TIMESTAMP_NOT_FINITE(timestamp))
                PG_RETURN_NULL();
 
-       if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0)
+       if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
                ereport(ERROR,
                                (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
                                 errmsg("timestamp out of range")));

diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index edcce5f31ef42dd1c4b734cbe78668e7f4924f2a..b3cf1b16a5ec9fe91a07194c7133de0f7df4ba08 100644 (file)
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -530,7 +530,6 @@ timestamptz_recv(PG_FUNCTION_ARGS)
        struct pg_tm tt,
                           *tm = &tt;
        fsec_t          fsec;
-       char       *tzn;
 
 #ifdef HAVE_INT64_TIMESTAMP
        timestamp = (TimestampTz) pq_getmsgint64(buf);
@@ -541,7 +540,7 @@ timestamptz_recv(PG_FUNCTION_ARGS)
        /* rangecheck: see if timestamptz_out would like it */
        if (TIMESTAMP_NOT_FINITE(timestamp))
                 /* ok */ ;
-       else if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0)
+       else if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
                ereport(ERROR,
                                (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
                                 errmsg("timestamp out of range")));
@@ -2723,7 +2722,6 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS)
        Interval   *span = PG_GETARG_INTERVAL_P(1);
        TimestampTz result;
        int                     tz;
-       char       *tzn;
 
        if (TIMESTAMP_NOT_FINITE(timestamp))
                result = timestamp;
@@ -2735,7 +2733,7 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS)
                                           *tm = &tt;
                        fsec_t          fsec;
 
-                       if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0)
+                       if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
                                ereport(ERROR,
                                                (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
                                                 errmsg("timestamp out of range")));
@@ -2771,7 +2769,7 @@ timestamptz_pl_interval(PG_FUNCTION_ARGS)
                        fsec_t          fsec;
                        int                     julian;
 
-                       if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0)
+                       if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
                                ereport(ERROR,
                                                (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
                                                 errmsg("timestamp out of range")));
@@ -3250,12 +3248,11 @@ timestamptz_age(PG_FUNCTION_ARGS)
                           *tm2 = &tt2;
        int                     tz1;
        int                     tz2;
-       char       *tzn;
 
        result = (Interval *) palloc(sizeof(Interval));
 
-       if (timestamp2tm(dt1, &tz1, tm1, &fsec1, &tzn, NULL) == 0 &&
-               timestamp2tm(dt2, &tz2, tm2, &fsec2, &tzn, NULL) == 0)
+       if (timestamp2tm(dt1, &tz1, tm1, &fsec1, NULL, NULL) == 0 &&
+               timestamp2tm(dt2, &tz2, tm2, &fsec2, NULL, NULL) == 0)
        {
                /* form the symbolic difference */
                fsec = fsec1 - fsec2;
@@ -3509,7 +3506,6 @@ timestamptz_trunc(PG_FUNCTION_ARGS)
        bool            redotz = false;
        char       *lowunits;
        fsec_t          fsec;
-       char       *tzn;
        struct pg_tm tt,
                           *tm = &tt;
 
@@ -3524,7 +3520,7 @@ timestamptz_trunc(PG_FUNCTION_ARGS)
 
        if (type == UNITS)
        {
-               if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0)
+               if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
                        ereport(ERROR,
                                        (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
                                         errmsg("timestamp out of range")));
@@ -4159,7 +4155,6 @@ timestamptz_part(PG_FUNCTION_ARGS)
        char       *lowunits;
        double          dummy;
        fsec_t          fsec;
-       char       *tzn;
        struct pg_tm tt,
                           *tm = &tt;
 
@@ -4179,7 +4174,7 @@ timestamptz_part(PG_FUNCTION_ARGS)
 
        if (type == UNITS)
        {
-               if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0)
+               if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
                        ereport(ERROR,
                                        (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
                                         errmsg("timestamp out of range")));
@@ -4319,7 +4314,7 @@ timestamptz_part(PG_FUNCTION_ARGS)
 
                        case DTK_DOW:
                        case DTK_ISODOW:
-                               if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0)
+                               if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
                                        ereport(ERROR,
                                                        (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
                                                         errmsg("timestamp out of range")));
@@ -4329,7 +4324,7 @@ timestamptz_part(PG_FUNCTION_ARGS)
                                break;
 
                        case DTK_DOY:
-                               if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0)
+                               if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
                                        ereport(ERROR,
                                                        (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
                                                         errmsg("timestamp out of range")));
@@ -4650,14 +4645,13 @@ timestamptz_timestamp(PG_FUNCTION_ARGS)
        struct pg_tm tt,
                           *tm = &tt;
        fsec_t          fsec;
-       char       *tzn;
        int                     tz;
 
        if (TIMESTAMP_NOT_FINITE(timestamp))
                result = timestamp;
        else
        {
-               if (timestamp2tm(timestamp, &tz, tm, &fsec, &tzn, NULL) != 0)
+               if (timestamp2tm(timestamp, &tz, tm, &fsec, NULL, NULL) != 0)
                        ereport(ERROR,
                                        (errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
                                         errmsg("timestamp out of range")));