Partial merge issue #642 develop branch PRs to Hdf5 1 10 (#718)

* Revert addition of & to 2 parameters in DSetCreatPropList::setVirtual to
maintain binary compatibility.

* Fix H5Eget_auto2/H5Eauto_is_v2 to not clear error stack (#625)

* Removes gratuitous (double)x.yF casts (#632)

* Committing clang-format changes

* Removes gratuitous (double)x.yF casts

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Cleans up a const warning left over from previous constification (#633)

* Committing clang-format changes

* Adds consts to a few global variables

* Cleans up a const warning left over from previous constification

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Purges UFAIL from the library (#637)

* Committing clang-format changes

* Purges UFAIL from the library

* H5HL_insert change requested in PR

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Bmr dev hdffv 11223 (#640)

* Fixed HDFFV-11223 (CVE-2018-14460)

Description
    - Added checks against buffer size to prevent segfault, in case of data
      corruption, for sdim->size and sdim->max.
    - Renamed data files in an existing test to shorten their length
      as agreed with other developers previously.
Platforms tested:
    Linux/64 (jelly)

* Committing clang-format changes

* Updated for test files

* Updated for HDFFV-11223

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Committing clang-format changes

* Restore "error:" in line 2666.

* Revert "Fix H5Eget_auto2/H5Eauto_is_v2 to not clear error stack (#625)"

This reverts commit 426b50484841118cf633fd6147302a63a30fd746.

Co-authored-by: jhendersonHDF <jhenderson@hdfgroup.org>
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

18 files changed, 186 insertions, 184 deletions

diff --git a/test/cache.c b/test/cache.c
index 895d301..85cc417 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -26482,7 +26482,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged)
             pass         = FALSE;
             failure_mssg = "H5C_get_cache_hit_rate failed.\n";
         }
-        else if (!H5_DBL_ABS_EQUAL(hit_rate, (double)0.0f)) { /* i.e. hit_rate != 0.0 */
+        else if (!H5_DBL_ABS_EQUAL(hit_rate, 0.0)) { /* i.e. hit_rate != 0.0 */
 
             pass         = FALSE;
             failure_mssg = "H5C_get_cache_hit_rate returned unexpected hit rate 1.\n";
@@ -26513,7 +26513,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged)
             pass         = FALSE;
             failure_mssg = "H5C_get_cache_hit_rate failed.\n";
         }
-        else if (!H5_DBL_ABS_EQUAL(hit_rate, (double)0.0f)) { /* i.e. hit_rate != 0.0 */
+        else if (!H5_DBL_ABS_EQUAL(hit_rate, 0.0)) { /* i.e. hit_rate != 0.0 */
 
             pass         = FALSE;
             failure_mssg = "H5C_get_cache_hit_rate returned unexpected hit rate 2.\n";
@@ -26554,7 +26554,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged)
             pass         = FALSE;
             failure_mssg = "H5C_get_cache_hit_rate failed.\n";
         }
-        else if (!H5_DBL_ABS_EQUAL(hit_rate, (double)0.5f)) { /* i.e. hit_rate != 0.5 */
+        else if (!H5_DBL_ABS_EQUAL(hit_rate, 0.5)) { /* i.e. hit_rate != 0.5 */
 
             pass         = FALSE;
             failure_mssg = "H5C_get_cache_hit_rate returned unexpected hit rate 3.\n";
@@ -26627,7 +26627,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged)
             pass         = FALSE;
             failure_mssg = "H5C_get_cache_hit_rate failed.\n";
         }
-        else if (!H5_DBL_ABS_EQUAL(hit_rate, (double)0.5F)) { /* i.e. hit_rate != 0.5 */
+        else if (!H5_DBL_ABS_EQUAL(hit_rate, 0.5)) { /* i.e. hit_rate != 0.5 */
 
             pass         = FALSE;
             failure_mssg = "H5C_get_cache_hit_rate returned unexpected hit rate 4.\n";
diff --git a/test/cache_api.c b/test/cache_api.c
index 60014c8..de975d2 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -81,27 +81,27 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id)
         /* hbool_t     evictions_enabled      = */ TRUE,
         /* hbool_t     set_initial_size       = */ TRUE,
         /* size_t      initial_size           = */ (1 * 1024 * 1024 + 1),
-        /* double      min_clean_fraction     = */ 0.2f,
+        /* double      min_clean_fraction     = */ 0.2,
         /* size_t      max_size               = */ (16 * 1024 * 1024 + 1),
         /* size_t      min_size               = */ (1 * 1024 * 1024 + 1),
         /* long int    epoch_length           = */ 50001,
         /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
-        /* double      lower_hr_threshold     = */ 0.91f,
-        /* double      increment              = */ 2.1f,
+        /* double      lower_hr_threshold     = */ 0.91,
+        /* double      increment              = */ 2.1,
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (4 * 1024 * 1024 + 1),
         /* enum H5C_cache_flash_incr_mode       */
         /*                    flash_incr_mode = */ H5C_flash_incr__off,
-        /* double      flash_multiple         = */ 2.0f,
-        /* double      flash_threshold        = */ 0.5f,
+        /* double      flash_multiple         = */ 2.0,
+        /* double      flash_threshold        = */ 0.5,
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
-        /* double      upper_hr_threshold     = */ 0.998f,
-        /* double      decrement              = */ 0.91f,
+        /* double      upper_hr_threshold     = */ 0.998,
+        /* double      decrement              = */ 0.91,
         /* hbool_t     apply_max_decrement    = */ TRUE,
         /* size_t      max_decrement          = */ (1 * 1024 * 1024 - 1),
         /* int         epochs_before_eviction = */ 4,
         /* hbool_t     apply_empty_reserve    = */ TRUE,
-        /* double      empty_reserve          = */ 0.05f,
+        /* double      empty_reserve          = */ 0.05,
         /* int         dirty_bytes_threshold  = */ (256 * 1024),
         /* int        metadata_write_strategy = */
         H5AC__DEFAULT_METADATA_WRITE_STRATEGY};
@@ -526,22 +526,22 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
         /* hbool_t     evictions_enabled      = */ TRUE,
         /* hbool_t     set_initial_size       = */ TRUE,
         /* size_t      initial_size           = */ (1 * 1024 * 1024 + 1),
-        /* double      min_clean_fraction     = */ 0.2f,
+        /* double      min_clean_fraction     = */ 0.2,
         /* size_t      max_size               = */ (16 * 1024 * 1024 + 1),
         /* size_t      min_size               = */ (1 * 1024 * 1024 + 1),
         /* long int    epoch_length           = */ 50001,
         /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
-        /* double      lower_hr_threshold     = */ 0.91f,
-        /* double      increment              = */ 2.1f,
+        /* double      lower_hr_threshold     = */ 0.91,
+        /* double      increment              = */ 2.1,
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (4 * 1024 * 1024 + 1),
         /* enum H5C_cache_flash_incr_mode       */
         /*                    flash_incr_mode = */ H5C_flash_incr__off,
-        /* double      flash_multiple         = */ 2.0f,
-        /* double      flash_threshold        = */ 0.5f,
+        /* double      flash_multiple         = */ 2.0,
+        /* double      flash_threshold        = */ 0.5,
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
-        /* double      upper_hr_threshold     = */ 0.998f,
-        /* double      decrement              = */ 0.91f,
+        /* double      upper_hr_threshold     = */ 0.998,
+        /* double      decrement              = */ 0.91,
         /* hbool_t     apply_max_decrement    = */ TRUE,
         /* size_t      max_decrement          = */ (1 * 1024 * 1024 - 1),
         /* int         epochs_before_eviction = */ 4,
@@ -559,27 +559,27 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
         /* hbool_t     evictions_enabled      = */ TRUE,
         /* hbool_t     set_initial_size       = */ TRUE,
         /* size_t      initial_size           = */ (512 * 1024),
-        /* double      min_clean_fraction     = */ 0.1f,
+        /* double      min_clean_fraction     = */ 0.1,
         /* size_t      max_size               = */ (8 * 1024 * 1024),
         /* size_t      min_size               = */ (512 * 1024),
         /* long int    epoch_length           = */ 25000,
         /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
-        /* double      lower_hr_threshold     = */ 0.9f,
-        /* double      increment              = */ 2.0f,
+        /* double      lower_hr_threshold     = */ 0.9,
+        /* double      increment              = */ 2.0,
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (2 * 1024 * 1024),
         /* enum H5C_cache_flash_incr_mode       */
         /*                    flash_incr_mode = */ H5C_flash_incr__off,
-        /* double      flash_multiple         = */ 1.5f,
-        /* double      flash_threshold        = */ 0.4f,
+        /* double      flash_multiple         = */ 1.5,
+        /* double      flash_threshold        = */ 0.4,
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
-        /* double      upper_hr_threshold     = */ 0.9995f,
-        /* double      decrement              = */ 0.95f,
+        /* double      upper_hr_threshold     = */ 0.9995,
+        /* double      decrement              = */ 0.95,
         /* hbool_t     apply_max_decrement    = */ TRUE,
         /* size_t      max_decrement          = */ (512 * 1024),
         /* int         epochs_before_eviction = */ 4,
         /* hbool_t     apply_empty_reserve    = */ TRUE,
-        /* double      empty_reserve          = */ 0.05f,
+        /* double      empty_reserve          = */ 0.05,
         /* int         dirty_bytes_threshold  = */ (256 * 1024),
         /* int        metadata_write_strategy = */
         H5AC__DEFAULT_METADATA_WRITE_STRATEGY};
@@ -592,27 +592,27 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
         /* hbool_t     evictions_enabled      = */ TRUE,
         /* hbool_t     set_initial_size       = */ TRUE,
         /* size_t      initial_size           = */ (1 * 1024 * 1024),
-        /* double      min_clean_fraction     = */ 0.2f,
+        /* double      min_clean_fraction     = */ 0.2,
         /* size_t      max_size               = */ (16 * 1024 * 1024),
         /* size_t      min_size               = */ (1 * 1024 * 1024),
         /* long int    epoch_length           = */ 50000,
         /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__off,
-        /* double      lower_hr_threshold     = */ 0.90f,
-        /* double      increment              = */ 2.0f,
+        /* double      lower_hr_threshold     = */ 0.90,
+        /* double      increment              = */ 2.0,
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
         /* enum H5C_cache_flash_incr_mode       */
         /*                    flash_incr_mode = */ H5C_flash_incr__off,
-        /* double      flash_multiple         = */ 2.1f,
-        /* double      flash_threshold        = */ 0.6f,
+        /* double      flash_multiple         = */ 2.1,
+        /* double      flash_threshold        = */ 0.6,
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
-        /* double      upper_hr_threshold     = */ 0.999f,
-        /* double      decrement              = */ 0.9f,
+        /* double      upper_hr_threshold     = */ 0.999,
+        /* double      decrement              = */ 0.9,
         /* hbool_t     apply_max_decrement    = */ FALSE,
         /* size_t      max_decrement          = */ (1 * 1024 * 1024 - 1),
         /* int         epochs_before_eviction = */ 3,
         /* hbool_t     apply_empty_reserve    = */ FALSE,
-        /* double      empty_reserve          = */ 0.05f,
+        /* double      empty_reserve          = */ 0.05,
         /* int         dirty_bytes_threshold  = */ (256 * 1024),
         /* int        metadata_write_strategy = */
         H5AC__DEFAULT_METADATA_WRITE_STRATEGY};
@@ -625,28 +625,28 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
         /* hbool_t     evictions_enabled      = */ TRUE,
         /* hbool_t     set_initial_size       = */ TRUE,
         /* size_t      initial_size           = */ (1 * 1024 * 1024),
-        /* double      min_clean_fraction     = */ 0.15f,
+        /* double      min_clean_fraction     = */ 0.15,
         /* size_t      max_size               = */ (20 * 1024 * 1024),
         /* size_t      min_size               = */ (1 * 1024 * 1024),
         /* long int    epoch_length           = */ 75000,
         /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
-        /* double      lower_hr_threshold     = */ 0.9f,
-        /* double      increment              = */ 2.0f,
+        /* double      lower_hr_threshold     = */ 0.9,
+        /* double      increment              = */ 2.0,
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (2 * 1024 * 1024),
         /* enum H5C_cache_flash_incr_mode       */
         /*                    flash_incr_mode = */ H5C_flash_incr__off,
-        /* double      flash_multiple         = */ 1.1f,
-        /* double      flash_threshold        = */ 0.3f,
+        /* double      flash_multiple         = */ 1.1,
+        /* double      flash_threshold        = */ 0.3,
         /* enum H5C_cache_decr_mode decr_mode = */
         H5C_decr__age_out_with_threshold,
-        /* double      upper_hr_threshold     = */ 0.999f,
-        /* double      decrement              = */ 0.9f,
+        /* double      upper_hr_threshold     = */ 0.999,
+        /* double      decrement              = */ 0.9,
         /* hbool_t     apply_max_decrement    = */ TRUE,
         /* size_t      max_decrement          = */ (1 * 1024 * 1024),
         /* int         epochs_before_eviction = */ 3,
         /* hbool_t     apply_empty_reserve    = */ TRUE,
-        /* double      empty_reserve          = */ 0.1f,
+        /* double      empty_reserve          = */ 0.1,
         /* int         dirty_bytes_threshold  = */ (256 * 1024),
         /* int        metadata_write_strategy = */
         H5AC__DEFAULT_METADATA_WRITE_STRATEGY};
