Rename lwfree_* to *_free.

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

diff --git a/liblwgeom/cunit/cu_algorithm.c b/liblwgeom/cunit/cu_algorithm.c
index 748b1d7d3c79a630d9c0e88a5e91d2f81204e48f..a84441182b7b0533855f212947bf25d597fface7 100644 (file)
--- a/liblwgeom/cunit/cu_algorithm.c
+++ b/liblwgeom/cunit/cu_algorithm.c
@@ -98,9 +98,9 @@ int clean_cg_suite(void)
        if ( p2 ) lwfree(p2);
        if ( q1 ) lwfree(q1);
        if ( q2 ) lwfree(q2);
-       if ( l21 ) lwfree_line(l21);
-       if ( l22 ) lwfree_line(l22);
-       if ( l51 ) lwfree_line(l51);
+       if ( l21 ) lwline_free(l21);
+       if ( l22 ) lwline_free(l22);
+       if ( l51 ) lwline_free(l51);
        return 0;
 }
 
@@ -350,52 +350,52 @@ void test_lwline_crossing_long_lines(void)
        /* Two crossings at segment midpoints */
        l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, -1 1.5, 1 3, 1 4, 1 5)", PARSER_CHECK_NONE);
        CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_SAME_FIRST_LEFT );
-       lwfree_line(l52);
+       lwline_free(l52);
 
        /* One crossing at interior vertex */
        l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, 0 1, -1 1, -1 2, -1 3)", PARSER_CHECK_NONE);
        CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_CROSS_LEFT );
-       lwfree_line(l52);
+       lwline_free(l52);
 
        /* Two crossings at interior vertices */
        l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, 0 1, -1 1, 0 3, 1 3)", PARSER_CHECK_NONE);
        CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_SAME_FIRST_LEFT );
-       lwfree_line(l52);
+       lwline_free(l52);
 
        /* Two crossings, one at the first vertex on at interior vertex */
        l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 0, 0 0, -1 1, 0 3, 1 3)", PARSER_CHECK_NONE);
        CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_SAME_FIRST_LEFT );
-       lwfree_line(l52);
+       lwline_free(l52);
 
        /* Two crossings, one at the first vertex on the next interior vertex */
        l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 0, 0 0, -1 1, 0 1, 1 2)", PARSER_CHECK_NONE);
        CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_SAME_FIRST_LEFT );
-       lwfree_line(l52);
+       lwline_free(l52);
 
        /* Two crossings, one at the last vertex on the next interior vertex */
        l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 4, 0 4, -1 3, 0 3, 1 3)", PARSER_CHECK_NONE);
        CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_SAME_FIRST_LEFT );
-       lwfree_line(l52);
+       lwline_free(l52);
 
        /* Three crossings, two at midpoints, one at vertex */
        l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(0.5 1, -1 0.5, 1 2, -1 2, -1 3)", PARSER_CHECK_NONE);
        CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_MULTICROSS_END_LEFT );
-       lwfree_line(l52);
+       lwline_free(l52);
 
        /* One mid-point co-linear crossing */
        l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, 0 1.5, 0 2.5, -1 3, -1 4)", PARSER_CHECK_NONE);
        CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_CROSS_LEFT );
-       lwfree_line(l52);
+       lwline_free(l52);
 
        /* One on-vertices co-linear crossing */
        l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, 0 1, 0 2, -1 4, -1 4)", PARSER_CHECK_NONE);
        CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_CROSS_LEFT );
-       lwfree_line(l52);
+       lwline_free(l52);
 
        /* No crossing, but end on a co-linearity. */
        l52 = (LWLINE*)lwgeom_from_ewkt("LINESTRING(1 1, 1 2, 1 3, 0 3, 0 4)", PARSER_CHECK_NONE);
        CU_ASSERT( lwline_crossing_direction(l51, l52) == LINE_NO_CROSS );
-       lwfree_line(l52);
+       lwline_free(l52);
 
 }
 
@@ -475,7 +475,7 @@ void test_lwline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 1.5,0 2,0 2.5))");
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
        /* Clip off the top. */
        c = lwline_clip_to_ordinate_range(l51, 1, 3.5, 5.5);
