Rename the existing get_int32() and get_uint32() functions to lw_get_int32() and...

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

diff --git a/lwgeom/liblwgeom.h b/lwgeom/liblwgeom.h
index 100e1f30132bfacda6a3f84cbcb8b7e8008af254..06c8a1135fd368a8b10724dc01dc836029515230 100644 (file)
--- a/lwgeom/liblwgeom.h
+++ b/lwgeom/liblwgeom.h
@@ -888,8 +888,8 @@ extern void pfree_POINTARRAY(POINTARRAY *pa);
  * utility
  ****************************************************************/
 
-extern uint32 get_uint32(const uchar *loc);
-extern int32 get_int32(const uchar *loc);
+extern uint32 lw_get_uint32(const uchar *loc);
+extern int32 lw_get_int32(const uchar *loc);
 extern void printBOX3D(BOX3D *b);
 extern void printPA(POINTARRAY *pa);
 extern void printLWPOINT(LWPOINT *point);

diff --git a/lwgeom/lwcurve.c b/lwgeom/lwcurve.c
index db2d748c53eaced7cfa835ac33447381227666c7..50110717465f027ad69812154baf278f210e5af0 100644 (file)
--- a/lwgeom/lwcurve.c
+++ b/lwgeom/lwcurve.c
@@ -107,7 +107,7 @@ lwcurve_deserialize(uchar *serialized_form)
 #ifdef PGIS_DEBUG\r
                 lwnotice("lwcurve_deserialize: input has srid");\r
 #endif\r
-                result->SRID = get_int32(loc);               \r
+                result->SRID = lw_get_int32(loc);               \r
                 loc += 4; /* type + SRID */\r
          }\r
          else\r
@@ -120,7 +120,7 @@ lwcurve_deserialize(uchar *serialized_form)
 \r
          /* we've read the type (1 byte) and SRID (4 bytes, if present) */\r
 \r
-         npoints = get_uint32(loc);\r
+         npoints = lw_get_uint32(loc);\r
 #ifdef PGIS_DEBUG\r
          lwnotice("curve npoints = %d", npoints);\r
 #endif         \r
@@ -505,7 +505,7 @@ lwgeom_size_curve(const uchar *serialized_curve)
         }\r
 \r
         /* we've read the type (1 byte) and SRID (4 bytes, if present) */\r
-        npoints = get_uint32(loc);\r
+        npoints = lw_get_uint32(loc);\r
         result += sizeof(uint32); /* npoints */\r
 \r
         result += TYPE_NDIMS(type) * sizeof(double) * npoints;\r

diff --git a/lwgeom/lwgeom_api.c b/lwgeom/lwgeom_api.c
index 16dfd6791a2569756ce4018695a76c2dae619a11..c401b2cf73318bf5e156c169c09c080a830e21bc 100644 (file)
--- a/lwgeom/lwgeom_api.c
+++ b/lwgeom/lwgeom_api.c
@@ -906,7 +906,7 @@ lwgeom_hasBBOX(uchar type)
 
 /* handle missaligned unsigned int32 data */
 uint32
-get_uint32(const uchar *loc)
+lw_get_uint32(const uchar *loc)
 {
        uint32 result;
 
@@ -916,7 +916,7 @@ get_uint32(const uchar *loc)
 
 /* handle missaligned signed int32 data */
 int32
-get_int32(const uchar *loc)
+lw_get_int32(const uchar *loc)
 {
        int32 result;
 
@@ -974,7 +974,7 @@ lwgeom_inspect(const uchar *serialized_form)
 
        if ( lwgeom_hasSRID(typefl) )
        {
-               result->SRID = get_int32(loc);
+               result->SRID = lw_get_int32(loc);
                loc += 4;
        }
 
@@ -990,7 +990,7 @@ lwgeom_inspect(const uchar *serialized_form)
 
        /* its a GeometryCollection or multi* geometry */
 
-       result->ngeometries = get_uint32(loc);
+       result->ngeometries = lw_get_uint32(loc);
        loc +=4;
 
 #ifdef PGIS_DEBUG
@@ -1307,7 +1307,7 @@ lwgeom_getnumgeometries(uchar *serialized_form)
                loc += 4;
        }
        /* its a GeometryCollection or multi* geometry */
-       return get_uint32(loc);
+       return lw_get_uint32(loc);
 }
 
 /*
@@ -1590,7 +1590,7 @@ lwgeom_size(const uchar *serialized_form)
        }
 
 
-       ngeoms = get_uint32(loc);
+       ngeoms = lw_get_uint32(loc);
        loc +=4;
        result += 4; /* numgeoms */
 
@@ -1745,7 +1745,7 @@ lwnotice("compute_serialized_box3d: bbox found");
                loc +=4;
        }
 
-       ngeoms = get_uint32(loc);
+       ngeoms = lw_get_uint32(loc);
        loc += 4;
 
        /* each sub-type */
@@ -1926,7 +1926,7 @@ lwgeom_getsrid(uchar *serialized)
                loc += sizeof(BOX2DFLOAT4);
        }
 
