MonetDB: Oct2010 - More coverity issues

[mk]

Changeset: e6dfbc62716e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6dfbc62716e
Modified Files:
        MonetDB5/src/modules/kernel/batcalc.mx
        sql/src/backends/monet5/sql_gencode.mx
Branch: Oct2010
Log Message:

More coverity issues


diffs (61 lines):

diff -r 1945384d96ae -r e6dfbc62716e MonetDB5/src/modules/kernel/batcalc.mx
--- a/MonetDB5/src/modules/kernel/batcalc.mx    Sat Jan 15 17:33:24 2011 +0100
+++ b/MonetDB5/src/modules/kernel/batcalc.mx    Sat Jan 15 18:14:20 2011 +0100
@@ -700,22 +700,22 @@
 nor being a persistent BAT
 */
 batcalc_export str CMDbataccum@2_@3_@4_@5(int *ret, int *l, int *r, bit 
*lflag, bit *rflag);
-str CMDbataccum@2_@3_@4_@5(int *ret, int *l, int *r, bit *lflag, bit *rflag)
+str CMDbataccum@2_@3_@4_@5(int *ret, int *l, int *ri, bit *lflag, bit *rflag)
 {      
        BAT *bn, *b, *right;
        char *res = MAL_SUCCEED;
 
        @:getBATdescriptor(l,b,"batcalc.@1")@
-       @:getBATdescriptor(r,right,"batcalc.@1")@
+       @:getBATdescriptor(ri,right,"batcalc.@1")@
 
        if( *lflag && !isVIEW(b) && BBP_refs(*l) == 1 && BBP_lrefs(*l) == 1)
                bn = b;
-       else if( *rflag && !isVIEW(right) && BBP_refs(*r) == 1 &&  
BBP_lrefs(*r) == 1)
+       else if( *rflag && !isVIEW(right) && BBP_refs(*ri) == 1 &&  
BBP_lrefs(*ri) == 1)
                bn = right;
        else {
                BBPreleaseref(b->batCacheid);
                BBPreleaseref(right->batCacheid);
-               return CMDbat@2_@3_@4_@5(ret,l,r);
+               return CMDbat@2_@3_@4_@5(ret,l,ri);
        }
 
        @:chkSize(bn,b,CMDbataccum@2)@
@@ -1412,10 +1412,10 @@
        if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ); 
 
        if (b->htype != bn->htype) {
-               BAT *r = VIEWcreate(b,bn);
+               BAT *rview = VIEWcreate(b,bn);
 
                BBPreleaseref(bn->batCacheid);
-               bn = r;
+               bn = rview;
        }
        BBPkeepref(*ret= bn->batCacheid);
        BBPreleaseref(b->batCacheid);
diff -r 1945384d96ae -r e6dfbc62716e sql/src/backends/monet5/sql_gencode.mx
--- a/sql/src/backends/monet5/sql_gencode.mx    Sat Jan 15 17:33:24 2011 +0100
+++ b/sql/src/backends/monet5/sql_gencode.mx    Sat Jan 15 18:14:20 2011 +0100
@@ -2123,11 +2123,11 @@
        if (m->history == 1) {
                sql_schema *sys = mvc_bind_schema(m, "sys");
                sql_subfunc *kq = sql_find_func(sys, "keepquery", 
NR_KEEPQUERY_ARGS);
-               sql_subfunc *cq = sql_find_func(sys, "keepcall", 
NR_KEEPCALL_ARGS);
+               sql_subfunc *rq = sql_find_func(sys, "keepcall", 
NR_KEEPCALL_ARGS);
 
-               assert(kq && cq);
+               assert(kq && rq);
                backend_create_func(be, kq->func);
-               backend_create_func(be, cq->func);
+               backend_create_func(be, rq->func);
                /* only needed once */
                m->history = 2;
        }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list