Revert "fix warnings from Intel compiler"

This reverts commit 8b9338ab57eec0cc8fa5a36c44d7b28e52e9a466.

47 files changed, 100 insertions, 120 deletions

diff --git a/bin/warnhist b/bin/warnhist
index 507477d..7e56246 100755
--- a/bin/warnhist
+++ b/bin/warnhist
@@ -205,12 +205,8 @@ while (<>) {
         ($last_c_name, $toss) = split /\:/, $_;
     }
 
-    if($_ =~ /.*[A-Za-z0-9_]\.[chC]\(.*[0-9]\):.*#.*/) {
-        $last_c_name = $_;
-    }
-
     # Skip lines that don't have the word "warning"
-    next if $_ !~ /[Ww]arning/;
+    next if $_ !~ /[Ww]arning:/;
 
     # Skip warnings from linker
     next if $_ =~ /ld: warning:/;
@@ -260,15 +256,11 @@ while (<>) {
     } elsif($_ =~ /^\".*, line [0-9]+: *[Ww]arning:.*/) {
         ($name, $toss, $warning, $extra, $extra2) = split /\:/, $_;
         ($name, $line) = split /\,/, $name;
-	    $name =~ s/^\"//g;
-	    $name =~ s/\"$//g;
-	    $line =~ s/^\s*line\s*//g;
+	$name =~ s/^\"//g;
+	$name =~ s/\"$//g;
+	$line =~ s/^\s*line\s*//g;
 # print "name:'", $name, "'-'", $line, "'\n";
 # print "warning:'", $warning, "'\n";
-    } elsif($_ =~ /.*[A-Za-z0-9_]\.[chC]\(.*[0-9]\):.*#.*/) {
-        ($last_c_name, $toss, $warning) = split /\:/, $last_c_name;
-        ($name, $line) = split /\(/, $last_c_name;
-        $line =~ s/\)//g;
     } else {
         # Check for 'character offset' field appended to file & line #
 	# (This is probably specific to GCC)
@@ -338,7 +330,6 @@ while (<>) {
     # Convert all quotes to '
     $warning =~ s/‘/'/g;
     $warning =~ s/’/'/g;
-    $warning =~ s/"/'/g;
 
 #
 # These skipped messages & "genericizations" may be specific to GCC
diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index 7e8ff31..2219263 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -1176,12 +1176,12 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = (YY_CHAR)yy_ec[YY_SC_TO_UI(*yy_cp)];
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
 				if ( yy_current_state >= 545 )
-					yy_c = (YY_CHAR)yy_meta[(unsigned int) yy_c];
+					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			*(yy_state_ptr)++ = yy_current_state;
@@ -1831,12 +1831,12 @@ static int yy_get_next_buffer (void)
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
-		register YY_CHAR yy_c = (YY_CHAR)(*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
 			if ( yy_current_state >= 545 )
-				yy_c = (YY_CHAR)yy_meta[(unsigned int) yy_c];
+				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 		*(yy_state_ptr)++ = yy_current_state;
@@ -1859,7 +1859,7 @@ static int yy_get_next_buffer (void)
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
 		if ( yy_current_state >= 545 )
-			yy_c = (YY_CHAR)yy_meta[(unsigned int) yy_c];
+			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 544);
diff --git a/hl/tools/gif2h5/decompress.c b/hl/tools/gif2h5/decompress.c
index 713ca7e..6668c22 100644
--- a/hl/tools/gif2h5/decompress.c
+++ b/hl/tools/gif2h5/decompress.c
@@ -173,7 +173,7 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead)
     /* Now read in values from the image descriptor */
     IWidth = GifImageDesc->ImageWidth;
     IHeight = GifImageDesc->ImageHeight;
-    Interlace = (unsigned char)(GifImageDesc->PackedField & 0x40);
+    Interlace = GifImageDesc->PackedField & 0x40;
 
     /*
      * Note that I ignore the possible existence of a local color map.  I'm
diff --git a/src/H5Aint.c b/src/H5Aint.c
index 2a0c782..2b43a64 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -2026,7 +2026,7 @@ H5A__set_version(const H5F_t *f, H5A_t *attr)
         version = H5O_ATTR_VERSION_1;   /* Write out basic version */
 
     /* Upgrade to the version indicated by the file's low bound if higher */
-    version = (uint8_t)MAX(version, (uint8_t)H5O_attr_ver_bounds[H5F_LOW_BOUND(f)]);
+    version = MAX(version, (uint8_t)H5O_attr_ver_bounds[H5F_LOW_BOUND(f)]);
 
     /* Version bounds check */
     if(version > H5O_attr_ver_bounds[H5F_HIGH_BOUND(f)])
diff --git a/src/H5B2cache.c b/src/H5B2cache.c
index 09bb389..2a77bd5 100644
--- a/src/H5B2cache.c
+++ b/src/H5B2cache.c
@@ -398,7 +398,7 @@ H5B2__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le
     *image++ = H5B2_HDR_VERSION;
 
     /* B-tree type */
-    *image++ = (uint8_t)hdr->cls->id;
+    *image++ = hdr->cls->id;
 
     /* Node size (in bytes) */
     UINT32ENCODE(image, hdr->node_size);
@@ -818,7 +818,7 @@ H5B2__cache_int_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le
     *image++ = H5B2_INT_VERSION;
 
     /* B-tree type */
-    *image++ = (uint8_t)internal->hdr->cls->id;
+    *image++ = internal->hdr->cls->id;
     HDassert((size_t)(image - (uint8_t *)_image) == (H5B2_INT_PREFIX_SIZE - H5B2_SIZEOF_CHKSUM));
 
     /* Serialize records for internal node */
@@ -1219,7 +1219,7 @@ H5B2__cache_leaf_serialize(const H5F_t H5_ATTR_UNUSED *f, void *_image, size_t H
     *image++ = H5B2_LEAF_VERSION;
 
     /* B-tree type */
-    *image++ = (uint8_t)leaf->hdr->cls->id;
+    *image++ = leaf->hdr->cls->id;
     HDassert((size_t)(image - (uint8_t *)_image) == (H5B2_LEAF_PREFIX_SIZE - H5B2_SIZEOF_CHKSUM));
 
     /* Serialize records for leaf node */
diff --git a/src/H5B2int.c b/src/H5B2int.c
index ea03ed6..2d77276 100644
--- a/src/H5B2int.c
+++ b/src/H5B2int.c
@@ -239,7 +239,7 @@ H5B2__split1(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node_ptr,
     old_node_nrec = internal->node_ptrs[idx].node_nrec;
 
     /* Determine "middle" record to promote to internal node */
-    mid_record = (uint16_t)(old_node_nrec / 2);
+    mid_record = old_node_nrec / 2;
 
     /* Copy "upper half" of records to new child */
     H5MM_memcpy(H5B2_NAT_NREC(right_native, hdr, 0),
@@ -507,8 +507,8 @@ H5B2__redistribute2(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal,
     if(*left_nrec < *right_nrec) {
         /* Moving record from right node to left */
 
-        uint16_t new_right_nrec = (uint16_t)((*left_nrec + *right_nrec) / 2);    /* New number of records for right child */
-        uint16_t move_nrec = (uint16_t)(*right_nrec - new_right_nrec);           /* Number of records to move from right node to left */
+        uint16_t new_right_nrec = (uint16_t)(*left_nrec + *right_nrec) / 2;             /* New number of records for right child */
+        uint16_t move_nrec = (uint16_t)(*right_nrec - new_right_nrec);      /* Number of records to move from right node to left */
 
         /* Copy record from parent node down into left child */
         H5MM_memcpy(H5B2_NAT_NREC(left_native, hdr, *left_nrec), H5B2_INT_NREC(internal, hdr, idx), hdr->cls->nrec_size);
@@ -558,8 +558,8 @@ H5B2__redistribute2(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal,
     else {
         /* Moving record from left node to right */
 
-        uint16_t new_left_nrec = (uint16_t)((*left_nrec + *right_nrec) / 2);    /* New number of records for left child */
-        uint16_t move_nrec = (uint16_t)(*left_nrec - new_left_nrec);            /* Number of records to move from left node to right */
+        uint16_t new_left_nrec = (uint16_t)(*left_nrec + *right_nrec) / 2;    /* New number of records for left child */
+        uint16_t move_nrec = (uint16_t)(*left_nrec - new_left_nrec);        /* Number of records to move from left node to right */
 
         /* Sanity check */
         HDassert(*left_nrec > *right_nrec);
@@ -762,8 +762,8 @@ H5B2__redistribute3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal,
     {
         /* Compute new # of records in each node */
         unsigned total_nrec = (unsigned)(*left_nrec + *middle_nrec + *right_nrec + 2);
-        uint16_t new_middle_nrec = (uint16_t)((total_nrec - 2) / 3);
-        uint16_t new_left_nrec = (uint16_t)(((total_nrec - 2) - new_middle_nrec) / 2);
+        uint16_t new_middle_nrec = (uint16_t)(total_nrec - 2) / 3;
+        uint16_t new_left_nrec = (uint16_t)((total_nrec - 2) - new_middle_nrec) / 2;
         uint16_t new_right_nrec = (uint16_t)((total_nrec - 2) - (unsigned)(new_left_nrec + new_middle_nrec));
         uint16_t curr_middle_nrec = *middle_nrec;
 
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index ecb0f9c..53ca7d1 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -2193,7 +2193,7 @@ H5D__create_chunk_mem_map_1d(const H5D_chunk_map_t *fm)
 
             schunk_points = H5S_GET_SELECT_NPOINTS(chunk_info->fspace);
 
-            if(H5S_select_hyperslab(chunk_info->mspace, H5S_SELECT_SET, mem_sel_start, NULL, &tmp_count, &(const hsize_t)schunk_points) < 0)
+            if(H5S_select_hyperslab(chunk_info->mspace, H5S_SELECT_SET, mem_sel_start, NULL, &tmp_count, &schunk_points) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTSELECT, FAIL, "can't create chunk memory selection")
 
             mem_sel_start[0] += schunk_points;
@@ -5676,6 +5676,7 @@ H5D__chunk_addrmap_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
     /* Set it in the userdata to return */
     udata->chunk_addr[chunk_index] = chunk_rec->chunk_addr;
 
+done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__chunk_addrmap_cb() */
 
diff --git a/src/H5Dint.c b/src/H5Dint.c
index bd87c7f..772a150 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -2197,7 +2197,7 @@ H5D_nameof(const H5D_t *dataset)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    FUNC_LEAVE_NOAPI((H5G_name_t *)(dataset ? &(dataset->path) : NULL))
+    FUNC_LEAVE_NOAPI(dataset ? &(dataset->path) : NULL)
 } /* end H5D_nameof() */
 
 
diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index 7b1968e..da67e6b 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -487,7 +487,7 @@ H5EA__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le
     *image++ = H5EA_HDR_VERSION;
 
     /* Extensible array type */
-    *image++ = (uint8_t)hdr->cparam.cls->id;
+    *image++ = hdr->cparam.cls->id;
 
     /* General array creation/configuration information */
     *image++ = hdr->cparam.raw_elmt_size;          /* Element size in file (in bytes) */
@@ -875,7 +875,7 @@ H5EA__cache_iblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED
     *image++ = H5EA_IBLOCK_VERSION;
 
     /* Extensible array type */
-    *image++ = (uint8_t)iblock->hdr->cparam.cls->id;
+    *image++ = iblock->hdr->cparam.cls->id;
 
     /* Address of array header for array which owns this block */
     H5F_addr_encode(f, &image, iblock->hdr->addr);
@@ -1284,7 +1284,7 @@ H5EA__cache_sblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED
     *image++ = H5EA_SBLOCK_VERSION;
 
     /* Extensible array type */
-    *image++ = (uint8_t)sblock->hdr->cparam.cls->id;
+    *image++ = sblock->hdr->cparam.cls->id;
 
     /* Address of array header for array which owns this block */
     H5F_addr_encode(f, &image, sblock->hdr->addr);
@@ -1698,7 +1698,7 @@ H5EA__cache_dblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED
     *image++ = H5EA_DBLOCK_VERSION;
 
     /* Extensible array type */
-    *image++ = (uint8_t)dblock->hdr->cparam.cls->id;
+    *image++ = dblock->hdr->cparam.cls->id;
 
     /* Address of array header for array which owns this block */
     H5F_addr_encode(f, &image, dblock->hdr->addr);
diff --git a/src/H5FAcache.c b/src/H5FAcache.c
index e142ae2..f440efe 100644
--- a/src/H5FAcache.c
+++ b/src/H5FAcache.c
@@ -417,7 +417,7 @@ H5FA__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le
     *image++ = H5FA_HDR_VERSION;
 
     /* Fixed array type */
-    *image++ = (uint8_t)hdr->cparam.cls->id;
+    *image++ = hdr->cparam.cls->id;
 
     /* General array creation/configuration information */
     *image++ = hdr->cparam.raw_elmt_size;          /* Element size in file (in bytes) */
@@ -805,7 +805,7 @@ H5FA__cache_dblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED
     *image++ = H5FA_DBLOCK_VERSION;
 
     /* Fixed array type */
-    *image++ = (uint8_t)dblock->hdr->cparam.cls->id;
+    *image++ = dblock->hdr->cparam.cls->id;
 
     /* Address of array header for array which owns this block */
     H5F_addr_encode(f, &image, dblock->hdr->addr);
diff --git a/src/H5FScache.c b/src/H5FScache.c
index fbdada2..b520458 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -735,7 +735,7 @@ H5FS__cache_hdr_serialize(const H5F_t *f, void *_image, size_t len,
     *image++ = H5FS_HDR_VERSION;
 
     /* Client ID */
-    *image++ = (uint8_t)fspace->client;
+    *image++ = fspace->client;
 
     /* Total space tracked */
     H5F_ENCODE_LENGTH(f, image, fspace->tot_space);
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 9ad33b2..c9a1b25 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -93,7 +93,7 @@ typedef struct H5F_t H5F_t;
    for (_i = 0; _i < sizeof(int64_t); _i++, _n >>= 8)                  \
       *_p++ = (uint8_t)(_n & 0xff);                          \
    for (/*void*/; _i < 8; _i++)                              \
-      *_p++ = (uint8_t)((n) < 0 ? 0xff : 0);                          \
+      *_p++ = (n) < 0 ? 0xff : 0;                          \
    (p) = (uint8_t*)(p)+8;                              \
 }
 
@@ -184,7 +184,7 @@ typedef struct H5F_t H5F_t;
    n = 0;                                      \
    (p) += l;                                      \
    for (_i = 0; _i < l; _i++)                              \
-      n = (uint16_t)((n << 8) | *(--p));                              \
+      n = (n << 8) | *(--p);                              \
    (p) += l;                                      \
 }
 
diff --git a/src/H5Gint.c b/src/H5Gint.c
index c7ac1d1..049c696 100644
--- a/src/H5Gint.c
+++ b/src/H5Gint.c
@@ -583,7 +583,7 @@ H5G_nameof(const H5G_t *grp)
     /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    FUNC_LEAVE_NOAPI((H5G_name_t *)(grp ? &(grp->path) : NULL))
+    FUNC_LEAVE_NOAPI(grp ? &(grp->path) : NULL)
 } /* end H5G_nameof() */
 
 
diff --git a/src/H5HFtest.c b/src/H5HFtest.c
index 9eb8ed2..6f174bb 100644
--- a/src/H5HFtest.c
+++ b/src/H5HFtest.c
@@ -481,7 +481,7 @@ H5HF_get_id_type_test(const void *_id, unsigned char *obj_type)
     HDassert(obj_type);
 
     /* Get the type for a heap ID */
-    *obj_type = (unsigned char)(*id & H5HF_ID_TYPE_MASK);
+    *obj_type = *id & H5HF_ID_TYPE_MASK;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_get_id_type_test() */
diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c
index 23aba09..7f4f17f 100644
--- a/src/H5Oainfo.c
+++ b/src/H5Oainfo.c
@@ -194,7 +194,7 @@ H5O_ainfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
     *p++ = H5O_AINFO_VERSION;
 
     /* The flags for the attribute indices */
-    flags = (unsigned char)(ainfo->track_corder ? H5O_AINFO_TRACK_CORDER : 0);
+    flags = ainfo->track_corder ? H5O_AINFO_TRACK_CORDER : 0;
     flags = (unsigned char)(flags | (ainfo->index_corder ? H5O_AINFO_INDEX_CORDER : 0));
     *p++ = flags;
 
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index b7d4dd5..f685a00c 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -329,7 +329,7 @@ H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg)
 
     /* The character encoding for the attribute's name, in later versions */
     if(attr->shared->version >= H5O_ATTR_VERSION_3)
-        *p++ = (uint8_t)attr->shared->encoding;
+        *p++ = attr->shared->encoding;
 
     /* Write the name including null terminator */
     H5MM_memcpy(p, attr->shared->name, name_len);
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index cb75bc3..0cc58a6 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -408,10 +408,10 @@ H5O_fill_new_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p, const void *_fill)
 
     if(fill->version < H5O_FILL_VERSION_3) {
         /* Space allocation time */
-        *p++ = (uint8_t)fill->alloc_time;
+        *p++ = fill->alloc_time;
 
         /* Fill value writing time */
-        *p++ = (uint8_t)fill->fill_time;
+        *p++ = fill->fill_time;
 
         /* Whether fill value is defined */
         *p++ = (uint8_t)fill->fill_defined;
diff --git a/src/H5Ofsinfo.c b/src/H5Ofsinfo.c
index fd62aa2..e5e6741 100644
--- a/src/H5Ofsinfo.c
+++ b/src/H5Ofsinfo.c
@@ -224,7 +224,7 @@ H5O_fsinfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, c
     HDassert(fsinfo);
 
     *p++ = (uint8_t)fsinfo->version;    /* message version */
-    *p++ = (uint8_t)fsinfo->strategy;        /* File space strategy */
+    *p++ = fsinfo->strategy;        /* File space strategy */
     *p++ = (unsigned char)fsinfo->persist;    /* Free-space persist or not */
     H5F_ENCODE_LENGTH(f, p, fsinfo->threshold); /* Free-space section size threshold */
 
diff --git a/src/H5Oginfo.c b/src/H5Oginfo.c
index abe7879..4b34a52 100644
--- a/src/H5Oginfo.c
+++ b/src/H5Oginfo.c
@@ -183,7 +183,7 @@ H5O_ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
     *p++ = H5O_GINFO_VERSION;
 
     /* The flags for the group info */
-    flags = (unsigned char)(ginfo->store_link_phase_change ?  H5O_GINFO_STORE_PHASE_CHANGE : 0);
+    flags = ginfo->store_link_phase_change ?  H5O_GINFO_STORE_PHASE_CHANGE : 0;
     flags = (unsigned char)(flags | (ginfo->store_est_entry_info ?  H5O_GINFO_STORE_EST_ENTRY_INFO : 0));
     *p++ = flags;
 
diff --git a/src/H5Oint.c b/src/H5Oint.c
index 9d4c066..ecf347c 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.c
@@ -239,7 +239,7 @@ H5O_set_version(H5F_t *f, H5O_t *oh, uint8_t oh_flags, hbool_t store_msg_crt_idx
         version = H5O_VERSION_1;
 
     /* Upgrade to the version indicated by the file's low bound if higher */
-    version = (uint8_t)MAX(version, (uint8_t)H5O_obj_ver_bounds[H5F_LOW_BOUND(f)]);
+    version = MAX(version, (uint8_t)H5O_obj_ver_bounds[H5F_LOW_BOUND(f)]);
 
     /* Version bounds check */
     if(version > H5O_obj_ver_bounds[H5F_HIGH_BOUND(f)])
@@ -2368,7 +2368,7 @@ H5O_get_create_plist(const H5O_loc_t *loc, H5P_genplist_t *oc_plist)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set min. # of dense attributes in property list")
 
         /* Mask off non-"user visible" flags */
-        ohdr_flags = (uint8_t)(oh->flags & (H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED | H5O_HDR_STORE_TIMES));
+        ohdr_flags = oh->flags & (H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED | H5O_HDR_STORE_TIMES);
 
         /* Set object header flags */
         if(H5P_set(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 2a2a07b..138f219 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -570,7 +570,7 @@ H5O__layout_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p,
              H5O_LAYOUT_VERSION_3 : mesg->version);
 
     /* Layout class */
-    *p++ = (uint8_t)mesg->type;
+    *p++ = mesg->type;
 
     /* Write out layout class specific information */
     switch(mesg->type) {
diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c
index 475f66f..9827b6a 100644
--- a/src/H5Olinfo.c
+++ b/src/H5Olinfo.c
@@ -203,7 +203,7 @@ H5O_linfo_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, co
     *p++ = H5O_LINFO_VERSION;
 
     /* The flags for the link indices */
-    index_flags = (unsigned char)(linfo->track_corder ? H5O_LINFO_TRACK_CORDER : 0);
+    index_flags = linfo->track_corder ? H5O_LINFO_TRACK_CORDER : 0;
     index_flags = (uint8_t)(index_flags | (linfo->index_corder ? H5O_LINFO_INDEX_CORDER : 0));
     *p++ = index_flags;
 
diff --git a/src/H5Olink.c b/src/H5Olink.c
index 1f0c6c7..4bd952b 100644
--- a/src/H5Olink.c
+++ b/src/H5Olink.c
@@ -316,7 +316,7 @@ H5O_link_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
 
     /* Store the type of a non-default link */
     if(link_flags & H5O_LINK_STORE_LINK_TYPE)
-        *p++ = (uint8_t)lnk->type;
+        *p++ = lnk->type;
 
     /* Store the link creation order in the file, if its valid */
     if(lnk->corder_valid)
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c
index 33310dc..b4f00ea 100644
--- a/src/H5Osdspace.c
+++ b/src/H5Osdspace.c
@@ -257,7 +257,7 @@ H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *_mesg)
 
     /* Dataspace type */
     if(sdim->version > H5O_SDSPACE_VERSION_1)
-        *p++ = (uint8_t)sdim->type;
+        *p++ = sdim->type;
     else {
         *p++ = 0; /*reserved*/
         *p++ = 0; /*reserved*/
diff --git a/src/H5Rint.c b/src/H5Rint.c
index 77227ec..443a245 100644
--- a/src/H5Rint.c
+++ b/src/H5Rint.c
@@ -993,7 +993,7 @@ H5R__decode(const unsigned char *buf, size_t *nbytes, H5R_ref_priv_t *ref)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, FAIL, "Buffer size is too small")
 
     /* Set new reference */
-    ref->type = (int8_t)((H5R_type_t)*p++);
+    ref->type = (H5R_type_t)*p++;
     if(ref->type <= H5R_BADTYPE || ref->type >= H5R_MAXTYPE)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference type")
 
diff --git a/src/H5SMcache.c b/src/H5SMcache.c
index ee28fa4..49ce2b4 100644
--- a/src/H5SMcache.c
+++ b/src/H5SMcache.c
@@ -397,7 +397,7 @@ H5SM__cache_table_serialize(const H5F_t *f, void *_image, size_t len,
         *image++ = H5SM_LIST_VERSION;
 
         /* Is message index a list or a B-tree? */
-        *image++ = (uint8_t)table->indexes[u].index_type;
+        *image++ = table->indexes[u].index_type;
 
         /* Type of messages in the index */
         UINT16ENCODE(image, table->indexes[u].mesg_types);
diff --git a/src/H5SMmessage.c b/src/H5SMmessage.c
index e085204..0cca6bb 100644
--- a/src/H5SMmessage.c
+++ b/src/H5SMmessage.c
@@ -298,7 +298,7 @@ H5SM__message_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
     /* Sanity check */
     HDassert(ctx);
 
-    *raw++ = (uint8_t)message->location;
+    *raw++ = message->location;
     UINT32ENCODE(raw, message->hash);
 
     if(message->location == H5SM_IN_HEAP) {
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index cfcc5ac..9feb8de 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -3674,7 +3674,7 @@ H5S__hyper_get_version_enc_size(const H5S_t *space, hsize_t block_count, uint32_
                 /* Determine the encoding size */
                 enc2 = H5S__hyper_get_enc_size_real(max2);
 
-                *enc_size = (uint8_t)MAX(enc1, enc2);
+                *enc_size = MAX(enc1, enc2);
             } /* end if */
             else {
                 hsize_t max_size = block_count;
diff --git a/src/H5Tbit.c b/src/H5Tbit.c
index c6c1777..df6d2c3 100644
--- a/src/H5Tbit.c
+++ b/src/H5Tbit.c
@@ -363,7 +363,7 @@ H5T__bit_set(uint8_t *buf, size_t offset, size_t size, hbool_t value)
 
     /* The middle bytes */
     while (size >= 8) {
-        buf[idx++] = (uint8_t)(value ? 0xff : 0x00);
+        buf[idx++] = value ? 0xff : 0x00;
         size -= 8;
     }
 
@@ -532,7 +532,7 @@ H5T__bit_inc(uint8_t *buf, size_t start, size_t size)
         acc = buf[idx];
         acc++;
         carry = acc & 0x100;
-        buf[idx] = (uint8_t)(acc & 0xff);
+        buf[idx] = acc & 0xff;
         idx++;
         size -= 8;
     }
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index 50ac947..6d07513 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -324,7 +324,7 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
 
 #define H5Z_XFORM_DO_OP5(TYPE, SIZE)                                                               \
 {                                                                                                  \
-    TYPE val = (TYPE)((tree->type == H5Z_XFORM_INTEGER) ? (TYPE)tree->value.int_val : (TYPE)tree->value.float_val); \
+    TYPE val = ((tree->type == H5Z_XFORM_INTEGER) ? (TYPE)tree->value.int_val : (TYPE)tree->value.float_val); \
     H5VM_array_fill(array, &val, sizeof(TYPE), (SIZE));                                             \
 }
 
diff --git a/test/dsets.c b/test/dsets.c
index b32c5b6..21d5431 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -5293,7 +5293,7 @@ test_types(hid_t file)
     (space=H5Screate_simple(1, &nelmts, NULL)) < 0 ||
     (dset=H5Dcreate2(grp, "bitfield_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
     goto error;
-    for(i=0; i<sizeof buf; i++) buf[i] = (unsigned char)(0xff ^ i);
+    for(i=0; i<sizeof buf; i++) buf[i] = (unsigned char)0xff ^ (unsigned char)i;
     if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
     goto error;
 
@@ -5307,7 +5307,7 @@ test_types(hid_t file)
     (space=H5Screate_simple(1, &nelmts, NULL)) < 0 ||
     (dset=H5Dcreate2(grp, "bitfield_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
     goto error;
-    for(i=0; i<sizeof buf; i++) buf[i] = (unsigned char)(0xff ^ i);
+    for(i=0; i<sizeof buf; i++) buf[i] = (unsigned char)0xff ^ (unsigned char)i;
     if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
     goto error;
     if(H5Sclose(space) < 0) goto error;
@@ -5322,7 +5322,7 @@ test_types(hid_t file)
             (dset = H5Dcreate2(grp, "opaque_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
     goto error;
     for(i = 0; i < sizeof buf; i++)
-        buf[i] = (unsigned char)(0xff ^ i);
+        buf[i] = (unsigned char)0xff ^ (unsigned char)i;
     if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) goto error;
     if(H5Sclose(space) < 0) goto error;
     if(H5Tclose(type) < 0) goto error;
@@ -5336,7 +5336,7 @@ test_types(hid_t file)
             (dset = H5Dcreate2(grp, "opaque_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
     goto error;
     for(i = 0; i < sizeof buf; i++)
-        buf[i] = (unsigned char)(0xff ^ i);
+        buf[i] = (unsigned char)0xff ^ (unsigned char)i;
     if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) goto error;
     if(H5Sclose(space) < 0) goto error;
     if(H5Tclose(type) < 0) goto error;
diff --git a/test/dtypes.c b/test/dtypes.c
index 5238306..689336f 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -1216,8 +1216,8 @@ test_compound_6(void)
     orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st));
     for (i=0; i<(int)nelmts; i++) {
         s_ptr = ((struct st*)((void *)orig)) + i;
-        s_ptr->b    = (short)((i*8+1) & 0x7fff);
-        s_ptr->d    = (short)((i*8+6) & 0x7fff);
+        s_ptr->b    = (i*8+1) & 0x7fff;
+        s_ptr->d    = (i*8+6) & 0x7fff;
     }
     HDmemcpy(buf, orig, nelmts*sizeof(struct st));
 
diff --git a/test/ntypes.c b/test/ntypes.c
index f1d2449..34558f5 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -2484,7 +2484,7 @@ test_opaque_dtype(hid_t file)
         TEST_ERROR;
 
     for(i = 0; i < sizeof(wbuf); i++)
-        wbuf[i] = (unsigned char)(0xff ^ i);
+        wbuf[i] = (unsigned char)0xff ^ (unsigned char)i;
 
     if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0) TEST_ERROR;
     if(H5Sclose(space) < 0) TEST_ERROR;
diff --git a/test/th5s.c b/test/th5s.c
index ed02c16..1a4456a 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -1583,7 +1583,7 @@ test_h5s_encode1(void)
 ****************************************************************/
 static herr_t
 test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid, 
-    uint32_t expected_version, uint32_t expected_enc_size, hbool_t expected_to_fail)
+    uint32_t expected_version, uint8_t expected_enc_size, hbool_t expected_to_fail)
 {
     char *buf = NULL;       /* Pointer to the encoded buffer */
     size_t buf_size;        /* Size of the encoded buffer */
@@ -1697,7 +1697,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high)
     unsigned unlim;                    /* H5S_UNLIMITED setting or not */
     herr_t ret;                        /* Generic return value */
     uint32_t expected_version = 0;     /* Expected version for selection info */
-    uint32_t expected_enc_size = 0;    /* Expected encoded size for selection info */
+    uint8_t expected_enc_size = 0;     /* Expected encoded size for selection info */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Dataspace encoding of regular hyperslabs\n"));
@@ -1912,7 +1912,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high)
     for(config = CONFIG_8; config <= CONFIG_32; config++) {
         hbool_t expected_to_fail = FALSE;   /* Whether H5Sencode2 is expected to fail */
         uint32_t expected_version = 0;      /* Expected version for selection info */
-        uint32_t expected_enc_size = 0;     /* Expected encoded size for selection info */
+        uint8_t expected_enc_size = 0;      /* Expected encoded size for selection info */
 
         start = 0;
         count = 2;
diff --git a/test/tsohm.c b/test/tsohm.c
index 0fc273b..a064940 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -3346,7 +3346,7 @@ verify_dataset_extension(hid_t fcpl_id, hbool_t close_reopen)
     hid_t orig_space_id = -1;
     hid_t space1_id, space2_id, space3_id;
     hid_t dcpl_id = -1;
-    hid_t dset1_id, dset2_id = -1, dset3_id = -1;
+    hid_t dset1_id, dset2_id, dset3_id;
     hsize_t dims1[] = {1, 2};
     hsize_t max_dims[] = {H5S_UNLIMITED, 2};
     hsize_t dims2[] = {5, 2};
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 832a47f..6c91a41 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -3806,7 +3806,7 @@ test_no_collective_cause_mode_filter(int selection_mode)
     uint32_t no_collective_cause_global_expected = 0;
 
     const char  * filename;
-    const char  * test_name = "I/O";
+    const char  * test_name;
     hbool_t     is_chunked=1;
     int         mpi_size = -1;
     int         mpi_rank = -1;
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index 2bb2336..890a918 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -303,7 +303,7 @@ static int test_mpio_gb_file(char *filename) {
                             mpi_rank, mpi_off, mpi_off);
                 /* set data to some trivial pattern for easy verification */
                 for (j = 0; j < MB; j++)
-                    *(buf + j) = (char)(i * mpi_size + mpi_rank);
+                    *(buf + j) = i * mpi_size + mpi_rank;
                 if (VERBOSE_MED)
                     HDfprintf(stdout,
                             "proc %d: writing %d bytes at offset %lld\n",
@@ -351,7 +351,7 @@ static int test_mpio_gb_file(char *filename) {
                 mrc = MPI_File_read_at(fh, mpi_off, buf, MB, MPI_BYTE,
                         &mpi_stat);
                 INFO((mrc == MPI_SUCCESS), "GB size file read");
-                expected = (char)(i * mpi_size + (mpi_size - mpi_rank - 1));
+                expected = i * mpi_size + (mpi_size - mpi_rank - 1);
                 vrfyerrs = 0;
                 for (j = 0; j < MB; j++) {
                     if ((*(buf + j) != expected)
@@ -526,7 +526,7 @@ static int test_mpio_1wMr(char *filename, int special_request) {
     * ==================================================*/
     irank = 0;
     for (i = 0; i < DIMSIZE; i++)
-        writedata[i] = (unsigned char)(irank * DIMSIZE + i);
+        writedata[i] = irank * DIMSIZE + i;
     mpi_off = irank * DIMSIZE;
 
     /* Only one process writes */
@@ -597,7 +597,7 @@ static int test_mpio_1wMr(char *filename, int special_request) {
         return 1;
     };
     for (i = 0; i < DIMSIZE; i++) {
-        expect_val = (unsigned char)(irank * DIMSIZE + i);
+        expect_val = irank * DIMSIZE + i;
         if (readdata[i] != expect_val) {
             PRINTID;
             HDprintf("read data[%d:%d] got %02x, expect %02x\n", irank, i,
@@ -697,7 +697,7 @@ static int test_mpio_derived_dtype(char *filename) {
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
     retcode = 0;
     for (i = 0; i < 3; i++)
-        buf[i] = (char)(i + 1);
+        buf[i] = i + 1;
 
     if ((mpi_err = MPI_File_open(MPI_COMM_WORLD, filename,
             MPI_MODE_RDWR | MPI_MODE_CREATE, MPI_INFO_NULL, &fh))
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 5acdde8..c2153e5 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -908,14 +908,8 @@ h5diff(const char *fname1,
              parallel_print("---------------------------------------\n");
              for(u = 0; u < match_list->nobjs; u++) {
                  char c1, c2;
-                 if (match_list->objs[u].flags[0])
-                     c1 = 'x';
-                 else
-                     c1 = ' ';
-                 if (match_list->objs[u].flags[1])
-                     c2 = 'x';
-                 else
-                     c2 = ' ';
+                 c1 = (match_list->objs[u].flags[0]) ? 'x' : ' ';
+                 c2 = (match_list->objs[u].flags[1]) ? 'x' : ' ';
                  parallel_print("%5c %6c    %-15s\n", c1, c2, match_list->objs[u].name);
              } /* end for */
              parallel_print ("\n");
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index a648be1..351e6ab 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -274,14 +274,8 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
         parallel_print(" --------------------------------------\n");
         for(i = 0; i < (unsigned int) table_lp->nattrs; i++) {
             char c1, c2;
-            if (table_lp->attrs[i].exist[0])
-                c1 = 'x';
-            else
-                c1 = ' ';
-            if (table_lp->attrs[i].exist[1])
-                c2 = 'x';
-            else
-                c2 = ' ';
+            c1 = (table_lp->attrs[i].exist[0]) ? 'x' : ' ';
+            c2 = (table_lp->attrs[i].exist[1]) ? 'x' : ' ';
             parallel_print("%5c %6c    %-15s\n", c1, c2, table_lp->attrs[i].name);
         } /* end for */
     }
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index 40b812f..1eef5ab 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -4709,12 +4709,12 @@ static int process(struct Options *opt)
 
 uint16_t swap_uint16( uint16_t val)
 {
-    return (uint16_t)((val << 8) | (val >> 8));
+    return (val << 8) | (val >> 8);
 }
 
 int16_t swap_int16(int16_t val)
 {
-    return (uint16_t)((val << 8) | ((val >> 8) & 0xFF));
+    return (val << 8) | ((val >> 8) & 0xFF);
 }
 
 uint32_t swap_uint32(uint32_t val)
diff --git a/tools/test/h5diff/dynlib_diff.c b/tools/test/h5diff/dynlib_diff.c
index 4f2d435..571452e 100644
--- a/tools/test/h5diff/dynlib_diff.c
+++ b/tools/test/h5diff/dynlib_diff.c
@@ -69,7 +69,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Subtract the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = (char)(temp - MULTIPLIER);
+            *int_ptr = temp - MULTIPLIER;
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
@@ -78,7 +78,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Add the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = (char)(temp + MULTIPLIER);
+            *int_ptr = temp + MULTIPLIER;
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
diff --git a/tools/test/h5dump/dynlib_dump.c b/tools/test/h5dump/dynlib_dump.c
index 4f2d435..571452e 100644
--- a/tools/test/h5dump/dynlib_dump.c
+++ b/tools/test/h5dump/dynlib_dump.c
@@ -69,7 +69,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Subtract the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = (char)(temp - MULTIPLIER);
+            *int_ptr = temp - MULTIPLIER;
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
@@ -78,7 +78,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Add the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = (char)(temp + MULTIPLIER);
+            *int_ptr = temp + MULTIPLIER;
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 85fe754..ad70770 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -2565,7 +2565,7 @@ static void gent_bitfields(void)
         goto error;
 
     for(i = 0; i < sizeof buf; i++)
-        buf[i] = (unsigned char)(0xff ^ i);
+        buf[i] = (unsigned char)0xff ^ (unsigned char)i;
     if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
     if(H5Sclose(space) < 0) goto error;
@@ -2579,7 +2579,7 @@ static void gent_bitfields(void)
             (dset = H5Dcreate2(grp, "bitfield_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto error;
     for(i = 0; i < sizeof buf; i++)
-        buf[i] = (unsigned char)(0xff ^ i);
+        buf[i] = (unsigned char)0xff ^ (unsigned char)i;
     if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
     if(H5Sclose(space) < 0) goto error;
@@ -9814,7 +9814,7 @@ static void gent_bitnopaquefields(void)
             if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                 if ((dset = H5Dcreate2(grp, "bitfield_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     for (i = 0; i < nelmts; i++) {
-                        buf[i] = (uint8_t)(0xff ^ i);
+                        buf[i] = (uint8_t)0xff ^ (uint8_t)i;
                     }
                     H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
                     H5Dclose(dset);
@@ -9829,7 +9829,7 @@ static void gent_bitnopaquefields(void)
             if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                 if ((dset = H5Dcreate2(grp, "bitfield_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     for (i = 0; i < nelmts; i++) {
-                        buf2[i] = (uint16_t)(0xffff ^ (i * 16));
+                        buf2[i] = (uint16_t)0xffff ^ (uint16_t)(i * 16);
                     }
                     H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2);
                     H5Dclose(dset);
@@ -9879,7 +9879,7 @@ static void gent_bitnopaquefields(void)
                 if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                     if ((dset = H5Dcreate2(grp, "opaque_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                         for(i = 0; i < nelmts; i++)
-                            buf[i] = (uint8_t)(0xff ^ i);
+                            buf[i] = (uint8_t)0xff ^ (uint8_t)i;
                         H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
                         H5Dclose(dset);
                     }
@@ -9895,7 +9895,7 @@ static void gent_bitnopaquefields(void)
                 if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                     if ((dset = H5Dcreate2(grp, "opaque_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                         for(i = 0; i < nelmts; i++)
-                            buf2[i] = (uint16_t)(0xffff ^ (i * 16));
+                            buf2[i] = (uint16_t)0xffff ^ (uint16_t)(i * 16);
 
                         H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2);
                         H5Dclose(dset);
@@ -9918,8 +9918,8 @@ static void gent_bitnopaquefields(void)
             if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                 if ((dset = H5Dcreate2(grp, "compound_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     for(i = 0; i < nelmts; i++) {
-                        buf5[i].a = (uint8_t)(0xff ^ i);
-                        buf5[i].b = (uint16_t)(0xffff ^ (i * 16));
+                        buf5[i].a = (uint8_t)0xff ^ (uint8_t)i;
+                        buf5[i].b = (uint16_t)0xffff ^ (uint16_t)(i * 16);
                         buf5[i].c = (uint32_t)0xffffffff ^ (uint32_t)(i * 32);
                         buf5[i].d = (uint64_t)0xffffffffffffffff ^ (uint64_t)(i * 64);
                     }
@@ -10488,7 +10488,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Subtract the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = (char)(temp - MULTIPLIER);
+            *int_ptr = temp - MULTIPLIER;
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
@@ -10497,7 +10497,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Add the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = (char)(temp + MULTIPLIER);
+            *int_ptr = temp + MULTIPLIER;
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
diff --git a/tools/test/h5ls/dynlib_ls.c b/tools/test/h5ls/dynlib_ls.c
index 4f2d435..571452e 100644
--- a/tools/test/h5ls/dynlib_ls.c
+++ b/tools/test/h5ls/dynlib_ls.c
@@ -69,7 +69,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Subtract the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = (char)(temp - MULTIPLIER);
+            *int_ptr = temp - MULTIPLIER;
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
@@ -78,7 +78,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
         /* Add the original value with MULTIPLIER */
         while(buf_left > 0) {
             char temp = *int_ptr;
-            *int_ptr = (char)(temp + MULTIPLIER);
+            *int_ptr = temp + MULTIPLIER;
             int_ptr++;
             buf_left -= sizeof(*int_ptr);
         } /* end while */
diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c
index f476a16..aaac285 100644
--- a/tools/test/h5repack/h5repackgentest.c
+++ b/tools/test/h5repack/h5repackgentest.c
@@ -266,7 +266,7 @@ generate_uint8be(hbool_t external) {
     for (i = 0, n = 0; i < dims[0]; i++) {
         for (j = 0; j < dims[1]; j++) {
             for (k = 0; k < dims[2]; k++, n++) {
-                wdata[n] = (uint8_t)(n * ((n & 1) ? (-1) : (1)));
+                wdata[n] = n * ((n & 1) ? (-1) : (1));
             }
         }
     }
@@ -296,7 +296,7 @@ generate_f32le(hbool_t external) {
     /* Generate values */
     for (i = 0, k = 0, n = 0; i < dims[0]; i++) {
         for (j = 0; j < dims[1]; j++, k++, n++) {
-            wdata[k] = (float)(n * 801.1 * ((k % 5 == 1) ? (-1) : (1)));
+            wdata[k] = n * 801.1 * ((k % 5 == 1) ? (-1) : (1));
         }
     }
 
diff --git a/tools/test/perform/pio_engine.c b/tools/test/perform/pio_engine.c
index 5d8474b..77c04ab 100644
--- a/tools/test/perform/pio_engine.c
+++ b/tools/test/perform/pio_engine.c
@@ -208,7 +208,7 @@ do_pio(parameters param)
         bsize = buf_size;   /* Actual buffer size       */
     }
     else {
-        snbytes = (off_t)sqrt((double)nbytes);  /* General dataset size     */
+        snbytes = (off_t)sqrt(nbytes);  /* General dataset size     */
         bsize = buf_size * blk_size;    /* Actual buffer size       */
     }
 
@@ -601,7 +601,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
         /* nbytes is always the number of bytes per dataset (1D or 2D). If the
            dataspace is 2D, snbytes is the size of a side of the dataset square.
          */
-        snbytes = (off_t)sqrt((double)nbytes);
+        snbytes = (off_t)sqrt(nbytes);
 
         /* Contiguous Pattern: */
         if (!parms->interleaved) {
@@ -1577,7 +1577,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
         /* nbytes is always the number of bytes per dataset (1D or 2D). If the
            dataspace is 2D, snbytes is the size of a side of the 'dataset square'.
          */
-        snbytes = (off_t)sqrt((double)nbytes);
+        snbytes = (off_t)sqrt(nbytes);
 
         bsize = buf_size * blk_size;
 
diff --git a/tools/test/perform/pio_perf.c b/tools/test/perform/pio_perf.c
index 5977731..9f4d116 100644
--- a/tools/test/perform/pio_perf.c
+++ b/tools/test/perform/pio_perf.c
@@ -1155,9 +1155,9 @@ report_parameters(struct options *opts)
     recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "\n");
 
     HDfprintf(output, "rank %d: File size=", rank);
-    recover_size_and_print((long long)(pow((double)(opts->num_bpp * opts->min_num_procs),2)
+    recover_size_and_print((long long)(pow(opts->num_bpp * opts->min_num_procs,2)
             * opts->num_dsets), ":");
-    recover_size_and_print((long long)(pow((double)(opts->num_bpp * opts->max_num_procs),2)
+    recover_size_and_print((long long)(pow(opts->num_bpp * opts->max_num_procs,2)
             * opts->num_dsets), "\n");
 
     HDfprintf(output, "rank %d: Transfer buffer size=", rank);