-       return get_int32(loc);
+       return lw_get_int32(loc);
 }
 
 char

diff --git a/lwgeom/lwgeom_pg.c b/lwgeom/lwgeom_pg.c
index c7843e397e0f7d39777261843c7e132076e618e9..67cd6b0fc32cfc523f8df1f14691ad51f6bb525e 100644 (file)
--- a/lwgeom/lwgeom_pg.c
+++ b/lwgeom/lwgeom_pg.c
@@ -404,7 +404,7 @@ pglwgeom_getSRID(PG_LWGEOM *lwgeom)
                loc += sizeof(BOX2DFLOAT4);
        }
 
-       return get_int32(loc);
+       return lw_get_int32(loc);
 }
 
 

diff --git a/lwgeom/lwline.c b/lwgeom/lwline.c
index 38ea3798ea598a4871dc82bc6fa6945c58cb5644..a56a389a3ab9a84604bea51ed836c90255fcc88e 100644 (file)
--- a/lwgeom/lwline.c
+++ b/lwgeom/lwline.c
@@ -98,7 +98,7 @@ lwline_deserialize(uchar *serialized_form)
        if ( lwgeom_hasSRID(type))
        {
                /*lwnotice("line has srid"); */
-               result->SRID = get_int32(loc);
+               result->SRID = lw_get_int32(loc);
                loc +=4; /* type + SRID */
        }
        else
@@ -109,7 +109,7 @@ lwline_deserialize(uchar *serialized_form)
 
        /* we've read the type (1 byte) and SRID (4 bytes, if present) */
 
-       npoints = get_uint32(loc);
+       npoints = lw_get_uint32(loc);
        /*lwnotice("line npoints = %d", npoints); */
        loc +=4;
        pa = pointArray_construct(loc, TYPE_HASZ(type), TYPE_HASM(type), npoints);
@@ -303,7 +303,7 @@ lwgeom_size_line(const uchar *serialized_line)
        }
 
        /* we've read the type (1 byte) and SRID (4 bytes, if present) */
-       npoints = get_uint32(loc);
+       npoints = lw_get_uint32(loc);
        result += sizeof(uint32); /* npoints */
 
        result += TYPE_NDIMS(type) * sizeof(double) * npoints;

diff --git a/lwgeom/lwpoint.c b/lwgeom/lwpoint.c
index 26503c40734fbc5075d0ac9a9b55d1ba6e8848a6..5fc04a3e1dabcaa74416241995a4a8a50477c3a9 100644 (file)
--- a/lwgeom/lwpoint.c
+++ b/lwgeom/lwpoint.c
@@ -298,7 +298,7 @@ lwpoint_deserialize(uchar *serialized_form)
 #ifdef PGIS_DEBUG
                lwnotice("lwpoint_deserialize: input has SRID");
 #endif
-               result->SRID = get_int32(loc);
+               result->SRID = lw_get_int32(loc);
                loc += 4; /* type + SRID */
        }
        else

diff --git a/lwgeom/lwpoly.c b/lwgeom/lwpoly.c
index 1bcbc67eb9dc6453136b3e078ca0d04b231821ce..d27c01d35a5eb32a3aba4bc466fb3820214af3fc 100644 (file)
--- a/lwgeom/lwpoly.c
+++ b/lwgeom/lwpoly.c
@@ -116,7 +116,7 @@ lwpoly_deserialize(uchar *serialized_form)
 
        if ( lwgeom_hasSRID(type))
        {
-               result->SRID = get_int32(loc);
+               result->SRID = lw_get_int32(loc);
                loc +=4; /* type + SRID */
        }
        else
@@ -124,7 +124,7 @@ lwpoly_deserialize(uchar *serialized_form)
                result->SRID = -1;
        }
 
-       nrings = get_uint32(loc);
+       nrings = lw_get_uint32(loc);
        result->nrings = nrings;
        loc +=4;
        result->rings = (POINTARRAY**) lwalloc(nrings* sizeof(POINTARRAY*));
@@ -132,7 +132,7 @@ lwpoly_deserialize(uchar *serialized_form)
        for (t =0;t<nrings;t++)
        {
                /* read in a single ring and make a PA */
-               npoints = get_uint32(loc);
+               npoints = lw_get_uint32(loc);
                loc +=4;
 
                result->rings[t] = pointArray_construct(loc, hasz, hasm, npoints);
@@ -299,7 +299,7 @@ lwgeom_size_poly(const uchar *serialized_poly)
        }
 
 
-       nrings = get_uint32(loc);
+       nrings = lw_get_uint32(loc);
        loc +=4;
        result +=4;
 
@@ -309,7 +309,7 @@ lwgeom_size_poly(const uchar *serialized_poly)
        for (t =0;t<nrings;t++)
        {
                /* read in a single ring and make a PA */
-               npoints = get_uint32(loc);
+               npoints = lw_get_uint32(loc);
                loc += 4;
                result += 4;