Complete the pfree_* to lwfree_* renaming.

git-svn-id: http://svn.osgeo.org/postgis/trunk@3448 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/examples/unparser.c b/liblwgeom/examples/unparser.c
index c8c2db251dce14bd1f0fd4444d0ab606c6a47227..616f399ffee4ad701a13ca1de8308664490fcbd2 100644 (file)
--- 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 aee7de37e01cd195e48f544d850307748f2cf1a5..b39c36d264aa7bc2df6949231db7bc51c700e199 100644 (file)
--- 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 baf5093dee4b2d070b9edb29eac60161cba280ec..ef7830619cd8656befe3d419105567233dacc647 100644 (file)
--- 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 3a1a708d237a8fab9dcfb63680ee574b34e9223c..ec3a3479c9a1f23f2184a0d0d18999e4985e6ab2 100644 (file)
--- 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 69a063d945cfcacc894c6d449ef1bf4c481f77e0..9b20588ae85741f2525c08545e02be6ea41e08ef 100644 (file)
--- 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 116335c2544dde5a632ab197140d308b532044d8..a45a335954cfcf70f7517825c395dc3b6d18280d 100644 (file)
--- 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 80b1aec4edaea3b6ff609a051e39d21b944e7247..b749d486bb5ed974671f78544c8ac99b98a6971d 100644 (file)
--- 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;t<poly->nrings;t++)
        {
-               pfree_POINTARRAY(poly->rings[t]);
+               lwfree_pointarray(poly->rings[t]);
        }
 
        lwfree(poly);