MonetDB: DVframework - Avoid self-assignments and unused variables

[Dimitar Nedev]

Changeset: c4b15d4166de for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c4b15d4166de
Modified Files:
        monetdb5/extras/dvf/dvf.c
        monetdb5/extras/dvf/opt_dvf.c
        sql/server/rel_optimizer.c
Branch: DVframework
Log Message:

Avoid self-assignments and unused variables


diffs (77 lines):

diff --git a/monetdb5/extras/dvf/dvf.c b/monetdb5/extras/dvf/dvf.c
--- a/monetdb5/extras/dvf/dvf.c
+++ b/monetdb5/extras/dvf/dvf.c
@@ -96,9 +96,9 @@ str plan_modifier(Client cntxt, MalBlkPt
        /* check for logical error: mb must never be NULL */
        assert (mb != NULL);
 
-       cntxt = cntxt; /* to escape 'unused' parameter error. */
-       stk = stk; /* to escape 'unused' parameter error. */
-       pci = pci; /* to escape 'unused' parameter error. */
+       (void)cntxt; /* to escape 'unused' parameter error. */
+       (void)stk; /* to escape 'unused' parameter error. */
+       (void)pci; /* to escape 'unused' parameter error. */
 
        if ((BAT_fi = BATdescriptor(bat_fi)) == NULL)
                throw(MAL, "dvf.plan_modifier", RUNTIME_OBJECT_MISSING);
@@ -129,7 +129,7 @@ str plan_modifier(Client cntxt, MalBlkPt
 
        printf("files of interest: %d\n", num_fl);
        
-       num_fi = num_fi;
+       (void)num_fi;
        
        /* check for logical error */
        assert(num_fi == num_fl);
@@ -153,7 +153,7 @@ str plan_modifier(Client cntxt, MalBlkPt
        copy_old = mb;
        mb = copy_mb;
 
-       copy_old = copy_old; /* to escape 'unused' parameter error. */
+       (void)copy_old; /* to escape 'unused' parameter error. */
        
        old = mb->stmt;
        limit= mb->stop;
@@ -464,7 +464,7 @@ str plan_modifier(Client cntxt, MalBlkPt
 //             mb->profiler[i].trace = TRUE;
 //     }
        
-       msg = msg;
+       (void)msg;
        /* run rest of the plan */
        msg = runMALsequence(cntxt, mb, startpc+1, mb->stop, stk_new, stk_new, 
mb->stmt[startpc]);
 
diff --git a/monetdb5/extras/dvf/opt_dvf.c b/monetdb5/extras/dvf/opt_dvf.c
--- a/monetdb5/extras/dvf/opt_dvf.c
+++ b/monetdb5/extras/dvf/opt_dvf.c
@@ -136,9 +136,9 @@ OPTdvfImplementation(Client cntxt, MalBl
        int var_sql_mvc = 0;
        int barrier_to_defend_against_dataflow = 0;
 
-       stk = stk; //to escape 'unused' parameter error.
-       pci = pci; //to escape 'unused' parameter error.
-       cntxt = cntxt; //to escape 'unused' parameter error.
+       (void)stk; //to escape 'unused' parameter error.
+       (void)pci; //to escape 'unused' parameter error.
+       (void)cntxt; //to escape 'unused' parameter error.
 
        /* check for logical error: mb must never be NULL */
        assert (mb != NULL);
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -1999,11 +1999,11 @@ void compute_and_insert_unavailable_requ
        
 //     u = "INSERT INTO %s.%s SELECT %s, %s FROM mseed.dataview%sWHERE 
start_time < %s + INTERVAL %s AND end_time > %s AND sys.date_trunc(sample_time, 
\'%s\') = %s %s GROUP BY %s;";
        
-       schema_name = schema_name;
-       dmdt_name = dmdt_name;
+       (void)schema_name;
+       (void)dmdt_name;
        pkey_select_str = form_pkey_select_str(sps, num_PERPAD, 
pkey_bound_to_dataview, select_str_per_pkey);
        non_pkey_select_str = get_non_pkey_select_str(schema_name, dmdt_name);
-       from_join_temp_table_str = from_join_temp_table_str;
+       (void)from_join_temp_table_str;
        if(idx_time_pkey >= 0)
                start_ts_str = select_str_per_pkey[idx_time_pkey];
        else
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list