Merged in dachary/jerasure/wip-compilation-warnings (pull request #2)

fix compilation warnings

src/galois.c

@@ -250,6 +250,7 @@ int galois_single_multiply(int x, int y, int w)
     return gfp_array[w]->multiply.w32(gfp_array[w], x, y);
   } else {
     fprintf(stderr, "ERROR -- Galois field not implemented for w=%d\n", w);
+    return 0;
   }
 }
 
@@ -266,6 +267,7 @@ int galois_single_divide(int x, int y, int w)
     return gfp_array[w]->divide.w32(gfp_array[w], x, y);
   } else {
     fprintf(stderr, "ERROR -- Galois field not implemented for w=%d\n", w);
+    return 0;
   }
 }
 

src/jerasure.c

@@ -167,7 +167,7 @@ int jerasure_make_decoding_bitmatrix(int k, int m, int w, int *matrix, int *eras
 int jerasure_matrix_decode(int k, int m, int w, int *matrix, int row_k_ones, int *erasures,
                           char **data_ptrs, char **coding_ptrs, int size)
 {
-  int i, j, edd, lastdrive;
+  int i, edd, lastdrive;
   int *tmpids;
   int *erased, *decoding_matrix, *dm_ids;
 
@@ -299,8 +299,7 @@ int *jerasure_matrix_to_bitmatrix(int k, int m, int w, int *matrix)
 void jerasure_matrix_encode(int k, int m, int w, int *matrix,
                           char **data_ptrs, char **coding_ptrs, int size)
 {
-  int *init;
+  int i;
-  int i, j;
   
   if (w != 8 && w != 16 && w != 32) {
     fprintf(stderr, "ERROR: jerasure_matrix_encode() and w is not 8, 16 or 32\n");
@@ -637,7 +636,7 @@ void jerasure_matrix_dotprod(int k, int w, int *matrix_row,
 int jerasure_bitmatrix_decode(int k, int m, int w, int *bitmatrix, int row_k_ones, int *erasures,
                             char **data_ptrs, char **coding_ptrs, int size, int packetsize)
 {
-  int i, j;
+  int i;
   int *erased;
   int *decoding_matrix;
   int *dm_ids;
@@ -775,7 +774,6 @@ static int set_up_ids_for_scheduled_decoding(int k, int m, int *erasures, int *r
 {
   int ddf, cdf;
   int *erased;
-  char **ptrs;
   int i, j, x;
 
   ddf = 0;
@@ -1010,9 +1008,6 @@ int jerasure_schedule_decode_cache(int k, int m, int w, int ***scache, int *eras
 
 int ***jerasure_generate_schedule_cache(int k, int m, int w, int *bitmatrix, int smart)
 {
-  int i, tdone;
-  char **ptrs;
-  int **schedule;
   int ***scache;
   int erasures[3];
   int e1, e2;
@@ -1139,7 +1134,7 @@ int jerasure_invertible_bitmatrix(int *mat, int rows)
   
 int *jerasure_matrix_multiply(int *m1, int *m2, int r1, int c1, int r2, int c2, int w)
 {
-  int *product, i, j, k, l;
+  int *product, i, j, k;
 
   product = (int *) malloc(sizeof(int)*r1*c2);
   for (i = 0; i < r1*c2; i++) product[i] = 0;
@@ -1193,7 +1188,7 @@ void jerasure_schedule_encode(int k, int m, int w, int **schedule,
                                    char **data_ptrs, char **coding_ptrs, int size, int packetsize)
 {
   char **ptr_copy;
-  int i, j, tdone;
+  int i, tdone;
 
   ptr_copy = talloc(char *, (k+m));
   for (i = 0; i < k; i++) ptr_copy[i] = data_ptrs[i];
@@ -1360,8 +1355,7 @@ int **jerasure_smart_bitmatrix_to_schedule(int k, int m, int w, int *bitmatrix)
 void jerasure_bitmatrix_encode(int k, int m, int w, int *bitmatrix,
                             char **data_ptrs, char **coding_ptrs, int size, int packetsize)
 {
-  int i, j, x, y, sptr, pstarted, index;
+  int i;
-  char *dptr, *pptr;
 
   if (packetsize%sizeof(long) != 0) {
     fprintf(stderr, "jerasure_bitmatrix_encode - packetsize(%d) %c sizeof(long) != 0\n", packetsize, '%');

src/reed_sol.c

@@ -77,8 +77,7 @@ int *reed_sol_r6_coding_matrix(int k, int w)
 
 int *reed_sol_vandermonde_coding_matrix(int k, int m, int w)
 {
-  int tmp;
+  int i, j;
-  int i, j, index;
   int *vdm, *dist;
 
   vdm = reed_sol_big_vandermonde_distribution_matrix(k+m, k, w);