MonetDB: default - geom: make macro more logical

[Fabian Groffen]

Changeset: 31689ab17f6e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31689ab17f6e
Modified Files:
        geom/monetdb5/geom.mx
Branch: default
Log Message:

geom: make macro more logical

make 'basic' code easier to read, and emit more useful error messages


diffs (33 lines):

diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -1107,18 +1107,19 @@
 str
 wkb@1( @2 *out, wkb **geom)
 {
-       str ret = "";
        GEOSGeom geosGeometry = wkb2geos(*geom);
 
-       if (geosGeometry) { 
-               if ((*out=@4(@3( geosGeometry))) != @5) {
-                       ret = MAL_SUCCEED;
-               }
-               GEOSGeom_destroy(geosGeometry);
-       }
-       if (ret)
-               throw(MAL, "geom.@1", "Failed");
-       return ret;
+       if (!geosGeometry)
+               throw(MAL, "geom.@1", "wkb2geos failed");
+
+       *out = @4(@3(geosGeometry));
+
+       GEOSGeom_destroy(geosGeometry);
+
+       if (*out != @5)
+               return MAL_SUCCEED;
+
+       throw(MAL, "geom.@1", "@3 failed");
 }
 @c
 @:basic(Dimension,int,GEOSGeom_getDimensions,,0)@
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list