@@ -755,7 +755,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
             pass         = FALSE;
             failure_mssg = "H5Fget_mdc_hit_rate() failed 1.\n";
         }
-        else if (!H5_DBL_ABS_EQUAL(hit_rate, (double)0.0f)) {
+        else if (!H5_DBL_ABS_EQUAL(hit_rate, 0.0)) {
 
             pass         = FALSE;
             failure_mssg = "H5Fget_mdc_hit_rate() returned unexpected hit rate.\n";
@@ -857,7 +857,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
     hbool_t             valid_chunk;
     hbool_t             dump_hit_rate   = FALSE;
     int64_t             min_accesses    = 1000;
-    double              min_hit_rate    = 0.90f;
+    double              min_hit_rate    = 0.90;
     hbool_t             dump_cache_size = FALSE;
     hid_t               file_id         = -1;
     hid_t               dataspace_id    = -1;
@@ -883,27 +883,27 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
         /* hbool_t     evictions_enabled      = */ TRUE,
         /* hbool_t     set_initial_size       = */ TRUE,
         /* size_t      initial_size           = */ 500000,
-        /* double      min_clean_fraction     = */ 0.1f,
+        /* double      min_clean_fraction     = */ 0.1,
         /* size_t      max_size               = */ 16000000,
         /* size_t      min_size               = */ 250000,
         /* long int    epoch_length           = */ 50000,
         /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__off,
-        /* double      lower_hr_threshold     = */ 0.95f,
-        /* double      increment              = */ 2.0f,
+        /* double      lower_hr_threshold     = */ 0.95,
+        /* double      increment              = */ 2.0,
         /* hbool_t     apply_max_increment    = */ FALSE,
         /* size_t      max_increment          = */ 4000000,
         /* enum H5C_cache_flash_incr_mode       */
         /*                    flash_incr_mode = */ H5C_flash_incr__off,
-        /* double      flash_multiple         = */ 2.0f,
-        /* double      flash_threshold        = */ 0.5f,
+        /* double      flash_multiple         = */ 2.0,
+        /* double      flash_threshold        = */ 0.5,
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
-        /* double      upper_hr_threshold     = */ 0.999f,
-        /* double      decrement              = */ 0.9f,
+        /* double      upper_hr_threshold     = */ 0.999,
+        /* double      decrement              = */ 0.9,
         /* hbool_t     apply_max_decrement    = */ FALSE,
         /* size_t      max_decrement          = */ 1000000,
         /* int         epochs_before_eviction = */ 2,
         /* hbool_t     apply_empty_reserve    = */ TRUE,
-        /* double      empty_reserve          = */ 0.05f,
+        /* double      empty_reserve          = */ 0.05,
         /* int         dirty_bytes_threshold  = */ (256 * 1024),
         /* int        metadata_write_strategy = */
         H5AC__DEFAULT_METADATA_WRITE_STRATEGY};
@@ -916,27 +916,27 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
         /* hbool_t     evictions_enabled      = */ TRUE,
         /* hbool_t     set_initial_size       = */ TRUE,
         /* size_t      initial_size           = */ 12000000,
-        /* double      min_clean_fraction     = */ 0.1f,
+        /* double      min_clean_fraction     = */ 0.1,
         /* size_t      max_size               = */ 16000000,
         /* size_t      min_size               = */ 250000,
         /* long int    epoch_length           = */ 50000,
         /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__off,
-        /* double      lower_hr_threshold     = */ 0.95f,
-        /* double      increment              = */ 2.0f,
+        /* double      lower_hr_threshold     = */ 0.95,
+        /* double      increment              = */ 2.0,
         /* hbool_t     apply_max_increment    = */ FALSE,
         /* size_t      max_increment          = */ 4000000,
         /* enum H5C_cache_flash_incr_mode       */
         /*                    flash_incr_mode = */ H5C_flash_incr__off,
-        /* double      flash_multiple         = */ 2.0f,
-        /* double      flash_threshold        = */ 0.5f,
+        /* double      flash_multiple         = */ 2.0,
+        /* double      flash_threshold        = */ 0.5,
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
-        /* double      upper_hr_threshold     = */ 0.999f,
-        /* double      decrement              = */ 0.9f,
+        /* double      upper_hr_threshold     = */ 0.999,
+        /* double      decrement              = */ 0.9,
         /* hbool_t     apply_max_decrement    = */ FALSE,
         /* size_t      max_decrement          = */ 1000000,
         /* int         epochs_before_eviction = */ 2,
         /* hbool_t     apply_empty_reserve    = */ TRUE,
-        /* double      empty_reserve          = */ 0.05f,
+        /* double      empty_reserve          = */ 0.05,
         /* int         dirty_bytes_threshold  = */ (256 * 1024),
         /* int        metadata_write_strategy = */
         H5AC__DEFAULT_METADATA_WRITE_STRATEGY};
