MonetDB: default - small cleanup

[Niels Nes]

Changeset: 31ddbfdf5754 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31ddbfdf5754
Modified Files:
        monetdb5/optimizer/opt_history.mx
        monetdb5/optimizer/opt_mergetable.mx
        monetdb5/optimizer/opt_multiplex.mx
Branch: default
Log Message:

small cleanup


diffs (63 lines):

diff --git a/monetdb5/optimizer/opt_history.mx 
b/monetdb5/optimizer/opt_history.mx
--- a/monetdb5/optimizer/opt_history.mx
+++ b/monetdb5/optimizer/opt_history.mx
@@ -255,8 +255,8 @@ OPThistoryImplementation(Client cntxt, M
        }
 
        for( ; i<slimit; i++)
-       if(old[i])
-               freeInstruction(old[i]);
+               if(old[i])
+                       freeInstruction(old[i]);
        GDKfree(old);
        DEBUGoptimizers
                mnstr_printf(cntxt->fdout,"#opt_history: code added\n");
diff --git a/monetdb5/optimizer/opt_mergetable.mx 
b/monetdb5/optimizer/opt_mergetable.mx
--- a/monetdb5/optimizer/opt_mergetable.mx
+++ b/monetdb5/optimizer/opt_mergetable.mx
@@ -2323,9 +2323,8 @@ OPTmergetableImplementation(Client cntxt
 
        if ( mb->errors == 0) {
                for(i=0; i<slimit; i++)
-                       if (old[i]) {
+                       if (old[i]) 
                                freeInstruction(old[i]);
-                       }
                GDKfree(old);
        }
 
diff --git a/monetdb5/optimizer/opt_multiplex.mx 
b/monetdb5/optimizer/opt_multiplex.mx
--- a/monetdb5/optimizer/opt_multiplex.mx
+++ b/monetdb5/optimizer/opt_multiplex.mx
@@ -296,10 +296,10 @@ OPTmultiplexImplementation(Client cntxt,
 
        for (i = 0; i < limit; i++) {
                p = old[i];
-               if (msg == MAL_SUCCEED &&
-                       getModuleId(p) == malRef && 
-                       getFunctionId(p) == multiplexRef) {
-                       msg= OPTexpandMultiplex(cntxt, mb, stk, p);
+               if (msg == MAL_SUCCEED && 
+                    getModuleId(p) == malRef && 
+                   getFunctionId(p) == multiplexRef) {
+                       msg = OPTexpandMultiplex(cntxt, mb, stk, p);
                        if( msg== MAL_SUCCEED){
                                freeInstruction(p); 
                                old[i]=0;
@@ -307,13 +307,12 @@ OPTmultiplexImplementation(Client cntxt,
                                pushInstruction(mb, p);
                        }
                        actions++;
-               } else
-               if( old[i])
+               } else if( old[i])
                        pushInstruction(mb, p);
        }
        for(;i<slimit; i++)
-       if( old[i])
-               freeInstruction(old[i]);
+               if( old[i])
+                       freeInstruction(old[i]);
        GDKfree(old);
        DEBUGoptimizers {
                mnstr_printf(cntxt->fdout,"#opt_multiplex: %d expansions\n", 
actions);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list