Merge pull request #330 from mohabsafey/removes-warning-msgs-clang

Author: ederc

src/msolve/hilbert.c

@@ -183,7 +183,6 @@ static inline int32_t generate_new_elts_basis(int32_t nvars, int32_t *ind,
                                               int32_t *bexp_lm){
 
   len_t c = 0;
-  len_t def = 0;
   for(int64_t n = nvars-1; n >= 0; n--){
     for(len_t i = ind[nvars-1-n]; i < len1; i++){
       for(int64_t k = 0; k < nvars; k++){
@@ -193,9 +192,6 @@ static inline int32_t generate_new_elts_basis(int32_t nvars, int32_t *ind,
       if(!is_divisible_lexp(nvars, len_lm, (new_basis+c*nvars), bexp_lm)){
         c++;
       }
-      else{
-        def++;
-      }
     }
   }
 
@@ -3813,19 +3809,18 @@ static inline int32_t *get_lm_from_bs(const bs_t * const bs, const ht_t * const
   int32_t *exp  = (int32_t *)malloc(
                                     (unsigned long)(nelts) * (unsigned long)(nv) * sizeof(int32_t));
   /* counters for lengths, exponents and coefficients */
-  int64_t cl = 0, ce = 0;//, cc = 0, ctmp  = 0;;
+  int64_t ce = 0;
 
-  for (long i = 0; i < nelts; ++i) {
+  for (len_t i = 0; i < nelts; ++i) {
     const bl_t bi = bs->lmps[i];
 
     dt  = bs->hm[bi] + OFFSET;
-    for (int k = 1; k < ebl; ++k) {
+    for (len_t k = 1; k < ebl; ++k) {
       exp[ce++] = (int32_t)ht->ev[dt[0]][k];
     }
-    for (int k = ebl+1; k < evl; ++k) {
+    for (len_t k = ebl+1; k < evl; ++k) {
       exp[ce++] = (int32_t)ht->ev[dt[0]][k];
     }
-    cl++;
   }
   return exp;
 }
@@ -3838,21 +3833,18 @@ static inline void get_lm_from_bs_trace(bs_t *bs, const ht_t *ht, int32_t *exp){
   const len_t evl = ht->evl;
 
   /* counters for lengths, exponents and coefficients */
-  int64_t cl = 0, ce = 0;//, cc = 0, ctmp  = 0;;
+  int64_t ce = 0;
 
-  for (long i = 0; i < nelts; ++i) {
+  for (len_t i = 0; i < nelts; ++i) {
     const bl_t bi = bs->lmps[i];
-    //    len[cl] = bs->hm[bi][LENGTH];
 
     dt  = bs->hm[bi] + OFFSET;
-    for (int k = 1; k < ebl; ++k) {
+    for (len_t k = 1; k < ebl; ++k) {
       exp[ce++] = (int32_t)ht->ev[dt[0]][k];
     }
-    for (int k = ebl+1; k < evl; ++k) {
+    for (len_t k = ebl+1; k < evl; ++k) {
       exp[ce++] = (int32_t)ht->ev[dt[0]][k];
     }
-    //    cc  +=  len[cl];
-    cl++;
   }
 }
 
@@ -3863,21 +3855,15 @@ static inline void get_lm_from_bs_trace_elim(bs_t *bs, const ht_t *ht, int32_t *
   const len_t evl = ht->evl;
 
   /* counters for lengths, exponents and coefficients */
-  int64_t cl = 0, ce = 0;//, cc = 0, ctmp  = 0;;
+  int64_t ce = 0;
 
-  for (long i = 0; i < nelts; ++i) {
+  for (len_t i = 0; i < nelts; ++i) {
     const bl_t bi = bs->lmps[i];
-    //    len[cl] = bs->hm[bi][LENGTH];
 
     dt  = bs->hm[bi] + OFFSET;
-    /* for (int k = 1; k < ebl; ++k) { */
-    /*   exp[ce++] = (int32_t)ht->ev[dt[0]][k]; */
-    /* } */
-    for (int k = ebl+1; k < evl; ++k) {
+    for (len_t k = ebl+1; k < evl; ++k) {
       exp[ce++] = (int32_t)ht->ev[dt[0]][k];
     }
-    //    cc  +=  len[cl];
-    cl++;
   }
 }
 

src/usolve/descartes.c

@@ -90,7 +90,7 @@ static long descartes_truncate(mpz_t *upol2,
                                const unsigned long deg,
                                const unsigned long nbits,
                                usolve_flags *flags){
-  int i;
+  unsigned long i;
   /* /\* Max bit size of coefficients in upol1 *\/ */
   /* const unsigned long int nbits = mpz_poly_max_bsize_coeffs(upol1, deg); */
 

src/usolve/utils.c

@@ -154,7 +154,7 @@ static inline void USOLVEmpz_poly_print_maple(mpz_t *upol, unsigned long int deg
 */
 static inline int USOLVEmpz_poly_rescale_normalize_2exp_th(mpz_t *upol, long int b, unsigned long deg,
                                                            unsigned int nthreads){
-  long int i;
+  unsigned long int i;
   if (b > 0) {
     //    j = b;
 #ifdef _OPENMP
@@ -170,7 +170,7 @@ static inline int USOLVEmpz_poly_rescale_normalize_2exp_th(mpz_t *upol, long int
     omp_set_num_threads(nthreads);
 #endif
 #pragma omp parallel for num_threads(nthreads)
-      for(i=0; i<deg; i++){
+      for(i = 0; i < deg; i++){
         mpz_mul_2exp(upol[i], upol[i], (i-deg)*b);
     }
   }
@@ -187,7 +187,7 @@ static inline int USOLVEmpz_poly_rescale_normalize_2exp_th_long(mpz_t *upol,
                                                                 long int b,
                                                                 long int c,
                                                                 unsigned int nthreads){
-  long int i;
+  unsigned long int i;
   mpz_t coef;mpz_init(coef);mpz_set_si(coef, c);
   if (b > 0) {
 #ifdef _OPENMP
@@ -205,7 +205,7 @@ static inline int USOLVEmpz_poly_rescale_normalize_2exp_th_long(mpz_t *upol,
     omp_set_num_threads(nthreads);
 #endif
 #pragma omp parallel for num_threads(nthreads)
-    for(i=0; i<deg; i++){
+    for(i = 0; i < deg; i++){
       mpz_mul(upol[i], upol[i], coef);
       mpz_mul_2exp(upol[i], upol[i], (i-deg)*b);
       mpz_mul_si(coef, coef, c);