@@ -949,27 +949,27 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
         /* hbool_t     evictions_enabled      = */ TRUE,
         /* hbool_t     set_initial_size       = */ TRUE,
         /* size_t      initial_size           = */ 2000000,
-        /* double      min_clean_fraction     = */ 0.1f,
+        /* double      min_clean_fraction     = */ 0.1,
         /* size_t      max_size               = */ 16000000,
         /* size_t      min_size               = */ 250000,
         /* long int    epoch_length           = */ 50000,
         /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__off,
-        /* double      lower_hr_threshold     = */ 0.95f,
-        /* double      increment              = */ 2.0f,
+        /* double      lower_hr_threshold     = */ 0.95,
+        /* double      increment              = */ 2.0,
         /* hbool_t     apply_max_increment    = */ FALSE,
         /* size_t      max_increment          = */ 4000000,
         /* enum H5C_cache_flash_incr_mode       */
         /*                    flash_incr_mode = */ H5C_flash_incr__off,
-        /* double      flash_multiple         = */ 2.0f,
-        /* double      flash_threshold        = */ 0.5f,
+        /* double      flash_multiple         = */ 2.0,
+        /* double      flash_threshold        = */ 0.5,
         /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
-        /* double      upper_hr_threshold     = */ 0.999f,
-        /* double      decrement              = */ 0.9f,
+        /* double      upper_hr_threshold     = */ 0.999,
+        /* double      decrement              = */ 0.9,
         /* hbool_t     apply_max_decrement    = */ FALSE,
         /* size_t      max_decrement          = */ 1000000,
         /* int         epochs_before_eviction = */ 2,
         /* hbool_t     apply_empty_reserve    = */ TRUE,