@@ -483,7 +483,7 @@ void test_lwline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 3.5,0 4))");
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
        /* Clip off the bottom. */
        c = lwline_clip_to_ordinate_range(l51, 1, -1.5, 2.5);
@@ -491,7 +491,7 @@ void test_lwline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 0,0 1,0 2,0 2.5))" );
        lwfree(ewkt);
-       lwfree_collection(c);   
+       lwcollection_free(c);   
 
        /* Range holds entire object. */
        c = lwline_clip_to_ordinate_range(l51, 1, -1.5, 5.5);
@@ -499,7 +499,7 @@ void test_lwline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 0,0 1,0 2,0 3,0 4))" );
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
        /* Clip on vertices. */
        c = lwline_clip_to_ordinate_range(l51, 1, 1.0, 2.0);
@@ -507,7 +507,7 @@ void test_lwline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 1,0 2))" );
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
        /* Clip on vertices off the bottom. */
        c = lwline_clip_to_ordinate_range(l51, 1, -1.0, 2.0);
@@ -515,7 +515,7 @@ void test_lwline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 0,0 1,0 2))" );
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
        /* Clip on top. */
        c = lwline_clip_to_ordinate_range(l51, 1, -1.0, 0.0);
@@ -523,7 +523,7 @@ void test_lwline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "GEOMETRYCOLLECTION(POINT(0 0))" );
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
 }
 
@@ -546,9 +546,9 @@ void test_lwmline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0 1.5,0 2,0 2.5))");
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
-       lwfree_mline(mline);
+       lwmline_free(mline);
 
        /* 
        ** Set up the input line. Two-member case. 
@@ -561,9 +561,9 @@ void test_lwmline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((1 3.5,1 4),(0 3.5,0 4))");
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
-       lwfree_mline(mline);
+       lwmline_free(mline);
 
        /* 
        ** Set up staggered input line to create multi-type output. 
@@ -576,9 +576,9 @@ void test_lwmline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "GEOMETRYCOLLECTION(POINT(1 0),LINESTRING(0 0,0 1,0 2,0 2.5))");
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
-       lwfree_mline(mline);
+       lwmline_free(mline);
 
        /* 
        ** Set up input line from MAC
@@ -591,7 +591,7 @@ void test_lwmline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((3 3 3 3,3.5 3.5 3.5 3.5),(3.5 3.5 3.5 4.5,3 3 3 5))");
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
        /* Clip from 2 to 3.5 */
        c = lwline_clip_to_ordinate_range(line, 2, 2.0, 3.5);
@@ -599,7 +599,7 @@ void test_lwmline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((2 2 2 2,3 3 3 3,3.5 3.5 3.5 3.5),(3.5 3.5 3.5 4.5,3 3 3 5,2 2 2 6))");
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
        /* Clip from 3 to 4 */
        c = lwline_clip_to_ordinate_range(line, 2, 3.0, 4.0);
@@ -607,7 +607,7 @@ void test_lwmline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((3 3 3 3,4 4 4 4,3 3 3 5))");
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
        /* Clip from 2 to 3 */
        c = lwline_clip_to_ordinate_range(line, 2, 2.0, 3.0);
@@ -615,10 +615,10 @@ void test_lwmline_clip(void)
        //printf("c = %s\n", ewkt);
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((2 2 2 2,3 3 3 3),(3 3 3 5,2 2 2 6))");
        lwfree(ewkt);
-       lwfree_collection(c);
+       lwcollection_free(c);
 
 
-       lwfree_line(line);
+       lwline_free(line);
 
 }
 
@@ -653,7 +653,7 @@ void test_lwline_clip_big(void)
        CU_ASSERT_STRING_EQUAL(ewkt, "MULTILINESTRING((0.5 0.5 0.5,1 1 1,1.5 1.5 1.5))" );
 
        lwfree(ewkt);
-       lwfree_collection(c);
-       lwfree_line(line);
+       lwcollection_free(c);
+       lwline_free(line);
 }
 

