Stricter syntax fixes. Reported by S�bastien NICAISE <snicaise@iciatechnologies.com>

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

diff --git a/lwgeom/lwgeom.c b/lwgeom/lwgeom.c
index ad2b4c9942edb01b58823ce8d0b29db7081b9e38..a9fde843abbb24513a71d929fca10cdf449f96e1 100644 (file)
--- a/lwgeom/lwgeom.c
+++ b/lwgeom/lwgeom.c
@@ -363,10 +363,11 @@ char *
 lwgeom_to_wkt(LWGEOM *lwgeom)
 {
        char *serialized = lwgeom_serialize(lwgeom);
+       char *ret;
        if ( ! serialized ) {
                lwerror("Error serializing geom %p", lwgeom);
        }
-       char *ret = unparse_WKT(serialized, lwalloc, lwfree);
+       ret = unparse_WKT(serialized, lwalloc, lwfree);
        lwfree(serialized);
        return ret;
 }

diff --git a/lwgeom/wktunparse.c b/lwgeom/wktunparse.c
index cb99232d241a33dcaf9e1472697cd145f9ad0a21..e55a45ed08ecd247733f52b5f249a3c4ab4c7ed9 100644 (file)
--- a/lwgeom/wktunparse.c
+++ b/lwgeom/wktunparse.c
@@ -251,8 +251,8 @@ output_wkt(byte* geom, int supress)
 {
 
        unsigned type=*geom++;
-       dims = TYPE_NDIMS(type); //((type & 0x30) >> 4)+2;
        char writeM=0;
+       dims = TYPE_NDIMS(type); //((type & 0x30) >> 4)+2;
 
        if ( ! supress && !TYPE_HASZ(type) && TYPE_HASM(type) ) writeM=1;
 
@@ -557,6 +557,9 @@ unparse_WKB(byte* serialized, allocator alloc, freeor free, unsigned int endian)
 
 /******************************************************************
  * $Log$
+ * Revision 1.12  2004/10/21 19:48:34  strk
+ * Stricter syntax fixes. Reported by Sébastien NICAISE <snicaise@iciatechnologies.com>
+ *
  * Revision 1.11  2004/10/15 07:35:41  strk
  * Fixed a bug introduced by me (byteorder skipped for inner geoms in WKB)
  *