Commit 4dc0a4cf authored by Paul Ramsey's avatar Paul Ramsey

Rename pfree_* memory management function lwfree_*


git-svn-id: http://svn.osgeo.org/postgis/[email protected] b70326c6-7e19-0410-871a-916f4a2858ee
parent 0cef5b22
......@@ -79,7 +79,7 @@ int main()
/* Free all of the allocated items */
lwfree(lwg_unparser_result.wkoutput);
lwfree(serialized_lwgeom);
pfree_point(testpoint);
free_point(testpoint);
lwfree(dpa);
......
......@@ -944,7 +944,7 @@ char box2d_same(BOX2DFLOAT4 *box1, BOX2DFLOAT4 *box2);
extern void pfree_inspected(LWGEOM_INSPECTED *inspected);
extern void pfree_point (LWPOINT *pt);
extern void free_point (LWPOINT *pt);
extern void pfree_line (LWLINE *line);
extern void pfree_polygon (LWPOLY *poly);
extern void pfree_POINTARRAY(POINTARRAY *pa);
......
......@@ -1666,7 +1666,7 @@ compute_serialized_box3d(uchar *srl)
LWDEBUG(3, "compute_serialized_box3d: bbox found");
pfree_point(pt);
free_point(pt);
return result;
}
......
......@@ -300,7 +300,7 @@ lwpoint_deserialize(uchar *serialized_form)
return result;
}
void pfree_point (LWPOINT *pt)
void free_point (LWPOINT *pt)
{
pfree_POINTARRAY(pt->point);
lwfree(pt);
......
......@@ -1281,7 +1281,7 @@ InsertPoint(void)
for (u = 0; u < obj->nVertices; u++)
{
pfree_point(lwgeom_as_lwpoint(lwmultipoints[u]));
free_point(lwgeom_as_lwpoint(lwmultipoints[u]));
lwfree(dpas[u]);
}
......
......@@ -379,7 +379,7 @@ Datum LWGEOM_line_interpolate_point(PG_FUNCTION_ARGS)
1);
point = lwpoint_construct(line->SRID, 0, opa);
srl = lwpoint_serialize(point);
pfree_point(point);
free_point(point);
PG_RETURN_POINTER(PG_LWGEOM_construct(srl, line->SRID, 0));
}
......@@ -414,7 +414,7 @@ Datum LWGEOM_line_interpolate_point(PG_FUNCTION_ARGS)
1);
point = lwpoint_construct(line->SRID, 0, opa);
srl = lwpoint_serialize(point);
pfree_point(point);
free_point(point);
PG_RETURN_POINTER(PG_LWGEOM_construct(srl, line->SRID, 0));
}
tlength += slength;
......@@ -429,7 +429,7 @@ Datum LWGEOM_line_interpolate_point(PG_FUNCTION_ARGS)
1);
point = lwpoint_construct(line->SRID, 0, opa);
srl = lwpoint_serialize(point);
pfree_point(point);
free_point(point);
PG_RETURN_POINTER(PG_LWGEOM_construct(srl, line->SRID, 0));
}
/***********************************************************************
......
......@@ -470,7 +470,7 @@ asgeojson_multipoint_buf(LWGEOM_INSPECTED *insp, char *srs, char *output, BOX3D
if (i) ptr += sprintf(ptr, ",");
point=lwgeom_getpoint_inspected(insp, i);
ptr += pointArray_to_geojson(point->point, ptr, precision);
pfree_point(point);
free_point(point);
}
ptr += sprintf(ptr, "]}");
......@@ -721,7 +721,7 @@ asgeojson_inspected_size(LWGEOM_INSPECTED *insp, BOX3D *bbox, int precision)
case POINTTYPE:
point=lwgeom_getpoint_inspected(insp, 0);
size = asgeojson_point_size(point, NULL, bbox, precision);
pfree_point(point);
free_point(point);
break;
case LINETYPE:
......@@ -776,7 +776,7 @@ asgeojson_inspected_buf(LWGEOM_INSPECTED *insp, char *output, BOX3D *bbox, int p
case POINTTYPE:
point=lwgeom_getpoint_inspected(insp, 0);
ptr += asgeojson_point_buf(point, NULL, ptr, bbox, precision);
pfree_point(point);
free_point(point);
break;
case LINETYPE:
......
......@@ -324,7 +324,7 @@ asgml2_inspected_size(LWGEOM_INSPECTED *insp, char *srs)
if ((point=lwgeom_getpoint_inspected(insp, i)))
{
size += asgml2_point_size(point, 0);
pfree_point(point);
free_point(point);
}
else if ((line=lwgeom_getline_inspected(insp, i)))
{
......@@ -384,7 +384,7 @@ asgml2_inspected_buf(LWGEOM_INSPECTED *insp, char *srs, char *output)
{
ptr += sprintf(ptr, "<gml:pointMember>");
ptr += asgml2_point_buf(point, 0, ptr);
pfree_point(point);
free_point(point);
ptr += sprintf(ptr, "</gml:pointMember>");
}
else if ((line=lwgeom_getline_inspected(insp, i)))
......@@ -681,7 +681,7 @@ asgml3_inspected_size(LWGEOM_INSPECTED *insp, char *srs)
if ((point=lwgeom_getpoint_inspected(insp, i)))
{
size += asgml3_point_size(point, 0);
pfree_point(point);
free_point(point);
}
else if ((line=lwgeom_getline_inspected(insp, i)))
{
......@@ -741,7 +741,7 @@ asgml3_inspected_buf(LWGEOM_INSPECTED *insp, char *srs, char *output)
{
ptr += sprintf(ptr, "<gml:pointMember>");
ptr += asgml3_point_buf(point, 0, ptr);
pfree_point(point);
free_point(point);
ptr += sprintf(ptr, "</gml:pointMember>");
}
else if ((line=lwgeom_getline_inspected(insp, i)))
......
......@@ -284,7 +284,7 @@ askml2_inspected_size(LWGEOM_INSPECTED *insp)
if ((point=lwgeom_getpoint_inspected(insp, i)))
{
size += askml2_point_size(point);
pfree_point(point);
free_point(point);
}
else if ((line=lwgeom_getline_inspected(insp, i)))
{
......@@ -334,7 +334,7 @@ askml2_inspected_buf(LWGEOM_INSPECTED *insp, char *output)
if ((point=lwgeom_getpoint_inspected(insp, i)))
{
ptr += askml2_point_buf(point, ptr);
pfree_point(point);
free_point(point);
}
else if ((line=lwgeom_getline_inspected(insp, i)))
{
......
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