diff --git a/liblwgeom/examples/unparser.c b/liblwgeom/examples/unparser.c
index 15459c2e334f25eabab9cb7ccfb22f6a43b67ee6..7fe5339b1a8a5be3b7e64907c726f9cbe2627cb6 100644 (file)
--- a/liblwgeom/examples/unparser.c
+++ b/liblwgeom/examples/unparser.c
@@ -79,7 +79,7 @@ int main()
        /* Free all of the allocated items */
        lwfree(lwg_unparser_result.wkoutput);
        lwfree(serialized_lwgeom);
-       lwfree_point(testpoint);
+       lwpoint_free(testpoint);
        lwfree(dpa);
 
 
@@ -115,7 +115,7 @@ int main()
        /* Free all of the allocated items */
        lwfree(lwg_unparser_result.wkoutput);
        lwfree(serialized_lwgeom);
-       lwfree_line(testline);
+       lwline_free(testline);
        lwfree(dpa);
 
 
@@ -191,6 +191,6 @@ int main()
        /* Free all of the allocated items */
        lwfree(lwg_unparser_result.wkoutput);
        lwfree(serialized_lwgeom);
-       lwfree_polygon(testpoly);
+       lwpoly_free(testpoly);
 
 }

diff --git a/liblwgeom/liblwgeom.h b/liblwgeom/liblwgeom.h
index fdf3317930f318dd4a2f5a87ab1ae12cb126cd8c..721683969b0ec3e2aa6296e09240aa48740133c6 100644 (file)
--- a/liblwgeom/liblwgeom.h
+++ b/liblwgeom/liblwgeom.h
@@ -965,15 +965,15 @@ char box2d_same(BOX2DFLOAT4 *box1, BOX2DFLOAT4 *box2);
  * constructed yourself.
  */
  
-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_mpoint(LWMPOINT *mpt);
-extern void lwfree_mline(LWMLINE *mline);
-extern void lwfree_mpolygon(LWMPOLY *mpoly);
-extern void lwfree_collection(LWCOLLECTION *col);
-extern void lwfree_geom(LWGEOM *geom);
+extern void ptarray_free(POINTARRAY *pa);
+extern void lwpoint_free(LWPOINT *pt);
+extern void lwline_free(LWLINE *line);
+extern void lwpoly_free(LWPOLY *poly);
+extern void lwmpoint_free(LWMPOINT *mpt);
+extern void lwmline_free(LWMLINE *mline);
+extern void lwmpoly_free(LWMPOLY *mpoly);
+extern void lwcollection_free(LWCOLLECTION *col);
+extern void lwgeom_free(LWGEOM *geom);
 
 extern void lwfree_inspected(LWGEOM_INSPECTED *inspected); /* TODO: make this deep free... */
 
@@ -985,14 +985,14 @@ extern void lwfree_inspected(LWGEOM_INSPECTED *inspected); /* TODO: make this de
  * constructed yourself, or you will leak lots of memory.
  */
 
-extern void lwgeom_release(LWGEOM *lwgeom);
-extern void lwpoly_release(LWPOLY *lwpoly);
-extern void lwline_release(LWLINE *lwline);
 extern void lwpoint_release(LWPOINT *lwpoint);
-extern void lwmpoly_release(LWMPOLY *lwpoly);
-extern void lwmline_release(LWMLINE *lwline);
+extern void lwline_release(LWLINE *lwline);
+extern void lwpoly_release(LWPOLY *lwpoly);
 extern void lwmpoint_release(LWMPOINT *lwpoint);
+extern void lwmline_release(LWMLINE *lwline);
+extern void lwmpoly_release(LWMPOLY *lwpoly);
 extern void lwcollection_release(LWCOLLECTION *lwcollection);
+extern void lwgeom_release(LWGEOM *lwgeom);
 
 
 /****************************************************************

diff --git a/liblwgeom/lwcollection.c b/liblwgeom/lwcollection.c
index ed456fd81118153934e581ed63bd4cd29d38a555..40c7c0f1e313d33f7aa15770ff9d0edca0e1d16f 100644 (file)
--- a/liblwgeom/lwcollection.c
+++ b/liblwgeom/lwcollection.c
@@ -443,7 +443,7 @@ TODO: pramsey
 */
 
 
