From d33c9f9c04b0df48647b0dffeda55b37e2b30618 Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Thu, 18 Dec 2008 20:35:27 +0000 Subject: [PATCH] Complete the pfree_* to lwfree_* renaming. git-svn-id: http://svn.osgeo.org/postgis/trunk@3448 b70326c6-7e19-0410-871a-916f4a2858ee --- liblwgeom/examples/unparser.c | 4 ++-- liblwgeom/liblwgeom.h | 12 ++++++------ liblwgeom/lwcurve.c | 2 +- liblwgeom/lwgeom_api.c | 16 ++++++++-------- liblwgeom/lwline.c | 2 +- liblwgeom/lwpoint.c | 2 +- liblwgeom/lwpoly.c | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/liblwgeom/examples/unparser.c b/liblwgeom/examples/unparser.c index c8c2db251..616f399ff 100644 --- a/liblwgeom/examples/unparser.c +++ b/liblwgeom/examples/unparser.c @@ -115,7 +115,7 @@ int main() /* Free all of the allocated items */ lwfree(lwg_unparser_result.wkoutput); lwfree(serialized_lwgeom); - pfree_line(testline); + lwfree_line(testline); lwfree(dpa); @@ -191,6 +191,6 @@ int main() /* Free all of the allocated items */ lwfree(lwg_unparser_result.wkoutput); lwfree(serialized_lwgeom); - pfree_polygon(testpoly); + lwfree_polygon(testpoly); } diff --git a/liblwgeom/liblwgeom.h b/liblwgeom/liblwgeom.h index aee7de37e..b39c36d26 100644 --- a/liblwgeom/liblwgeom.h +++ b/liblwgeom/liblwgeom.h @@ -943,11 +943,12 @@ char box2d_same(BOX2DFLOAT4 *box1, BOX2DFLOAT4 *box2); ****************************************************************/ -extern void pfree_inspected(LWGEOM_INSPECTED *inspected); -extern void free_point (LWPOINT *pt); -extern void pfree_line (LWLINE *line); -extern void pfree_polygon (LWPOLY *poly); -extern void pfree_POINTARRAY(POINTARRAY *pa); +extern void lwfree_inspected(LWGEOM_INSPECTED *inspected); +extern void lwfree_point (LWPOINT *pt); +extern void lwfree_line (LWLINE *line); +extern void lwfree_polygon (LWPOLY *poly); +extern void lwfree_pointarray(POINTARRAY *pa); +extern void lwfree_curve(LWCURVE *curve); /**************************************************************** @@ -1323,7 +1324,6 @@ extern BOX3D *lwcurve_compute_box3d(LWCURVE *curve); LWGEOM *lwcurve_add(const LWCURVE *to, uint32 where, const LWGEOM *what); extern int lwcurve_compute_box2d_p(LWCURVE *curve, BOX2DFLOAT4 *box); extern BOX3D *lwcurve_compute_box3d(LWCURVE *curve); -extern void pfree_curve(LWCURVE *curve); LWCURVE *lwcurve_clone(const LWCURVE *curve); extern LWCURVE *lwgeom_getcurve_inspected(LWGEOM_INSPECTED *inspected, int geom_number); diff --git a/liblwgeom/lwcurve.c b/liblwgeom/lwcurve.c index baf5093de..ef7830619 100644 --- a/liblwgeom/lwcurve.c +++ b/liblwgeom/lwcurve.c @@ -494,7 +494,7 @@ lwcurve_compute_box2d_p(LWCURVE *curve, BOX2DFLOAT4 *result) return 1; } -void pfree_curve(LWCURVE *curve) +void lwfree_curve(LWCURVE *curve) { lwfree(curve->points); lwfree(curve); diff --git a/liblwgeom/lwgeom_api.c b/liblwgeom/lwgeom_api.c index 3a1a708d2..ec3a3479c 100644 --- a/liblwgeom/lwgeom_api.c +++ b/liblwgeom/lwgeom_api.c @@ -1218,7 +1218,7 @@ lwgeom_getsubgeometry(const uchar *serialized_form, int geom_number) LWGEOM_INSPECTED *inspected = lwgeom_inspect(serialized_form); result = lwgeom_getsubgeometry_inspected(inspected, geom_number); - pfree_inspected(inspected); + lwfree_inspected(inspected); return result; } @@ -1252,7 +1252,7 @@ lwgeom_getsubtype(uchar *serialized_form, int geom_number) LWGEOM_INSPECTED *inspected = lwgeom_inspect(serialized_form); result = lwgeom_getsubtype_inspected(inspected, geom_number); - pfree_inspected(inspected); + lwfree_inspected(inspected); return result; } @@ -1674,7 +1674,7 @@ compute_serialized_box3d(uchar *srl) { LWLINE *line = lwline_deserialize(srl); result = lwline_compute_box3d(line); - pfree_line(line); + lwfree_line(line); return result; } @@ -1682,14 +1682,14 @@ compute_serialized_box3d(uchar *srl) { LWCURVE *curve = lwcurve_deserialize(srl); result = lwcurve_compute_box3d(curve); - pfree_curve(curve); + lwfree_curve(curve); return result; } else if (type == POLYGONTYPE) { LWPOLY *poly = lwpoly_deserialize(srl); result = lwpoly_compute_box3d(poly); - pfree_polygon(poly); + lwfree_polygon(poly); return result; } @@ -1757,7 +1757,7 @@ compute_serialized_box3d(uchar *srl) ****************************************************************/ void -pfree_inspected(LWGEOM_INSPECTED *inspected) +lwfree_inspected(LWGEOM_INSPECTED *inspected) { if ( inspected->ngeometries ) lwfree(inspected->sub_geoms); @@ -1765,7 +1765,7 @@ pfree_inspected(LWGEOM_INSPECTED *inspected) } -void pfree_POINTARRAY(POINTARRAY *pa) +void lwfree_pointarray(POINTARRAY *pa) { lwfree(pa); } @@ -1871,7 +1871,7 @@ printMULTI(uchar *serialized) lwnotice("end multi*"); - pfree_inspected(inspected); + lwfree_inspected(inspected); } void diff --git a/liblwgeom/lwline.c b/liblwgeom/lwline.c index 69a063d94..9b20588ae 100644 --- a/liblwgeom/lwline.c +++ b/liblwgeom/lwline.c @@ -241,7 +241,7 @@ lwline_serialize_size(LWLINE *line) return size; } -void pfree_line (LWLINE *line) +void lwfree_line (LWLINE *line) { lwfree(line->points); lwfree(line); diff --git a/liblwgeom/lwpoint.c b/liblwgeom/lwpoint.c index 116335c25..a45a33595 100644 --- a/liblwgeom/lwpoint.c +++ b/liblwgeom/lwpoint.c @@ -302,7 +302,7 @@ lwpoint_deserialize(uchar *serialized_form) void free_point (LWPOINT *pt) { - pfree_POINTARRAY(pt->point); + lwfree_pointarray(pt->point); lwfree(pt); } diff --git a/liblwgeom/lwpoly.c b/liblwgeom/lwpoly.c index 80b1aec4e..b749d486b 100644 --- a/liblwgeom/lwpoly.c +++ b/liblwgeom/lwpoly.c @@ -354,13 +354,13 @@ lwpoly_serialize_size(LWPOLY *poly) return size; } -void pfree_polygon (LWPOLY *poly) +void lwfree_polygon (LWPOLY *poly) { int t; for (t=0;tnrings;t++) { - pfree_POINTARRAY(poly->rings[t]); + lwfree_pointarray(poly->rings[t]); } lwfree(poly); -- 2.49.0