[svn-r24030] Description:

    Clean up more compiler warnings.

Tested on:
    Mac OSX/64 10.8.4 (amazon) w/gcc, C++ & FORTRAN
    (too minor to require h5committest)

13 files changed, 571 insertions, 682 deletions

diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c
index 93bda2b..a60a560 100644
--- a/hl/test/gen_test_ds.c
+++ b/hl/test/gen_test_ds.c
@@ -102,7 +102,7 @@ int main(int argc , char **argv)
     nerrors += test_duplicatelong_attachscales(filename) < 0  ? 1 : 0;
     nerrors += test_samelong_scalenames(filename) < 0  ? 1 : 0;
     nerrors += test_foreign_scaleattached(filename) < 0  ? 1 : 0;
-
+    nerrors += test_long_scalenames(filename) < 0  ? 1 : 0;
 
     if(nerrors) goto error;
     printf("Dimension scales file generation passed.\n");
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index e5775ab..0a899a9 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -604,126 +604,6 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/,
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_multi_dxpl_copy_cb
- *
- * Purpose:	Multi VFD DXPL property 'copy' callback
- *
- * Return:	Success:	0
- *		Failure:	-1
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, August 15, 2012
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_multi_dxpl_copy_cb(const char *name, size_t size, void *_dx)
-{
-    H5FD_multi_dxpl_t *dx = (H5FD_multi_dxpl_t *)_dx;
-    static const char *func = "H5FD_multi_dxpl_copy_cb";  /* Function Name for error reporting */
-
-    /* Shut compiler up */
-    name = name;
-
-    /* Sanity check */
-    assert(size == sizeof(H5FD_multi_dxpl_t));
-
-    ALL_MEMBERS(mt) {
-        if(dx->memb_dxpl[mt] >= 0)
-            if(H5Iinc_ref(dx->memb_dxpl[mt]) < 0)
-                H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTINC, "can't increment ref. count for multi VFD property", -1)
-    } END_MEMBERS;
-
-    return 0;
-} /* end H5FD_multi_dxpl_copy_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FD_multi_dxpl_cmp_cb
- *
- * Purpose:	Multi VFD DXPL property 'compare' callback
- *
- * Return:	Success:	same as memcmp()
- *		Failure:	<can't fail>
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, August 15, 2012
- *
- *-------------------------------------------------------------------------
- */
-static int
-H5FD_multi_dxpl_cmp_cb(const void *_dx1, const void *_dx2, size_t size)
-{
-    const H5FD_multi_dxpl_t *dx1 = (const H5FD_multi_dxpl_t *)_dx1;
-    const H5FD_multi_dxpl_t *dx2 = (const H5FD_multi_dxpl_t *)_dx2;
-    int cmp_status;
-
-    /* Sanity check */
-    assert(size == sizeof(H5FD_multi_dxpl_t));
-
-    ALL_MEMBERS(mt) {
-        if(dx1->memb_dxpl[mt] >= 0) {
-            if(dx2->memb_dxpl[mt] >= 0) {
-                cmp_status = H5Pequal(dx1->memb_dxpl[mt], dx2->memb_dxpl[mt]);
-                if(cmp_status != 0)
-                    return(cmp_status);
-            } /* end if */
-            else
-                return(-1);
-        } /* end if */
-        else {
-            if(dx2->memb_dxpl[mt] >= 0)
-                return(1);
-            else
-                if(dx1->memb_dxpl[mt] > dx2->memb_dxpl[mt])
-                    return(-1);
-                else if(dx1->memb_dxpl[mt] < dx2->memb_dxpl[mt])
-                    return(1);
-                else
-                    continue;
-        } /* end else */
-    } END_MEMBERS;
-
-    return 0;
-} /* end H5FD_multi_dxpl_cmp_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FD_multi_dxpl_cls_cb
- *
- * Purpose:	Multi VFD DXPL property 'close' callback
- *
- * Return:	Success:	0
- *		Failure:	-1
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, August 15, 2012
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FD_multi_dxpl_cls_cb(const char *name, size_t size, void *_dx)
-{
-    H5FD_multi_dxpl_t *dx = (H5FD_multi_dxpl_t *)_dx;
-    static const char *func = "H5FD_multi_dxpl_cls_cb";  /* Function Name for error reporting */
-
-    /* Shut compiler up */
-    name = name;
-
-    /* Sanity check */
-    assert(size == sizeof(H5FD_multi_dxpl_t));
-
-    ALL_MEMBERS(mt) {
-        if(dx->memb_dxpl[mt] >= 0)
-            if(H5Idec_ref(dx->memb_dxpl[mt]) < 0)
-                H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_CANTDEC, "can't increment ref. count for multi VFD property", -1)
-    } END_MEMBERS;
-
-    return 0;
-} /* end H5FD_multi_dxpl_cls_cb() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5FD_multi_sb_size
  *
  * Purpose:	Returns the size of the private information to be stored in
diff --git a/test/cache_api.c b/test/cache_api.c
index c6e27c6..85b2407 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -89,27 +89,27 @@ check_fapl_mdc_api_calls(void)
       /* hbool_t     evictions_enabled      = */ TRUE,
       /* hbool_t     set_initial_size       = */ TRUE,
       /* size_t      initial_size           = */ (1 * 1024 * 1024 + 1),
-      /* double      min_clean_fraction     = */ 0.2,
+      /* double      min_clean_fraction     = */ 0.2f,
       /* 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.91,
-      /* double      increment              = */ 2.1,
+      /* double      lower_hr_threshold     = */ 0.91f,
+      /* double      increment              = */ 2.1f,
       /* 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.0,
-      /* double      flash_threshold        = */ 0.5,
+      /* double      flash_multiple         = */ 2.0f,
+      /* double      flash_threshold        = */ 0.5f,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
-      /* double      upper_hr_threshold     = */ 0.998,
-      /* double      decrement              = */ 0.91,
+      /* double      upper_hr_threshold     = */ 0.998f,
+      /* double      decrement              = */ 0.91f,
       /* 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.05,
+      /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
       /* int	    metadata_write_strategy = */
 					H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -538,27 +538,27 @@ check_file_mdc_api_calls(void)
       /* hbool_t     evictions_enabled      = */ TRUE,
       /* hbool_t     set_initial_size       = */ TRUE,
       /* size_t      initial_size           = */ (1 * 1024 * 1024 + 1),
-      /* double      min_clean_fraction     = */ 0.2,
+      /* double      min_clean_fraction     = */ 0.2f,
       /* 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.91,
-      /* double      increment              = */ 2.1,
+      /* double      lower_hr_threshold     = */ 0.91f,
+      /* double      increment              = */ 2.1f,
       /* 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.0,
-      /* double      flash_threshold        = */ 0.5,
+      /* double      flash_multiple         = */ 2.0f,
+      /* double      flash_threshold        = */ 0.5f,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
-      /* double      upper_hr_threshold     = */ 0.998,
-      /* double      decrement              = */ 0.91,
+      /* double      upper_hr_threshold     = */ 0.998f,
+      /* double      decrement              = */ 0.91f,
       /* 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.05,
+      /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
       /* int	    metadata_write_strategy = */
 					H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -573,27 +573,27 @@ check_file_mdc_api_calls(void)
       /* hbool_t     evictions_enabled      = */ TRUE,
       /* hbool_t     set_initial_size       = */ TRUE,
       /* size_t      initial_size           = */ (512 * 1024),
-      /* double      min_clean_fraction     = */ 0.1,
+      /* double      min_clean_fraction     = */ 0.1f,
       /* 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.9,
-      /* double      increment              = */ 2.0,
+      /* double      lower_hr_threshold     = */ 0.9f,
+      /* double      increment              = */ 2.0f,
       /* 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.5,
-      /* double      flash_threshold        = */ 0.4,
+      /* double      flash_multiple         = */ 1.5f,
+      /* double      flash_threshold        = */ 0.4f,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
-      /* double      upper_hr_threshold     = */ 0.9995,
-      /* double      decrement              = */ 0.95,
+      /* double      upper_hr_threshold     = */ 0.9995f,
+      /* double      decrement              = */ 0.95f,
       /* 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.05,
+      /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
       /* int	    metadata_write_strategy = */
 					H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -608,27 +608,27 @@ check_file_mdc_api_calls(void)
       /* hbool_t     evictions_enabled      = */ TRUE,
       /* hbool_t     set_initial_size       = */ TRUE,
       /* size_t      initial_size           = */ (1 * 1024 * 1024),
-      /* double      min_clean_fraction     = */ 0.2,
+      /* double      min_clean_fraction     = */ 0.2f,
       /* 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.90,
-      /* double      increment              = */ 2.0,
+      /* double      lower_hr_threshold     = */ 0.90f,
+      /* double      increment              = */ 2.0f,
       /* 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.1,
-      /* double      flash_threshold        = */ 0.6,
+      /* double      flash_multiple         = */ 2.1f,
+      /* double      flash_threshold        = */ 0.6f,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
-      /* double      upper_hr_threshold     = */ 0.999,
-      /* double      decrement              = */ 0.9,
+      /* double      upper_hr_threshold     = */ 0.999f,
+      /* double      decrement              = */ 0.9f,
       /* 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.05,
+      /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
       /* int	    metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -643,28 +643,28 @@ check_file_mdc_api_calls(void)
       /* hbool_t     evictions_enabled      = */ TRUE,
       /* hbool_t     set_initial_size       = */ TRUE,
       /* size_t      initial_size           = */ (1 * 1024 * 1024),
-      /* double      min_clean_fraction     = */ 0.15,
+      /* double      min_clean_fraction     = */ 0.15f,
       /* 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.9,
-      /* double      increment              = */ 2.0,
+      /* double      lower_hr_threshold     = */ 0.9f,
+      /* double      increment              = */ 2.0f,
       /* 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.1,
-      /* double      flash_threshold        = */ 0.3,
+      /* double      flash_multiple         = */ 1.1f,
+      /* double      flash_threshold        = */ 0.3f,
       /* enum H5C_cache_decr_mode decr_mode = */
                                                H5C_decr__age_out_with_threshold,
-      /* double      upper_hr_threshold     = */ 0.999,
-      /* double      decrement              = */ 0.9,
+      /* double      upper_hr_threshold     = */ 0.999f,
+      /* double      decrement              = */ 0.9f,
       /* 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.1,
+      /* double      empty_reserve          = */ 0.1f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
       /* int	    metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -773,7 +773,7 @@ check_file_mdc_api_calls(void)
             pass = FALSE;
             failure_mssg = "H5Fget_mdc_hit_rate() failed 1.\n";
 
-        } else if ( hit_rate != 0.0 ) {
+        } else if ( hit_rate != 0.0f ) {
 
             pass = FALSE;
             failure_mssg =
@@ -873,7 +873,7 @@ mdc_api_call_smoke_check(int express_test)
     hbool_t valid_chunk;
     hbool_t dump_hit_rate = FALSE;
     int64_t min_accesses = 1000;
-    double min_hit_rate = 0.90;
+    double min_hit_rate = 0.90f;
     hbool_t dump_cache_size = FALSE;
     hid_t file_id = -1;
     hid_t dataspace_id = -1;
@@ -901,27 +901,27 @@ mdc_api_call_smoke_check(int express_test)
       /* hbool_t     evictions_enabled      = */ TRUE,
       /* hbool_t     set_initial_size       = */ TRUE,
       /* size_t      initial_size           = */ 500000,
-      /* double      min_clean_fraction     = */ 0.1,
+      /* double      min_clean_fraction     = */ 0.1f,
       /* 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.95,
-      /* double      increment              = */ 2.0,
+      /* double      lower_hr_threshold     = */ 0.95f,
+      /* double      increment              = */ 2.0f,
       /* 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.0,
-      /* double      flash_threshold        = */ 0.5,
+      /* double      flash_multiple         = */ 2.0f,
+      /* double      flash_threshold        = */ 0.5f,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
-      /* double      upper_hr_threshold     = */ 0.999,
-      /* double      decrement              = */ 0.9,
+      /* double      upper_hr_threshold     = */ 0.999f,
+      /* double      decrement              = */ 0.9f,
       /* 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.05,
+      /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
       /* int	    metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -936,27 +936,27 @@ mdc_api_call_smoke_check(int express_test)
       /* hbool_t     evictions_enabled      = */ TRUE,
       /* hbool_t     set_initial_size       = */ TRUE,
       /* size_t      initial_size           = */ 12000000,
-      /* double      min_clean_fraction     = */ 0.1,
+      /* double      min_clean_fraction     = */ 0.1f,
       /* 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.95,
-      /* double      increment              = */ 2.0,
+      /* double      lower_hr_threshold     = */ 0.95f,
+      /* double      increment              = */ 2.0f,
       /* 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.0,
-      /* double      flash_threshold        = */ 0.5,
+      /* double      flash_multiple         = */ 2.0f,
+      /* double      flash_threshold        = */ 0.5f,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
-      /* double      upper_hr_threshold     = */ 0.999,
-      /* double      decrement              = */ 0.9,
+      /* double      upper_hr_threshold     = */ 0.999f,
+      /* double      decrement              = */ 0.9f,
       /* 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.05,
+      /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
       /* int	    metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -971,27 +971,27 @@ mdc_api_call_smoke_check(int express_test)
       /* hbool_t     evictions_enabled      = */ TRUE,
       /* hbool_t     set_initial_size       = */ TRUE,
       /* size_t      initial_size           = */ 2000000,
-      /* double      min_clean_fraction     = */ 0.1,
+      /* double      min_clean_fraction     = */ 0.1f,
       /* 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.95,
-      /* double      increment              = */ 2.0,
+      /* double      lower_hr_threshold     = */ 0.95f,
+      /* double      increment              = */ 2.0f,
       /* 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.0,
-      /* double      flash_threshold        = */ 0.5,
+      /* double      flash_multiple         = */ 2.0f,
+      /* double      flash_threshold        = */ 0.5f,
       /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
-      /* double      upper_hr_threshold     = */ 0.999,
-      /* double      decrement              = */ 0.9,
+      /* double      upper_hr_threshold     = */ 0.999f,
+      /* double      decrement              = */ 0.9f,
       /* 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.05,
+      /* double      empty_reserve          = */ 0.05f,
       /* int         dirty_bytes_threshold  = */ (256 * 1024),
       /* int	    metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1541,27 +1541,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1576,27 +1576,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1611,27 +1611,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1646,27 +1646,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1681,27 +1681,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1716,27 +1716,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ 2,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1751,27 +1751,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* size_t      max_size               = */ H5C__MAX_MAX_CACHE_SIZE + 1,
     /* size_t      min_size               = */ ( 1 * 1024 * 1024),
     /* long int    epoch_length           = */ 50000,
     /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1786,27 +1786,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* size_t      max_size               = */ (16 * 1024 * 1024),
     /* size_t      min_size               = */ H5C__MIN_MAX_CACHE_SIZE - 1,
     /* long int    epoch_length           = */ 50000,
     /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1821,27 +1821,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ FALSE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* size_t      max_size               = */ (16 * 1024 * 1024),
     /* size_t      min_size               = */ (16 * 1024 * 1024 + 1),
     /* long int    epoch_length           = */ 50000,
     /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1856,27 +1856,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (16 * 1024 * 1024 + 1),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1891,27 +1891,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024 - 1),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1926,27 +1926,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 1.000001,
+    /* double      min_clean_fraction     = */ 1.000001f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1961,27 +1961,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ -0.00000001,
+    /* double      min_clean_fraction     = */ -0.00000001f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -1996,27 +1996,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* size_t      max_size               = */ (16 * 1024 * 1024),
     /* size_t      min_size               = */ ( 1 * 1024 * 1024),
     /* long int    epoch_length           = */ H5C__MIN_AR_EPOCH_LENGTH - 1,
     /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2031,27 +2031,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* size_t      max_size               = */ (16 * 1024 * 1024),
     /* size_t      min_size               = */ ( 1 * 1024 * 1024),
     /* long int    epoch_length           = */ H5C__MAX_AR_EPOCH_LENGTH + 1,
     /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2066,27 +2066,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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 = */ (enum H5C_cache_incr_mode)-1,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2101,27 +2101,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ -0.000001,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ -0.000001f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2136,27 +2136,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 1.00000001,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 1.00000001f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2171,27 +2171,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
+    /* double      lower_hr_threshold     = */ 0.9f,
     /* double      increment              = */ 0.999999999999,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2206,27 +2206,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* hbool_t     apply_max_increment    = */ (hbool_t)-1,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
     /* enum H5C_cache_flash_incr_mode       */
     /*                    flash_incr_mode = */ H5C_flash_incr__off,
-    /* double      flash_multiple         = */ 2.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2241,27 +2241,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* hbool_t     apply_max_increment    = */ TRUE,
     /* size_t      max_increment          = */ (4 * 1024 * 1024),
     /* enum H5C_cache_flash_incr_mode       */
     /*                    flash_incr_mode = */ (enum H5C_cache_flash_incr_mode)-1,
-    /* double      flash_multiple         = */ 2.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2276,27 +2276,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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__add_space,
-    /* double      flash_multiple         = */ 0.09,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 0.09f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2311,27 +2311,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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__add_space,
-    /* double      flash_multiple         = */ 10.001,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 10.001f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2346,27 +2346,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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__add_space,
-    /* double      flash_multiple         = */ 1.0,
-    /* double      flash_threshold        = */ 0.099,
+    /* double      flash_multiple         = */ 1.0f,
+    /* double      flash_threshold        = */ 0.099f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2381,27 +2381,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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__add_space,
-    /* double      flash_multiple         = */ 1.0,
-    /* double      flash_threshold        = */ 1.001,
+    /* double      flash_multiple         = */ 1.0f,
+    /* double      flash_threshold        = */ 1.001f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2416,27 +2416,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ (enum H5C_cache_decr_mode)-1,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2451,27 +2451,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
-    /* double      upper_hr_threshold     = */ 1.00001,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 1.00001f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2486,27 +2486,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ -0.0000000001,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ -0.0000000001f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2521,27 +2521,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
+    /* double      upper_hr_threshold     = */ 0.999f,
     /* double      decrement              = */ 1.0000000001,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2556,27 +2556,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* hbool_t     apply_max_decrement    = */ TRUE,
     /* size_t      max_decrement          = */ (1 * 1024 * 1024),
     /* int         epochs_before_eviction = */ 0,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
-    /* double      empty_reserve          = */ 0.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2591,27 +2591,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* hbool_t     apply_max_decrement    = */ TRUE,
     /* size_t      max_decrement          = */ (1 * 1024 * 1024),
     /* int         epochs_before_eviction = */ H5C__MAX_EPOCH_MARKERS + 1,
     /* hbool_t     apply_empty_reserve    = */ TRUE,
-    /* double      empty_reserve          = */ 0.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2626,27 +2626,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* hbool_t     apply_max_decrement    = */ TRUE,
     /* size_t      max_decrement          = */ (1 * 1024 * 1024),
     /* int         epochs_before_eviction = */ 3,
     /* hbool_t     apply_empty_reserve    = */ 2,
-    /* double      empty_reserve          = */ 0.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2661,27 +2661,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.0000000001,
+    /* double      empty_reserve          = */ -0.0000000001f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2696,22 +2696,22 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* hbool_t     apply_max_decrement    = */ TRUE,
     /* size_t      max_decrement          = */ (1 * 1024 * 1024),
     /* int         epochs_before_eviction = */ 3,
@@ -2731,27 +2731,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ -0.000000001,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ -0.000000001f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2766,27 +2766,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
     /* double      upper_hr_threshold     = */ 1.00000001,
-    /* double      decrement              = */ 0.9,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2801,27 +2801,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.9,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.9f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2836,27 +2836,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (H5C__MIN_MAX_CACHE_SIZE / 2) - 1,
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2871,27 +2871,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.9,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.9f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (H5C__MAX_MAX_CACHE_SIZE / 4) + 1,
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2906,27 +2906,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ FALSE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__off,
-    /* double      upper_hr_threshold     = */ 0.9,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.9f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2941,27 +2941,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ FALSE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out,
-    /* double      upper_hr_threshold     = */ 0.9,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.9f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */
 				      H5AC__DEFAULT_METADATA_WRITE_STRATEGY
@@ -2976,27 +2976,27 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
     /* hbool_t     evictions_enabled      = */ TRUE,
     /* hbool_t     set_initial_size       = */ TRUE,
     /* size_t      initial_size           = */ (1 * 1024 * 1024),
-    /* double      min_clean_fraction     = */ 0.25,
+    /* double      min_clean_fraction     = */ 0.25f,
     /* 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__threshold,
-    /* double      lower_hr_threshold     = */ 0.9,
-    /* double      increment              = */ 2.0,
+    /* double      lower_hr_threshold     = */ 0.9f,
+    /* double      increment              = */ 2.0f,
     /* 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.0,
-    /* double      flash_threshold        = */ 0.5,
+    /* double      flash_multiple         = */ 2.0f,
+    /* double      flash_threshold        = */ 0.5f,
     /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
-    /* double      upper_hr_threshold     = */ 0.999,
-    /* double      decrement              = */ 0.9,
+    /* double      upper_hr_threshold     = */ 0.999f,
+    /* double      decrement              = */ 0.9f,
     /* 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.1,
+    /* double      empty_reserve          = */ 0.1f,
     /* int         dirty_bytes_threshold  = */ (256 * 1024),
     /* int	  metadata_write_strategy = */ -1
   }
diff --git a/test/dtransform.c b/test/dtransform.c
index 2bcbe8c..9c78043 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -35,18 +35,18 @@ hid_t dset_id_float_chunk = -1;
 
 
 const float windchillFfloat[ROWS][COLS] =
-    {   {36.0, 31.0, 25.0, 19.0, 13.0, 7.0, 1.0, -5.0, -11.0, -16.0, -22.0, -28.0, -34.0, -40.0, -46.0, -52.0, -57.0, -63.0 },
-	{34.0, 27.0, 21.0, 15.0, 9.0, 3.0, -4.0, -10.0, -16.0, -22.0, -28.0, -35.0, -41.0, -47.0, -53.0, -59.0, -66.0, -72.0 } ,
-	{32.0, 25.0, 19.0, 13.0, 6.0, 0.0, -7.0, -13.0, -19.0, -26.0, -32.0, -39.0, -45.0, -51.0, -58.0, -64.0, -71.0, -77.0 },
-	{30.0, 24.0, 17.0, 11.0, 4.0, -2.0, -9.0, -15.0, -22.0, -29.0, -35.0, -42.0, -48.0, -55.0, -61.0, -68.0, -74.0, -81.0 },
-	{29.0, 23.0, 16.0, 9.0, 3.0, -4.0, -11.0, -17.0, -24.0, -31.0, -37.0, -44.0, -51.0, -58.0, -64.0, -71.0, -78.0, -84.0 },
-	{28.0, 22.0, 15.0, 8.0, 1.0, -5.0, -12.0, -19.0, -26.0, -33.0, -39.0, -46.0, -53.0, -60.0, -67.0, -73.0, -80.0, -87.0 },
-	{28.0, 21.0, 14.0, 7.0, 0.0, -7.0, -14.0, -21.0, -27.0, -34.0, -41.0, -48.0, -55.0, -62.0, -69.0, -76.0, -82.0, -89.0 },
-	{27.0, 20.0, 13.0, 6.0, -1.0, -8.0, -15.0, -22.0, -29.0, -36.0, -43.0, -50.0, -57.0, -64.0, -71.0, -78.0, -84.0, -91.0 },
-	{26.0, 19.0, 12.0, 5.0, -2.0, -9.0, -16.0, -23.0, -30.0, -37.0, -44.0, -51.0, -58.0, -65.0, -72.0, -79.0, -86.0, -93.0 },
-	{26.0, 19.0, 12.0, 4.0, -3.0, -10.0, -17.0, -24.0, -31.0, -38.0, -45.0, -52.0, -60.0, -67.0, -74.0, -81.0, -88.0, -95.0},
-	{25.0, 18.0, 11.0, 4.0, -3.0, -11.0, -18.0, -25.0, -32.0, -39.0, -46.0, -54.0, -61.0, -68.0, -75.0, -82.0, -89.0, -97.0},
-	{25.0, 17.0, 10.0, 3.0, -4.0, -11.0, -19.0, -26.0, -33.0, -40.0, -48.0, -55.0, -62.0, -69.0, -76.0, -84.0, -91.0, -98.0}
+    {   {36.0f, 31.0f, 25.0f, 19.0f, 13.0f,   7.0f,   1.0f,  -5.0f, -11.0f, -16.0f, -22.0f, -28.0f, -34.0f, -40.0f, -46.0f, -52.0f, -57.0f, -63.0f},
+	{34.0f, 27.0f, 21.0f, 15.0f,  9.0f,   3.0f,  -4.0f, -10.0f, -16.0f, -22.0f, -28.0f, -35.0f, -41.0f, -47.0f, -53.0f, -59.0f, -66.0f, -72.0f} ,
+	{32.0f, 25.0f, 19.0f, 13.0f,  6.0f,   0.0f,  -7.0f, -13.0f, -19.0f, -26.0f, -32.0f, -39.0f, -45.0f, -51.0f, -58.0f, -64.0f, -71.0f, -77.0f},
+	{30.0f, 24.0f, 17.0f, 11.0f,  4.0f,  -2.0f,  -9.0f, -15.0f, -22.0f, -29.0f, -35.0f, -42.0f, -48.0f, -55.0f, -61.0f, -68.0f, -74.0f, -81.0f},
+	{29.0f, 23.0f, 16.0f,  9.0f,  3.0f,  -4.0f, -11.0f, -17.0f, -24.0f, -31.0f, -37.0f, -44.0f, -51.0f, -58.0f, -64.0f, -71.0f, -78.0f, -84.0f},
+	{28.0f, 22.0f, 15.0f,  8.0f,  1.0f,  -5.0f, -12.0f, -19.0f, -26.0f, -33.0f, -39.0f, -46.0f, -53.0f, -60.0f, -67.0f, -73.0f, -80.0f, -87.0f},
+	{28.0f, 21.0f, 14.0f,  7.0f,  0.0f,  -7.0f, -14.0f, -21.0f, -27.0f, -34.0f, -41.0f, -48.0f, -55.0f, -62.0f, -69.0f, -76.0f, -82.0f, -89.0f},
+	{27.0f, 20.0f, 13.0f,  6.0f, -1.0f,  -8.0f, -15.0f, -22.0f, -29.0f, -36.0f, -43.0f, -50.0f, -57.0f, -64.0f, -71.0f, -78.0f, -84.0f, -91.0f},
+	{26.0f, 19.0f, 12.0f,  5.0f, -2.0f,  -9.0f, -16.0f, -23.0f, -30.0f, -37.0f, -44.0f, -51.0f, -58.0f, -65.0f, -72.0f, -79.0f, -86.0f, -93.0f},
+	{26.0f, 19.0f, 12.0f,  4.0f, -3.0f, -10.0f, -17.0f, -24.0f, -31.0f, -38.0f, -45.0f, -52.0f, -60.0f, -67.0f, -74.0f, -81.0f, -88.0f, -95.0f},
+	{25.0f, 18.0f, 11.0f,  4.0f, -3.0f, -11.0f, -18.0f, -25.0f, -32.0f, -39.0f, -46.0f, -54.0f, -61.0f, -68.0f, -75.0f, -82.0f, -89.0f, -97.0f},
+	{25.0f, 17.0f, 10.0f,  3.0f, -4.0f, -11.0f, -19.0f, -26.0f, -33.0f, -40.0f, -48.0f, -55.0f, -62.0f, -69.0f, -76.0f, -84.0f, -91.0f, -98.0f}
     };
 
 const int transformData[ROWS][COLS] =
@@ -489,8 +489,8 @@ test_poly(const hid_t dxpl_id_polynomial)
 
     for(row = 0; row < ROWS; row++)
         for(col = 0; col < COLS; col++) {
-            windchillC = (int) ((5.0 / 9.0) * (windchillFfloat[row][col] - 32));
-            polyflres[row][col] = (float) ((2.0 + windchillC) * ((windchillC - 8.0) / 2.0));
+            windchillC = (int) ((5.0f / 9.0f) * (windchillFfloat[row][col] - 32));
+            polyflres[row][col] = (float) ((2.0f + windchillC) * ((windchillC - 8.0f) / 2.0f));
         }
 
     TESTING("data transform, polynomial transform (int->float)")
@@ -498,11 +498,11 @@ test_poly(const hid_t dxpl_id_polynomial)
             dxpl_id_polynomial, polyflread) < 0)
         TEST_ERROR
         
-    COMPARE(float, polyflread, polyflres, 2.0)
+    COMPARE(float, polyflread, polyflres, 2.0f)
 
     for(row = 0; row < ROWS; row++)
         for(col = 0; col < COLS; col++) {
-            windchillC = (int) ((5.0 / 9.0) * (windchillFfloat[row][col] - 32));
+            windchillC = (int) ((5.0f / 9.0f) * (windchillFfloat[row][col] - 32));
             polyflres[row][col] = (float) ((2 + windchillC) * ((windchillC - 8) / 2));
         }
 
@@ -684,7 +684,7 @@ test_copy(const hid_t dxpl_id_c_to_f_copy, const hid_t dxpl_id_polynomial_copy)
 
     for(row = 0; row < ROWS; row++)
         for(col = 0; col < COLS; col++) {
-            windchillC = (int) ((5.0 / 9.0) * (windchillFfloat[row][col] - 32));
+            windchillC = (int) ((5.0f / 9.0f) * (windchillFfloat[row][col] - 32));
             polyflres[row][col] = (float) ((2 + windchillC) * ((windchillC - 8) / 2));
         }
 
@@ -721,7 +721,7 @@ test_trivial(const hid_t dxpl_id_simple)
         TEST_ERROR
     for(row = 0; row < ROWS; row++)
         for(col = 0; col < COLS; col++) {
-            if((windchillFfloatread[row][col] - 4.8) > FLOAT_TOL) 
+            if((windchillFfloatread[row][col] - 4.8f) > FLOAT_TOL) 
                 FAIL_PUTS_ERROR("    ERROR: Conversion failed to match computed data\n");
         }
 
@@ -780,7 +780,7 @@ test_getset(const hid_t dxpl_id_c_to_f)
         
     for(row = 0; row < ROWS; row++)
         for(col = 0; col < COLS; col++) {
-            if((windchillFfloatread[row][col] - 4.8) > FLOAT_TOL) 
+            if((windchillFfloatread[row][col] - 4.8f) > FLOAT_TOL) 
                 FAIL_PUTS_ERROR("    ERROR: Conversion failed to match computed data\n")
         }
 
diff --git a/test/gen_cross.c b/test/gen_cross.c
index d960499..8cbb2f5 100644
--- a/test/gen_cross.c
+++ b/test/gen_cross.c
@@ -94,7 +94,7 @@ create_normal_dset(hid_t fid, hid_t fsid, hid_t msid)
     hid_t       dataset;         /* file and dataset handles */
     hid_t       dcpl;
     float       data[NX][NY];          /* data to write */
-    float       fillvalue = -2.2;
+    float       fillvalue = -2.2f;
     int         i, j;
 
     /*
@@ -204,7 +204,7 @@ create_scale_offset_dsets_float(hid_t fid, hid_t fsid, hid_t msid)
     hid_t       dataset;         /* dataset handles */
     hid_t       dcpl;
     float       data[NX][NY];          /* data to write */
-    float       fillvalue = -2.2;
+    float       fillvalue = -2.2f;
     hsize_t     chunk[RANK] = {CHUNK0, CHUNK1};
     int         i, j;
 
@@ -304,7 +304,7 @@ create_scale_offset_dsets_double(hid_t fid, hid_t fsid, hid_t msid)
     hid_t       dataset;         /* dataset handles */
     hid_t       dcpl;
     double      data[NX][NY];          /* data to write */
-    double      fillvalue = -2.2;
+    double      fillvalue = -2.2f;
     hsize_t     chunk[RANK] = {CHUNK0, CHUNK1};
     int         i, j;
 
@@ -837,7 +837,7 @@ create_fletcher_dsets_float(hid_t fid, hid_t fsid, hid_t msid)
     hid_t       dataset;         /* dataset handles */
     hid_t       dcpl;
     float       data[NX][NY];          /* data to write */
-    float       fillvalue = -2.2;
+    float       fillvalue = -2.2f;
     hsize_t     chunk[RANK] = {CHUNK0, CHUNK1};
     int         i, j;
 
@@ -937,7 +937,7 @@ create_deflate_dsets_float(hid_t fid, hid_t fsid, hid_t msid)
     hid_t       dataset;         /* dataset handles */
     hid_t       dcpl;
     float       data[NX][NY];          /* data to write */
-    float       fillvalue = -2.2;
+    float       fillvalue = -2.2f;
     hsize_t     chunk[RANK] = {CHUNK0, CHUNK1};
     int         i, j;
 
@@ -1037,7 +1037,7 @@ create_szip_dsets_float(hid_t fid, hid_t fsid, hid_t msid)
     hid_t       dataset;         /* dataset handles */
     hid_t       dcpl;
     float       data[NX][NY];          /* data to write */
-    float       fillvalue = -2.2;
+    float       fillvalue = -2.2f;
     hsize_t     chunk[RANK] = {CHUNK0, CHUNK1};
     int         i, j;
 
@@ -1137,7 +1137,7 @@ create_shuffle_dsets_float(hid_t fid, hid_t fsid, hid_t msid)
     hid_t       dataset;         /* dataset handles */
     hid_t       dcpl;
     float       data[NX][NY];          /* data to write */
-    float       fillvalue = -2.2;
+    float       fillvalue = -2.2f;
     hsize_t     chunk[RANK] = {CHUNK0, CHUNK1};
     int         i, j;
 
@@ -1239,7 +1239,7 @@ create_nbit_dsets_float(hid_t fid, hid_t fsid, hid_t msid)
     hid_t       dcpl;
     size_t      precision, offset;
     float       data[NX][NY];          /* data to write */
-    float       fillvalue = -2.2;
+    float       fillvalue = -2.2f;
     hsize_t     chunk[RANK] = {CHUNK0, CHUNK1};
     int         i, j;
 
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c
index 20f4f90..b81a7ad 100644
--- a/test/ttsafe_error.c
+++ b/test/ttsafe_error.c
@@ -199,7 +199,7 @@ void *tts_error_thread(void UNUSED *arg)
 }
 
 static
-herr_t error_callback(hid_t estack_id, void *client_data)
+herr_t error_callback(hid_t UNUSED estack_id, void *client_data)
 {
     H5TS_mutex_lock_simple(&error_mutex);
     error_count++;
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index d8b3b34..2271703 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -560,10 +560,10 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
         int          data4[3][2] = {{0,0},{0,0},{0,0}};
         int          data5[2][2] = {{0,0},{0,0}};
         unsigned int data6[3][2] = {{0,0},{0,0},{0,0}};
-        cmp1_t       data7[1] = {{1,2}};
-        cmp2_t       data8[1] = {{1,2}};
-        hsize_t      dims3[2] = { 2,2 };
-        hsize_t      dims4[1] = { 1 };
+        cmp1_t       data7[1] = {{1.0f, 2}};
+        cmp2_t       data8[1] = {{1, 2.0f}};
+        hsize_t      dims3[2] = {2, 2};
+        hsize_t      dims4[1] = {1};
         size_t       type_size;
         hid_t        tid;
 
@@ -4419,6 +4419,7 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
      * Create an attribute in root group
      */
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
+    assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
     assert(ret >= 0);
 
@@ -4461,6 +4462,7 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     hid_t  fid;  /* HDF5 File ID */
     hid_t  did_dset; /* dataset ID   */
     hid_t  sid_dset;  /* dataset space ID */
+    hid_t  tid_attr;
     hid_t  tid_cmpd2; /* compound2 type ID */
     hid_t  tid_cmpd1; /* compound1 type ID */
     hid_t  tid_cmpd1_vlen;
@@ -4525,22 +4527,22 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     ret = H5Dwrite(did_dset, tid_cmpd1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
     assert(ret >= 0);
 
-    /* Reclaim the write VL data */
-    ret = H5Dvlen_reclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
-    assert(ret >= 0);
-
     /*-----------------------------------
      * Create an attribute in root group
      */
-    /* TODO: creating vlen with compound type doesn't work for attribute now. 
-     * so add this later when it's fixed 
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
+    assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
     assert(ret >= 0);
-    */
+
+    /* Reclaim the write VL data */
+    ret = H5Dvlen_reclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
+    assert(ret >= 0);
 
     /* ----------------
      * Close IDs */
+    ret = H5Aclose(tid_attr);
+    assert(ret >= 0);
     ret = H5Dclose(did_dset);
     assert(ret >= 0);
     ret = H5Tclose(tid_cmpd2);
@@ -4577,6 +4579,7 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     hid_t  fid;  /* HDF5 File IDs  */
     hid_t  did_dset; /* Dataset ID   */
     hid_t  sid_dset;       /* Dataspace ID   */
+    hid_t  tid_attr;
     hid_t  tid_cmpd1;       /* Compound1 Datatype ID   */
     hid_t  tid_arry1;       /* Array Datatype ID   */
     hid_t  tid_cmpd2;       /* Compound2 Datatype ID   */
@@ -4664,22 +4667,22 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     ret = H5Dwrite(did_dset, tid_cmpd1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
     assert(ret >= 0);
 
-    /* Reclaim the write VL data */
-    ret = H5Dvlen_reclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
-    assert(ret >= 0);
-
     /*-----------------------------------
      * Create an attribute in root group
      */
-    /* TODO: creating vlen with compound type doesn't work for attribute now. 
-     * so add this later when it's fixed
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
+    assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
     assert(ret >= 0);
-    */
+
+    /* Reclaim the write VL data */
+    ret = H5Dvlen_reclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
+    assert(ret >= 0);
 
     /*-------------------
      * Close IDs */
+    ret = H5Aclose(tid_attr);
+    assert(ret >= 0);
     ret = H5Tclose(tid_arry1);
     assert(ret >= 0);
     ret = H5Dclose(did_dset);
@@ -4724,6 +4727,7 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     hid_t  fid;  /* HDF5 File ID */
     hid_t  did_dset; /* dataset ID   */
     hid_t  sid_dset;  /* dataset space ID */
+    hid_t  tid_attr;
     hid_t  tid_cmpd3; /* compound3 type ID */
     hid_t  tid_cmpd2; /* compound2 type ID */
     hid_t  tid_cmpd2_arry;
@@ -4809,22 +4813,22 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     ret = H5Dwrite(did_dset, tid_cmpd1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
     assert(ret >= 0);
 
-    /* Reclaim the write VL data */
-    ret = H5Dvlen_reclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
-    assert(ret >= 0);
-
     /*-----------------------------------
      * Create an attribute in root group
      */
-    /* TODO: creating vlen with compound type doesn't work for attribute now.
-     * so add this later when it's fixed
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
+    assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
     assert(ret >= 0);
-    */
+
+    /* Reclaim the write VL data */
+    ret = H5Dvlen_reclaim(tid_cmpd1, sid_dset, H5P_DEFAULT, wdata);
+    assert(ret >= 0);
 
     /* ----------------
      * Close IDs */
+    ret = H5Aclose(tid_attr);
+    assert(ret >= 0);
     ret = H5Dclose(did_dset);
     assert(ret >= 0);
     ret = H5Sclose(sid_dset);
@@ -4870,7 +4874,7 @@ static void test_data_nocomparables (const char * fname, int make_diffs)
     int data1[DIM_ARRY] = {0,0,0};
     int data2[DIM_ARRY] = {1,1,1};
     int data3[DIM_ARRY+1] = {1,1,1,1};
-    int data1_dim2[DIM_ARRY][1] = {{0,0,0}};
+    int data1_dim2[DIM_ARRY][1] = {0,0,0};
     int rank_attr;
     char data1_str[DIM_ARRY][STR_SIZE]= {"ab","cd","ef"};
     herr_t  status = SUCCEED;
diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c
index ec93778..380eb8e 100644
--- a/tools/h5dump/h5dump_ddl.c
+++ b/tools/h5dump/h5dump_ddl.c
@@ -148,7 +148,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t UNUSED *info, vo
     outputformat = &string_dataformat;
 
     h5dump_type_table = type_table;
-    h5tools_dump_attribute(rawoutstream, outputformat, &ctx, oid, attr_name, attr_id, display_ai, display_char);
+    h5tools_dump_attribute(rawoutstream, outputformat, &ctx, attr_name, attr_id, display_ai, display_char);
     h5dump_type_table = NULL;
 
     if(attr_id < 0) {
@@ -1360,7 +1360,7 @@ attr_search(hid_t oid, const char *attr_name, const H5A_info_t UNUSED *ainfo, vo
 } /* end attr_search() */
 
 static herr_t
-obj_search(const char *path, const H5O_info_t *oi, const char *already_visited, void *_op_data)
+obj_search(const char *path, const H5O_info_t *oi, const char UNUSED *already_visited, void *_op_data)
 {
 	trav_handle_udata_t  *handle_data = (trav_handle_udata_t*)_op_data;
     char *op_name = (char*)handle_data->op_name;
@@ -1452,7 +1452,7 @@ lnk_search(const char *path, const H5L_info_t *li, void *_op_data)
  *-------------------------------------------------------------------------
  */
 void
-handle_paths(hid_t fid, const char *path_name, void* data, int pe, const char *display_name)
+handle_paths(hid_t fid, const char *path_name, void UNUSED * data, int UNUSED pe, const char UNUSED *display_name)
 {
     hid_t  gid = -1;
 
@@ -1613,7 +1613,7 @@ handle_attributes(hid_t fid, const char *attr, void UNUSED * data, int UNUSED pe
     attr_data_output = display_attr_data;
 
     h5dump_type_table = type_table;
-    h5tools_dump_attribute(rawoutstream, outputformat, &ctx, oid, attr_name, attr_id, display_ai, display_char);
+    h5tools_dump_attribute(rawoutstream, outputformat, &ctx, attr_name, attr_id, display_ai, display_char);
     h5dump_type_table = NULL;
 
     if(attr_id < 0) {
diff --git a/tools/h5dump/h5dump_xml.c b/tools/h5dump/h5dump_xml.c
index 53ad894..f3fefba 100644
--- a/tools/h5dump/h5dump_xml.c
+++ b/tools/h5dump/h5dump_xml.c
@@ -26,6 +26,88 @@
 
 const char       *xmlnsprefix="hdf5:";
 
+/*
+ *  Alternative formating for data dumped to XML
+ *  In general, the numbers are the same, but separators
+ *  except spaces are not used.
+ *
+ *  Some of these are not used, as some kinds of data are
+ *  dumped in completely new subroutines.
+ *
+ *  Some of this formatting may yet need to change.
+ *
+ *  This table only affects XML output.
+ */
+static h5tool_format_t         xml_dataformat = {
+    0,              /*raw */
+
+    "",             /*fmt_raw */
+    "%d",           /*fmt_int */
+    "%u",           /*fmt_uint */
+    "%hhd",           /*fmt_schar */
+    "%u",           /*fmt_uchar */
+    "%d",           /*fmt_short */
+    "%u",           /*fmt_ushort */
+    "%ld",          /*fmt_long */
+    "%lu",          /*fmt_ulong */
+    NULL,           /*fmt_llong */
+    NULL,           /*fmt_ullong */
+    "%g",           /*fmt_double */
+    "%g",           /*fmt_float */
+
+    0,              /*ascii */
+    0,              /*str_locale */
+    0,              /*str_repeat */
+
+    "",            /*arr_pre */
+    "",             /*arr_sep */
+    "",             /*arr_suf */
+    1,              /*arr_linebreak */
+
+    "",             /*cmpd_name */
+    "",             /*cmpd_sep */
+    "",             /*cmpd_pre */
+    "",             /*cmpd_suf */
+    "",             /*cmpd_end */
+
+    " ",            /*vlen_sep */
+    " ",            /*vlen_pre */
+    "",             /*vlen_suf */
+    "",             /*vlen_end */
+
+    "%s",           /*elmt_fmt */
+    "",             /*elmt_suf1 */
+    " ",            /*elmt_suf2 */
+
+    "",             /*idx_n_fmt */
+    "",             /*idx_sep */
+    "",             /*idx_fmt */
+
+    80,             /*line_ncols *//*standard default columns */
+    0,              /*line_per_line */
+    "",             /*line_pre */
+    "%s",           /*line_1st */
+    "%s",           /*line_cont */
+    "",             /*line_suf */
+    "",             /*line_sep */
+    1,              /*line_multi_new */
+    "   ",          /*line_indent */
+
+    1,              /*skip_first */
+
+    1,              /*obj_hidefileno */
+    " "H5_PRINTF_HADDR_FMT, /*obj_format */
+
+    1,              /*dset_hidefileno */
+    "DATASET %s ",  /*dset_format */
+    "%s",           /*dset_blockformat_pre */
+    "%s",           /*dset_ptformat_pre */
+    "%s",           /*dset_ptformat */
+     0,             /*array indices */
+     0              /*escape non printable characters */
+};
+
+
 /* internal functions */
 static int      xml_name_to_XID(const char *, char *, int , int );
 
diff --git a/tools/h5dump/h5dump_xml.h b/tools/h5dump/h5dump_xml.h
index 258fd38..c1d6c62 100644
--- a/tools/h5dump/h5dump_xml.h
+++ b/tools/h5dump/h5dump_xml.h
@@ -17,87 +17,6 @@
 
 extern const char       *xmlnsprefix;
 
-/*
- *  Alternative formating for data dumped to XML
- *  In general, the numbers are the same, but separators
- *  except spaces are not used.
- *
- *  Some of these are not used, as some kinds of data are
- *  dumped in completely new subroutines.
- *
- *  Some of this formatting may yet need to change.
- *
- *  This table only affects XML output.
- */
-static h5tool_format_t         xml_dataformat = {
-    0,              /*raw */
-
-    "",             /*fmt_raw */
-    "%d",           /*fmt_int */
-    "%u",           /*fmt_uint */
-    "%hhd",           /*fmt_schar */
-    "%u",           /*fmt_uchar */
-    "%d",           /*fmt_short */
-    "%u",           /*fmt_ushort */
-    "%ld",          /*fmt_long */
-    "%lu",          /*fmt_ulong */
-    NULL,           /*fmt_llong */
-    NULL,           /*fmt_ullong */
-    "%g",           /*fmt_double */
-    "%g",           /*fmt_float */
-
-    0,              /*ascii */
-    0,              /*str_locale */
-    0,              /*str_repeat */
-
-    "",            /*arr_pre */
-    "",             /*arr_sep */
-    "",             /*arr_suf */
-    1,              /*arr_linebreak */
-
-    "",             /*cmpd_name */
-    "",             /*cmpd_sep */
-    "",             /*cmpd_pre */
-    "",             /*cmpd_suf */
-    "",             /*cmpd_end */
-
-    " ",            /*vlen_sep */
-    " ",            /*vlen_pre */
-    "",             /*vlen_suf */
-    "",             /*vlen_end */
-
-    "%s",           /*elmt_fmt */
-    "",             /*elmt_suf1 */
-    " ",            /*elmt_suf2 */
-
-    "",             /*idx_n_fmt */
-    "",             /*idx_sep */
-    "",             /*idx_fmt */
-
-    80,             /*line_ncols *//*standard default columns */
-    0,              /*line_per_line */
-    "",             /*line_pre */
-    "%s",           /*line_1st */
-    "%s",           /*line_cont */
-    "",             /*line_suf */
-    "",             /*line_sep */
-    1,              /*line_multi_new */
-    "   ",          /*line_indent */
-
-    1,              /*skip_first */
-
-    1,              /*obj_hidefileno */
-    " "H5_PRINTF_HADDR_FMT, /*obj_format */
-
-    1,              /*dset_hidefileno */
-    "DATASET %s ",  /*dset_format */
-    "%s",           /*dset_blockformat_pre */
-    "%s",           /*dset_ptformat_pre */
-    "%s",           /*dset_ptformat */
-     0,             /*array indices */
-     0              /*escape non printable characters */
-};
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index cde249c..75d3c67 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -3497,7 +3497,7 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info,
  */
 void
 h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
-        h5tools_context_t *ctx, hid_t oid, const char *attr_name, hid_t attr_id, 
+        h5tools_context_t *ctx, const char *attr_name, hid_t attr_id, 
         int display_index, int display_char)
 {
     h5tools_str_t buffer;          /* string into which to render   */
diff --git a/tools/lib/h5tools_dump.h b/tools/lib/h5tools_dump.h
index 86f9f99..061a3db 100644
--- a/tools/lib/h5tools_dump.h
+++ b/tools/lib/h5tools_dump.h
@@ -52,7 +52,7 @@ H5TOOLS_DLL void    h5tools_dump_datatype(FILE *stream, const h5tool_format_t *i
 H5TOOLS_DLL void    h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info,
                             h5tools_context_t *ctx/*in,out*/, hid_t space);
 H5TOOLS_DLL void    h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
-                            h5tools_context_t *ctx/*in,out*/, hid_t oid, const char *attr_name, 
+                            h5tools_context_t *ctx/*in,out*/, const char *attr_name, 
                             hid_t attr_id, int display_index, int display_char);
 H5TOOLS_DLL void    h5tools_dump_oid(FILE *stream, const h5tool_format_t *info,
                             h5tools_context_t *ctx/*in,out*/, hid_t oid);
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 8455360..58d7959 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -724,22 +724,22 @@ trav_table_add(trav_table_t *table,
                     const char *path,
                     const H5O_info_t *oinfo)
 {
-    size_t new;
+    size_t new_obj;
 
     if(table->nobjs == table->size) {
         table->size = MAX(1, table->size * 2);
         table->objs = (trav_obj_t*)HDrealloc(table->objs, table->size * sizeof(trav_obj_t));
     } /* end if */
 
-    new = table->nobjs++;
-    table->objs[new].objno = oinfo ? oinfo->addr : HADDR_UNDEF;
-    table->objs[new].flags[0] = table->objs[new].flags[1] = 0;
-    table->objs[new].is_same_trgobj = 0;
-    table->objs[new].name = (char *)HDstrdup(path);
-    table->objs[new].type = oinfo ? (h5trav_type_t)oinfo->type : H5TRAV_TYPE_LINK;
-    table->objs[new].nlinks = 0;
-    table->objs[new].sizelinks = 0;
-    table->objs[new].links = NULL;
+    new_obj = table->nobjs++;
+    table->objs[new_obj].objno = oinfo ? oinfo->addr : HADDR_UNDEF;
+    table->objs[new_obj].flags[0] = table->objs[new_obj].flags[1] = 0;
+    table->objs[new_obj].is_same_trgobj = 0;
+    table->objs[new_obj].name = (char *)HDstrdup(path);
+    table->objs[new_obj].type = oinfo ? (h5trav_type_t)oinfo->type : H5TRAV_TYPE_LINK;
+    table->objs[new_obj].nlinks = 0;
+    table->objs[new_obj].sizelinks = 0;
+    table->objs[new_obj].links = NULL;
 }
 
 /*-------------------------------------------------------------------------
@@ -807,23 +807,23 @@ void trav_table_addflags(unsigned *flags,
                          h5trav_type_t type,
                          trav_table_t *table)
 {
-    unsigned int new;
+    unsigned int new_obj;
 
     if(table->nobjs == table->size) {
         table->size = MAX(1, table->size * 2);
         table->objs = (trav_obj_t *)HDrealloc(table->objs, table->size * sizeof(trav_obj_t));
     } /* end if */
 
-    new = table->nobjs++;
-    table->objs[new].objno = 0;
-    table->objs[new].flags[0] = flags[0];
-    table->objs[new].flags[1] = flags[1];
-    table->objs[new].is_same_trgobj = 0;
-    table->objs[new].name = (char *)HDstrdup(name);
-    table->objs[new].type = type;
-    table->objs[new].nlinks = 0;
-    table->objs[new].sizelinks = 0;
-    table->objs[new].links = NULL;
+    new_obj = table->nobjs++;
+    table->objs[new_obj].objno = 0;
+    table->objs[new_obj].flags[0] = flags[0];
+    table->objs[new_obj].flags[1] = flags[1];
+    table->objs[new_obj].is_same_trgobj = 0;
+    table->objs[new_obj].name = (char *)HDstrdup(name);
+    table->objs[new_obj].type = type;
+    table->objs[new_obj].nlinks = 0;
+    table->objs[new_obj].sizelinks = 0;
+    table->objs[new_obj].links = NULL;
 }
 
 
@@ -890,7 +890,11 @@ void trav_table_free( trav_table_t *table )
 }
 
 static herr_t
-trav_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo, void *op_data)
+trav_attr(hid_t
+#ifndef H5TRAV_PRINT_SPACE
+UNUSED
+#endif /* H5TRAV_PRINT_SPACE */
+obj, const char *attr_name, const H5A_info_t UNUSED *ainfo, void *op_data)
 {
     char               *buf;