Changeset: fb30bb606cb2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb30bb606cb2
Modified Files:
MonetDB5/src/modules/kernel/bat5.mx
MonetDB5/src/modules/kernel/batcalc.mx
MonetDB5/src/modules/mal/replication.mx
Branch: Oct2010
Log Message:
A bit is not the same size as an int: don't access a bit through an int pointer.
Errors found by valgrind.
diffs (178 lines):
diff -r 392761a5bd5a -r fb30bb606cb2 MonetDB5/src/modules/kernel/bat5.mx
--- a/MonetDB5/src/modules/kernel/bat5.mx Fri Oct 08 16:29:33 2010 +0200
+++ b/MonetDB5/src/modules/kernel/bat5.mx Sat Oct 09 13:33:31 2010 +0200
@@ -659,7 +659,7 @@
bat5_export str BKCgetRole(str *res, int *bid);
bat5_export str BKCsetkey(int *res, int *bid, bit *param);
bat5_export str BKCsetSet(int *res, int *bid, bit *param);
-bat5_export str BKCisaSet(int *res, int *bid);
+bat5_export str BKCisaSet(bit *res, int *bid);
bat5_export str BKCsetSorted(bit *res, int *bid);
bat5_export str BKCisSorted(bit *res, int *bid);
bat5_export str BKCisSortedReverse(bit *res, int *bid);
@@ -685,7 +685,7 @@
bat5_export str BKCsetName(int *r, int *bid, str *s);
bat5_export str BKCgetBBPname(str *ret, int *bid);
bat5_export str BKCunload(bit *res, str *input);
-bat5_export str BKCisCached(int *res, int *bid);
+bat5_export str BKCisCached(bit *res, int *bid);
bat5_export str BKCload(int *res, str *input);
bat5_export str BKChot(int *res, str *input);
bat5_export str BKCcold(int *res, str *input);
@@ -694,10 +694,10 @@
bat5_export str BKChotBAT(int *res, int *bid);
bat5_export str BKCsave(bit *res, str *input);
bat5_export str BKCsave2(int *r, int *bid);
-bat5_export str BKCmmap(int *res, int *bid, int *hbns, int *tbns, int *hhp,
int *thp);
-bat5_export str BKCmmap2(int *res, int *bid, int *bns);
-bat5_export str BKCmadvise(int *res, int *bid, int *hbns, int *tbns, int *hhp,
int *thp);
-bat5_export str BKCmadvise2(int *res, int *bid, int *mode);
+bat5_export str BKCmmap(bit *res, int *bid, int *hbns, int *tbns, int *hhp,
int *thp);
+bat5_export str BKCmmap2(bit *res, int *bid, int *bns);
+bat5_export str BKCmadvise(bit *res, int *bid, int *hbns, int *tbns, int *hhp,
int *thp);
+bat5_export str BKCmadvise2(bit *res, int *bid, int *mode);
bat5_export str BKCaccbuild(int *ret, int *bid, str *acc, ptr *param);
bat5_export str BKCaccbuild_std(int *ret, int *bid, int *acc);
bat5_export str BKCsetHash(bit *ret, int *bid, bit *prop);
@@ -3112,7 +3112,7 @@
}
str
-BKCisaSet(int *res, int *bid)
+BKCisaSet(bit *res, int *bid)
{
BAT *b;
@@ -3588,7 +3588,7 @@
}
str
-BKCisCached(int *res, int *bid)
+BKCisCached(bit *res, int *bid)
{
BAT *b;
@@ -3695,7 +3695,7 @@
@c
str
-BKCmmap(int *res, int *bid, int *hbns, int *tbns, int *hhp, int *thp)
+BKCmmap(bit *res, int *bid, int *hbns, int *tbns, int *hhp, int *thp)
{
BAT *b, *bn = NULL;
@@ -3714,13 +3714,13 @@
}
str
-BKCmmap2(int *res, int *bid, int *mode)
+BKCmmap2(bit *res, int *bid, int *mode)
{
return BKCmmap(res, bid, mode, mode, mode, mode);
}
str
-BKCmadvise(int *res, int *bid, int *hbns, int *tbns, int *hhp, int *thp)
+BKCmadvise(bit *res, int *bid, int *hbns, int *tbns, int *hhp, int *thp)
{
BAT *b;
@@ -3735,7 +3735,7 @@
}
str
-BKCmadvise2(int *res, int *bid, int *mode)
+BKCmadvise2(bit *res, int *bid, int *mode)
{
return BKCmadvise(res, bid, mode, mode, mode, mode);
}
diff -r 392761a5bd5a -r fb30bb606cb2 MonetDB5/src/modules/kernel/batcalc.mx
--- a/MonetDB5/src/modules/kernel/batcalc.mx Fri Oct 08 16:29:33 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batcalc.mx Sat Oct 09 13:33:31 2010 +0200
@@ -699,8 +699,8 @@
The accumulator variants may re-use the storage of an argument only when it is
not shared,
nor being a persistent BAT
*/
-batcalc_export str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, int
*lflag, int *rflag);
-str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, int *lflag, int *rflag)
+batcalc_export str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, bit
*lflag, bit *rflag);
+str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, bit *lflag, bit *rflag)
{
BAT *bn, *b, *right;
char *res = MAL_SUCCEED;
@@ -738,8 +738,8 @@
return res;
}
-batcalc_export str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst,
int *lflag, int *rflag);
-str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst, int *lflag, int
*rflag)
+batcalc_export str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst,
bit *lflag, bit *rflag);
+str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst, bit *lflag, bit
*rflag)
{
BAT *bn, *b;
char *res = MAL_SUCCEED;
@@ -789,8 +789,8 @@
return res;
}
-batcalc_export str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r,
int *lflag, int *rflag);
-str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r, int *lflag, int
*rflag)
+batcalc_export str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r,
bit *lflag, bit *rflag);
+str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r, bit *lflag, bit
*rflag)
{
BAT *bn, *b;
char *res = MAL_SUCCEED;
@@ -987,8 +987,8 @@
return msg;
}
-batcalc_export str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, int
*lflag, int *rflag);
-str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, int *lflag, int *rflag)
+batcalc_export str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, bit
*lflag, bit *rflag);
+str cmdbatac...@2_@3...@4_@5(int *ret, int *l, int *r, bit *lflag, bit *rflag)
{
BAT *bn, *b, *right;
str msg;
@@ -1046,8 +1046,8 @@
return res;
}
-batcalc_export str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst,
int *lflag, int *rflag);
-str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst, int *lflag, int
*rflag)
+batcalc_export str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst,
bit *lflag, bit *rflag);
+str cmdbatac...@2cst_@3...@4_@5(int *ret, int *l, void *cst, bit *lflag, bit
*rflag)
{
BAT *bn, *b;
@@ -1099,8 +1099,8 @@
return res;
}
-batcalc_export str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r,
int *lflag, int *rflag);
-str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r, int *lflag, int
*rflag)
+batcalc_export str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r,
bit *lflag, bit *rflag);
+str cmdbatac...@2cst2_@3...@4_@5(int *ret, void *cst, int *r, bit *lflag, bit
*rflag)
{
BAT *bn, *b;
diff -r 392761a5bd5a -r fb30bb606cb2 MonetDB5/src/modules/mal/replication.mx
--- a/MonetDB5/src/modules/mal/replication.mx Fri Oct 08 16:29:33 2010 +0200
+++ b/MonetDB5/src/modules/mal/replication.mx Sat Oct 09 13:33:31 2010 +0200
@@ -370,7 +370,7 @@
replication_export str SLAVEclose(int *ret, oid *tag, timestamp *stamp);
replication_export str SLAVEdrop(int *ret, str *tag);
replication_export str SLAVEprotect(int *ret, str *schema, str *table);
-replication_export str SLAVEisprotected(int *ret, str *schema, str *table);
+replication_export str SLAVEisprotected(bit *ret, str *schema, str *table);
replication_export int SLAVEisprotectedInternal(str schema, str table);
replication_export str SLAVEprelude(int *ret);
replication_export str SLAVEsynchronizing(int *ret);
@@ -1443,7 +1443,7 @@
}
str
-SLAVEisprotected(int *ret, str *schema, str *table)
+SLAVEisprotected(bit *ret, str *schema, str *table)
{
*ret = SLAVEisprotectedInternal(*schema, *table);
return MAL_SUCCEED;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