-        /* double      empty_reserve          = */ 0.05f,
+        /* double      empty_reserve          = */ 0.05,
         /* int         dirty_bytes_threshold  = */ (256 * 1024),
         /* int        metadata_write_strategy = */
         H5AC__DEFAULT_METADATA_WRITE_STRATEGY};
@@ -1517,26 +1517,26 @@ init_invalid_configs(void)
         configs[i].evictions_enabled       = TRUE;
         configs[i].set_initial_size        = TRUE;
         configs[i].initial_size            = (1 * 1024 * 1024);
-        configs[i].min_clean_fraction      = 0.25F;
+        configs[i].min_clean_fraction      = 0.25;
         configs[i].max_size                = (16 * 1024 * 1024);
         configs[i].min_size                = (1 * 1024 * 1024);
         configs[i].epoch_length            = 50000;
         configs[i].incr_mode               = H5C_incr__threshold;
-        configs[i].lower_hr_threshold      = 0.9F;
-        configs[i].increment               = 2.0F;
+        configs[i].lower_hr_threshold      = 0.9;
+        configs[i].increment               = 2.0;
         configs[i].apply_max_increment     = TRUE;
         configs[i].max_increment           = (4 * 1024 * 1024);
         configs[i].flash_incr_mode         = H5C_flash_incr__off;
-        configs[i].flash_multiple          = 2.0F;
-        configs[i].flash_threshold         = 0.5F;
+        configs[i].flash_multiple          = 2.0;
+        configs[i].flash_threshold         = 0.5;
         configs[i].decr_mode               = H5C_decr__age_out_with_threshold;
-        configs[i].upper_hr_threshold      = 0.999F;
-        configs[i].decrement               = 0.9F;
+        configs[i].upper_hr_threshold      = 0.999;
+        configs[i].decrement               = 0.9;
         configs[i].apply_max_decrement     = TRUE;
         configs[i].max_decrement           = (1 * 1024 * 1024);
         configs[i].epochs_before_eviction  = 3;
         configs[i].apply_empty_reserve     = TRUE;
-        configs[i].empty_reserve           = 0.1F;
+        configs[i].empty_reserve           = 0.1;
         configs[i].dirty_bytes_threshold   = (256 * 1024);
         configs[i].metadata_write_strategy = H5AC__DEFAULT_METADATA_WRITE_STRATEGY;
     }
@@ -1567,10 +1567,10 @@ init_invalid_configs(void)
     configs[6].initial_size = (1 * 1024 * 1024 - 1);
 
     /* 7 -- min_clean_fraction too big */
-    configs[7].min_clean_fraction = 1.000001f;
+    configs[7].min_clean_fraction = 1.000001;
 
     /* 8 -- min_clean_fraction too small */
-    configs[8].min_clean_fraction = -0.00000001f;
+    configs[8].min_clean_fraction = -0.00000001;
 
     /* 9 -- epoch_length too small */
     configs[9].epoch_length = H5C__MIN_AR_EPOCH_LENGTH - 1;
@@ -1582,10 +1582,10 @@ init_invalid_configs(void)
     configs[11].incr_mode = (enum H5C_cache_incr_mode) - 1;
 
     /* 12 -- lower_hr_threshold too small */
-    configs[12].lower_hr_threshold = -0.000001f;
+    configs[12].lower_hr_threshold = -0.000001;
 
     /* 13 -- lower_hr_threshold too big */
-    configs[13].lower_hr_threshold = 1.00000001f;
+    configs[13].lower_hr_threshold = 1.00000001;
 
     /* 14 -- increment too small */
     configs[14].increment = 0.999999999999;
@@ -1595,29 +1595,29 @@ init_invalid_configs(void)
 
     /* 16 -- flash_multiple too small */
     configs[16].flash_incr_mode = H5C_flash_incr__add_space;
-    configs[16].flash_multiple  = 0.09f;
+    configs[16].flash_multiple  = 0.09;
 
     /* 17 -- flash_multiple too big */
     configs[17].flash_incr_mode = H5C_flash_incr__add_space;
-    configs[17].flash_multiple  = 10.001f;
+    configs[17].flash_multiple  = 10.001;
 
     /* 18 -- flash_threshold too small */
     configs[18].flash_incr_mode = H5C_flash_incr__add_space;
-    configs[18].flash_threshold = 0.099f;
+    configs[18].flash_threshold = 0.099;
 
     /* 19 -- flash_threshold too big */
     configs[19].flash_incr_mode = H5C_flash_incr__add_space;
