Changeset: e3eef9c2d065 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e3eef9c2d065
Modified Files:
gdk/gdk_select.c
Branch: leftmart
Log Message:
small fixes in cand_sort to silence strict (yet fair) compilers.
diffs (39 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -161,7 +161,6 @@ sort_cand(BAT *b, BUN cnt)
#define remainder8(X) ((X) & 7)
#define quotient8(X) ((X) >> 3)
- assert(b->ttype=TYPE_oid);
/* input must be a potential candidate list or NULL */
assert(b == NULL ||
(((b->ttype == TYPE_void && b->tseqbase != oid_nil) ||
@@ -171,8 +170,8 @@ sort_cand(BAT *b, BUN cnt)
sz_b = BATcount(b);
bitvector = (unsigned char *) GDKzalloc(cnt/8+1);
if (bitvector == NULL) {
- GDKerror("#BATbloom: memory allocation error");
- return GDK_FAIL;
+ GDKerror("#sort_cand: memory allocation error");
+ return NULL;
}
o = (oid *) Tloc(b,0);
@@ -1727,12 +1726,11 @@ BATselect(BAT *b, BAT *s, const void *tl
}
rs++;
}
- BATsetcount(bn, cnt);
- bn->tkey = 1;
- bn->tnil = 0;
- bn->tnonil = 1;
}
-
+ BATsetcount(bn, cnt);
+ bn->tkey = 1;
+ bn->tnil = 0;
+ bn->tnonil = 1;
/* output must be sorted */
/*
GDKqsort((oid *) Tloc(bn, 0), NULL, NULL,
(size_t) bn->batCount, sizeof(oid), 0, TYPE_oid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