-void lwfree_collection(LWCOLLECTION *col) 
+void lwcollection_free(LWCOLLECTION *col) 
 {
        int i;
        if( col->bbox ) 
@@ -456,25 +456,25 @@ void lwfree_collection(LWCOLLECTION *col)
                        switch( TYPE_GETTYPE(col->geoms[i]->type) )
                        {
                                case POINTTYPE:
-                                       lwfree_point((LWPOINT*)col->geoms[i]);
+                                       lwpoint_free((LWPOINT*)col->geoms[i]);
                                        break;
                                case LINETYPE:
-                                       lwfree_line((LWLINE*)col->geoms[i]);
+                                       lwline_free((LWLINE*)col->geoms[i]);
                                        break;
                                case POLYGONTYPE:
-                                       lwfree_polygon((LWPOLY*)col->geoms[i]);
+                                       lwpoly_free((LWPOLY*)col->geoms[i]);
                                        break;
                                case MULTIPOINTTYPE:
-                                       lwfree_mpoint((LWMPOINT*)col->geoms[i]);
+                                       lwmpoint_free((LWMPOINT*)col->geoms[i]);
                                        break;
                                case MULTILINETYPE:
-                                       lwfree_mline((LWMLINE*)col->geoms[i]);
+                                       lwmline_free((LWMLINE*)col->geoms[i]);
                                        break;
                                case MULTIPOLYGONTYPE:
-                                       lwfree_mpolygon((LWMPOLY*)col->geoms[i]);
+                                       lwmpoly_free((LWMPOLY*)col->geoms[i]);
                                        break;
                                case COLLECTIONTYPE:
-                                       lwfree_collection((LWCOLLECTION*)col->geoms[i]);
+                                       lwcollection_free((LWCOLLECTION*)col->geoms[i]);
                                        break;
                        }
                }

diff --git a/liblwgeom/lwgeom.c b/liblwgeom/lwgeom.c
index 97d34cff580bed8fc02c97651e33c788cf87096f..aa0fe055876905206ae9cb39b06541f1ccbf6699 100644 (file)
--- a/liblwgeom/lwgeom.c
+++ b/liblwgeom/lwgeom.c
@@ -827,30 +827,30 @@ lwgeom_contains_subgeoms(int type)
        }
 }
 
-void lwfree_geom(LWGEOM *lwgeom) {
+void lwgeom_free(LWGEOM *lwgeom) {
 
        switch(TYPE_GETTYPE(lwgeom->type))
        {
                case POINTTYPE:
-                       lwfree_point((LWPOINT *)lwgeom);
+                       lwpoint_free((LWPOINT *)lwgeom);
                        break;
                case LINETYPE:
-                       lwfree_line((LWLINE *)lwgeom);
+                       lwline_free((LWLINE *)lwgeom);
                        break;
                case POLYGONTYPE:
-                       lwfree_polygon((LWPOLY *)lwgeom);
+                       lwpoly_free((LWPOLY *)lwgeom);
                        break;
                case MULTIPOINTTYPE:
-                       lwfree_mpoint((LWMPOINT *)lwgeom);
+                       lwmpoint_free((LWMPOINT *)lwgeom);
                        break;
                case MULTILINETYPE:
-                       lwfree_mline((LWMLINE *)lwgeom);
+                       lwmline_free((LWMLINE *)lwgeom);
                        break;
                case MULTIPOLYGONTYPE:
-                       lwfree_mpolygon((LWMPOLY *)lwgeom);
+                       lwmpoly_free((LWMPOLY *)lwgeom);
                        break;
                case COLLECTIONTYPE:
-                       lwfree_collection((LWCOLLECTION *)lwgeom);
+                       lwcollection_free((LWCOLLECTION *)lwgeom);
                        break;
        }       
        return;

diff --git a/liblwgeom/lwgeom_api.c b/liblwgeom/lwgeom_api.c
index 0854b9dd502463a79ff9d36732f1a36d0d26e082..7ded3518537893c363b506a5c4b541a2108d11c1 100644 (file)
--- a/liblwgeom/lwgeom_api.c
+++ b/liblwgeom/lwgeom_api.c
@@ -1664,7 +1664,7 @@ compute_serialized_box3d(uchar *srl)
 
                LWDEBUG(3, "compute_serialized_box3d: bbox found");
 
-               lwfree_point(pt);
+               lwpoint_free(pt);
                return result;
        }
 
@@ -1672,7 +1672,7 @@ compute_serialized_box3d(uchar *srl)
        {
                LWLINE *line = lwline_deserialize(srl);
                result = lwline_compute_box3d(line);
-               lwfree_line(line);
+               lwline_free(line);
                return result;
 
        }
@@ -1687,7 +1687,7 @@ compute_serialized_box3d(uchar *srl)
        {
                LWPOLY *poly = lwpoly_deserialize(srl);
                result = lwpoly_compute_box3d(poly);
-               lwfree_polygon(poly);
+               lwpoly_free(poly);
                return result;
        }
 

diff --git a/liblwgeom/lwline.c b/liblwgeom/lwline.c
index 3a81a6d600f2690aa85f5ed1e184b938934e0648..5aaee9aff2a6f6fce31d9028eafd3f9058550f52 100644 (file)
--- a/liblwgeom/lwline.c
+++ b/liblwgeom/lwline.c
@@ -241,12 +241,12 @@ lwline_serialize_size(LWLINE *line)
        return size;
 }
 
