Version abc80702

1 files changed, 15 insertions, 10 deletions

diff --git a/src/misc/espresso/pair.c b/src/misc/espresso/pair.c
index a8077176..a5345178 100644
--- a/src/misc/espresso/pair.c
+++ b/src/misc/espresso/pair.c
@@ -163,7 +163,8 @@ pcover A;
 bool paired[];
 {
     bool run;
-    int first_run, run_length, var, offset = 0;
+    int first_run = 0; // Suppress "might be used uninitialized"
+    int run_length, var, offset = 0;
 
     run = FALSE; run_length = 0;
     for(var = 0; var < cube.num_binary_vars; var++)
@@ -261,8 +262,10 @@ pPLA PLA;
 int strategy;
 {
     int var1, var2, **cost_array;
-    int i, j, xnum_binary_vars, xnum_vars, *xpart_size, cost;
-    pcover T, Fsave, Dsave, Rsave;
+    int i, j;
+    int xnum_binary_vars = 0, xnum_vars = 0, *xpart_size = NULL, cost = 0; // Suppress "might be used uninitialized"
+    pcover T;
+    pcover Fsave = NULL, Dsave = NULL, Rsave = NULL; // Suppress "might be used uninitialized"
     pset mask;
 /*    char *s;*/
 
@@ -366,7 +369,7 @@ static pcover best_F, best_D, best_R;
 static int pair_minim_strategy;
 
 
-print_pair(pair)
+void print_pair(pair)
 ppair pair;
 {
     int i;
@@ -382,7 +385,9 @@ int greedy_best_cost(cost_array_local, pair_p)
 int **cost_array_local;
 ppair *pair_p;
 {
-    int i, j, besti, bestj, maxcost, total_cost;
+    int i, j;
+    int besti = 0, bestj = 0;
+    int maxcost, total_cost;
     pset cand;
     ppair pair;
 
@@ -437,7 +442,7 @@ int **cost_array_local;
 }
 
 
-int find_best_cost(pair)
+void find_best_cost(pair)
 register ppair pair;
 {
     register int i, cost;
@@ -464,7 +469,7 @@ register ppair pair;
     4) for phase assignment
 */
 
-pair_all(PLA, pair_strategy)
+void pair_all(PLA, pair_strategy)
 pPLA PLA;
 int pair_strategy;
 {
@@ -507,7 +512,7 @@ int pair_strategy;
 /*
  *  minimize_pair -- called as each pair is generated
  */
-int minimize_pair(pair)
+void minimize_pair(pair)
 ppair pair;
 {
     pcover Fsave, Dsave, Rsave;
@@ -582,7 +587,7 @@ ppair pair;
     global_PLA->phase = NULL;
 }
 
-generate_all_pairs(pair, n, candidate, action)
+void generate_all_pairs(pair, n, candidate, action)
 ppair pair;
 int n;
 pset candidate;
@@ -666,7 +671,7 @@ register int n;
 }
 
 
-int pair_free(pair)
+void pair_free(pair)
 register ppair pair;
 {
     FREE(pair->var1);