Changeset: 37e76e3b801a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37e76e3b801a
Modified Files:
sql/backends/monet5/generator/generator.c
Branch: generator
Log Message:
Silence compiler.
diffs (30 lines):
diff --git a/sql/backends/monet5/generator/generator.c
b/sql/backends/monet5/generator/generator.c
--- a/sql/backends/monet5/generator/generator.c
+++ b/sql/backends/monet5/generator/generator.c
@@ -385,7 +385,7 @@ VLTgenerator_subselect(Client cntxt, Mal
int li, hi, anti, i;
lng o1, o2;
lng n = 0;
- oid *cl;
+ oid *cl = 0;
BUN c;
BAT *bn, *cand = NULL;
InstrPtr p;
@@ -465,7 +465,7 @@ VLTgenerator_subselect(Client cntxt, Mal
if( (((tsf.days>tlow.days || (tsf.days==
tlow.days && tsf.msecs >= tlow.msecs) || timestamp_isnil(tlow))) &&
((tsf.days<thgh.days || (tsf.days==
thgh.days && tsf.msecs < thgh.msecs)) || timestamp_isnil(thgh)) ) || anti ){
/* could be improved when no candidate
list is available into a void/void BAT */
- if( cand){
+ if( cl){
while ( c < BATcount(cand) &&
(lng) *cl < o1 ) {cl++; c++;}
if( (lng) *cl == o1){
*ol++ = o1;
@@ -693,7 +693,7 @@ str VLTgenerator_thetasubselect(Client c
if ( strcmp(oper,"==") != 0)
throw(MAL,"generator.thetasubselect","Unknown
operator");
- cap = (BUN)( l.days > f.days ? ((l.days
-f.days)*24*60*60 +abs(s))/abs(s):((f.days -l.days)*24*60*60 +abs(s))/abs(s));
+ cap = (BUN) ((((lng) l.days - f.days) * 24*60*60*1000 +
l.msecs - f.msecs) / s);
bn = BATnew(TYPE_void, TYPE_oid, cap);
if( bn == NULL)
throw(MAL,"generator.thetasubselect",MAL_MALLOC_FAIL);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