-void lwfree_line (LWLINE  *line)
+void lwline_free (LWLINE  *line)
 {
        if ( line->bbox ) 
                lwfree(line->bbox);
 
-       lwfree_pointarray(line->points);
+       ptarray_free(line->points);
        lwfree(line);
 }
 

diff --git a/liblwgeom/lwmline.c b/liblwgeom/lwmline.c
index af849a3bbae9913e49ab3edde9d65c58ded6e2a3..7b0ddcfdabcc85d52790b1266fbdffc1b4061ca2 100644 (file)
--- a/liblwgeom/lwmline.c
+++ b/liblwgeom/lwmline.c
@@ -115,7 +115,7 @@ lwmline_add(const LWMLINE *to, uint32 where, const LWGEOM *what)
 
 }
 
-void lwfree_mline(LWMLINE *mline) 
+void lwmline_free(LWMLINE *mline) 
 {
        int i;
        if( mline->bbox ) 
@@ -125,7 +125,7 @@ void lwfree_mline(LWMLINE *mline)
        for ( i = 0; i < mline->ngeoms; i++ ) 
        {
                if( mline->geoms[i] ) {
-                       lwfree_line(mline->geoms[i]);
+                       lwline_free(mline->geoms[i]);
                }
        }
        if( mline->geoms ) 

diff --git a/liblwgeom/lwmpoint.c b/liblwgeom/lwmpoint.c
index cbad513929ac4aa0728420d60a31d6f638704c89..a570ed2f16a0de038ec0ed81546e9a02a1dd5cb6 100644 (file)
--- a/liblwgeom/lwmpoint.c
+++ b/liblwgeom/lwmpoint.c
@@ -115,7 +115,7 @@ lwmpoint_add(const LWMPOINT *to, uint32 where, const LWGEOM *what)
 
 }
 
-void lwfree_mpoint(LWMPOINT *mpt) 
+void lwmpoint_free(LWMPOINT *mpt) 
 {
        int i;
        if( mpt->bbox ) 
@@ -125,7 +125,7 @@ void lwfree_mpoint(LWMPOINT *mpt)
        for ( i = 0; i < mpt->ngeoms; i++ ) 
        {
                if( mpt->geoms[i] ) {
-                       lwfree_point(mpt->geoms[i]);
+                       lwpoint_free(mpt->geoms[i]);
                }
        }
        if( mpt->geoms ) 

diff --git a/liblwgeom/lwmpoly.c b/liblwgeom/lwmpoly.c
index 12a0dce04a3789adaa4bcf34532a5d7c17ab2211..f0ec82563b47681f0f704283b07b523399575951 100644 (file)
--- a/liblwgeom/lwmpoly.c
+++ b/liblwgeom/lwmpoly.c
@@ -118,7 +118,7 @@ lwmpoly_add(const LWMPOLY *to, uint32 where, const LWGEOM *what)
 
 }
 
