Commitb9b4431

committed

Fix compiler error related to explicit allocation of variable size

arrays

1 parente0b303d commitb9b4431Copy full SHA for b9b4431

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -506,20 +506,22 @@ spherepath_in(PG_FUNCTION_ARGS)`
`506`	`506`	`char*c=PG_GETARG_CSTRING(0);`
`507`	`507`	`int32i,nelem;`
`508`	`508`	`voidsphere_yyparse(void);`
	`509`	`+SPoint*arr;`
`509`	`510`
`510`	`511`	`init_buffer(c);`
`511`	`512`	`sphere_yyparse();`
`512`	`513`
`513`	`514`	`nelem=get_path_count();`
`514`	`515`	`if (nelem>1)`
`515`	`516`	`{`
`516`		`-SPointarr[nelem];`
	`517`	`+arr= (SPoint)palloc(sizeof(SPoint)nelem);`
`517`	`518`
`518`	`519`	`for (i=0;i<nelem;i++)`
`519`	`520`	`{`
`520`	`521`	`get_path_elem(i,&arr[i].lng,&arr[i].lat);`
`521`	`522`	`}`
`522`	`523`	`path=spherepath_from_array(&arr[0],nelem);`
	`524`	`+pfree(arr);`
`523`	`525`	`}`
`524`	`526`	`else`
`525`	`527`	`{`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -815,6 +815,7 @@ spherepoly_in(PG_FUNCTION_ARGS)`
`815`	`815`	`char*c=PG_GETARG_CSTRING(0);`
`816`	`816`	`int32i,`
`817`	`817`	`nelem;`
	`818`	`+SPoint*arr;`
`818`	`819`
`819`	`820`	`voidsphere_yyparse(void);`
`820`	`821`
`@@ -824,13 +825,14 @@ spherepoly_in(PG_FUNCTION_ARGS)`
`824`	`825`	`nelem=get_path_count();`
`825`	`826`	`if (nelem>2)`
`826`	`827`	`{`
`827`		`-SPointarr[nelem];`
	`828`	`+arr= (SPoint)palloc(sizeof(SPoint)nelem);`
`828`	`829`
`829`	`830`	`for (i=0;i<nelem;i++)`
`830`	`831`	`{`
`831`	`832`	`get_path_elem(i,&arr[i].lng,&arr[i].lat);`
`832`	`833`	`}`
`833`	`834`	`poly=spherepoly_from_array(&arr[0],nelem);`
	`835`	`+pfree(arr);`
`834`	`836`	`}`
`835`	`837`	`else`
`836`	`838`	`{`
`@@ -892,11 +894,12 @@ spherepoly_area(PG_FUNCTION_ARGS)`
`892`	`894`	`{`
`893`	`895`	`SPOLY*poly=PG_GETARG_SPOLY(0);`
`894`	`896`	`int32i;`
`895`		`-SPoints[poly->npts+2];`
	`897`	`+SPoint*s;`
`896`	`898`	`SPointstmp[2];`
`897`	`899`	`SEulerse;`
`898`	`900`	`float8sum=0.0;`
`899`	`901`
	`902`	`+s=(SPoint)palloc(sizeof(SPoint)(poly->npts+2));`
`900`	`903`	`memcpy((void*)&s[1],`
`901`	`904`	`(void*)&poly->p[0],`
`902`	`905`	`poly->npts*sizeof(SPoint));`
`@@ -936,6 +939,7 @@ spherepoly_area(PG_FUNCTION_ARGS)`
`936`	`939`	`sum=0.0;`
`937`	`940`	`}`
`938`	`941`
	`942`	`+pfree(s);`
`939`	`943`	`PG_RETURN_FLOAT8(sum);`
`940`	`944`	`}`
`941`	`945`

Comments

(0)