VFD SWMR: Normalization with develop (#1270)

Brings many October-November changes from develop

14 files changed, 229 insertions, 445 deletions

diff --git a/test/cache_api.c b/test/cache_api.c
index 7858c65..412888e 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -546,7 +546,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
         /* size_t      max_decrement          = */ (1 * 1024 * 1024 - 1),
         /* int         epochs_before_eviction = */ 4,
         /* hbool_t     apply_empty_reserve    = */ TRUE,
-        /* double      empty_reserve          = */ 0.05f,
+        /* double      empty_reserve          = */ 0.05,
         /* int         dirty_bytes_threshold  = */ (256 * 1024),
         /* int        metadata_write_strategy = */
         H5AC__DEFAULT_METADATA_WRITE_STRATEGY};
diff --git a/test/cork.c b/test/cork.c
index 80934ad..28c0604 100644
--- a/test/cork.c
+++ b/test/cork.c
@@ -89,10 +89,11 @@ static unsigned
 verify_old_dset_cork(void)
 {
     /* Variable Declarations */
-    hid_t       fid = -1;                             /* File ID */
-    hid_t       did = -1, did2 = -1, did3 = -1;       /* Dataset IDs */
-    hid_t       dcpl = -1, dcpl2 = -1, dcpl3 = -1;    /* Dataset creation property lists */
-    hid_t       sid = -1, sid2 = -1, sid3 = -1;       /* Dataspace IDs */
+    hid_t fid = H5I_INVALID_HID;                                                 /* File ID */
+    hid_t did = H5I_INVALID_HID, did2 = H5I_INVALID_HID, did3 = H5I_INVALID_HID; /* Dataset IDs */
+    hid_t dcpl = H5I_INVALID_HID, dcpl2 = H5I_INVALID_HID,
+          dcpl3     = H5I_INVALID_HID; /* Dataset creation property lists */
+    hid_t       sid = H5I_INVALID_HID, sid2 = H5I_INVALID_HID, sid3 = H5I_INVALID_HID; /* Dataspace IDs */
     hsize_t     dims[2]       = {100, 20};            /* Dataset dimension sizes */
     hsize_t     max_dims[2]   = {100, H5S_UNLIMITED}; /* Dataset maximum dimension sizes */
     hsize_t     chunk_dims[2] = {2, 5};               /* Dataset chunked dimension sizes */
@@ -295,19 +296,19 @@ static unsigned
 verify_obj_dset_cork(hbool_t swmr)
 {
     /* Variable Declarations */
-    hid_t       fid  = -1;            /* File ID */
-    hid_t       fapl = -1;            /* File access property list */
-    hid_t       aid  = -1;            /* Attribute ID */
-    hid_t       sid = -1, sid2 = -1;  /* Dataspace IDs */
-    hid_t       did = -1, did2 = -1;  /* Dataset IDs */
-    hid_t       oid = -1;             /* Object ID */
-    hid_t       dcpl2;                /* Dataset creation property list */
-    int         i            = 0;     /* Local index variable */
-    hsize_t     dim[1]       = {100}; /* Dataset dimension size */
-    hsize_t     chunk_dim[1] = {7};   /* Dataset chunk dimension size */
-    H5O_info2_t oinfo, oinfo2;        /* Object metadata information */
-    char        attrname[500];        /* Name of attribute */
-    unsigned    flags;                /* File access flags */
+    hid_t       fid  = H5I_INVALID_HID;                        /* File ID */
+    hid_t       fapl = H5I_INVALID_HID;                        /* File access property list */
+    hid_t       aid  = H5I_INVALID_HID;                        /* Attribute ID */
+    hid_t       sid = H5I_INVALID_HID, sid2 = H5I_INVALID_HID; /* Dataspace IDs */
+    hid_t       did = H5I_INVALID_HID, did2 = H5I_INVALID_HID; /* Dataset IDs */
+    hid_t       oid          = H5I_INVALID_HID;                /* Object ID */
+    hid_t       dcpl2        = H5I_INVALID_HID;                /* Dataset creation property list */
+    int         i            = 0;                              /* Local index variable */
+    hsize_t     dim[1]       = {100};                          /* Dataset dimension size */
+    hsize_t     chunk_dim[1] = {7};                            /* Dataset chunk dimension size */
+    H5O_info2_t oinfo, oinfo2;                                 /* Object metadata information */
+    char        attrname[500];                                 /* Name of attribute */
+    unsigned    flags;                                         /* File access flags */
 
     if (swmr) {
         TESTING("cork status for dataset objects with attributes (SWMR)");
@@ -500,11 +501,11 @@ static unsigned
 verify_dset_cork(hbool_t swmr, hbool_t new_format)
 {
     /* Variable Declarations */
-    hid_t       fid  = -1;                            /* File ID */
-    hid_t       fapl = -1;                            /* File access property list */
-    hid_t       did = -1, did2 = -1, did3 = -1;       /* Dataset IDs */
-    hid_t       dcpl = -1;                            /* Dataset creation property list */
-    hid_t       sid = -1, sid2 = -1, sid3 = -1;       /* Dataspace IDs */
+    hid_t       fid  = H5I_INVALID_HID; /* File ID */
+    hid_t       fapl = H5I_INVALID_HID; /* File access property list */
+    hid_t       did = H5I_INVALID_HID, did2 = H5I_INVALID_HID, did3 = H5I_INVALID_HID; /* Dataset IDs */
+    hid_t       dcpl = H5I_INVALID_HID; /* Dataset creation property list */
+    hid_t       sid = H5I_INVALID_HID, sid2 = H5I_INVALID_HID, sid3 = H5I_INVALID_HID; /* Dataspace IDs */
     hsize_t     dims[2]       = {100, 20};            /* Dataset dimension sizes */
     hsize_t     max_dims[2]   = {100, H5S_UNLIMITED}; /* Dataset maximum dimension sizes */
     hsize_t     chunk_dims[2] = {2, 5};               /* Dataset chunked dimension sizes */
@@ -758,15 +759,15 @@ static unsigned
 verify_group_cork(hbool_t swmr)
 {
     /* Variable Declarations */
-    hid_t       fid  = -1;                      /* File ID */
-    hid_t       fapl = -1;                      /* File access property list */
-    hid_t       gid = -1, gid2 = -1, gid3 = -1; /* Group IDs */
-    H5O_info2_t oinfo, oinfo2, oinfo3;          /* Object metadata information */
-    hid_t       aid;                            /* Attribute ID */
-    hid_t       sid;                            /* Dataspace ID */
-    char        attrname[500];                  /* Name of attribute */
-    unsigned    flags;                          /* File access flags */
-    int         i = 0;                          /* Local index variable */
+    hid_t       fid  = H5I_INVALID_HID; /* File ID */
+    hid_t       fapl = H5I_INVALID_HID; /* File access property list */
+    hid_t       gid = H5I_INVALID_HID, gid2 = H5I_INVALID_HID, gid3 = H5I_INVALID_HID; /* Group IDs */
+    H5O_info2_t oinfo, oinfo2, oinfo3; /* Object metadata information */
+    hid_t       aid = H5I_INVALID_HID; /* Attribute ID */
+    hid_t       sid = H5I_INVALID_HID; /* Dataspace ID */
+    char        attrname[500];         /* Name of attribute */
+    unsigned    flags;                 /* File access flags */
+    int         i = 0;                 /* Local index variable */
 
     /* Testing Macro */
     if (swmr) {
@@ -927,17 +928,17 @@ static unsigned
 verify_named_cork(hbool_t swmr)
 {
     /* Variable Declarations */
-    hid_t       fid  = -1;                      /* File ID */
-    hid_t       fapl = -1;                      /* File access property list */
-    hid_t       tid = -1, tid2 = -1, tid3 = -1; /* Datatype IDs */
-    hid_t       gid = -1, gid2 = -1;            /* Group IDs */
-    H5O_info2_t oinfo, oinfo2, oinfo3, oinfo4;  /* Object metadata information */
-    hid_t       aid = -1;                       /* Attribute ID */
-    hid_t       sid;                            /* Dataspace ID */
-    hid_t       did;                            /* Dataset ID */
-    char        attrname[500];                  /* Name of attribute */
-    unsigned    flags;                          /* File access flags */
-    int         i = 0;                          /* Local index variable */
+    hid_t       fid  = H5I_INVALID_HID; /* File ID */
+    hid_t       fapl = H5I_INVALID_HID; /* File access property list */
+    hid_t       tid = H5I_INVALID_HID, tid2 = H5I_INVALID_HID, tid3 = H5I_INVALID_HID; /* Datatype IDs */
+    hid_t       gid = H5I_INVALID_HID, gid2 = H5I_INVALID_HID;                         /* Group IDs */
+    H5O_info2_t oinfo, oinfo2, oinfo3, oinfo4; /* Object metadata information */
+    hid_t       aid = H5I_INVALID_HID;         /* Attribute ID */
+    hid_t       sid = H5I_INVALID_HID;         /* Dataspace ID */
+    hid_t       did = H5I_INVALID_HID;         /* Dataset ID */
+    char        attrname[500];                 /* Name of attribute */
+    unsigned    flags;                         /* File access flags */
+    int         i = 0;                         /* Local index variable */
 
     /* Testing Macro */
     if (swmr) {
@@ -1204,20 +1205,20 @@ static unsigned
 verify_multiple_cork(hbool_t swmr)
 {
     /* Variable Declarations */
-    hid_t       fid1 = -1, fid2 = -1;   /* File ID */
-    hid_t       fapl = -1;              /* File access property list */
-    hid_t       tid1 = -1, tid2 = -1;   /* Datatype IDs */
-    hid_t       gid1 = -1, gid2 = -1;   /* Group IDs */
-    hid_t       did1 = -1, did2 = -1;   /* Dataset ID */
-    hid_t       aidg1 = -1, aidg2 = -1; /* Attribute ID */
-    hid_t       aidd1 = -1, aidd2 = -1; /* Attribute ID */
-    hid_t       aidt1 = -1, aidt2 = -1; /* Attribute ID */
-    hid_t       sid = -1;               /* Dataspace ID */
-    H5O_info2_t oinfo1, oinfo2, oinfo3; /* Object metadata information */
-    hsize_t     dim[1] = {5};           /* Dimension sizes */
-    unsigned    flags;                  /* File access flags */
-    hbool_t     corked;                 /* Cork status */
-    herr_t      ret;                    /* Return value */
+    hid_t       fid1 = H5I_INVALID_HID, fid2 = H5I_INVALID_HID;   /* File ID */
+    hid_t       fapl = H5I_INVALID_HID;                           /* File access property list */
+    hid_t       tid1 = H5I_INVALID_HID, tid2 = H5I_INVALID_HID;   /* Datatype IDs */
+    hid_t       gid1 = H5I_INVALID_HID, gid2 = H5I_INVALID_HID;   /* Group IDs */
+    hid_t       did1 = H5I_INVALID_HID, did2 = H5I_INVALID_HID;   /* Dataset ID */
+    hid_t       aidg1 = H5I_INVALID_HID, aidg2 = H5I_INVALID_HID; /* Attribute ID */
+    hid_t       aidd1 = H5I_INVALID_HID, aidd2 = H5I_INVALID_HID; /* Attribute ID */
+    hid_t       aidt1 = H5I_INVALID_HID, aidt2 = H5I_INVALID_HID; /* Attribute ID */
+    hid_t       sid = H5I_INVALID_HID;                            /* Dataspace ID */
+    H5O_info2_t oinfo1, oinfo2, oinfo3;                           /* Object metadata information */
+    hsize_t     dim[1] = {5};                                     /* Dimension sizes */
+    unsigned    flags;                                            /* File access flags */
+    hbool_t     corked;                                           /* Cork status */
+    herr_t      ret;                                              /* Return value */
 
     /* Testing Macro */
     if (swmr) {
@@ -1880,18 +1881,18 @@ error:
 static unsigned
 test_dset_cork(hbool_t swmr, hbool_t new_format)
 {
-    hid_t    fid;                                          /* File ID */
-    hid_t    fapl;                                         /* File access property list */
-    hid_t    gid;                                          /* Groupd ID */
-    hid_t    did1, did2;                                   /* Dataset IDs */
-    hid_t    tid1, tid2;                                   /* Datatype IDs */
-    hid_t    sid;                                          /* Dataspace ID */
-    hid_t    dcpl;                                         /* Dataset creation property list */
-    hsize_t  dims[RANK];                                   /* Dataset dimensions */
-    hsize_t  maxdims[2]  = {H5S_UNLIMITED, H5S_UNLIMITED}; /* Maximum dataset dimensions */
-    hsize_t  cdims[RANK] = {2, 2};                         /* Chunk dimensions */
-    int      fillval     = 0;                              /* Fill value */
-    int      i, j, k = 0;                                  /* Local index variables */
+    hid_t    fid = H5I_INVALID_HID;                          /* File ID */
+    hid_t    fapl;                                           /* File access property list */
+    hid_t    gid  = H5I_INVALID_HID;                         /* Groupd ID */
+    hid_t    did1 = H5I_INVALID_HID, did2 = H5I_INVALID_HID; /* Dataset IDs */
+    hid_t    tid1 = H5I_INVALID_HID, tid2 = H5I_INVALID_HID; /* Datatype IDs */
+    hid_t    sid  = H5I_INVALID_HID;                         /* Dataspace ID */
+    hid_t    dcpl = H5I_INVALID_HID;                         /* Dataset creation property list */
+    hsize_t  dims[RANK];                                     /* Dataset dimensions */
+    hsize_t  maxdims[2]  = {H5S_UNLIMITED, H5S_UNLIMITED};   /* Maximum dataset dimensions */
+    hsize_t  cdims[RANK] = {2, 2};                           /* Chunk dimensions */
+    int      fillval     = 0;                                /* Fill value */
+    int      i, j, k = 0;                                    /* Local index variables */
     int **   wbuf      = NULL; /* Data buffer for writes (pointers to fake 2D array) */
     int *    wbuf_data = NULL; /* Data buffer for writes (real data) */
     int *    rbuf_data = NULL; /* Data buffer for reads (real data) */
diff --git a/test/dsets.c b/test/dsets.c
index 922f370..e2d281a 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -1399,7 +1399,7 @@ test_conv_buffer(hid_t fid)
         cf->b[j] = 100.0F * (float)(j + 1) + 0.01F * (float)j;
 
     for (j = 0; j < DIM3; j++)
-        cf->c[j] = 100.0F * (float)(j + 1) + 0.02F * (float)j;
+        cf->c[j] = 100.0 * (double)(j + 1) + 0.02 * (double)j;
 
     /* Create data space */
     if ((space = H5Screate(H5S_SCALAR)) < 0)
@@ -3442,11 +3442,11 @@ test_nbit_double(hid_t file)
     /* orig_data[] are initialized to be within the range that can be represented by
      * dataset datatype (no precision loss during datatype conversion)
      */
-    double orig_data[2][5] = {{(double)1.6081706885101836e+60L, -255.32099170994480f,
-                               (double)1.2677579992621376e-61L, 64568.289448797700f,
+    double orig_data[2][5] = {{(double)1.6081706885101836e+60L, -255.32099170994480,
+                               (double)1.2677579992621376e-61L, 64568.289448797700,
                                (double)-1.0619721778839084e-75L},
-                              {(double)2.1499497833454840e+56L, 6.6562295504670740e-3f, -1.5747263393432150f,
-                               1.0711093225222612f, -9.8971679387636870e-1f}};
+                              {(double)2.1499497833454840e+56L, 6.6562295504670740e-3, -1.5747263393432150,
+                               1.0711093225222612, -9.8971679387636870e-1}};
     double new_data[2][5];
     size_t precision, offset;
     size_t i, j;
@@ -5201,7 +5201,7 @@ test_scaleoffset_float(hid_t file)
     /* Check that the values read are the same as the values written */
     for (i = 0; i < (size_t)size[0]; i++) {
         for (j = 0; j < (size_t)size[1]; j++) {
-            if (HDfabs(new_data[i][j] - orig_data[i][j]) > HDpow(10.0, -3.0)) {
+            if (HDfabs((double)(new_data[i][j] - orig_data[i][j])) > HDpow(10.0, -3.0)) {
                 H5_FAILED();
                 HDprintf("    Read different values than written.\n");
                 HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
@@ -5347,7 +5347,7 @@ test_scaleoffset_float_2(hid_t file)
 
     /* Check that the values read are the same as the values written */
     for (j = 0; j < (size_t)size[1]; j++) {
-        if (HDfabs(new_data[0][j] - orig_data[0][j]) > HDpow(10.0, -3.0)) {
+        if (HDfabs((double)(new_data[0][j] - orig_data[0][j])) > HDpow(10.0, -3.0)) {
             H5_FAILED();
             HDprintf("    Read different values than written.\n");
             HDprintf("    At index %lu,%lu\n", (unsigned long)0, (unsigned long)j);
@@ -5435,7 +5435,7 @@ test_scaleoffset_double(hid_t file)
     /* Initialize data */
     for (i = 0; i < (size_t)size[0]; i++)
         for (j = 0; j < (size_t)size[1]; j++) {
-            orig_data[i][j] = (float)(HDrandom() % 10000000) / 10000000.0F;
+            orig_data[i][j] = (HDrandom() % 10000000) / 10000000.0;
 
             /* even-numbered values are negtive */
             if ((i * size[1] + j + 1) % 2 == 0)
@@ -5544,7 +5544,7 @@ test_scaleoffset_double_2(hid_t file)
         goto error;
 
     /* Set fill value */
-    fillval = 10000.0F;
+    fillval = 10000.0;
     if (H5Pset_fill_value(dc, H5T_NATIVE_DOUBLE, &fillval) < 0)
         goto error;
 
@@ -5581,7 +5581,7 @@ test_scaleoffset_double_2(hid_t file)
 
     /* Initialize data of hyperslab */
     for (j = 0; j < (size_t)size[1]; j++) {
-        orig_data[0][j] = (float)(HDrandom() % 10000000) / 10000000.0F;
+        orig_data[0][j] = (HDrandom() % 10000000) / 10000000.0;
 
         /* even-numbered values are negtive */
         if ((j + 1) % 2 == 0)
@@ -5614,7 +5614,7 @@ test_scaleoffset_double_2(hid_t file)
 
     /* Check that the values read are the same as the values written */
     for (j = 0; j < (size_t)size[1]; j++) {
-        if (HDfabs(new_data[0][j] - orig_data[0][j]) > HDpow(10.0, -7.0)) {
+        if (HDfabs((double)(new_data[0][j] - orig_data[0][j])) > HDpow(10.0, -7.0)) {
             H5_FAILED();
             HDprintf("    Read different values than written.\n");
             HDprintf("    At index %lu,%lu\n", (unsigned long)0, (unsigned long)j);
@@ -6525,7 +6525,7 @@ test_set_local(hid_t fapl)
     h5_fixname(FILENAME[5], fapl, filename, sizeof filename);
 
     /* Initialize the integer & floating-point dataset */
-    n = 1.0F;
+    n = 1.0;
     for (i = 0; i < DSET_DIM1; i++)
         for (j = 0; j < DSET_DIM2; j++) {
             points[i][j]     = (int)n++;
@@ -9085,7 +9085,7 @@ test_big_chunks_bypass_cache(hid_t fapl)
     /* Define cache size to be smaller than chunk size */
     rdcc_nelmts = BYPASS_CHUNK_DIM / 5;
     rdcc_nbytes = sizeof(int) * BYPASS_CHUNK_DIM / 5;
-    if (H5Pset_cache(fapl_local, 0, rdcc_nelmts, rdcc_nbytes, 0.0F) < 0)
+    if (H5Pset_cache(fapl_local, 0, rdcc_nelmts, rdcc_nbytes, 0.0) < 0)
         FAIL_STACK_ERROR
 
     /* Create file */
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 91e31d5..7e96d29 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -68,9 +68,7 @@ typedef enum dtype_t {
     INT_ULLONG,
     FLT_FLOAT,
     FLT_DOUBLE,
-#if H5_SIZEOF_LONG_DOUBLE != 0
     FLT_LDOUBLE,
-#endif
     OTHER
 } dtype_t;
 
@@ -457,10 +455,8 @@ reset_hdf5(void)
     SET_ALIGNMENT(ULLONG, H5_SIZEOF_LONG_LONG);
     SET_ALIGNMENT(FLOAT, H5_SIZEOF_FLOAT);
     SET_ALIGNMENT(DOUBLE, H5_SIZEOF_DOUBLE);
-#if H5_SIZEOF_LONG_DOUBLE != 0
     SET_ALIGNMENT(LDOUBLE, H5_SIZEOF_LONG_DOUBLE);
 #endif
-#endif
 }
 
 /*-------------------------------------------------------------------------
@@ -2704,10 +2700,10 @@ my_isnan(dtype_t type, void *val)
         double x = 0.0;
         HDmemcpy(&x, val, sizeof(double));
         retval = (x != x);
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
     }
     else if (FLT_LDOUBLE == type) {
-        long double x = 0.0;
+        long double x = 0.0L;
         HDmemcpy(&x, val, sizeof(long double));
         retval = (x != x);
 #endif
@@ -2732,10 +2728,10 @@ my_isnan(dtype_t type, void *val)
 
             HDmemcpy(&x, val, sizeof(double));
             HDsnprintf(s, sizeof(s), "%g", x);
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
         }
         else if (FLT_LDOUBLE == type) {
-            long double x = 0.0;
+            long double x = 0.0L;
 
             HDmemcpy(&x, val, sizeof(long double));
             HDsnprintf(s, sizeof(s), "%Lg", x);
@@ -2898,7 +2894,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
     else if (H5Tequal(src, H5T_NATIVE_DOUBLE)) {
         src_type_name = "double";
         src_type      = FLT_DOUBLE;
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
     }
     else if (H5Tequal(src, H5T_NATIVE_LDOUBLE)) {
         src_type_name = "long double";
@@ -2917,7 +2913,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
     else if (H5Tequal(dst, H5T_NATIVE_DOUBLE)) {
         dst_type_name = "double";
         dst_type      = FLT_DOUBLE;
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
     }
     else if (H5Tequal(dst, H5T_NATIVE_LDOUBLE)) {
         dst_type_name = "long double";
@@ -3000,7 +2996,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
             else if (src_type == FLT_DOUBLE) {
                 INIT_FP_NORM(double, DBL_MAX, DBL_MIN, DBL_MAX_10_EXP, DBL_MIN_10_EXP, src_size, dst_size,
                              buf, saved, nelmts);
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
             }
             else if (src_type == FLT_LDOUBLE) {
                 INIT_FP_NORM(long double, LDBL_MAX, LDBL_MIN, LDBL_MAX_10_EXP, LDBL_MIN_10_EXP, src_size,
@@ -3019,7 +3015,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
             else if (src_type == FLT_DOUBLE) {
                 INIT_FP_DENORM(double, DBL_MANT_DIG, src_size, src_nbits, sendian, dst_size, buf, saved,
                                nelmts);
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
             }
             else if (src_type == FLT_LDOUBLE) {
                 INIT_FP_DENORM(long double, LDBL_MANT_DIG, src_size, src_nbits, sendian, dst_size, buf, saved,
@@ -3037,7 +3033,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
             }
             else if (src_type == FLT_DOUBLE) {
                 INIT_FP_SPECIAL(src_size, src_nbits, sendian, DBL_MANT_DIG, dst_size, buf, saved, nelmts);
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
             }
             else if (src_type == FLT_LDOUBLE) {
                 INIT_FP_SPECIAL(src_size, src_nbits, sendian, LDBL_MANT_DIG, dst_size, buf, saved, nelmts);
@@ -3059,7 +3055,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
     for (j = 0; j < nelmts; j++) {
         underflow = 0;
         hw_f      = 911.0F;
-        hw_d      = 911.0F;
+        hw_d      = 911.0;
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
         hw_ld = 911.0L;
 #endif
@@ -3108,14 +3104,14 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
             if (FLT_FLOAT == dst_type) {
                 hw_f      = (float)*((long double *)aligned);
                 hw        = (unsigned char *)&hw_f;
-                underflow = HDfabsl(*((long double *)aligned)) < FLT_MIN;
-                overflow  = HDfabsl(*((long double *)aligned)) > FLT_MAX;
+                underflow = HDfabsl(*((long double *)aligned)) < (long double)FLT_MIN;
+                overflow  = HDfabsl(*((long double *)aligned)) > (long double)FLT_MAX;
             }
             else if (FLT_DOUBLE == dst_type) {
                 hw_d      = (double)*((long double *)aligned);
                 hw        = (unsigned char *)&hw_d;
-                underflow = HDfabsl(*((long double *)aligned)) < DBL_MIN;
-                overflow  = HDfabsl(*((long double *)aligned)) > DBL_MAX;
+                underflow = HDfabsl(*((long double *)aligned)) < (long double)DBL_MIN;
+                overflow  = HDfabsl(*((long double *)aligned)) > (long double)DBL_MAX;
             }
             else {
                 hw_ld = *((long double *)aligned);
@@ -3133,7 +3129,6 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
          * last few unused bytes may have garbage in them.  Clean them out with
          * 0s before compare the values.
          */
-#if H5_SIZEOF_LONG_DOUBLE != 0
         if (sendian == H5T_ORDER_LE && dst_type == FLT_LDOUBLE) {
             size_t q;
 
@@ -3142,7 +3137,6 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
                 hw[q]                 = 0x00;
             }
         }
-#endif
 
         /* Are the two results the same? */
         for (k = (dst_size - (dst_nbits / 8)); k < dst_size; k++)
@@ -3163,7 +3157,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
         else if (FLT_DOUBLE == dst_type && my_isnan(dst_type, buf + j * sizeof(double)) &&
                  my_isnan(dst_type, hw)) {
             continue;
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
         }
         else if (FLT_LDOUBLE == dst_type && my_isnan(dst_type, buf + j * sizeof(long double)) &&
                  my_isnan(dst_type, hw)) {
@@ -3204,8 +3198,8 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
                 if (overflow && my_isinf(dendian, buf + j * sizeof(float), dst_size, dst_mpos, dst_msize,
                                          dst_epos, dst_esize))
                     continue; /* all overflowed, no error */
-                check_mant[0] = HDfrexpf(x, check_expo + 0);
-                check_mant[1] = HDfrexpf(hw_f, check_expo + 1);
+                check_mant[0] = (double)HDfrexpf(x, check_expo + 0);
+                check_mant[1] = (double)HDfrexpf(hw_f, check_expo + 1);
             }
             else if (FLT_DOUBLE == dst_type) {
                 double x = 0.0;
@@ -3217,10 +3211,10 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
                     continue; /* all overflowed, no error */
                 check_mant[0] = HDfrexp(x, check_expo + 0);
                 check_mant[1] = HDfrexp(hw_d, check_expo + 1);
-#if H5_SIZEOF_LONG_DOUBLE != 0 && (H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE)
+#if (H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE)
             }
             else {
-                long double x = 0.0;
+                long double x = 0.0L;
                 HDmemcpy(&x, &buf[j * dst_size], sizeof(long double));
                 /* dst is largest float, no need to check underflow. */
                 check_mant[0] = (double)HDfrexpl(x, check_expo + 0);
@@ -3278,7 +3272,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
         }
         else {
-            long double x = 0.0;
+            long double x = 0.0L;
             HDmemcpy(&x, &saved[j * src_size], sizeof(long double));
             HDfprintf(stdout, " %29.20Le\n", x);
 #endif
@@ -3300,7 +3294,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
         }
         else {
-            long double x = 0.0;
+            long double x = 0.0L;
             HDmemcpy(&x, &buf[j * dst_size], sizeof(long double));
             HDfprintf(stdout, " %29.20Le\n", x);
 #endif
@@ -3506,7 +3500,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
     else if (H5Tequal(src, H5T_NATIVE_DOUBLE)) {
         src_type_name = "double";
         src_type      = FLT_DOUBLE;
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
     }
     else if (H5Tequal(src, H5T_NATIVE_LDOUBLE)) {
         src_type_name = "long double";
@@ -3566,7 +3560,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
     else if (H5Tequal(dst, H5T_NATIVE_DOUBLE)) {
         dst_type_name = "double";
         dst_type      = FLT_DOUBLE;
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
     }
     else if (H5Tequal(dst, H5T_NATIVE_LDOUBLE)) {
         dst_type_name = "long double";
@@ -3590,11 +3584,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
     if ((INT_SCHAR == src_type || INT_UCHAR == src_type || INT_SHORT == src_type || INT_USHORT == src_type ||
          INT_INT == src_type || INT_UINT == src_type || INT_LONG == src_type || INT_ULONG == src_type ||
          INT_LLONG == src_type || INT_ULLONG == src_type) &&
-        (FLT_FLOAT != dst_type && FLT_DOUBLE != dst_type
-#if H5_SIZEOF_LONG_DOUBLE != 0
-         && FLT_LDOUBLE != dst_type
-#endif
-         )) {
+        (FLT_FLOAT != dst_type && FLT_DOUBLE != dst_type && FLT_LDOUBLE != dst_type)) {
         HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name);
         HDprintf("%-70s", str);
         H5_FAILED();
@@ -3602,11 +3592,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
         goto error;
     }
 
-    if ((FLT_FLOAT == src_type || FLT_DOUBLE == src_type
-#if H5_SIZEOF_LONG_DOUBLE != 0
-         || FLT_LDOUBLE == src_type
-#endif
-         ) &&
+    if ((FLT_FLOAT == src_type || FLT_DOUBLE == src_type || FLT_LDOUBLE == src_type) &&
         (INT_SCHAR != dst_type && INT_UCHAR != dst_type && INT_SHORT != dst_type && INT_USHORT != dst_type &&
          INT_INT != dst_type && INT_UINT != dst_type && INT_LONG != dst_type && INT_ULONG != dst_type &&
          INT_LLONG != dst_type && INT_ULLONG != dst_type)) {
@@ -3738,7 +3724,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
         else {
             INIT_FP_SPECIAL(src_size, src_nbits, sendian, DBL_MANT_DIG, dst_size, buf, saved, nelmts);
         }
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
     }
     else if (src_type == FLT_LDOUBLE) {
         if (run_test == TEST_NORMAL) {
@@ -3763,11 +3749,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
 
     /* Check the results from the library against hardware */
     for (j = 0; j < nelmts; j++) {
-        if (FLT_FLOAT == src_type || FLT_DOUBLE == src_type
-#if H5_SIZEOF_LONG_DOUBLE != 0
-            || FLT_LDOUBLE == src_type
-#endif
-        )
+        if (FLT_FLOAT == src_type || FLT_DOUBLE == src_type || FLT_LDOUBLE == src_type)
             if (my_isnan(src_type, saved + j * src_size))
                 continue;
 
@@ -3874,7 +3856,6 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDassert(0 && "Unknown type");
                     break;
             }
-#if H5_SIZEOF_LONG_DOUBLE != 0
         }
         else if (FLT_LDOUBLE == dst_type) {
             hw = (unsigned char *)&hw_ldouble;
@@ -3927,7 +3908,6 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDassert(0 && "Unknown type");
                     break;
             }
-#endif
         }
         else if (INT_SCHAR == dst_type) {
             hw = (unsigned char *)&hw_schar;
@@ -3940,12 +3920,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
                     hw_schar = (signed char)(*((double *)aligned));
                     break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
                 case FLT_LDOUBLE:
                     HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
                     hw_schar = (signed char)(*((long double *)aligned));
                     break;
-#endif
                 case INT_SCHAR:
                 case INT_UCHAR:
                 case INT_SHORT:
@@ -3973,12 +3951,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
                     hw_uchar = (unsigned char)(*((double *)aligned));
                     break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
                 case FLT_LDOUBLE:
                     HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
                     hw_uchar = (unsigned char)(*((long double *)aligned));
                     break;
-#endif
                 case INT_SCHAR:
                 case INT_UCHAR:
                 case INT_SHORT:
@@ -4006,12 +3982,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
                     hw_short = (short)(*((double *)aligned));
                     break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
                 case FLT_LDOUBLE:
                     HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
                     hw_short = (short)(*((long double *)aligned));
                     break;
-#endif
                 case INT_SCHAR:
                 case INT_UCHAR:
                 case INT_SHORT:
@@ -4039,12 +4013,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
                     hw_ushort = (unsigned short)(*((double *)aligned));
                     break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
                 case FLT_LDOUBLE:
                     HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
                     hw_ushort = (unsigned short)(*((long double *)aligned));
                     break;
-#endif
                 case INT_SCHAR:
                 case INT_UCHAR:
                 case INT_SHORT:
@@ -4072,12 +4044,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
                     hw_int = (int)(*((double *)aligned));
                     break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
                 case FLT_LDOUBLE:
                     HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
                     hw_int = (int)(*((long double *)aligned));
                     break;
-#endif
                 case INT_SCHAR:
                 case INT_UCHAR:
                 case INT_SHORT:
@@ -4105,12 +4075,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
                     hw_uint = (unsigned int)(*((double *)aligned));
                     break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
                 case FLT_LDOUBLE:
                     HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
                     hw_uint = (unsigned int)(*((long double *)aligned));
                     break;
-#endif
                 case INT_SCHAR:
                 case INT_UCHAR:
                 case INT_SHORT:
@@ -4138,12 +4106,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
                     hw_long = (long)(*((double *)aligned));
                     break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
                 case FLT_LDOUBLE:
                     HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
                     hw_long = (long)(*((long double *)aligned));
                     break;
-#endif
                 case INT_SCHAR:
                 case INT_UCHAR:
                 case INT_SHORT:
@@ -4171,12 +4137,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
                     hw_ulong = (unsigned long)(*((double *)aligned));
                     break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
                 case FLT_LDOUBLE:
                     HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
                     hw_ulong = (unsigned long)(*((long double *)aligned));
                     break;
-#endif
                 case INT_SCHAR:
                 case INT_UCHAR:
                 case INT_SHORT:
@@ -4204,12 +4168,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
                     hw_llong = (long long)(*((double *)aligned));
                     break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
                 case FLT_LDOUBLE:
                     HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
                     hw_llong = (long long)(*((long double *)aligned));
                     break;
-#endif
                 case INT_SCHAR:
                 case INT_UCHAR:
                 case INT_SHORT:
@@ -4237,12 +4199,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                     HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
                     hw_ullong = (unsigned long long)(*((double *)aligned));
                     break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
                 case FLT_LDOUBLE:
                     HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
                     hw_ullong = (unsigned long long)(*((long double *)aligned));
                     break;
-#endif
                 case INT_SCHAR:
                 case INT_UCHAR:
                 case INT_SHORT:
@@ -4269,14 +4229,12 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
          * bytes may have garbage in them.  Clean them out with 0s before compare
          * the values.
          */
-#if H5_SIZEOF_LONG_DOUBLE != 0
         if (dendian == H5T_ORDER_LE && dst_type == FLT_LDOUBLE) {
             size_t q;
 
             for (q = dst_nbits / 8; q < dst_size; q++)
                 buf[j * dst_size + q] = 0x00;
         }
-#endif
 
         /* Are the two results the same? */
         for (k = (dst_size - (dst_nbits / 8)); k < dst_size; k++)
@@ -4315,11 +4273,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
          * Try to follow the except_func callback function to check if the
          * desired value was set.
          */
-        if ((FLT_FLOAT == src_type || FLT_DOUBLE == src_type
-#if H5_SIZEOF_LONG_DOUBLE != 0
-             || FLT_LDOUBLE == src_type
-#endif
-             ) &&
+        if ((FLT_FLOAT == src_type || FLT_DOUBLE == src_type || FLT_LDOUBLE == src_type) &&
             (INT_SCHAR == dst_type || INT_SHORT == dst_type || INT_INT == dst_type || INT_LONG == dst_type ||
              INT_LLONG == dst_type)) {
             if (0 == H5T__bit_get_d(src_bits, src_nbits - 1, (size_t)1) &&
@@ -4359,11 +4313,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
             }
         }
 
-        if ((FLT_FLOAT == src_type || FLT_DOUBLE == src_type
-#if H5_SIZEOF_LONG_DOUBLE != 0
-             || FLT_LDOUBLE == src_type
-#endif
-             ) &&
+        if ((FLT_FLOAT == src_type || FLT_DOUBLE == src_type || FLT_LDOUBLE == src_type) &&
             (INT_UCHAR == dst_type || INT_USHORT == dst_type || INT_UINT == dst_type ||
              INT_ULONG == dst_type || INT_ULLONG == dst_type)) {
             if (H5T__bit_get_d(src_bits, src_nbits - 1, (size_t)1)) {
@@ -4462,12 +4412,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                 HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
                 HDprintf(" %29f\n", *((double *)aligned));
                 break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
             case FLT_LDOUBLE:
                 HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
                 HDprintf(" %29Lf\n", *((long double *)aligned));
                 break;
-#endif
             case OTHER:
             default:
                 HDassert(0 && "Unknown type");
@@ -4527,12 +4475,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                 HDmemcpy(aligned, buf + j * sizeof(double), sizeof(double));
                 HDprintf(" %29f\n", *((double *)aligned));
                 break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
             case FLT_LDOUBLE:
                 HDmemcpy(aligned, buf + j * sizeof(long double), sizeof(long double));
                 HDprintf(" %29Lf\n", *((long double *)aligned));
                 break;
-#endif
             case OTHER:
             default:
                 HDassert(0 && "Unknown type");
@@ -4580,11 +4526,9 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
             case FLT_DOUBLE:
                 HDprintf(" %29f\n", *((double *)((void *)hw)));
                 break;
-#if H5_SIZEOF_LONG_DOUBLE != 0
             case FLT_LDOUBLE:
                 HDprintf(" %29Lf\n", *((long double *)((void *)hw)));
                 break;
-#endif
             case OTHER:
             default:
                 HDassert(0 && "Unknown type");
@@ -4923,16 +4867,14 @@ run_fp_tests(const char *name)
     if (!HDstrcmp(name, "noop")) {
         nerrors += test_conv_flt_1("noop", TEST_NOOP, H5T_NATIVE_FLOAT, H5T_NATIVE_FLOAT);
         nerrors += test_conv_flt_1("noop", TEST_NOOP, H5T_NATIVE_DOUBLE, H5T_NATIVE_DOUBLE);
-#if H5_SIZEOF_LONG_DOUBLE != 0
         nerrors += test_conv_flt_1("noop", TEST_NOOP, H5T_NATIVE_LDOUBLE, H5T_NATIVE_LDOUBLE);
-#endif
         goto done;
     }
 
     /*Test normalized values.  TEST_NORMAL indicates normalized values.*/
     nerrors += test_conv_flt_1(name, TEST_NORMAL, H5T_NATIVE_FLOAT, H5T_NATIVE_DOUBLE);
     nerrors += test_conv_flt_1(name, TEST_NORMAL, H5T_NATIVE_DOUBLE, H5T_NATIVE_FLOAT);
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
     nerrors += test_conv_flt_1(name, TEST_NORMAL, H5T_NATIVE_FLOAT, H5T_NATIVE_LDOUBLE);
     nerrors += test_conv_flt_1(name, TEST_NORMAL, H5T_NATIVE_DOUBLE, H5T_NATIVE_LDOUBLE);
     nerrors += test_conv_flt_1(name, TEST_NORMAL, H5T_NATIVE_LDOUBLE, H5T_NATIVE_FLOAT);
@@ -4942,7 +4884,7 @@ run_fp_tests(const char *name)
     /*Test denormalized values.  TEST_DENORM indicates denormalized values.*/
     nerrors += test_conv_flt_1(name, TEST_DENORM, H5T_NATIVE_FLOAT, H5T_NATIVE_DOUBLE);
     nerrors += test_conv_flt_1(name, TEST_DENORM, H5T_NATIVE_DOUBLE, H5T_NATIVE_FLOAT);
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
     nerrors += test_conv_flt_1(name, TEST_DENORM, H5T_NATIVE_FLOAT, H5T_NATIVE_LDOUBLE);
     nerrors += test_conv_flt_1(name, TEST_DENORM, H5T_NATIVE_DOUBLE, H5T_NATIVE_LDOUBLE);
 #ifndef H5_DISABLE_SOME_LDOUBLE_CONV
@@ -4955,11 +4897,7 @@ run_fp_tests(const char *name)
                    "float");
         HDprintf("%-70s", str);
         SKIPPED();
-#if H5_SIZEOF_LONG_DOUBLE != 0
         HDputs("    Test skipped due to the conversion problem on IBM ppc64le cpu.");
-#else
-        HDputs("    Test skipped due to disabled long double.");
-#endif
     }
 #endif
 
@@ -4969,7 +4907,7 @@ run_fp_tests(const char *name)
     /*Test special values, +/-0, +/-infinity, +/-QNaN, +/-SNaN.*/
     nerrors += test_conv_flt_1(name, TEST_SPECIAL, H5T_NATIVE_FLOAT, H5T_NATIVE_DOUBLE);
     nerrors += test_conv_flt_1(name, TEST_SPECIAL, H5T_NATIVE_DOUBLE, H5T_NATIVE_FLOAT);
-#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
     nerrors += test_conv_flt_1(name, TEST_SPECIAL, H5T_NATIVE_FLOAT, H5T_NATIVE_LDOUBLE);
     nerrors += test_conv_flt_1(name, TEST_SPECIAL, H5T_NATIVE_DOUBLE, H5T_NATIVE_LDOUBLE);
 #ifndef H5_DISABLE_SOME_LDOUBLE_CONV
@@ -4983,11 +4921,7 @@ run_fp_tests(const char *name)
                    "float or double");
         HDprintf("%-70s", str);
         SKIPPED();
-#if H5_SIZEOF_LONG_DOUBLE != 0
         HDputs("    Test skipped due to the conversion problem on IBM ppc64le cpu.");
-#else
-        HDputs("    Test skipped due to disabled long double.");
-#endif
     }
 #endif
 #endif
@@ -5068,11 +5002,7 @@ run_int_fp_conv(const char *name)
                    "long double");
         HDprintf("%-70s", str);
         SKIPPED();
-#if H5_SIZEOF_LONG_DOUBLE != 0
         HDputs("    Test skipped due to the special algorithm of hardware conversion.");
-#else
-        HDputs("    Test skipped due to disabled long double.");
-#endif
     }
 #endif
 #endif /* H5_SIZEOF_LONG!=H5_SIZEOF_INT */
@@ -5193,14 +5123,10 @@ run_fp_int_conv(const char *name)
                        "signed and unsigned char, short, int, long");
             HDprintf("%-70s", str);
             SKIPPED();
-#if H5_SIZEOF_LONG_DOUBLE != 0
             HDputs("    Test skipped due to the conversion problem on IBM ppc64le cpu.");
-#else
-            HDputs("    Test skipped due to disabled long double.");
-#endif
 #endif
         }
-#if H5_SIZEOF_LONG != H5_SIZEOF_INT && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG != H5_SIZEOF_INT
 #ifndef H5_LDOUBLE_TO_LONG_SPECIAL
         if (test_values != TEST_SPECIAL && test_values != TEST_NORMAL) {
             nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_LONG);
@@ -5220,35 +5146,27 @@ run_fp_int_conv(const char *name)
                        "(unsigned) long");
             HDprintf("%-70s", str);
             SKIPPED();
-#if H5_SIZEOF_LONG_DOUBLE != 0
             HDputs("    Test skipped due to the special algorithm of hardware conversion.");
-#else
-            HDputs("    Test skipped due to disabled long double.");
-#endif
         }
 #endif
-#endif /*H5_SIZEOF_LONG!=H5_SIZEOF_INT && H5_SIZEOF_LONG_DOUBLE!=0 */
+#endif /*H5_SIZEOF_LONG!=H5_SIZEOF_INT */
 
-#if H5_SIZEOF_LONG_LONG != H5_SIZEOF_LONG && H5_SIZEOF_LONG_DOUBLE != 0
+#if H5_SIZEOF_LONG_LONG != H5_SIZEOF_LONG
 #ifdef H5_LDOUBLE_TO_LLONG_ACCURATE
         nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_LLONG);
-#else /*H5_LDOUBLE_TO_LLONG_ACCURATE*/
+#else  /*H5_LDOUBLE_TO_LLONG_ACCURATE*/
         {
             char str[256]; /*string        */
 
             HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "long double", "long long");
             HDprintf("%-70s", str);
             SKIPPED();
-#if H5_SIZEOF_LONG_DOUBLE != 0
             HDputs("    Test skipped due to hardware conversion error.");
-#else
-            HDputs("    Test skipped due to disabled long double.");
-#endif
         }
 #endif /*H5_LDOUBLE_TO_LLONG_ACCURATE*/
 #if defined(H5_LDOUBLE_TO_LLONG_ACCURATE)
         nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_ULLONG);
-#else /*H5_LDOUBLE_TO_LLONG_ACCURATE*/
+#else  /*H5_LDOUBLE_TO_LLONG_ACCURATE*/
         {
             char str[256]; /*string        */
 
@@ -5256,11 +5174,7 @@ run_fp_int_conv(const char *name)
                        "unsigned long long");
             HDprintf("%-70s", str);
             SKIPPED();
-#if H5_SIZEOF_LONG_DOUBLE != 0
             HDputs("    Test skipped due to hardware conversion error.");
-#else
-            HDputs("    Test skipped due to disabled long double.");
-#endif
         }
 #endif /*H5_LDOUBLE_TO_LLONG_ACCURATE*/
 #endif
diff --git a/test/dtransform.c b/test/dtransform.c
index 743103f..50c33ee 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -357,9 +357,7 @@ main(void)
     TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
     TEST_TYPE_CONTIG(dxpl_id_c_to_f, float, H5T_NATIVE_FLOAT, "float", windchillFfloat, 1);
     TEST_TYPE_CONTIG(dxpl_id_c_to_f, double, H5T_NATIVE_DOUBLE, "double", windchillFfloat, 1);
-#if H5_SIZEOF_LONG_DOUBLE != 0
     TEST_TYPE_CONTIG(dxpl_id_c_to_f, long double, H5T_NATIVE_LDOUBLE, "ldouble", windchillFfloat, 1);
-#endif
 
     TEST_TYPE_CHUNK(dxpl_id_utrans_inv, char, H5T_NATIVE_CHAR, "char", transformData, 0);
     TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned char, H5T_NATIVE_UCHAR, "uchar", transformData, 0);
@@ -374,9 +372,7 @@ main(void)
     TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
     TEST_TYPE_CHUNK(dxpl_id_c_to_f, float, H5T_NATIVE_FLOAT, "float", windchillFfloat, 1);
     TEST_TYPE_CHUNK(dxpl_id_c_to_f, double, H5T_NATIVE_DOUBLE, "double", windchillFfloat, 1);
-#if H5_SIZEOF_LONG_DOUBLE != 0
     TEST_TYPE_CHUNK(dxpl_id_c_to_f, long double, H5T_NATIVE_LDOUBLE, "ldouble", windchillFfloat, 1);
-#endif
 
     if (test_copy(dxpl_id_c_to_f_copy, dxpl_id_polynomial_copy) < 0)
         TEST_ERROR;
diff --git a/test/dtypes.c b/test/dtypes.c
index 8b3101c..f9b4e8c 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -160,10 +160,8 @@ reset_hdf5(void)
     SET_ALIGNMENT(ULLONG, H5_SIZEOF_LONG_LONG);
     SET_ALIGNMENT(FLOAT, H5_SIZEOF_FLOAT);
     SET_ALIGNMENT(DOUBLE, H5_SIZEOF_DOUBLE);
-#if H5_SIZEOF_LONG_DOUBLE != 0
     SET_ALIGNMENT(LDOUBLE, H5_SIZEOF_LONG_DOUBLE);
 #endif
-#endif
 }
 
 /*-------------------------------------------------------------------------
diff --git a/test/filter_plugin.c b/test/filter_plugin.c
index 276141a..c373b3b 100644
--- a/test/filter_plugin.c
+++ b/test/filter_plugin.c
@@ -1305,6 +1305,102 @@ error:
 } /* end test_path_api_calls() */
 
 /*-------------------------------------------------------------------------
+ * Function:  test_filter_numbers
+ *
+ * Purpose:   Tests the filter numbers are handled correctly
+ *
+ * Return:    SUCCEED/FAIL
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+test_filter_numbers(void)
+{
+    hid_t        dcpl_id = H5I_INVALID_HID;
+    H5Z_filter_t id;
+    herr_t       status = SUCCEED;
+    size_t       nelmts = 0;
+    unsigned int flags;
+    unsigned int filter_config;
+
+    HDputs("Testing filter number handling");
+
+    /* Check that out-of-range filter numbers are handled correctly */
+    TESTING("    Filter # out of range");
+
+    /* Create property list */
+    if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        TEST_ERROR;
+
+    nelmts = 0;
+
+    /* Test id > H5Z_FILTER_MAX and < 0, current version */
+
+    H5E_BEGIN_TRY
+    {
+        id     = H5Z_FILTER_MAX + 1;
+        status = H5Pget_filter_by_id2(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL, &filter_config);
+    }
+    H5E_END_TRY;
+
+    /* Should fail */
+    if (status != FAIL)
+        TEST_ERROR;
+
+    H5E_BEGIN_TRY
+    {
+        id     = -1;
+        status = H5Pget_filter_by_id2(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL, &filter_config);
+    }
+    H5E_END_TRY;
+
+    /* Should fail */
+    if (status != FAIL)
+        TEST_ERROR;
+
+        /* Test id > H5Z_FILTER_MAX and < 0, deprecated version */
+
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+    H5E_BEGIN_TRY
+    {
+        id     = H5Z_FILTER_MAX + 1;
+        status = H5Pget_filter_by_id1(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL);
+    }
+    H5E_END_TRY;
+
+    /* Should fail */
+    if (status != FAIL)
+        TEST_ERROR;
+
+    H5E_BEGIN_TRY
+    {
+        id     = -1;
+        status = H5Pget_filter_by_id1(dcpl_id, id, &flags, &nelmts, NULL, 0, NULL);
+    }
+    H5E_END_TRY;
+
+    /* Should fail */
+    if (status != FAIL)
+        TEST_ERROR;
+#endif
+
+    if (H5Pclose(dcpl_id) < 0)
+        TEST_ERROR;
+
+    PASSED();
+
+    return SUCCEED;
+
+error:
+    H5E_BEGIN_TRY
+    {
+        H5Pclose(dcpl_id);
+    }
+    H5E_END_TRY;
+    return FAIL;
+} /* end test_filter_numbers() */
+
+/*-------------------------------------------------------------------------
  * Function:  disable_chunk_cache
  *
  * Purpose:   Turns the chunk cache off
@@ -1523,6 +1619,9 @@ main(void)
     /* Test the APIs for access to the filter plugin path table */
     nerrors += (test_path_api_calls() < 0 ? 1 : 0);
 
+    /* Test filter numbers */
+    nerrors += (test_filter_numbers() < 0 ? 1 : 0);
+
     if (nerrors)
         TEST_ERROR;
 
diff --git a/test/objcopy.c b/test/objcopy.c
index e01083d..9aae621 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -11092,7 +11092,7 @@ test_copy_dataset_contig_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl,
         buf[i].b.p   = (int *)HDmalloc(buf[i].b.len * sizeof(int));
         for (j = 0; j < buf[i].b.len; j++)
             ((int *)buf[i].b.p)[j] = (int)(i * 10 + j);
-        buf[i].c = 1.0F / ((float)i + 1.0F);
+        buf[i].c = 1.0 / ((double)i + 1.0);
     } /* end for */
 
     /* Initialize the filenames */
@@ -11268,7 +11268,7 @@ test_copy_dataset_chunked_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
         buf[i].b.p   = (int *)HDmalloc(buf[i].b.len * sizeof(int));
         for (j = 0; j < buf[i].b.len; j++)
             ((int *)buf[i].b.p)[j] = (int)(i * 10 + j);
-        buf[i].c = 1.0F / ((float)i + 1.0F);
+        buf[i].c = 1.0 / ((double)i + 1.0);
     } /* end for */
 
     /* Initialize the filenames */
@@ -11453,7 +11453,7 @@ test_copy_dataset_compact_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl
         buf[i].b.p   = (int *)HDmalloc(buf[i].b.len * sizeof(int));
         for (j = 0; j < buf[i].b.len; j++)
             ((int *)buf[i].b.p)[j] = (int)(i * 10 + j);
-        buf[i].c = 1.0F / ((float)i + 1.0F);
+        buf[i].c = 1.0 / ((double)i + 1.0);
     } /* end for */
 
     /* Initialize the filenames */
diff --git a/test/swmr.c b/test/swmr.c
index 24a0b7c..9091fe2 100644
--- a/test/swmr.c
+++ b/test/swmr.c
@@ -5220,7 +5220,7 @@ test_file_lock_swmr_concur(hid_t H5_ATTR_UNUSED in_fapl)
 static int
 test_file_lock_swmr_concur(hid_t in_fapl)
 {
-    hid_t fid;                     /* File ID */
+    hid_t fid = H5I_INVALID_HID;   /* File ID */
     hid_t fapl;                    /* File access property list */
     char  filename[NAME_BUF_SIZE]; /* file name */
     pid_t childpid = 0;            /* Child process ID */
@@ -6721,7 +6721,7 @@ test_refresh_concur(hid_t H5_ATTR_UNUSED in_fapl, hbool_t new_format)
 static int
 test_refresh_concur(hid_t in_fapl, hbool_t new_format)
 {
-    hid_t fid;                     /* File ID */
+    hid_t fid = H5I_INVALID_HID;   /* File ID */
     hid_t fapl;                    /* File access property list */
     pid_t childpid = 0;            /* Child process ID */
     pid_t tmppid;                  /* Child process ID returned by waitpid */
diff --git a/test/tconfig.c b/test/tconfig.c
index 101de9a..8bd625f 100644
--- a/test/tconfig.c
+++ b/test/tconfig.c
@@ -114,30 +114,14 @@ test_config_ctypes(void)
     vrfy_cint_type(long, unsigned long, H5_SIZEOF_LONG);
     vrfy_ctype(float, H5_SIZEOF_FLOAT);
     vrfy_ctype(double, H5_SIZEOF_DOUBLE);
-#if H5_SIZEOF_LONG_DOUBLE > 0
     vrfy_ctype(long double, H5_SIZEOF_LONG_DOUBLE);
-#endif
 
     /* standard C99 basic types */
-#if H5_SIZEOF_LONG_LONG > 0
     vrfy_cint_type(long long, unsigned long long, H5_SIZEOF_LONG_LONG);
-#endif
-
-#if H5_SIZEOF_INT8_T > 0
     vrfy_cint_type(int8_t, uint8_t, H5_SIZEOF_INT8_T);
-#endif
-
-#if H5_SIZEOF_INT16_T > 0
     vrfy_cint_type(int16_t, uint16_t, H5_SIZEOF_INT16_T);
-#endif
-
-#if H5_SIZEOF_INT32_T > 0
     vrfy_cint_type(int32_t, uint32_t, H5_SIZEOF_INT32_T);
-#endif
-
-#if H5_SIZEOF_INT64_T > 0
     vrfy_cint_type(int64_t, uint64_t, H5_SIZEOF_INT64_T);
-#endif
 
     /* Some vendors have different sizes for the signed and unsigned */
     /* fast8_t.  Need to check them individually. */
diff --git a/test/testmeta.c b/test/testmeta.c
index c59c6cb..7cb3000 100644
--- a/test/testmeta.c
+++ b/test/testmeta.c
@@ -195,7 +195,7 @@ main(void)
 
             start[0] = 0;
             status   = H5Sselect_hyperslab(memspace_id, H5S_SELECT_SET, start, stride, count, NULL);
-            start[0] = (hssize_t)j;
+            start[0] = (hsize_t)j;
             status   = H5Sselect_hyperslab(dataspace_id, H5S_SELECT_SET, start, stride, count, NULL);
             status   = H5Dwrite(dataset_id, type_id, memspace_id, dataspace_id, H5P_DEFAULT, &floatval);
             if (status < 0) {
diff --git a/test/tskiplist.c b/test/tskiplist.c
index 4bf9b11..31b5cff 100644
--- a/test/tskiplist.c
+++ b/test/tskiplist.c
@@ -1165,213 +1165,6 @@ test_skiplist_free(void)
 
 /****************************************************************
 **
-**  test_skiplist_try_free_safe(): Test H5SL (skip list) code.
-**      Tests 'try_free_safe' operation in skip lists.
-**
-****************************************************************/
-/* Macro definitions */
-#define TEST_TFS_MAX_NOBJS 100
-#define TEST_TFS_MIN_NOBJS 5
-#define TEST_TFS_NITER     50
-
-/* Structure to hold the list of objects */
-typedef struct {
-    H5SL_t *               slist;     /* Skiplist holding the objects */
-    struct test_tfs_obj_t *list;      /* Linear list of objects */
-    int                    nobjs;     /* Number of objects in list */
-    int                    nobjs_rem; /* Number of objects in list that have not been freed */
-} test_tfs_list_t;
-
-/* Structure for an object */
-typedef struct test_tfs_obj_t {
-    int idx;    /* Index (key) for this object */
-    int nfrees; /* Number of times this object has been freed */
-} test_tfs_obj_t;
-
-/* op_data struct for H5SL_iterate() */
-typedef struct test_tfs_it_ud_t {
-    test_tfs_list_t *obj_list; /* List of objects */
-    int              last_idx; /* Index of last object visited in iteration */
-    int              ncalls;   /* Number of times this callback was called */
-} test_tfs_it_ud_t;
-
-/* iterate callback */
-static herr_t
-test_tfs_iter(void *_obj, void *key, void *_udata)
-{
-    test_tfs_obj_t *  obj   = (test_tfs_obj_t *)_obj;
-    test_tfs_it_ud_t *udata = (test_tfs_it_ud_t *)_udata;
-
-    /* Check consistency */
-    CHECK_PTR_EQ((void *)&obj->idx, key, "obj->idx");
-    CHECK_PTR_EQ(obj, &udata->obj_list->list[obj->idx], "obj_list->list[obj->idx]");
-
-    /* Increment number of calls */
-    udata->ncalls++;
-
-    /* Verify we were given the correct object */
-    do {
-        udata->last_idx++;
-    } while (udata->obj_list->list[udata->last_idx].nfrees != 0);
-    VERIFY(udata->last_idx, obj->idx, "H5SL_iterate");
-
-    return 0;
-} /* end test_tfs_iter() */
-
-/* try_free_safe callback */
-static htri_t
-test_tfs_free(void *_obj, void *key, void *_obj_list)
-{
-    test_tfs_obj_t * obj      = (test_tfs_obj_t *)_obj;
-    test_tfs_list_t *obj_list = (test_tfs_list_t *)_obj_list;
-    test_tfs_it_ud_t iter_ud;
-    int              nrems, rem_idx, i, j;
-    test_tfs_obj_t * obj_ret;
-    herr_t           ret; /* return value */
-    htri_t           ret_value;
-
-    /* Check consistency */
-    CHECK_PTR_EQ((void *)&obj->idx, key, "obj->idx");
-    CHECK_PTR_EQ(obj, &obj_list->list[obj->idx], "obj_list->list[obj->idx]");
-
-    /* Mark this object as freed (to make sure it isn't recursively freed, that
-     * is not something we support, we will undo this if we decide later not to
-     * free the object) */
-    obj->nfrees++;
-    obj_list->nobjs_rem--;
-
-    /* Decide how many objects to remove */
-    nrems = (int)(HDrandom() % (long)3);
-
-    /* Remove objects */
-    for (i = 0; i < nrems; i++)
-        /* Check nobjs_rem */
-        if (obj_list->nobjs_rem > 0) {
-            /* Remove a random object from the list */
-            rem_idx = (int)(HDrandom() % (long)obj_list->nobjs_rem);
-
-            /* Scan the list, finding the rem_idx'th object that has not been
-             * freed */
-            for (j = 0; j < obj_list->nobjs; j++)
-                if (obj_list->list[j].nfrees == 0) {
-                    if (rem_idx == 0)
-                        break;
-                    else
-                        rem_idx--;
-                } /* end if */
-            if (j == obj_list->nobjs)
-                ERROR("invalid obj_list");
-            else {
-                /* Remove the object */
-                obj_ret = (test_tfs_obj_t *)H5SL_remove(obj_list->slist, &j);
-                CHECK_PTR(obj_ret, "H5SL_remove");
-                obj_ret->nfrees++;
-                obj_list->nobjs_rem--;
-            } /* end else */
-        }     /* end if */
-
-    /* Mark this object as not freed so we know to expect it in the iterate call
-     */
-    obj->nfrees--;
-    obj_list->nobjs_rem++;
-
-    /* Iterate over skip list (maybe) */
-    if (HDrandom() % (long)5) {
-        iter_ud.obj_list = obj_list;
-        iter_ud.last_idx = -1;
-        iter_ud.ncalls   = 0;
-        ret              = H5SL_iterate(obj_list->slist, test_tfs_iter, &iter_ud);
-        CHECK(ret, FAIL, "H5SL_iterate");
-        VERIFY(iter_ud.ncalls, obj_list->nobjs_rem, "H5SL_iterate");
-    } /* end if */
-
-    /* Verify nobjs_rem is non-negative */
-    if (obj_list->nobjs_rem < 0)
-        ERROR("invalid nobjs_rem");
-
-    /* Decide whether this object should be freed */
-    if (HDrandom() % (long)2) {
-        /* Free the object */
-        ret_value = TRUE;
-        obj->nfrees++;
-        obj_list->nobjs_rem--;
-    } /* end if */
-    else
-        /* Do not free the object */
-        ret_value = FALSE;
-
-    return ret_value;
-} /* end test_tfs_free() */
-
-/* Test function */
-static void
-test_skiplist_try_free_safe(void)
-{
-    test_tfs_list_t obj_list;
-    test_tfs_obj_t  list[TEST_TFS_MAX_NOBJS];
-    int             i, j;
-    int             nobjs_found;
-    hsize_t         count;
-    herr_t          ret; /* Generic return value */
-
-    /* Output message about test being performed */
-    MESSAGE(7, ("Testing Skip List 'Try Free Safe' Operation\n"));
-
-    /* Create a skip list */
-    obj_list.slist = H5SL_create(H5SL_TYPE_INT, NULL);
-    CHECK_PTR(obj_list.slist, "H5SL_create");
-
-    /* Init obj_list.list */
-    obj_list.list = list;
-    for (j = 0; j < TEST_TFS_MAX_NOBJS; j++)
-        list[j].idx = j;
-
-    for (i = 0; i < TEST_TFS_NITER; i++) {
-        /* Build object list */
-        obj_list.nobjs = obj_list.nobjs_rem =
-            (int)(TEST_TFS_MIN_NOBJS + (HDrandom() % (long)(TEST_TFS_MAX_NOBJS - TEST_TFS_MIN_NOBJS + 1)));
-        for (j = 0; j < obj_list.nobjs; j++) {
-            list[j].nfrees = 0;
-            ret            = H5SL_insert(obj_list.slist, &list[j], &list[j].idx);
-            CHECK(ret, FAIL, "H5SL_insert");
-        } /* end for */
-
-        /* Call H5S_try_free_safe() - free most of the items in the skip list in
-         * a safe manner */
-        ret = H5SL_try_free_safe(obj_list.slist, test_tfs_free, &obj_list);
-        CHECK(ret, FAIL, "H5SL_try_free_safe");
-
-        /* Verify list */
-        nobjs_found = 0;
-        for (j = 0; j < obj_list.nobjs; j++)
-            if (list[j].nfrees == 0)
-                nobjs_found++;
-            else
-                VERIFY(list[j].nfrees, (long)1, "list[j].nfrees");
-
-        /* Verify number of objects */
-        VERIFY(obj_list.nobjs_rem, nobjs_found, "obj_list.nobjs_rem");
-        count = H5SL_count(obj_list.slist);
-        VERIFY(count, (size_t)nobjs_found, "H5SL_count");
-
-        /* Release the skip list, forcibly freeing all nodes (will not make
-         * callbacks) */
-        ret = H5SL_release(obj_list.slist);
-        CHECK(ret, FAIL, "H5SL_release");
-
-        /* Verify number of objects is 0 */
-        count = H5SL_count(obj_list.slist);
-        VERIFY(count, (size_t)0, "H5SL_count");
-    } /* end for */
-
-    /* Close the skip list */
-    ret = H5SL_close(obj_list.slist);
-    CHECK(ret, FAIL, "H5SL_close");
-
-} /* end test_skiplist_try_free_safe() */
-
-/****************************************************************
-**
 **  test_skiplist_less(): Test H5SL (skip list) code.
 **      Tests 'less' operation in skip lists.
 **
@@ -1796,7 +1589,6 @@ test_skiplist(void)
     test_skiplist_add();               /* Test 'add' operation */
     test_skiplist_destroy();           /* Test 'destroy' operation */
     test_skiplist_free();              /* Test 'free' operation */
-    test_skiplist_try_free_safe();     /* Test 'try_free_safe' operation */
     test_skiplist_less();              /* Test 'less' operation */
     test_skiplist_greater();           /* Test 'greater' operation */
     test_skiplist_below();             /* Test 'below' operation */
diff --git a/test/tunicode.c b/test/tunicode.c
index 1b696ac..7d4dba6 100644
--- a/test/tunicode.c
+++ b/test/tunicode.c
@@ -34,7 +34,7 @@
 #define RANK            1
 #define COMP_INT_VAL    7
 #define COMP_FLOAT_VAL  (-42.0F)
-#define COMP_DOUBLE_VAL 42.0F
+#define COMP_DOUBLE_VAL 42.0
 
 /* Test function prototypes */
 void test_fl_string(hid_t fid, const char *string);
diff --git a/test/tvlstr.c b/test/tvlstr.c
index 7e47c7b..68f6124 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -293,7 +293,7 @@ test_vlstrings_special(void)
     /* Check data read in */
     for (i = 0; i < SPACE1_DIM1; i++)
         if (rdata[i] != NULL)
-            TestErrPrintf("VL doesn't match!, rdata[%d]=%p\n", (int)i, rdata[i]);
+            TestErrPrintf("VL doesn't match!, rdata[%d]=%s\n", (int)i, rdata[i]);
 
     /* Write dataset to disk */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
@@ -352,7 +352,7 @@ test_vlstrings_special(void)
     /* Check data read in */
     for (i = 0; i < SPACE1_DIM1; i++)
         if (rdata[i] != NULL)
-            TestErrPrintf("VL doesn't match!, rdata[%d]=%p\n", (int)i, rdata[i]);
+            TestErrPrintf("VL doesn't match!, rdata[%d]=%s\n", (int)i, rdata[i]);
 
     /* Try to write nil strings to disk. */
     ret = H5Dwrite(dataset, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata2);
@@ -365,7 +365,7 @@ test_vlstrings_special(void)
     /* Check data read in */
     for (i = 0; i < SPACE1_DIM1; i++)
         if (rdata[i] != NULL)
-            TestErrPrintf("VL doesn't match!, rdata[%d]=%p\n", (int)i, rdata[i]);
+            TestErrPrintf("VL doesn't match!, rdata[%d]=%s\n", (int)i, rdata[i]);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);