]> granicus.if.org Git - postgis/commitdiff
C90 madness
authorPaul Ramsey <pramsey@cleverelephant.ca>
Wed, 29 Apr 2015 15:55:30 +0000 (15:55 +0000)
committerPaul Ramsey <pramsey@cleverelephant.ca>
Wed, 29 Apr 2015 15:55:30 +0000 (15:55 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@13459 b70326c6-7e19-0410-871a-916f4a2858ee

postgis/lwgeom_export.c

index eba0d30dadf3d6700d82455df48f65087291eb12..9232b93925e2b7e75381c4f0f05f47a65a74a18f 100644 (file)
@@ -177,6 +177,10 @@ Datum LWGEOM_asGML(PG_FUNCTION_ARGS)
        static const char* default_prefix = "gml:"; /* default prefix */
        const char* prefix = default_prefix;
        const char* gml_id = NULL;
+       size_t len;
+       char *gml_id_buf, *prefix_buf;
+       text *prefix_text, *gml_id_text;
+       
 
        /* Get the version */
        version = PG_GETARG_INT32(0);
@@ -207,15 +211,15 @@ Datum LWGEOM_asGML(PG_FUNCTION_ARGS)
        /* retrieve prefix */
        if (PG_NARGS() >4 && !PG_ARGISNULL(4))
        {
-               text* prefix_text = PG_GETARG_TEXT_P(4);
+               prefix_text = PG_GETARG_TEXT_P(4);
                if ( VARSIZE(prefix_text) == VARHDRSZ )
                {
                        prefix = "";
                }
                else
                {
-                       size_t len = VARSIZE(prefix_text)-VARHDRSZ;
-                       char* prefix_buf = palloc(len + 2); /* +2 is one for the ':' and one for term null */
+                       len = VARSIZE(prefix_text)-VARHDRSZ;
+                       prefix_buf = palloc(len + 2); /* +2 is one for the ':' and one for term null */
                        memcpy(prefix_buf, VARDATA(prefix_text), len);
                        /* add colon and null terminate */
                        prefix_buf[len] = ':';
@@ -226,15 +230,15 @@ Datum LWGEOM_asGML(PG_FUNCTION_ARGS)
 
        if (PG_NARGS() >5 && !PG_ARGISNULL(5))
        {
-               text* gml_id_text = PG_GETARG_TEXT_P(5);
+               gml_id_text = PG_GETARG_TEXT_P(5);
                if ( VARSIZE(gml_id_text) == VARHDRSZ )
                {
                        gml_id = "";
                }
                else
                {
-                       size_t len = VARSIZE(gml_id_text)-VARHDRSZ;
-                       char* gml_id_buf = palloc(len+1);
+                       len = VARSIZE(gml_id_text)-VARHDRSZ;
+                       gml_id_buf = palloc(len+1);
                        memcpy(gml_id_buf, VARDATA(gml_id_text), len);
                        gml_id_buf[len] = '\0';
                        gml_id = gml_id_buf;