-void lwfree_mpolygon(LWMPOLY *mpoly) 
+void lwmpoly_free(LWMPOLY *mpoly) 
 {
        int i;
        if( mpoly->bbox ) 
@@ -128,7 +128,7 @@ void lwfree_mpolygon(LWMPOLY *mpoly)
        for ( i = 0; i < mpoly->ngeoms; i++ ) 
        {
                if( mpoly->geoms[i] ) {
-                       lwfree_polygon(mpoly->geoms[i]);
+                       lwpoly_free(mpoly->geoms[i]);
                }
        }
        if( mpoly->geoms ) 

diff --git a/liblwgeom/lwpoint.c b/liblwgeom/lwpoint.c
index 723c2424a9e31468cf382ab86195f201c06b72d4..27b0a77860ce43ff181f6aa0c7f818a3044ad23b 100644 (file)
--- a/liblwgeom/lwpoint.c
+++ b/liblwgeom/lwpoint.c
@@ -300,10 +300,10 @@ lwpoint_deserialize(uchar *serialized_form)
        return result;
 }
 
-void lwfree_point(LWPOINT *pt)
+void lwpoint_free(LWPOINT *pt)
 {
        if(pt->point)
-               lwfree_pointarray(pt->point);
+               ptarray_free(pt->point);
        lwfree(pt);
 }
 

diff --git a/liblwgeom/lwpoly.c b/liblwgeom/lwpoly.c
index ce7a25c4d1a3e524ae795f49f3639f93cd7463c3..fbabd9fa5c9b1773557a42492d640a1cbb2947d6 100644 (file)
--- a/liblwgeom/lwpoly.c
+++ b/liblwgeom/lwpoly.c
@@ -354,7 +354,7 @@ lwpoly_serialize_size(LWPOLY *poly)
        return size;
 }
 
-void lwfree_polygon  (LWPOLY  *poly)
+void lwpoly_free  (LWPOLY  *poly)
 {
        int t;
 
@@ -364,7 +364,7 @@ void lwfree_polygon  (LWPOLY  *poly)
        for (t=0;t<poly->nrings;t++)
        {
                if( poly->rings[t] )
-                       lwfree_pointarray(poly->rings[t]);
+                       ptarray_free(poly->rings[t]);
        }
 
        if ( poly->rings ) 

diff --git a/liblwgeom/ptarray.c b/liblwgeom/ptarray.c
index c3828a153498018696d55ce18a401d94023252d0..13d0310467f99d9fd9139404af29dad6d9d3aef4 100644 (file)
--- a/liblwgeom/ptarray.c
+++ b/liblwgeom/ptarray.c
@@ -37,7 +37,7 @@ ptarray_construct(char hasz, char hasm, unsigned int npoints)
 
 }
 
-void lwfree_pointarray(POINTARRAY *pa)
+void ptarray_free(POINTARRAY *pa)
 {
        /* TODO 
        *  Turn this on after retrofitting all calls to lwfree_ in /lwgeom 

diff --git a/loader/shp2pgsql.c b/loader/shp2pgsql.c
index d9be03dba122e99e87e25d0d7aa7d082df9a5854..13f41a9add7c29df9d5ce65b3f71ba577526b1cf 100644 (file)
--- a/loader/shp2pgsql.c
+++ b/loader/shp2pgsql.c
@@ -899,7 +899,7 @@ InsertLineString()
 
        for (u = 0; u < obj->nParts; u++)
        {
-               lwfree_line(lwgeom_as_lwline(lwmultilinestrings[u]));
+               lwline_free(lwgeom_as_lwline(lwmultilinestrings[u]));
                lwfree(dpas[u]);
        }
 
@@ -1193,7 +1193,7 @@ InsertPolygon(void)
 
        /* Cycle through each polygon, freeing everything we need... */
        for (u = 0; u < polygon_total; u++)
-               lwfree_polygon(lwgeom_as_lwpoly(lwpolygons[u]));
+               lwpoly_free(lwgeom_as_lwpoly(lwpolygons[u]));
 
        /* Free the pointer arrays */
        lwfree(pas);
@@ -1284,7 +1284,7 @@ InsertPoint(void)
 
        for (u = 0; u < obj->nVertices; u++)
        {
-               lwfree_point(lwgeom_as_lwpoint(lwmultipoints[u]));
+               lwpoint_free(lwgeom_as_lwpoint(lwmultipoints[u]));
                lwfree(dpas[u]);
        }
 

diff --git a/lwgeom/lwgeom_functions_analytic.c b/lwgeom/lwgeom_functions_analytic.c
index 17d4e825ce2045ca57a08ea581fc20f52b69f25b..c9ceeeb4717d4d79aa211942bcd122dc70fd9c74 100644 (file)
--- a/lwgeom/lwgeom_functions_analytic.c
+++ b/lwgeom/lwgeom_functions_analytic.c
@@ -381,7 +381,7 @@ Datum LWGEOM_line_interpolate_point(PG_FUNCTION_ARGS)
                point = lwpoint_construct(line->SRID, 0, opa);
                srl = lwpoint_serialize(point);
                /* We shouldn't need this, the memory context is getting freed on the next line.
-               lwfree_point(point); */
+               lwpoint_free(point); */
                PG_RETURN_POINTER(PG_LWGEOM_construct(srl, line->SRID, 0));
        }
 
