MonetDB: default - Merge with Apr2011 branch.

[Stefan Manegold]

Changeset: 87a11c0cfc86 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=87a11c0cfc86
Modified Files:
        
Branch: default
Log Message:

Merge with Apr2011 branch.


diffs (52 lines):

diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -501,10 +501,10 @@
        return a;
 }
 
-geom_export void
+geom_export int
 mbrWRITE(mbr *c, stream *s, size_t cnt);
 
-void
+int
 mbrWRITE(mbr *c, stream *s, size_t cnt)
 {
        size_t i;
@@ -517,8 +517,9 @@
                    !mnstr_writeInt(s, (int) c->ymin) ||
                    !mnstr_writeInt(s, (int) c->xmax) ||
                    !mnstr_writeInt(s, (int) c->ymax))
-                       break;
+                       return GDK_FAIL;
        }
+       return GDK_SUCCEED;
 }
 
 geom_export str
@@ -837,18 +838,21 @@
        return a;
 }
 
-geom_export void
+geom_export int
 wkbWRITE(wkb *a, stream *s, size_t cnt);
 
-void
+int
 wkbWRITE(wkb *a, stream *s, size_t cnt)
 {
        int len = a->len;
 
        (void) cnt;
        assert(cnt == 1);
-       if (mnstr_writeInt(s, len) && len > 0) /* 64bit: check for overflow */
+       if (!mnstr_writeInt(s, len)) /* 64bit: check for overflow */
+               return GDK_FAIL;
+       if (len > 0) /* 64bit: check for overflow */
                mnstr_write(s, (char *) a->data, len, 1);
+       return GDK_SUCCEED;
 }
 
 geom_export void
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list