Changeset: 417a16af1a85 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=417a16af1a85
Modified Files:
common/stream/stream.c
sql/backends/monet5/sql.c
Branch: default
Log Message:
Merge with Jul2017 branch
diffs (35 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -971,7 +971,7 @@ gzfread(void *buf, z_size_t size, z_size
unsigned sz = nitems * size > (size_t) 1 << 30 ? 1 << 30 : (unsigned)
(nitems * size);
int len;
- len = gzread(fp, buf, sz);
+ len = gzread(file, buf, sz);
if (len == -1)
return 0;
return (z_size_t) len / size;
@@ -990,7 +990,7 @@ gzfwrite(const void *buf, z_size_t size,
if (wlen <= 0)
return 0;
buf = (const void *) ((const char *) buf + wlen);
- sz -= (z_wize_t) wlen;
+ sz -= (z_size_t) wlen;
}
return nitems;
}
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2816,8 +2816,8 @@ zero_or_one(ptr ret, const bat *bid)
_s = ATOMsize(ATOMtype(b->ttype));
if (ATOMextern(b->ttype)) {
_s = ATOMlen(ATOMtype(b->ttype), p);
- * (ptr *) ret = GDKmalloc(_s);
- if (* (ptr *) ret == NULL) {
+ *(ptr *) ret = GDKmalloc(_s);
+ if(*(ptr *) ret == NULL){
BBPunfix(b->batCacheid);
throw(SQL, "zero_or_one", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