@@ -417,7 +417,7 @@ Datum LWGEOM_line_interpolate_point(PG_FUNCTION_ARGS)
                        point = lwpoint_construct(line->SRID, 0, opa);
                        srl = lwpoint_serialize(point);
                        /* We shouldn't need this, the memory context is getting freed on the next line
-                       lwfree_point(point); */
+                       lwpoint_free(point); */
                        PG_RETURN_POINTER(PG_LWGEOM_construct(srl, line->SRID, 0));
                }
                tlength += slength;
@@ -433,7 +433,7 @@ Datum LWGEOM_line_interpolate_point(PG_FUNCTION_ARGS)
        point = lwpoint_construct(line->SRID, 0, opa);
        srl = lwpoint_serialize(point);
        /* We shouldn't need this, the memory context is getting freed on the next line
-       lwfree_point(point); */
+       lwpoint_free(point); */
        PG_RETURN_POINTER(PG_LWGEOM_construct(srl, line->SRID, 0));
 }
 /***********************************************************************
@@ -1031,7 +1031,7 @@ Datum ST_LocateBetweenElevations(PG_FUNCTION_ARGS)
        {
                geom_out = lwmline_clip_to_ordinate_range((LWMLINE*)line_in, ordinate, from, to);
        }
-       lwfree_geom(line_in);
+       lwgeom_free(line_in);
 
        if( ! geom_out ) {
                elog(ERROR,"The lwline_clip_to_ordinate_range returned null.");

diff --git a/lwgeom/lwgeom_kml.c b/lwgeom/lwgeom_kml.c
index 31e1f2a801e059ff06cd8924c0f70100a47dc6f1..07b7f328c57cec8b87d8d7387cbee2f4e764473b 100644 (file)
--- a/lwgeom/lwgeom_kml.c
+++ b/lwgeom/lwgeom_kml.c
@@ -284,17 +284,17 @@ askml2_inspected_size(LWGEOM_INSPECTED *insp)
                if ((point=lwgeom_getpoint_inspected(insp, i)))
                {
                        size += askml2_point_size(point);
-                       lwfree_point(point);
+                       lwpoint_free(point);
                }
                else if ((line=lwgeom_getline_inspected(insp, i)))
                {
                        size += askml2_line_size(line);
-                       lwfree_line(line);
+                       lwline_free(line);
                }
                else if ((poly=lwgeom_getpoly_inspected(insp, i)))
                {
                        size += askml2_poly_size(poly);
-                       lwfree_polygon(poly);
+                       lwpoly_free(poly);
                }
                else
                {
@@ -334,17 +334,17 @@ askml2_inspected_buf(LWGEOM_INSPECTED *insp, char *output)
                if ((point=lwgeom_getpoint_inspected(insp, i)))
                {
                        ptr += askml2_point_buf(point, ptr);
-                       lwfree_point(point);
+                       lwpoint_free(point);
                }
                else if ((line=lwgeom_getline_inspected(insp, i)))
                {
                        ptr += askml2_line_buf(line, ptr);
-                       lwfree_line(line);
+                       lwline_free(line);
                }
                else if ((poly=lwgeom_getpoly_inspected(insp, i)))
                {
                        ptr += askml2_poly_buf(poly, ptr);
-                       lwfree_polygon(poly);
+                       lwpoly_free(poly);
                }
                else
                {