-    configs[19].flash_threshold = 1.001f;
+    configs[19].flash_threshold = 1.001;
 
     /* 20 -- bad decr_mode */
     configs[20].decr_mode = (enum H5C_cache_decr_mode) - 1;
 
     /* 21 -- upper_hr_threshold too big */
-    configs[21].upper_hr_threshold = 1.00001f;
+    configs[21].upper_hr_threshold = 1.00001;
 
     /* 22 -- decrement too small */
     configs[22].decr_mode = H5C_decr__threshold;
-    configs[22].decrement = -0.0000000001f;
+    configs[22].decrement = -0.0000000001;
 
     /* 23 -- decrement too big */
     configs[23].decr_mode = H5C_decr__threshold;
@@ -1630,20 +1630,20 @@ init_invalid_configs(void)
     configs[25].epochs_before_eviction = H5C__MAX_EPOCH_MARKERS + 1;
 
     /* 26 -- empty_reserve too small */
-    configs[26].empty_reserve = -0.0000000001f;
+    configs[26].empty_reserve = -0.0000000001;
 
     /* 27 -- empty_reserve too big */
     configs[27].empty_reserve = 1.00000000001;
 
     /* 28 -- upper_hr_threshold too small */
-    configs[28].upper_hr_threshold = -0.000000001f;
+    configs[28].upper_hr_threshold = -0.000000001;
 
     /* 29 -- upper_hr_threshold too big */
     configs[29].upper_hr_threshold = 1.00000001;
 
     /* 30 -- upper_hr_threshold <= lower_hr_threshold */
-    configs[30].lower_hr_threshold = 0.9f;
-    configs[30].upper_hr_threshold = 0.9f;
+    configs[30].lower_hr_threshold = 0.9;
+    configs[30].upper_hr_threshold = 0.9;
 
     /* 31 -- dirty_bytes_threshold too small */
     configs[31].dirty_bytes_threshold = (H5C__MIN_MAX_CACHE_SIZE / 2) - 1;
diff --git a/test/cross_read.c b/test/cross_read.c
index 386c0da..eef814f 100644
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -159,9 +159,9 @@ check_data_f(const char *dsetname, hid_t fid)
     /* Input (last row is different) */
     for (i = 0; i < NX; i++)
         for (j = 0; j < NY; j++)
-            data_in[i][j] = ((double)(i + j + 1)) / (double)3.0F;
+            data_in[i][j] = ((double)(i + j + 1)) / 3.0;
     for (i = 0; i < NY; i++)
-        data_in[NX][i] = -2.2F;
+        data_in[NX][i] = -2.2;
     /* Output */
     HDmemset(data_out, 0, (NX + 1) * NY * sizeof(double));
 
@@ -174,7 +174,7 @@ check_data_f(const char *dsetname, hid_t fid)
     /* Check results */
     for (i = 0; i < (NX + 1); i++)
         for (j = 0; j < NY; j++)
-            if (!H5_DBL_REL_EQUAL(data_out[i][j], data_in[i][j], (double)0.001F))
+            if (!H5_DBL_REL_EQUAL(data_out[i][j], data_in[i][j], 0.001))
                 if (!nerrors++) {
                     H5_FAILED();
                     HDprintf("element [%d][%d] is %g but should have been %g\n", (int)i, (int)j,
diff --git a/test/dsets.c b/test/dsets.c
index 6160c65..88337bf 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -6520,7 +6520,7 @@ test_set_local(hid_t fapl)
     for (i = 0; i < DSET_DIM1; i++)
         for (j = 0; j < DSET_DIM2; j++) {
             points[i][j]     = (int)n++;
-            points_dbl[i][j] = (double)1.5F * n++;
+            points_dbl[i][j] = 1.5 * n++;
         }
 
     /* Open file */
@@ -6716,7 +6716,7 @@ test_set_local(hid_t fapl)
         for (j = 0; j < dims[1]; j++) {
             /* If the difference between two values is greater than 0.001%, they're
              * considered not equal. */
-            if (!H5_DBL_REL_EQUAL(points_dbl[i][j], check_dbl[i][j], (double)0.00001F)) {
+            if (!H5_DBL_REL_EQUAL(points_dbl[i][j], check_dbl[i][j], 0.00001)) {
                 H5_FAILED();
                 HDprintf("    Line %d: Read different values than written.\n", __LINE__);
                 HDprintf("    At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
@@ -8803,7 +8803,7 @@ test_chunk_cache(hid_t fapl)
     /* Set new rdcc settings on fapl */
     nslots_2 = nslots_1 * 2;
     nbytes_2 = nbytes_1 * 2;
-    w0_2     = w0_1 / (double)2.0F;
+    w0_2     = w0_1 / 2.0;
     if (H5Pset_cache(fapl_local, 0, nslots_2, nbytes_2, w0_2) < 0)
         FAIL_STACK_ERROR
 
@@ -9525,8 +9525,7 @@ test_chunk_fast(const char *env_h5_driver, hid_t fapl)
                         npoints = (hsize_t)snpoints;
 
                         /* Compute the "down" dimension values */
-                        if (H5VM_array_down(ndims, dim, down) < 0)
-                            FAIL_STACK_ERROR
+                        H5VM_array_down(ndims, dim, down);
 
                         /* Create chunked dataset */
                         if ((dsid = H5Dcreate2(fid, "dset", H5T_NATIVE_UINT, sid, H5P_DEFAULT, dcpl,
@@ -9708,8 +9707,7 @@ test_chunk_fast(const char *env_h5_driver, hid_t fapl)
                         H5VM_swizzle_coords(hsize_t, swizzled_dim, unlim_dim);
 
                         /* Compute the "down" dimension values */
-                        if (H5VM_array_down(ndims, swizzled_dim, down) < 0)
-                            FAIL_STACK_ERROR
+                        H5VM_array_down(ndims, swizzled_dim, down);
 
                         /* Read elements */
                         for (u = 0; u < npoints; u++) {
diff --git a/test/dt_arith.c b/test/dt_arith.c
index f2bf6cf..0ce1475 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -3322,7 +3322,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
                 int expo_diff = check_expo[0] - check_expo[1];
                 int valid_bits =
                     (int)((dst_ebias + dst_msize) + (size_t)MIN(check_expo[0], check_expo[1])) - 1;
-                double epsilon = 1.0F;
+                double epsilon = 1.0;
 
                 /* Re-scale the mantissas based on any exponent difference */
                 if (expo_diff != 0)
diff --git a/test/dtypes.c b/test/dtypes.c
index b7b8dbd..03516a1 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -2284,9 +2284,9 @@ test_compound_11(void)
 
     /* Initialize buffer */
     for (u = 0; u < NTESTELEM; u++) {
-        ((big_t *)buf)[u].d1 = (double)u * (double)1.5f;
-        ((big_t *)buf)[u].d2 = (double)u * (double)2.5f;
-        ((big_t *)buf)[u].d3 = (double)u * (double)3.5f;
+        ((big_t *)buf)[u].d1 = (double)u * 1.5;
+        ((big_t *)buf)[u].d2 = (double)u * 2.5;
+        ((big_t *)buf)[u].d3 = (double)u * 3.5;
         ((big_t *)buf)[u].i1 = (int)(u * 3);
         ((big_t *)buf)[u].i2 = (int)(u * 5);
         ((big_t *)buf)[u].s1 = (char *)HDmalloc((size_t)32);
diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c
index 7000140..5879e38 100644
--- a/test/enc_dec_plist.c
+++ b/test/enc_dec_plist.c
@@ -66,28 +66,32 @@ error:
 int
 main(void)
 {
-    hid_t dcpl;   /* dataset create prop. list */
-    hid_t dapl;   /* dataset access prop. list */
-    hid_t dxpl;   /* dataset xfer prop. list */
-    hid_t gcpl;   /* group create prop. list */
-    hid_t ocpypl; /* object copy prop. list */
-    hid_t ocpl;   /* object create prop. list */
-    hid_t lcpl;   /* link create prop. list */
-    hid_t lapl;   /* link access prop. list */
-    hid_t fapl;   /* file access prop. list */
-    hid_t fcpl;   /* file create prop. list */
-    hid_t strcpl; /* string create prop. list */
-    hid_t acpl;   /* attribute create prop. list */
-
-    hsize_t             chunk_size[2] = {16384, 4}; /* chunk size */
-    double              fill          = 2.7f;       /* Fill value */
-    hsize_t             max_size[1];                /* data space maximum size */
-    size_t              nslots = 521 * 2;
-    size_t              nbytes = 1048576 * 10;
-    double              w0     = 0.5f;
-    unsigned            max_compact;
-    unsigned            min_dense;
-    const char *        c_to_f          = "x+32";
+    hid_t        dcpl;                       /* dataset create prop. list */
+    hid_t        dapl;                       /* dataset access prop. list */
+    hid_t        dxpl;                       /* dataset xfer prop. list */
+    hid_t        gcpl;                       /* group create prop. list */
+    hid_t        ocpypl;                     /* object copy prop. list */
+    hid_t        ocpl;                       /* object create prop. list */
+    hid_t        lcpl;                       /* link create prop. list */
+    hid_t        lapl;                       /* link access prop. list */
+    hid_t        fapl;                       /* file access prop. list */
+    hid_t        fcpl;                       /* file create prop. list */
+    hid_t        strcpl;                     /* string create prop. list */
+    hid_t        acpl;                       /* attribute create prop. list */
+    hid_t        srcspace      = -1;         /* Source dataspaces */
+    hid_t        vspace        = -1;         /* Virtual dset dataspaces */
+    hsize_t      dims[1]       = {3};        /* Data space current size */
+    hsize_t      chunk_size[2] = {16384, 4}; /* chunk size */
+    double       fill          = 2.7;        /* Fill value */
+    hsize_t      max_size[1];                /* data space maximum size */
+    size_t       nslots = 521 * 2;
+    size_t       nbytes = 1048576 * 10;
+    double       w0     = 0.5;
+    unsigned     max_compact;
+    unsigned     min_dense;
+    const char * c_to_f = "x+32";
+    H5F_libver_t low, high; /* Low and high bounds */
+
     H5AC_cache_config_t my_cache_config = {H5AC__CURR_CACHE_CONFIG_VERSION,
                                            TRUE,
                                            FALSE,
@@ -96,26 +100,26 @@ main(void)
                                            TRUE,
                                            FALSE,
                                            (2 * 2048 * 1024),
-                                           0.3f,
+                                           0.3,
                                            (64 * 1024 * 1024),
                                            (4 * 1024 * 1024),
                                            60000,
                                            H5C_incr__threshold,
-                                           0.8f,
-                                           3.0f,
+                                           0.8,
+                                           3.0,
                                            TRUE,
                                            (8 * 1024 * 1024),
                                            H5C_flash_incr__add_space,
-                                           2.0f,
-                                           0.25f,
+                                           2.0,
+                                           0.25,
                                            H5C_decr__age_out_with_threshold,
-                                           0.997f,
-                                           0.8f,
+                                           0.997,
+                                           0.8,
                                            TRUE,
                                            (3 * 1024 * 1024),
                                            3,
                                            FALSE,
-                                           0.2f,
+                                           0.2,
                                            (256 * 2048),
                                            H5AC__DEFAULT_METADATA_WRITE_STRATEGY};
 
diff --git a/test/gen_cross.c b/test/gen_cross.c
index 3eac79a..2746bb6 100644
--- a/test/gen_cross.c
+++ b/test/gen_cross.c
@@ -295,7 +295,7 @@ create_scale_offset_dsets_double(hid_t fid, hid_t fsid, hid_t msid)
     hid_t   dataset = -1; /* dataset handles */
     hid_t   dcpl    = -1;
     double  data[NX][NY]; /* data to write */
-    double  fillvalue   = -2.2f;
+    double  fillvalue   = -2.2;
     hsize_t chunk[RANK] = {CHUNK0, CHUNK1};
     int     i, j;
 
diff --git a/test/gen_plist.c b/test/gen_plist.c
index 911e6d1..e9db752 100644
--- a/test/gen_plist.c
+++ b/test/gen_plist.c
@@ -42,7 +42,7 @@ main(void)
     hsize_t                   max_size[1];        /* data space maximum size */
     size_t                    nslots = 521 * 2;
     size_t                    nbytes = 1048576 * 10;
-    double                    w0     = 0.5f;
+    double                    w0     = 0.5;
     unsigned                  max_compact;
     unsigned                  min_dense;
     const char *              c_to_f = "x+32";
@@ -56,26 +56,26 @@ main(void)
                                            1 /*TRUE*/,
                                            0 /*FALSE*/,
                                            (2 * 2048 * 1024),
-                                           0.3f,
+                                           0.3,
                                            (64 * 1024 * 1024),
                                            (4 * 1024 * 1024),
                                            60000,
                                            H5C_incr__threshold,
-                                           0.8f,
-                                           3.0f,
+                                           0.8,
+                                           3.0,
                                            1 /*TRUE*/,
                                            (8 * 1024 * 1024),
                                            H5C_flash_incr__add_space,
-                                           2.0f,
-                                           0.25f,
+                                           2.0,
+                                           0.25,
                                            H5C_decr__age_out_with_threshold,
-                                           0.997f,
-                                           0.8f,
+                                           0.997,
+                                           0.8,
                                            1 /*TRUE*/,
                                            (3 * 1024 * 1024),
                                            3,
                                            0 /*FALSE*/,
-                                           0.2f,
+                                           0.2,
                                            (256 * 2048),
                                            H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY};
     H5AC_cache_image_config_t my_cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE,
diff --git a/test/lheap.c b/test/lheap.c
index 25dfed0..6c99835 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -102,7 +102,7 @@ main(void)
         if (j > 4)
             buf[j] = '\0';
 
-        if (UFAIL == (obj[i] = H5HL_insert(f, heap, HDstrlen(buf) + 1, buf))) {
+        if (H5HL_insert(f, heap, HDstrlen(buf) + 1, buf, &obj[i]) < 0) {
             H5_FAILED();
             H5Eprint2(H5E_DEFAULT, stdout);
             goto error;
diff --git a/test/links.c b/test/links.c
index 3dfba36..77a2c49 100644
--- a/test/links.c
+++ b/test/links.c
@@ -139,7 +139,7 @@ const char *FILENAME[] = {"links0",
 #define H5L_DIM1 100
 #define H5L_DIM2 100
 
-#define FILTER_FILESIZE_MAX_FRACTION (double)0.9F
+#define FILTER_FILESIZE_MAX_FRACTION 0.9
 
 /* Creation order macros */
 #define CORDER_GROUP_NAME      "corder_group"
diff --git a/test/mtime.c b/test/mtime.c
index 02ba0f0..fd5fc42 100644
--- a/test/mtime.c
+++ b/test/mtime.c
@@ -117,7 +117,7 @@ main(void)
         HDputs("    cannot be queried on this system.  See H5O_mtime_decode().");
         return 0;
     }
-    else if (HDfabs(HDdifftime(now, oi1.ctime)) > (double)60.0F) {
+    else if (HDfabs(HDdifftime(now, oi1.ctime)) > 60.0) {
         H5_FAILED();
         tm = HDlocaltime(&(oi1.ctime));
         HDstrftime((char *)buf1, sizeof buf1, "%Y-%m-%d %H:%M:%S", tm);
diff --git a/test/objcopy.c b/test/objcopy.c
index a1ca06b..52239ec 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -2897,7 +2897,7 @@ test_copy_dataset_compound(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t
     HDmemset(buf, 0, sizeof(buf));
     for (i = 0; i < DIM_SIZE_1; i++) {
         buf[i].a = i;
-        buf[i].d = (double)1.0F / (double)(i + 1);
+        buf[i].d = 1.0 / (double)(i + 1);
     } /* end for */
 
     /* Initialize the filenames */
diff --git a/test/tattr.c b/test/tattr.c
index 69e625a..9f0e4e4 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -508,13 +508,13 @@ test_attr_basic_read(hid_t fapl)
 static void
 test_attr_flush(hid_t fapl)
 {
-    hid_t fil,               /* File ID */
-        att,                 /* Attribute ID */
-        spc,                 /* Dataspace ID */
-        set;                 /* Dataset ID */
-    double wdata = 3.14159F; /* Data to write */
-    double rdata;            /* Data read in */
-    herr_t ret;              /* Generic return value        */
+    hid_t fil,              /* File ID */
+        att,                /* Attribute ID */
+        spc,                /* Dataspace ID */
+        set;                /* Dataset ID */
+    double wdata = 3.14159; /* Data to write */
+    double rdata;           /* Data read in */
+    herr_t ret;             /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Attribute Flushing\n"));
@@ -534,8 +534,8 @@ test_attr_flush(hid_t fapl)
     ret = H5Aread(att, H5T_NATIVE_DOUBLE, &rdata);
     CHECK(ret, FAIL, "H5Awrite");
 
-    if (!H5_DBL_ABS_EQUAL(rdata, (double)0.0f))
-        TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n", rdata, (double)0.0F);
+    if (!H5_DBL_ABS_EQUAL(rdata, 0.0))
+        TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n", rdata, 0.0);
 
     ret = H5Fflush(fil, H5F_SCOPE_GLOBAL);
     CHECK(ret, FAIL, "H5Fflush");
@@ -543,8 +543,8 @@ test_attr_flush(hid_t fapl)
     ret = H5Aread(att, H5T_NATIVE_DOUBLE, &rdata);
     CHECK(ret, FAIL, "H5Awrite");
 
-    if (!H5_DBL_ABS_EQUAL(rdata, (double)0.0f))
-        TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n", rdata, (double)0.0F);
+    if (!H5_DBL_ABS_EQUAL(rdata, 0.0))
+        TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n", rdata, 0.0);
 
     ret = H5Awrite(att, H5T_NATIVE_DOUBLE, &wdata);
     CHECK(ret, FAIL, "H5Awrite");
diff --git a/test/tgenprop.c b/test/tgenprop.c
index 7e805e2..55e5a9b 100644
--- a/test/tgenprop.c
+++ b/test/tgenprop.c
@@ -55,7 +55,7 @@ char prop3_def[10] = "Ten chars"; /* Property 3 default value */
 #define PROP3_DEF_VALUE (&prop3_def)
 
 #define PROP4_NAME "Property 4"
-double prop4_def = 1.41F; /* Property 4 default value */
+double prop4_def = 1.41; /* Property 4 default value */
 #define PROP4_SIZE      sizeof(prop4_def)
 #define PROP4_DEF_VALUE (&prop4_def)
 
diff --git a/test/th5s.c b/test/th5s.c
index e698490..9bcd52f 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -1765,7 +1765,7 @@ test_h5s_chunk(void)
     for (i = 0; i < CHUNK_DATA_NX; i++) {
         for (j = 0; j < CHUNK_DATA_NY; j++) {
             /* Check if the two values are within 0.001% range. */
-            if (!H5_DBL_REL_EQUAL(chunk_data_dbl[i][j], (double)chunk_data_flt[i][j], (double)0.00001F))
+            if (!H5_DBL_REL_EQUAL(chunk_data_dbl[i][j], (double)chunk_data_flt[i][j], 0.00001))
                 TestErrPrintf("%u: chunk_data_dbl[%d][%d]=%e, chunk_data_flt[%d][%d]=%e\n",
                               (unsigned)__LINE__, i, j, chunk_data_dbl[i][j], i, j,
                               (double)chunk_data_flt[i][j]);
diff --git a/test/timer.c b/test/timer.c
index 24f3245..bb474ca 100644
--- a/test/timer.c
+++ b/test/timer.c
@@ -144,7 +144,7 @@ test_timer_system_user(void)
     /* The system and user times may not be present on some systems.  They
      * will be -1.0 if they are not.
      */
-    if (timer.initial.system < (double)0.0f || timer.initial.user < (double)0.0f) {
+    if (timer.initial.system < 0.0 || timer.initial.user < 0.0) {
         SKIPPED();
         HDprintf("NOTE: No suitable way to get system/user times on this platform.\n");
         return 0;
@@ -165,7 +165,7 @@ test_timer_system_user(void)
         TEST_ERROR;
 
     /* System and user times should be non-negative. */
-    if (times.system < (double)0.0f || times.user < (double)0.0f)
+    if (times.system < 0.0 || times.user < 0.0)
         TEST_ERROR;
 
     PASSED();
@@ -224,7 +224,7 @@ test_timer_elapsed(void)
         TEST_ERROR;
 
     /* Elapsed time should be non-negative. */
-    if (times.elapsed < (double)0.0f)
+    if (times.elapsed < 0.0)
         TEST_ERROR;
 
     PASSED();
@@ -260,11 +260,11 @@ test_timer_functionality(void)
 
     /* Times should be initialized to zero */
     err = H5_timer_get_times(timer, &times);
-    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, (double)0.0f))
+    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, 0.0))
         TEST_ERROR;
 
     err = H5_timer_get_total_times(timer, &times);
-    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, (double)0.0f))
+    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, 0.0))
         TEST_ERROR;
 
     /********************
@@ -289,11 +289,11 @@ test_timer_functionality(void)
 
     /* Times should be positive and non-negative */
     err = H5_timer_get_times(timer, &times);
-    if (err < 0 || times.elapsed < (double)0.0f)
+    if (err < 0 || times.elapsed < 0.0)
         TEST_ERROR;
 
     err = H5_timer_get_total_times(timer, &times);
-    if (err < 0 || times.elapsed < (double)0.0f)
+    if (err < 0 || times.elapsed < 0.0)
         TEST_ERROR;
 
     /**********************
@@ -306,11 +306,11 @@ test_timer_functionality(void)
         TEST_ERROR;
 
     err = H5_timer_get_times(timer, &times);
-    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, (double)0.0f))
+    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, 0.0))
         TEST_ERROR;
 
     err = H5_timer_get_total_times(timer, &times);
-    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, (double)0.0f))
+    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, 0.0))
         TEST_ERROR;
 
     /* Timer state should flip */
@@ -326,12 +326,12 @@ test_timer_functionality(void)
 
     /* Times should be non-negative */
     err = H5_timer_get_times(timer, &times);
-    if (err < 0 || times.elapsed < (double)0.0f)
+    if (err < 0 || times.elapsed < 0.0)
         TEST_ERROR;
     prev_etime = times.elapsed;
 
     err = H5_timer_get_total_times(timer, &times);
-    if (err < 0 || times.elapsed < (double)0.0f)
+    if (err < 0 || times.elapsed < 0.0)
         TEST_ERROR;
     prev_total_etime = times.elapsed;
 
diff --git a/test/tmisc.c b/test/tmisc.c
index 8dac16d..a559191 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -2521,17 +2521,17 @@ test_misc13(void)
 static void
 test_misc14(void)
 {
-    hid_t  file_id;       /* File ID */
-    hid_t  fapl;          /* File access property list ID */
-    hid_t  DataSpace;     /* Dataspace ID */
-    hid_t  Dataset1;      /* Dataset ID #1 */
-    hid_t  Dataset2;      /* Dataset ID #2 */
-    hid_t  Dataset3;      /* Dataset ID #3 */
-    double data1 = 5.0F;  /* Data to write for dataset #1 */
-    double data2 = 10.0F; /* Data to write for dataset #2 */
-    double data3 = 15.0F; /* Data to write for dataset #3 */
-    double rdata;         /* Data read in */
-    herr_t ret;           /* Generic return value */
+    hid_t  file_id;      /* File ID */
+    hid_t  fapl;         /* File access property list ID */
+    hid_t  DataSpace;    /* Dataspace ID */
+    hid_t  Dataset1;     /* Dataset ID #1 */
+    hid_t  Dataset2;     /* Dataset ID #2 */
+    hid_t  Dataset3;     /* Dataset ID #3 */
+    double data1 = 5.0;  /* Data to write for dataset #1 */
+    double data2 = 10.0; /* Data to write for dataset #2 */
+    double data3 = 15.0; /* Data to write for dataset #3 */
+    double rdata;        /* Data read in */
+    herr_t ret;          /* Generic return value */
 
     /* Test creating two datasets and deleting the second */