squash cast warning fix

1 files changed, 21 insertions, 18 deletions

diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c
index e784487..5a1063f 100644
--- a/src/H5Cmpio.c
+++ b/src/H5Cmpio.c
@@ -174,13 +174,13 @@ H5C_apply_candidate_list(H5F_t * f,
                          int mpi_size)
 {
     int                 i;
-    int			m;
-    int			n;
-    unsigned		first_entry_to_flush;
-    unsigned		last_entry_to_flush;
-    unsigned		total_entries_to_clear = 0;
-    unsigned		total_entries_to_flush = 0;
-    int               * candidate_assignment_table = NULL;
+    int                 m;
+    unsigned            n;
+    unsigned		    first_entry_to_flush;
+    unsigned		    last_entry_to_flush;
+    unsigned		    total_entries_to_clear = 0;
+    unsigned		    total_entries_to_flush = 0;
+    unsigned          * candidate_assignment_table = NULL;
     unsigned            entries_to_flush[H5C_RING_NTYPES];
     unsigned            entries_to_clear[H5C_RING_NTYPES];
     haddr_t		addr;
@@ -231,17 +231,20 @@ H5C_apply_candidate_list(H5F_t * f,
             HGOTO_ERROR(H5E_DATASET, H5E_CANTCREATE, FAIL, "can't create skip list for entries")
     } /* end if */
 
-    n = num_candidates / mpi_size;
-    m = num_candidates % mpi_size;
-    HDassert(n >= 0);
-    if(NULL == (candidate_assignment_table = (int *)H5MM_malloc(sizeof(int) * (size_t)(mpi_size + 1))))
+    if(num_candidates / (unsigned)mpi_size > INT_MAX)
+        HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "num_candidates overflow")
+    n = num_candidates / (unsigned)mpi_size;
+    if(num_candidates % (unsigned)mpi_size > INT_MAX)
+        HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "m overflow")
+    m = (int)(num_candidates % (unsigned)mpi_size);
+
+    if(NULL == (candidate_assignment_table = (unsigned *)H5MM_malloc(sizeof(unsigned) * (size_t)(mpi_size + 1))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for candidate assignment table")
 
     candidate_assignment_table[0] = 0;
     candidate_assignment_table[mpi_size] = num_candidates;
 
     if(m == 0) { /* mpi_size is an even divisor of num_candidates */
-        HDassert(n > 0);
         for(i = 1; i < mpi_size; i++)
             candidate_assignment_table[i] = candidate_assignment_table[i - 1] + n;
     } /* end if */
@@ -249,7 +252,7 @@ H5C_apply_candidate_list(H5F_t * f,
         for(i = 1; i <= m; i++)
             candidate_assignment_table[i] = candidate_assignment_table[i - 1] + n + 1;
 
-        if(num_candidates < mpi_size) {
+        if(num_candidates < (unsigned)mpi_size) {
             for(i = m + 1; i < mpi_size; i++)
                 candidate_assignment_table[i] = num_candidates;
         } /* end if */
@@ -263,7 +266,7 @@ H5C_apply_candidate_list(H5F_t * f,
 #if H5C_DO_SANITY_CHECKS
     /* Verify that the candidate assignment table has the expected form */
     for(i = 1; i < mpi_size - 1; i++) {
-        int a, b;
+        unsigned a, b;
 
         a = candidate_assignment_table[i] - candidate_assignment_table[i - 1];
         b = candidate_assignment_table[i + 1] - candidate_assignment_table[i];
@@ -282,7 +285,7 @@ H5C_apply_candidate_list(H5F_t * f,
         tbl_buf[i] = '\0';
     HDsprintf(&(tbl_buf[0]), "candidate assignment table = ");
     for(i = 0; i <= mpi_size; i++)
-        HDsprintf(&(tbl_buf[HDstrlen(tbl_buf)]), " %d", candidate_assignment_table[i]);
+        HDsprintf(&(tbl_buf[HDstrlen(tbl_buf)]), " %u", candidate_assignment_table[i]);
     HDsprintf(&(tbl_buf[HDstrlen(tbl_buf)]), "\n");
     HDfprintf(stdout, "%s", tbl_buf);
 
@@ -359,11 +362,11 @@ H5C_apply_candidate_list(H5F_t * f,
     n = 0;
     for(i = 0; i < H5C_RING_NTYPES; i++) {
         m += (int)entries_to_flush[i];
-        n += (int)entries_to_clear[i];
+        n += entries_to_clear[i];
     } /* end if */
 
     HDassert((unsigned)m == total_entries_to_flush);
-    HDassert((unsigned)n == total_entries_to_clear);
+    HDassert(n == total_entries_to_clear);
 #endif /* H5C_DO_SANITY_CHECKS */
 
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
@@ -397,7 +400,7 @@ H5C_apply_candidate_list(H5F_t * f,
 
 done:
     if(candidate_assignment_table != NULL)
-        candidate_assignment_table = (int *)H5MM_xfree((void *)candidate_assignment_table);
+        candidate_assignment_table = (unsigned *)H5MM_xfree((void *)candidate_assignment_table);
     if(cache_ptr->coll_write_list) {
         if(H5SL_close(cache_ptr->coll_write_list) < 0)
             HDONE_ERROR(H5E_CACHE, H5E_CANTFREE, FAIL, "failed to destroy skip list")