mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out pfrees for justify_hour function calls.

Browse Source
This commit is contained in:
Bruce Momjian 2005-08-25 03:53:22 +00:00
parent ea849a2648
commit ca4cf09232
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/utils/adt/timestamp.c
View File

@ -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)
{ {
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)
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)
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)
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)
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)
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);
} }
/* /*