error messages and VARLENA handling cleanups

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

diff --git a/lwgeom/lwgeom_pg.c b/lwgeom/lwgeom_pg.c
index b010db69a2cc8aa22fe3a11de7007664b05328e5..f5339f48b78ba57f33f7f6887b6a8187a5003d7e 100644 (file)
--- a/lwgeom/lwgeom_pg.c
+++ b/lwgeom/lwgeom_pg.c
@@ -106,15 +106,14 @@ pglwgeom_serialize(LWGEOM *in)
        size_t size;
        PG_LWGEOM *result;
 
-       size = lwgeom_serialize_size(in);
-       //lwnotice("lwgeom_serialize_size returned %d", size);
-       result = palloc(size+4);
-       result->size = (size+4);
+       size = lwgeom_serialize_size(in) + VARHDRSZ;
+       //lwnotice("lwgeom_serialize_size returned %d", size-VARHDRSZ);
+       result = palloc(size);
+       result->size = (size);
        lwgeom_serialize_buf(in, SERIALIZED_FORM(result), &size);
-       if ( size != result->size-4 )
+       if ( size != result->size-VARHDRSZ )
        {
-               lwerror("lwgeom_serialize size:%d, lwgeom_serialize_size:%d",
-                       size, result->size-4);
+               lwerror("pglwgeom_serialize: serialized size:%d, computed size:%d", size, result->size-VARHDRSZ);
                return NULL;
        }