Changeset: 10c76364286c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10c76364286c
Modified Files:
clients/Tests/exports.stable.out
common/stream/stream.c
common/stream/stream.h
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc.h
gdk/gdk_heap.c
gdk/gdk_join.c
gdk/gdk_select.c
gdk/gdk_tm.c
gdk/gdk_utils.c
gdk/gdk_utils.h
monetdb5/extras/rapi/rapi.c
monetdb5/extras/rapi/rapi.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_runtime.c
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/wlc.c
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_utils.c
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: default
Log Message:
Use bool instead of int in a lot of places where it makes sense.
diffs (truncated from 2110 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -22,41 +22,41 @@ atomDesc BATatoms[];
BAT *BATattach(int tt, const char *heapfile, int role);
gdk_return BATbandjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
const void *c1, const void *c2, bool li, bool hi, BUN estimate)
__attribute__((__warn_unused_result__));
BAT *BATcalcabsolute(BAT *b, BAT *s);
-BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error);
-BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error);
+BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool
abort_on_error);
BAT *BATcalcand(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalcandcst(BAT *b, const ValRecord *v, BAT *s);
gdk_return BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals);
-BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, int sym);
-BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, int
sym);
-BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, int
sym);
-BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi,
BAT *s, int sym);
+BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, bool sym);
+BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, bool
sym);
+BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, bool
sym);
+BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi,
BAT *s, bool sym);
BAT *BATcalccmp(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalccmpcst(BAT *b, const ValRecord *v, BAT *s);
-BAT *BATcalccstadd(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalccstadd(const ValRecord *v, BAT *b, BAT *s, int tp, bool
abort_on_error);
BAT *BATcalccstand(const ValRecord *v, BAT *b, BAT *s);
BAT *BATcalccstcmp(const ValRecord *v, BAT *b, BAT *s);
-BAT *BATcalccstdiv(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalccstdiv(const ValRecord *v, BAT *b, BAT *s, int tp, bool
abort_on_error);
BAT *BATcalccsteq(const ValRecord *v, BAT *b, BAT *s);
BAT *BATcalccstge(const ValRecord *v, BAT *b, BAT *s);
BAT *BATcalccstgt(const ValRecord *v, BAT *b, BAT *s);
BAT *BATcalccstle(const ValRecord *v, BAT *b, BAT *s);
-BAT *BATcalccstlsh(const ValRecord *v, BAT *b, BAT *s, int abort_on_error);
+BAT *BATcalccstlsh(const ValRecord *v, BAT *b, BAT *s, bool abort_on_error);
BAT *BATcalccstlt(const ValRecord *v, BAT *b, BAT *s);
BAT *BATcalccstmax(const ValRecord *v, BAT *b, BAT *s);
BAT *BATcalccstmax_no_nil(const ValRecord *v, BAT *b, BAT *s);
BAT *BATcalccstmin(const ValRecord *v, BAT *b, BAT *s);
BAT *BATcalccstmin_no_nil(const ValRecord *v, BAT *b, BAT *s);
-BAT *BATcalccstmod(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
-BAT *BATcalccstmul(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalccstmod(const ValRecord *v, BAT *b, BAT *s, int tp, bool
abort_on_error);
+BAT *BATcalccstmul(const ValRecord *v, BAT *b, BAT *s, int tp, bool
abort_on_error);
BAT *BATcalccstne(const ValRecord *v, BAT *b, BAT *s);
BAT *BATcalccstor(const ValRecord *v, BAT *b, BAT *s);
-BAT *BATcalccstrsh(const ValRecord *v, BAT *b, BAT *s, int abort_on_error);
-BAT *BATcalccstsub(const ValRecord *v, BAT *b, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalccstrsh(const ValRecord *v, BAT *b, BAT *s, bool abort_on_error);
+BAT *BATcalccstsub(const ValRecord *v, BAT *b, BAT *s, int tp, bool
abort_on_error);
BAT *BATcalccstxor(const ValRecord *v, BAT *b, BAT *s);
-BAT *BATcalcdecr(BAT *b, BAT *s, int abort_on_error);
-BAT *BATcalcdiv(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error);
-BAT *BATcalcdivcst(BAT *b, const ValRecord *v, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalcdecr(BAT *b, BAT *s, bool abort_on_error);
+BAT *BATcalcdiv(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error);
+BAT *BATcalcdivcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool
abort_on_error);
BAT *BATcalceq(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalceqcst(BAT *b, const ValRecord *v, BAT *s);
BAT *BATcalcge(BAT *b1, BAT *b2, BAT *s);
@@ -67,14 +67,14 @@ BAT *BATcalcifthencstelse(BAT *b, const
BAT *BATcalcifthencstelsecst(BAT *b, const ValRecord *c1, const ValRecord *c2);
BAT *BATcalcifthenelse(BAT *b, BAT *b1, BAT *b2);
BAT *BATcalcifthenelsecst(BAT *b, BAT *b1, const ValRecord *c2);
-BAT *BATcalcincr(BAT *b, BAT *s, int abort_on_error);
+BAT *BATcalcincr(BAT *b, BAT *s, bool abort_on_error);
BAT *BATcalcisnil(BAT *b, BAT *s);
BAT *BATcalcisnotnil(BAT *b, BAT *s);
BAT *BATcalciszero(BAT *b, BAT *s);
BAT *BATcalcle(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalclecst(BAT *b, const ValRecord *v, BAT *s);
-BAT *BATcalclsh(BAT *b1, BAT *b2, BAT *s, int abort_on_error);
-BAT *BATcalclshcst(BAT *b, const ValRecord *v, BAT *s, int abort_on_error);
+BAT *BATcalclsh(BAT *b1, BAT *b2, BAT *s, bool abort_on_error);
+BAT *BATcalclshcst(BAT *b, const ValRecord *v, BAT *s, bool abort_on_error);
BAT *BATcalclt(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalcltcst(BAT *b, const ValRecord *v, BAT *s);
BAT *BATcalcmax(BAT *b1, BAT *b2, BAT *s);
@@ -85,23 +85,23 @@ BAT *BATcalcmin(BAT *b1, BAT *b2, BAT *s
BAT *BATcalcmin_no_nil(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalcmincst(BAT *b, const ValRecord *v, BAT *s);
BAT *BATcalcmincst_no_nil(BAT *b, const ValRecord *v, BAT *s);
-BAT *BATcalcmod(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error);
-BAT *BATcalcmodcst(BAT *b, const ValRecord *v, BAT *s, int tp, int
abort_on_error);
-BAT *BATcalcmul(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error);
-BAT *BATcalcmulcst(BAT *b, const ValRecord *v, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalcmod(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error);
+BAT *BATcalcmodcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool
abort_on_error);
+BAT *BATcalcmul(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error);
+BAT *BATcalcmulcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool
abort_on_error);
BAT *BATcalcne(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalcnecst(BAT *b, const ValRecord *v, BAT *s);
BAT *BATcalcnegate(BAT *b, BAT *s);
BAT *BATcalcnot(BAT *b, BAT *s);
BAT *BATcalcor(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalcorcst(BAT *b, const ValRecord *v, BAT *s);
-BAT *BATcalcrsh(BAT *b1, BAT *b2, BAT *s, int abort_on_error);
-BAT *BATcalcrshcst(BAT *b, const ValRecord *v, BAT *s, int abort_on_error);
+BAT *BATcalcrsh(BAT *b1, BAT *b2, BAT *s, bool abort_on_error);
+BAT *BATcalcrshcst(BAT *b, const ValRecord *v, BAT *s, bool abort_on_error);
BAT *BATcalcsign(BAT *b, BAT *s);
dbl BATcalcstdev_population(dbl *avgp, BAT *b);
dbl BATcalcstdev_sample(dbl *avgp, BAT *b);
-BAT *BATcalcsub(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error);
-BAT *BATcalcsubcst(BAT *b, const ValRecord *v, BAT *s, int tp, int
abort_on_error);
+BAT *BATcalcsub(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error);
+BAT *BATcalcsubcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool
abort_on_error);
dbl BATcalcvariance_population(dbl *avgp, BAT *b);
dbl BATcalcvariance_sample(dbl *avgp, BAT *b);
BAT *BATcalcxor(BAT *b1, BAT *b2, BAT *s);
@@ -109,7 +109,7 @@ BAT *BATcalcxorcst(BAT *b, const ValReco
gdk_return BATclear(BAT *b, bool force);
void BATcommit(BAT *b);
BAT *BATconstant(oid hseq, int tt, const void *val, BUN cnt, int role);
-BAT *BATconvert(BAT *b, BAT *s, int tp, int abort_on_error);
+BAT *BATconvert(BAT *b, BAT *s, int tp, bool abort_on_error);
BUN BATcount_no_nil(BAT *b);
gdk_return BATdel(BAT *b, BAT *d) __attribute__((__warn_unused_result__));
BAT *BATdense(oid hseq, oid tseq, BUN cnt)
__attribute__((__warn_unused_result__));
@@ -121,20 +121,20 @@ int BATgetaccess(BAT *b);
PROPrec *BATgetprop(BAT *b, int idx);
gdk_return BATgroup(BAT **groups, BAT **extents, BAT **histo, BAT *b, BAT *s,
BAT *g, BAT *e, BAT *h) __attribute__((__warn_unused_result__));
const char *BATgroupaggrinit(BAT *b, BAT *g, BAT *e, BAT *s, oid *minp, oid
*maxp, BUN *ngrpp, BUN *startp, BUN *endp, const oid **candp, const oid
**candendp);
-gdk_return BATgroupavg(BAT **bnp, BAT **cntsp, BAT *b, BAT *g, BAT *e, BAT *s,
int tp, int skip_nils, int abort_on_error);
-BAT *BATgroupcount(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int
abort_on_error);
-BAT *BATgroupmax(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int
abort_on_error);
-BAT *BATgroupmedian(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int
abort_on_error);
-BAT *BATgroupmin(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int
abort_on_error);
-BAT *BATgroupprod(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int
abort_on_error);
-BAT *BATgroupquantile(BAT *b, BAT *g, BAT *e, BAT *s, int tp, double quantile,
int skip_nils, int abort_on_error);
-BAT *BATgroupsize(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int
abort_on_error);
-BAT *BATgroupstdev_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int
skip_nils, int abort_on_error);
-BAT *BATgroupstdev_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int
skip_nils, int abort_on_error);
-BAT *BATgroupstr_group_concat(BAT *b, BAT *g, BAT *e, BAT *s, int skip_nils,
int abort_on_error, const str separator);
-BAT *BATgroupsum(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int
abort_on_error);
-BAT *BATgroupvariance_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int
skip_nils, int abort_on_error);
-BAT *BATgroupvariance_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int
skip_nils, int abort_on_error);
+gdk_return BATgroupavg(BAT **bnp, BAT **cntsp, BAT *b, BAT *g, BAT *e, BAT *s,
int tp, bool skip_nils, bool abort_on_error);
+BAT *BATgroupcount(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils,
bool abort_on_error);
+BAT *BATgroupmax(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool
abort_on_error);
+BAT *BATgroupmedian(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils,
bool abort_on_error);
+BAT *BATgroupmin(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool
abort_on_error);
+BAT *BATgroupprod(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool
abort_on_error);
+BAT *BATgroupquantile(BAT *b, BAT *g, BAT *e, BAT *s, int tp, double quantile,
bool skip_nils, bool abort_on_error);
+BAT *BATgroupsize(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool
abort_on_error);
+BAT *BATgroupstdev_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool
skip_nils, bool abort_on_error);
+BAT *BATgroupstdev_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool
skip_nils, bool abort_on_error);
+BAT *BATgroupstr_group_concat(BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils,
bool abort_on_error, const str separator);
+BAT *BATgroupsum(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool
abort_on_error);
+BAT *BATgroupvariance_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool
skip_nils, bool abort_on_error);
+BAT *BATgroupvariance_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool
skip_nils, bool abort_on_error);
BUN BATgrows(BAT *b);
gdk_return BAThash(BAT *b);
void BAThseqbase(BAT *b, oid o);
@@ -156,7 +156,7 @@ gdk_return BATorderidx(BAT *b, bool stab
gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, bool nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
gdk_return BATprint(BAT *b);
gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]);
-gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, int skip_nils, int
abort_on_error, int nil_if_empty);
+gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, bool skip_nils, bool
abort_on_error, bool nil_if_empty);
BAT *BATproject(BAT *l, BAT *r);
BAT *BATprojectchain(BAT **bats);
gdk_return BATrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT
*sl, BAT *sr, bool li, bool hi, BUN estimate)
__attribute__((__warn_unused_result__));
@@ -171,9 +171,9 @@ void BATsetcount(BAT *b, BUN cnt);
void BATsetprop(BAT *b, int idx, int type, void *v);
BAT *BATslice(BAT *b, BUN low, BUN high);
gdk_return BATsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o,
BAT *g, bool reverse, bool stable) __attribute__((__warn_unused_result__));
-gdk_return BATstr_group_concat(ValPtr res, BAT *b, BAT *s, int skip_nils, int
abort_on_error, int nil_if_empty, const str separator);
+gdk_return BATstr_group_concat(ValPtr res, BAT *b, BAT *s, bool skip_nils,
bool abort_on_error, bool nil_if_empty, const str separator);
gdk_return BATsubcross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr)
__attribute__((__warn_unused_result__));
-gdk_return BATsum(void *res, int tp, BAT *b, BAT *s, int skip_nils, int
abort_on_error, int nil_if_empty);
+gdk_return BATsum(void *res, int tp, BAT *b, BAT *s, bool skip_nils, bool
abort_on_error, bool nil_if_empty);
gdk_return BATthetajoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, int op, bool nil_matches, BUN estimate)
__attribute__((__warn_unused_result__));
BAT *BATthetaselect(BAT *b, BAT *s, const void *val, const char *op);
void BATtseqbase(BAT *b, oid o);
@@ -190,7 +190,7 @@ void BBPkeepref(bat i);
bat BBPlimit;
void BBPlock(void);
int BBPout;
-BAT *BBPquickdesc(bat b, int delaccess);
+BAT *BBPquickdesc(bat b, bool delaccess);
int BBPreclaim(BAT *b);
int BBPrelease(bat b);
int BBPrename(bat bid, const char *nme);
@@ -223,7 +223,7 @@ int GDKdebug;
void GDKerror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
void GDKexit(int status) __attribute__((__noreturn__));
void GDKexit(int status);
-int GDKexiting(void);
+bool GDKexiting(void);
gdk_return GDKextractParentAndLastDirFromPath(const char *path, char
*last_dir_parent, char *last_dir);
void GDKfatal(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2))) __attribute__((__noreturn__));
void GDKfatal(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
@@ -234,12 +234,12 @@ char *GDKfilepath(int farmid, const char
void GDKfree(void *blk);
char *GDKgetenv(const char *name);
int GDKgetenv_int(const char *name, int def);
-int GDKgetenv_istext(const char *name, const char *text);
-int GDKgetenv_istrue(const char *name);
-int GDKgetenv_isyes(const char *name);
+bool GDKgetenv_istext(const char *name, const char *text);
+bool GDKgetenv_istrue(const char *name);
+bool GDKgetenv_isyes(const char *name);
gdk_return GDKgetsem(int sem_id, int count, int *semid, str *msg);
gdk_return GDKgetsemval(int sem_id, int number, int *semval, str *msg);
-int GDKinit(opt *set, int setlen);
+bool GDKinit(opt *set, int setlen);
gdk_return GDKinitmmap(size_t id, size_t size, void **return_ptr, size_t
*return_size, str *msg);
BAT *GDKkey;
ATOMIC_TYPE volatile GDKlockcnt;
@@ -270,7 +270,7 @@ str GDKstrdup(const char *s) __attribute
str GDKstrndup(const char *s, size_t n)
__attribute__((__warn_unused_result__));
void GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
size_t GDKuniqueid(size_t offset);
-gdk_return GDKupgradevarheap(BAT *b, var_t v, int copyall, bool mayshare)
__attribute__((__warn_unused_result__));
+gdk_return GDKupgradevarheap(BAT *b, var_t v, bool copyall, bool mayshare)
__attribute__((__warn_unused_result__));
lng GDKusec(void);
BAT *GDKval;
const char *GDKversion(void);
@@ -333,33 +333,33 @@ ValPtr VALinit(ValPtr d, int tpe, const
int VALisnil(const ValRecord *v);
ValPtr VALset(ValPtr v, int t, ptr p);
gdk_return VARcalcabsolute(ValPtr ret, const ValRecord *v);
-gdk_return VARcalcadd(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalcadd(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
bool abort_on_error);
gdk_return VARcalcand(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-gdk_return VARcalcbetween(ValPtr ret, const ValRecord *v, const ValRecord *lo,
const ValRecord *hi, int sym);
+gdk_return VARcalcbetween(ValPtr ret, const ValRecord *v, const ValRecord *lo,
const ValRecord *hi, bool sym);
gdk_return VARcalccmp(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-gdk_return VARcalcdecr(ValPtr ret, const ValRecord *v, int abort_on_error);
-gdk_return VARcalcdiv(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalcdecr(ValPtr ret, const ValRecord *v, bool abort_on_error);
+gdk_return VARcalcdiv(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
bool abort_on_error);
gdk_return VARcalceq(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
gdk_return VARcalcge(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
gdk_return VARcalcgt(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-gdk_return VARcalcincr(ValPtr ret, const ValRecord *v, int abort_on_error);
+gdk_return VARcalcincr(ValPtr ret, const ValRecord *v, bool abort_on_error);
gdk_return VARcalcisnil(ValPtr ret, const ValRecord *v);
gdk_return VARcalcisnotnil(ValPtr ret, const ValRecord *v);
gdk_return VARcalciszero(ValPtr ret, const ValRecord *v);
gdk_return VARcalcle(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-gdk_return VARcalclsh(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalclsh(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
bool abort_on_error);
gdk_return VARcalclt(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-gdk_return VARcalcmod(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
-gdk_return VARcalcmul(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalcmod(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
bool abort_on_error);
+gdk_return VARcalcmul(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
bool abort_on_error);
gdk_return VARcalcne(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
gdk_return VARcalcnegate(ValPtr ret, const ValRecord *v);
gdk_return VARcalcnot(ValPtr ret, const ValRecord *v);
gdk_return VARcalcor(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-gdk_return VARcalcrsh(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalcrsh(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
bool abort_on_error);
gdk_return VARcalcsign(ValPtr ret, const ValRecord *v);
-gdk_return VARcalcsub(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
int abort_on_error);
+gdk_return VARcalcsub(ValPtr ret, const ValRecord *lft, const ValRecord *rgt,
bool abort_on_error);
gdk_return VARcalcxor(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
-gdk_return VARconvert(ValPtr ret, const ValRecord *v, int abort_on_error);
+gdk_return VARconvert(ValPtr ret, const ValRecord *v, bool abort_on_error);
void VIEWbounds(BAT *b, BAT *view, BUN l, BUN h);
BAT *VIEWcreate(oid seq, BAT *b);
size_t _MT_npages;
@@ -2759,7 +2759,7 @@ int mnstr_readStr(stream *restrict s, ch
ssize_t mnstr_read_block(stream *restrict s, void *restrict buf, size_t
elmsize, size_t cnt);
ssize_t mnstr_readline(stream *restrict s, void *restrict buf, size_t maxcnt);
void mnstr_set_byteorder(stream *s, char bigendian);
-void mnstr_settimeout(stream *s, unsigned int ms, int( *func)(void));
+void mnstr_settimeout(stream *s, unsigned int ms, bool( *func)(void));
int mnstr_type(stream *s);
ssize_t mnstr_write(stream *restrict s, const void *restrict buf, size_t
elmsize, size_t cnt);
int mnstr_writeBte(stream *s, int8_t val);
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -187,7 +187,7 @@ struct stream {
short type; /* ascii/binary */
char *name;
unsigned int timeout; /* timeout in ms */
- int (*timeout_func)(void); /* callback function: NULL/true -> return */
+ bool (*timeout_func)(void); /* callback function: NULL/true -> return */
union {
void *p;
int i;
@@ -450,7 +450,7 @@ mnstr_write(stream *restrict s, const vo
}
void
-mnstr_settimeout(stream *s, unsigned int ms, int (*func)(void))
+mnstr_settimeout(stream *s, unsigned int ms, bool (*func)(void))
{
if (s) {
s->timeout = ms;
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -149,7 +149,7 @@ stream_export void mnstr_clearerr(stream
stream_export int mnstr_type(stream *s);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
