MonetDB: default - Merge with Apr2011 branch.

[Stefan Manegold]

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

Merge with Apr2011 branch.


diffs (46 lines):

diff --git a/monetdb5/modules/atoms/blob.mx b/monetdb5/modules/atoms/blob.mx
--- a/monetdb5/modules/atoms/blob.mx
+++ b/monetdb5/modules/atoms/blob.mx
@@ -179,7 +179,7 @@
 blob_export int BLOBnitems(int *ret, blob *b);
 blob_export int BLOBget(Heap *h, int *bun, int *l, blob **val);
 blob_export blob * BLOBread(blob *a, stream *s, size_t cnt);
-blob_export void BLOBwrite(blob *a, stream *s, size_t cnt);
+blob_export int BLOBwrite(blob *a, stream *s, size_t cnt);
 
 blob_export str BLOBblob_blob(blob **d, blob **s);
 blob_export str BLOBblob_fromstr(blob **b, str *d);
@@ -290,15 +290,18 @@
        return a;
 }
 
-void
+int
 blob_write(blob *a, stream *s, size_t cnt)
 {
        var_t len = blobsize(a->nitems);
 
        (void) cnt;
        assert(cnt == 1);
-       if (mnstr_writeInt(s, (int) len)) /* 64bit: check for overflow */
+       if (mnstr_writeInt(s, (int) len)) { /* 64bit: check for overflow */
                mnstr_write(s, (char *) a, len, 1);
+               return GDK_SUCCEED;
+       }
+       return GDK_FAIL;
 }
 
 #if SIZEOF_SIZE_T == SIZEOF_INT
@@ -819,10 +822,10 @@
        return blob_read(a,s,cnt);
 }
 
-void
+int
 BLOBwrite(blob *a, stream *s, size_t cnt)
 {
-       blob_write(a,s,cnt);
+       return blob_write(a,s,cnt);
 }
 
 void
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list