MonetDB: default - Try to avoid clobbered variables.

[Jan Rittinger]

Changeset: d3e539206391 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d3e539206391
Modified Files:
        pathfinder/compiler/pf_ferry.c
Branch: default
Log Message:

Try to avoid clobbered variables.


diffs (30 lines):

diff -r e45ab1674367 -r d3e539206391 pathfinder/compiler/pf_ferry.c
--- a/pathfinder/compiler/pf_ferry.c    Thu Jun 17 12:03:14 2010 +0200
+++ b/pathfinder/compiler/pf_ferry.c    Thu Jun 17 12:04:19 2010 +0200
@@ -115,6 +115,7 @@
     PFla_pb_t       *lapb = NULL;
     XML2LALGContext *ctx;
     PFarray_t       *output;
+    char            *opt_args_local;
 
     /* setup the error buffer (needed for error handling and segfault trap) */
     PFerrbuf = err;
@@ -149,13 +150,15 @@
 
     /* Use the default optimization arguments 
        if no optimizations are available. */
-    if (!opt_args)
-        opt_args = PFopt_args;
+    if (opt_args)
+        opt_args_local = opt_args;
+    else
+        opt_args_local = PFopt_args;
 
     /* Rewrite/optimize the algebra plans. */
     for (unsigned int i = 0; i < PFla_pb_size(lapb); i++)
         PFla_pb_op_at (lapb, i) 
-            = PFalgopt (PFla_pb_op_at (lapb, i), false, NULL, opt_args);
+            = PFalgopt (PFla_pb_op_at (lapb, i), false, NULL, opt_args_local);
 
     /*
      * OUTPUT GENERATION
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list