MonetDB: Oct2010 - Coverity errors

[mk]

Changeset: 5574493b6a40 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5574493b6a40
Modified Files:
        MonetDB5/src/mal/mal_instruction.mx
        MonetDB5/src/mal/mal_interpreter.mx
Branch: Oct2010
Log Message:

Coverity errors


diffs (49 lines):

diff -r 6e988359e9be -r 5574493b6a40 MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx       Sat Jan 15 15:28:25 2011 +0100
+++ b/MonetDB5/src/mal/mal_instruction.mx       Sat Jan 15 15:42:05 2011 +0100
@@ -1305,8 +1305,7 @@
        i = findVariable(mb, nme);
        if (i < 0)
                return getTypeIndex(nme, -1, TYPE_any);
-       if (i >= 0)
-               return getVarType(mb, i);
+       return getVarType(mb, i);
 }
 
 str
diff -r 6e988359e9be -r 5574493b6a40 MonetDB5/src/mal/mal_interpreter.mx
--- a/MonetDB5/src/mal/mal_interpreter.mx       Sat Jan 15 15:28:25 2011 +0100
+++ b/MonetDB5/src/mal/mal_interpreter.mx       Sat Jan 15 15:42:05 2011 +0100
@@ -990,8 +990,7 @@
        THRset_errbuf(THRget(THRgettid()), cntxt->errbuf);      /* where to 
leave errors */
        if (stk->cmd || mb->trap) {
                lng tm = 0;
-               if( oldtimer)
-                       tm = GDKusec();
+               tm = GDKusec();
                mdbStep(cntxt,mb,stk, getPC(mb,pci));
                if (stk->cmd == 'x' || cntxt->mode == FINISHING) {
                        /* need a way to skip */
@@ -999,16 +998,14 @@
                        fs->status = -1;
                        return ret;
                }
-               if (oldtimer ) {
-                       /* ignore debugger waiting time*/
-                       tm = GDKusec()-tm;
-                       oldtimer += tm;
+               /* ignore debugger waiting time*/
+               tm = GDKusec()-tm;
+               oldtimer += tm;
 #ifdef HAVE_SYS_RESOURCE_H
-                       getrusage(RUSAGE_SELF, &oldResource);
+               getrusage(RUSAGE_SELF, &oldResource);
 #endif
-                       if (cntxt->flags & memoryFlag)
-                               oldMemory = MT_mallinfo();
-               }
+               if (cntxt->flags & memoryFlag)
+                       oldMemory = MT_mallinfo();
        }
 
        @:beginProfile(t,0)@
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list