Skip to content

P
Postgres FD Implementation
Commit ca4cf092 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Back out pfrees for justify_hour function calls.

parent ea849a26
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 13 deletions
src/backend/utils/adt/timestamp.c
View file @ ca4cf092
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.149 2005/08/25 01:30:06 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.150 2005/08/25 03:53:22 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1892,7 +1892,7 @@ timestamp_mi(PG_FUNCTION_ARGS) ...@@ -1892,7 +1892,7 @@ timestamp_mi(PG_FUNCTION_ARGS)
{ {
Timestamp dt1 = PG_GETARG_TIMESTAMP(0); Timestamp dt1 = PG_GETARG_TIMESTAMP(0);
Timestamp dt2 = PG_GETARG_TIMESTAMP(1); Timestamp dt2 = PG_GETARG_TIMESTAMP(1);
Interval *result, *result2; Interval *result;
result = (Interval *) palloc(sizeof(Interval)); result = (Interval *) palloc(sizeof(Interval));
...@@ -1914,10 +1914,9 @@ timestamp_mi(PG_FUNCTION_ARGS) ...@@ -1914,10 +1914,9 @@ timestamp_mi(PG_FUNCTION_ARGS)
result->month = 0; result->month = 0;
result->day = 0; result->day = 0;
result2 = DatumGetIntervalP(DirectFunctionCall1(interval_justify_hours, result = DatumGetIntervalP(DirectFunctionCall1(interval_justify_hours,
IntervalPGetDatum(result))); IntervalPGetDatum(result)));
pfree(result); PG_RETURN_INTERVAL_P(result);
PG_RETURN_INTERVAL_P(result2);
} }
/* interval_justify_hours() /* interval_justify_hours()
...@@ -2264,7 +2263,7 @@ interval_mul(PG_FUNCTION_ARGS) ...@@ -2264,7 +2263,7 @@ interval_mul(PG_FUNCTION_ARGS)
Interval *span = PG_GETARG_INTERVAL_P(0); Interval *span = PG_GETARG_INTERVAL_P(0);
float8 factor = PG_GETARG_FLOAT8(1); float8 factor = PG_GETARG_FLOAT8(1);
double month_remainder, day_remainder; double month_remainder, day_remainder;
Interval *result, *result2; Interval *result;
result = (Interval *) palloc(sizeof(Interval)); result = (Interval *) palloc(sizeof(Interval));
...@@ -2290,10 +2289,9 @@ interval_mul(PG_FUNCTION_ARGS) ...@@ -2290,10 +2289,9 @@ interval_mul(PG_FUNCTION_ARGS)
day_remainder * SECS_PER_DAY); day_remainder * SECS_PER_DAY);
#endif #endif
result2 = DatumGetIntervalP(DirectFunctionCall1(interval_justify_hours, result = DatumGetIntervalP(DirectFunctionCall1(interval_justify_hours,
IntervalPGetDatum(result))); IntervalPGetDatum(result)));
pfree(result); PG_RETURN_INTERVAL_P(result);
PG_RETURN_INTERVAL_P(result2);
} }
Datum Datum
...@@ -2312,7 +2310,7 @@ interval_div(PG_FUNCTION_ARGS) ...@@ -2312,7 +2310,7 @@ interval_div(PG_FUNCTION_ARGS)
Interval *span = PG_GETARG_INTERVAL_P(0); Interval *span = PG_GETARG_INTERVAL_P(0);
float8 factor = PG_GETARG_FLOAT8(1); float8 factor = PG_GETARG_FLOAT8(1);
double month_remainder, day_remainder; double month_remainder, day_remainder;
Interval *result, *result2; Interval *result;
result = (Interval *) palloc(sizeof(Interval)); result = (Interval *) palloc(sizeof(Interval));
...@@ -2343,10 +2341,9 @@ interval_div(PG_FUNCTION_ARGS) ...@@ -2343,10 +2341,9 @@ interval_div(PG_FUNCTION_ARGS)
result->time = JROUND(result->time); result->time = JROUND(result->time);
#endif #endif
result2 = DatumGetIntervalP(DirectFunctionCall1(interval_justify_hours, result = DatumGetIntervalP(DirectFunctionCall1(interval_justify_hours,
IntervalPGetDatum(result))); IntervalPGetDatum(result)));
pfree(result); PG_RETURN_INTERVAL_P(result);
PG_RETURN_INTERVAL_P(result2);
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment