From: Regina Obe Date: Fri, 13 May 2011 08:46:04 +0000 (+0000) Subject: apply astyle X-Git-Tag: 2.0.0alpha1~1669 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e822af5c694dd85b2aadcee225256be94b83f0c0;p=postgis apply astyle git-svn-id: http://svn.osgeo.org/postgis/trunk@7142 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/postgis/lwgeom_accum.c b/postgis/lwgeom_accum.c index 701cca544..b5f6b1c2f 100644 --- a/postgis/lwgeom_accum.c +++ b/postgis/lwgeom_accum.c @@ -106,18 +106,21 @@ pgis_geometry_accum_transfn(PG_FUNCTION_ARGS) if (fcinfo->context && IsA(fcinfo->context, AggState)) aggcontext = ((AggState *) fcinfo->context)->aggcontext; #if POSTGIS_PGSQL_VERSION == 84 + else if (fcinfo->context && IsA(fcinfo->context, WindowAggState)) aggcontext = ((WindowAggState *) fcinfo->context)->wincontext; #endif #if POSTGIS_PGSQL_VERSION > 84 + else if (fcinfo->context && IsA(fcinfo->context, WindowAggState)) aggcontext = ((WindowAggState *) fcinfo->context)->aggcontext; #endif + else { /* cannot be called directly because of dummy-type argument */ elog(ERROR, "array_agg_transfn called in non-aggregate context"); - aggcontext = NULL; /* keep compiler quiet */ + aggcontext = NULL; /* keep compiler quiet */ } if ( PG_ARGISNULL(0) ) @@ -167,10 +170,13 @@ pgis_accum_finalfn(pgis_abs *p, MemoryContext mctx, FunctionCallInfo fcinfo) dims[0] = state->nelems; lbs[0] = 1; #if POSTGIS_PGSQL_VERSION < 84 + result = makeMdArrayResult(state, 1, dims, lbs, mctx); #else + result = makeMdArrayResult(state, 1, dims, lbs, mctx, false); #endif + return result; } @@ -304,10 +310,12 @@ PGISDirectFunctionCall1(PGFunction func, Datum arg1) Datum result; #if POSTGIS_PGSQL_VERSION > 90 - InitFunctionCallInfoData(fcinfo, NULL, 1, InvalidOid, NULL, NULL); + + InitFunctionCallInfoData(fcinfo, NULL, 1, InvalidOid, NULL, NULL); #else - InitFunctionCallInfoData(fcinfo, NULL, 1, NULL, NULL); -#endif + + InitFunctionCallInfoData(fcinfo, NULL, 1, NULL, NULL); +#endif fcinfo.arg[0] = arg1; fcinfo.argnull[0] = false;