MonetDB: Oct2010 - More coverity complaints.

[mk]

Changeset: 6e988359e9be for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e988359e9be
Modified Files:
        MonetDB5/src/mal/mal_instruction.mx
        MonetDB5/src/mal/mal_interpreter.mx
        MonetDB5/src/modules/kernel/group.mx
        MonetDB5/src/modules/mal/mal_mapi.mx
        MonetDB5/src/optimizer/opt_constants.mx
        MonetDB5/src/optimizer/opt_octopus.mx
Branch: Oct2010
Log Message:

More coverity complaints.


diffs (70 lines):

diff -r 90170ae1fb10 -r 6e988359e9be MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx       Sat Jan 15 14:56:50 2011 +0100
+++ b/MonetDB5/src/mal/mal_instruction.mx       Sat Jan 15 15:28:25 2011 +0100
@@ -1307,7 +1307,6 @@
                return getTypeIndex(nme, -1, TYPE_any);
        if (i >= 0)
                return getVarType(mb, i);
-       return TYPE_any;
 }
 
 str
diff -r 90170ae1fb10 -r 6e988359e9be MonetDB5/src/mal/mal_interpreter.mx
--- a/MonetDB5/src/mal/mal_interpreter.mx       Sat Jan 15 14:56:50 2011 +0100
+++ b/MonetDB5/src/mal/mal_interpreter.mx       Sat Jan 15 15:28:25 2011 +0100
@@ -2301,7 +2301,7 @@
 @= exceptionHndlr
 if(cntxt->errbuf && cntxt->errbuf[0] ) {
        str oldret = ret;
-       ret = catchKernelException(cntxt, oldret);
+       ret = catchKernelException(cntxt, ret);
        if( oldret) GDKfree(oldret);
 }
 
diff -r 90170ae1fb10 -r 6e988359e9be MonetDB5/src/modules/kernel/group.mx
--- a/MonetDB5/src/modules/kernel/group.mx      Sat Jan 15 14:56:50 2011 +0100
+++ b/MonetDB5/src/modules/kernel/group.mx      Sat Jan 15 15:28:25 2011 +0100
@@ -1153,7 +1153,7 @@
                return GDK_FAIL;
        /* complete result histo */
        hn = BATnew(TYPE_oid, TYPE_wrd, BATcount(_b));
-       if (!mn) {
+       if (!hn) {
                BBPreclaim(mn);
                return GDK_FAIL;
        }
diff -r 90170ae1fb10 -r 6e988359e9be MonetDB5/src/modules/mal/mal_mapi.mx
--- a/MonetDB5/src/modules/mal/mal_mapi.mx      Sat Jan 15 14:56:50 2011 +0100
+++ b/MonetDB5/src/modules/mal/mal_mapi.mx      Sat Jan 15 15:28:25 2011 +0100
@@ -614,7 +614,7 @@
  * localhost.
  */
 void SERVERannounce(struct in_addr addr, int port, str usockfile) {
-       str buf = alloca(sizeof(char) * 1024);
+       str buf;
        str host = NULL;
        int ret = 0;
 
diff -r 90170ae1fb10 -r 6e988359e9be MonetDB5/src/optimizer/opt_constants.mx
--- a/MonetDB5/src/optimizer/opt_constants.mx   Sat Jan 15 14:56:50 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_constants.mx   Sat Jan 15 15:28:25 2011 +0100
@@ -94,6 +94,7 @@
                                        /* re-use a constant */
                                        alias[i]= index[k];
                                        fnd=1;
+                                       actions++;
                                        break;
                                }
                        }
diff -r 90170ae1fb10 -r 6e988359e9be MonetDB5/src/optimizer/opt_octopus.mx
--- a/MonetDB5/src/optimizer/opt_octopus.mx     Sat Jan 15 14:56:50 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_octopus.mx     Sat Jan 15 15:28:25 2011 +0100
@@ -239,7 +239,7 @@
        pushEndInstruction(mb);
        p = newStmt(mb, optimizerRef, putName("aliases", 7));
        p = pushStr(mb, p, octopusRef);
-       p = pushStr(mb, p, getFunctionId(getInstrPtr(mb, 0)));
+       (void) pushStr(mb, p, getFunctionId(getInstrPtr(mb, 0)));
 }
 
 static MalBlkPtr 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list