1.8 Merge Remove clang warnings from develop (#1099)

* Merge Remove clang warnings from develop

* revert HD prefix

6 files changed, 126 insertions, 127 deletions

diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index eb967e1..3015883 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -345,10 +345,10 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
      */
 
     {
-        double data1[3][2] = {{1.0F, 1.0F}, {1.00F, 1.000F}, {0.0F, 0.0F}};
-        double data2[3][2] = {{0.0F, 1.1F}, {1.01F, 1.001F}, {0.0F, 1.0F}};
-        double data3[3][2] = {{100.0F, 100.0F}, {100.00F, 100.000F}, {100.0F, 100.0F}};
-        double data4[3][2] = {{105.0F, 120.0F}, {160.00F, 95.000F}, {80.0F, 40.0F}};
+        double data1[3][2] = {{1.0, 1.0}, {1.00, 1.000}, {0.0, 0.0}};
+        double data2[3][2] = {{0.0, 1.1}, {1.01, 1.001}, {0.0, 1.0}};
+        double data3[3][2] = {{100.0, 100.0}, {100.00, 100.000}, {100.0, 100.0}};
+        double data4[3][2] = {{105.0, 120.0}, {160.00, 95.000}, {80.0, 40.0}};
 
         write_dset(gid1, 2, dims2, "dset1", H5T_NATIVE_DOUBLE, data1);
         write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_DOUBLE, data2);
@@ -396,8 +396,8 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
      *-------------------------------------------------------------------------
      */
     {
-        double data9[3][2]  = {{100.0F, 100.0F}, {100.0F, 0.0F}, {0.0F, 100.0F}};
-        double data10[3][2] = {{120.0F, 80.0F}, {0.0F, 100.0F}, {0.0F, 50.0F}};
+        double data9[3][2]  = {{100.0, 100.0}, {100.0, 0.0}, {0.0, 100.0}};
+        double data10[3][2] = {{120.0, 80.0}, {0.0, 100.0}, {0.0, 50.0}};
 
         write_dset(gid1, 2, dims2, "dset9", H5T_NATIVE_DOUBLE, data9);
         write_dset(gid1, 2, dims2, "dset10", H5T_NATIVE_DOUBLE, data10);
@@ -452,19 +452,19 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
         float data15[6];
         float data16[6];
 
-        data15[0] = (float)HDsqrt(-1.0F);
-        data15[1] = 1.0F;
-        data15[2] = (float)HDsqrt(-1.0F);
-        data15[3] = 1.0F;
-        data15[4] = 1.0F;
-        data15[5] = 1.0F;
+        data15[0] = (float)HDsqrt(-1.0);
+        data15[1] = 1.0;
+        data15[2] = (float)HDsqrt(-1.0);
+        data15[3] = 1.0;
+        data15[4] = 1.0;
+        data15[5] = 1.0;
 
-        data16[0] = (float)HDsqrt(-1.0F);
-        data16[1] = (float)HDsqrt(-1.0F);
-        data16[2] = 1.0F;
-        data16[3] = 1.0F;
-        data16[4] = 1.0F;
-        data16[5] = 1.0F;
+        data16[0] = (float)HDsqrt(-1.0);
+        data16[1] = (float)HDsqrt(-1.0);
+        data16[2] = 1.0;
+        data16[3] = 1.0;
+        data16[4] = 1.0;
+        data16[5] = 1.0;
 
         write_dset(gid1, 1, dims1, "fp15", H5T_NATIVE_FLOAT, data15);
         write_dset(gid1, 1, dims1, "fp16", H5T_NATIVE_FLOAT, data16);
@@ -479,19 +479,19 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
         double data17[6];
         double data18[6];
 
-        data17[0] = HDsqrt(-1.0F);
-        data17[1] = 1.0F;
-        data17[2] = HDsqrt(-1.0F);
-        data17[3] = 1.0F;
-        data17[4] = 1.0F;
-        data17[5] = 1.0F;
+        data17[0] = HDsqrt(-1.0);
+        data17[1] = 1.0;
+        data17[2] = HDsqrt(-1.0);
+        data17[3] = 1.0;
+        data17[4] = 1.0;
+        data17[5] = 1.0;
 
-        data18[0] = HDsqrt(-1.0F);
-        data18[1] = HDsqrt(-10000.0F);
-        data18[2] = 1.0F;
-        data18[3] = 1.0F;
-        data18[4] = 1.0F;
-        data18[5] = 1.0F;
+        data18[0] = HDsqrt(-1.0);
+        data18[1] = HDsqrt(-10000.0);
+        data18[2] = 1.0;
+        data18[3] = 1.0;
+        data18[4] = 1.0;
+        data18[5] = 1.0;
 
         write_dset(gid1, 1, dims1, "fp17", H5T_NATIVE_DOUBLE, data17);
         write_dset(gid1, 1, dims1, "fp18", H5T_NATIVE_DOUBLE, data18);
@@ -506,11 +506,11 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
         float  data19[6];
         double data20[6];
 
-        data19[0] = data19[1] = data19[2] = (float)HDlog(0.0F);
-        data19[3] = data19[4] = data19[5] = (float)-HDlog(0.0F);
+        data19[0] = data19[1] = data19[2] = (float)HDlog(0.0);
+        data19[3] = data19[4] = data19[5] = (float)-HDlog(0.0);
 
-        data20[0] = data20[1] = data20[2] = HDlog(0.0F);
-        data20[3] = data20[4] = data20[5] = -HDlog(0.0F);
+        data20[0] = data20[1] = data20[2] = HDlog(0.0);
+        data20[3] = data20[4] = data20[5] = -HDlog(0.0);
 
         write_dset(gid1, 1, dims1, "fp19", H5T_NATIVE_FLOAT, data19);
         write_dset(gid1, 1, dims1, "fp19_COPY", H5T_NATIVE_FLOAT, data19);
@@ -534,15 +534,15 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
         size_t  type_size;
         hid_t   tid;
 
-        buf1[0].d = HDsqrt(-1.0F);
-        buf1[0].f = (float)HDsqrt(-1.0F);
-        buf2[0].d = HDsqrt(-1.0F);
-        buf2[0].f = (float)HDsqrt(-1.0F);
+        buf1[0].d = HDsqrt(-1.0);
+        buf1[0].f = (float)HDsqrt(-1.0);
+        buf2[0].d = HDsqrt(-1.0);
+        buf2[0].f = (float)HDsqrt(-1.0);
 
-        buf1[1].d = HDsqrt(-1.0F);
-        buf1[1].f = (float)HDsqrt(-1.0F);
-        buf2[1].d = 0.0F;
-        buf2[1].f = 0.0F;
+        buf1[1].d = HDsqrt(-1.0);
+        buf1[1].f = (float)HDsqrt(-1.0);
+        buf2[1].d = 0.0;
+        buf2[1].f = 0.0;
 
         type_size = sizeof(cmp1_t);
         tid       = H5Tcreate(H5T_COMPOUND, type_size);
@@ -570,13 +570,13 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
             int i;
         } cmp3_t;
 
-        double       data2[6]    = {0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F};
+        double       data2[6]    = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
         int          data3[6]    = {0, 0, 0, 0, 0, 0};
         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.0f, 2}};
-        cmp2_t       data8[1]    = {{1, 2.0f}};
+        cmp1_t       data7[1]    = {{1.0, 2}};
+        cmp2_t       data8[1]    = {{1, 2.0}};
         hsize_t      dims3[2]    = {2, 2};
         hsize_t      dims4[1]    = {1};
         size_t       type_size;
@@ -776,10 +776,10 @@ test_datatypes(const char *fname)
     int     buf3b[3][2] = {{1, 1}, {3, 4}, {5, 6}};
     long    buf4a[3][2] = {{1, 1}, {1, 1}, {1, 1}};
     long    buf4b[3][2] = {{1, 1}, {3, 4}, {5, 6}};
-    float   buf5a[3][2] = {{1.0F, 1.0F}, {1.0F, 1.0F}, {1.0F, 1.0F}};
-    float   buf5b[3][2] = {{1.0F, 1.0F}, {3.0F, 4.0F}, {5.0F, 6.0F}};
-    double  buf6a[3][2] = {{1.0F, 1.0F}, {1.0F, 1.0F}, {1.0F, 1.0F}};
-    double  buf6b[3][2] = {{1.0F, 1.0F}, {3.0F, 4.0F}, {5.0F, 6.0F}};
+    float   buf5a[3][2] = {{1.0, 1.0}, {1.0, 1.0}, {1.0, 1.0}};
+    float   buf5b[3][2] = {{1.0, 1.0}, {3.0, 4.0}, {5.0, 6.0}};
+    double  buf6a[3][2] = {{1.0, 1.0}, {1.0, 1.0}, {1.0, 1.0}};
+    double  buf6b[3][2] = {{1.0, 1.0}, {3.0, 4.0}, {5.0, 6.0}};
 
     /*unsigned/signed test
     signed char -128 to 127
@@ -5111,27 +5111,27 @@ write_attr_strings(hid_t loc_id, const char *dset_name, hid_t fid,
     char       buf1[2][STR_SIZE] = {"ab", "de"};     /* string */
     char *     buf1a[2];                             /* VL string */
     char       buf2[2] = {1, 2};                     /* bitfield, opaque */
-    s_t        buf3[2] = {{1, 2.0F}, {3, 4.0F}};     /* compound */
+    s_t        buf3[2] = {{1, 2.0}, {3, 4.0}};       /* compound */
     hobj_ref_t buf4[2];                              /* reference */
     e_t        buf45[2] = {RED, RED};                /* enum */
     hvl_t      buf5[2];                              /* vlen */
     hsize_t    dimarray[1] = {3};                    /* array dimension */
     int        buf6[2][3]  = {{1, 2, 3}, {4, 5, 6}}; /* array */
     int        buf7[2]     = {1, 2};                 /* integer */
-    float      buf8[2]     = {1.0F, 2.0F};           /* float */
+    float      buf8[2]     = {1.0, 2.0};             /* float */
 
     /* create 2D attributes with dimension [3][2], 6 elements */
-    hsize_t dims2[2]              = {3, 2};
-    char    buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */
-    char *  buf12a[3][2];                                                       /* VL string */
-    char    buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}};                             /* bitfield, opaque */
-    s_t     buf32[6] = {{1, 2.0F}, {3, 4.0F}, {5, 6.0F}, {7, 8.0F}, {9, 10.0F}, {11, 12.0F}}; /* compound */
+    hsize_t    dims2[2]              = {3, 2};
+    char       buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */
+    char *     buf12a[3][2];                                                       /* VL string */
+    char       buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}};                             /* bitfield, opaque */
+    s_t        buf32[6]    = {{1, 2.0}, {3, 4.0}, {5, 6.0}, {7, 8.0}, {9, 10.0}, {11, 12.0}}; /* compound */
     hobj_ref_t buf42[3][2];                                                                   /* reference */
     e_t        buf452[3][2];                                                                  /* enum */
     hvl_t      buf52[3][2];                                                                   /* vlen */
     int buf62[6][3] = {{1, 2, 3}, {4, 5, 6}, {7, 8, 9}, {10, 11, 12}, {13, 14, 15}, {16, 17, 18}}; /* array */
-    int buf72[3][2] = {{1, 2}, {3, 4}, {5, 6}};                     /* integer */
-    float buf82[3][2] = {{1.0F, 2.0F}, {3.0F, 4.0F}, {5.0F, 6.0F}}; /* float */
+    int buf72[3][2] = {{1, 2}, {3, 4}, {5, 6}};               /* integer */
+    float buf82[3][2] = {{1.0, 2.0}, {3.0, 4.0}, {5.0, 6.0}}; /* float */
 
     /* create 3D attributes with dimension [4][3][2], 24 elements */
     hsize_t    dims3[3]                 = {4, 3, 2};
@@ -5832,7 +5832,7 @@ write_attr_strings(hid_t loc_id, const char *dset_name, hid_t fid,
             for (k = 0; k < 2; k++)
                 if (make_diffs) {
                     buf33[i][j][k].a = 0;
-                    buf33[i][j][k].b = 0.0F;
+                    buf33[i][j][k].b = 0.0;
                 }
                 else {
                     buf33[i][j][k].a = (char)n++;
@@ -6042,7 +6042,7 @@ write_attr_strings(hid_t loc_id, const char *dset_name, hid_t fid,
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
                     buf73[i][j][k] = 0;
-                    buf83[i][j][k] = 0.0F;
+                    buf83[i][j][k] = 0.0;
                 }
                 else {
                     buf73[i][j][k] = n++;
@@ -6100,27 +6100,27 @@ write_attr_in(hid_t loc_id, const char *dset_name, hid_t fid,
     char       buf1[2][STR_SIZE] = {"ab", "de"};     /* string */
     char *     buf1a[2];                             /* VL string */
     char       buf2[2] = {1, 2};                     /* bitfield, opaque */
-    s_t        buf3[2] = {{1, 2.0F}, {3, 4.0F}};     /* compound */
+    s_t        buf3[2] = {{1, 2.0}, {3, 4.0}};       /* compound */
     hobj_ref_t buf4[2];                              /* reference */
     e_t        buf45[2] = {RED, RED};                /* enum */
     hvl_t      buf5[2];                              /* vlen */
     hsize_t    dimarray[1] = {3};                    /* array dimension */
     int        buf6[2][3]  = {{1, 2, 3}, {4, 5, 6}}; /* array */
     int        buf7[2]     = {1, 2};                 /* integer */
-    float      buf8[2]     = {1.0F, 2.0F};           /* float */
+    float      buf8[2]     = {1.0, 2.0};             /* float */
 
     /* create 2D attributes with dimension [3][2], 6 elements */
-    hsize_t dims2[2]              = {3, 2};
-    char    buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */
-    char *  buf12a[3][2];                                                       /* VL string */
-    char    buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}};                             /* bitfield, opaque */
-    s_t     buf32[6] = {{1, 2.0F}, {3, 4.0F}, {5, 6.0F}, {7, 8.0F}, {9, 10.0F}, {11, 12.0F}}; /* compound */
+    hsize_t    dims2[2]              = {3, 2};
+    char       buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */
+    char *     buf12a[3][2];                                                       /* VL string */
+    char       buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}};                             /* bitfield, opaque */
+    s_t        buf32[6]    = {{1, 2.0}, {3, 4.0}, {5, 6.0}, {7, 8.0}, {9, 10.0}, {11, 12.0}}; /* compound */
     hobj_ref_t buf42[3][2];                                                                   /* reference */
     e_t        buf452[3][2];                                                                  /* enum */
     hvl_t      buf52[3][2];                                                                   /* vlen */
     int buf62[6][3] = {{1, 2, 3}, {4, 5, 6}, {7, 8, 9}, {10, 11, 12}, {13, 14, 15}, {16, 17, 18}}; /* array */
-    int buf72[3][2] = {{1, 2}, {3, 4}, {5, 6}};                     /* integer */
-    float buf82[3][2] = {{1.0F, 2.0F}, {3.0F, 4.0F}, {5.0F, 6.0F}}; /* float */
+    int buf72[3][2] = {{1, 2}, {3, 4}, {5, 6}};               /* integer */
+    float buf82[3][2] = {{1.0, 2.0}, {3.0, 4.0}, {5.0, 6.0}}; /* float */
 
     /* create 3D attributes with dimension [4][3][2], 24 elements */
     hsize_t    dims3[3]                 = {4, 3, 2};
@@ -6821,7 +6821,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, hid_t fid,
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
                     buf33[i][j][k].a = 0;
-                    buf33[i][j][k].b = 0.0F;
+                    buf33[i][j][k].b = 0.0;
                 }
                 else {
                     buf33[i][j][k].a = (char)n++;
@@ -7031,7 +7031,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, hid_t fid,
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
                     buf73[i][j][k] = 0;
-                    buf83[i][j][k] = 0.0F;
+                    buf83[i][j][k] = 0.0;
                 }
                 else {
                     buf73[i][j][k] = n++;
@@ -7092,26 +7092,26 @@ write_dset_in(hid_t loc_id, const char *dset_name, hid_t fid,
     char       buf1[2][STR_SIZE] = {"ab", "de"};     /* string */
     char *     buf1a[2];                             /* VL string */
     char       buf2[2] = {1, 2};                     /* bitfield, opaque */
-    s_t        buf3[2] = {{1, 2.0F}, {3, 4.0F}};     /* compound */
+    s_t        buf3[2] = {{1, 2.0}, {3, 4.0}};       /* compound */
     hobj_ref_t buf4[2];                              /* reference */
     e_t        buf45[2] = {RED, GREEN};              /* enum */
     hvl_t      buf5[2];                              /* vlen */
     hsize_t    dimarray[1] = {3};                    /* array dimension */
     int        buf6[2][3]  = {{1, 2, 3}, {4, 5, 6}}; /* array */
     int        buf7[2]     = {1, 2};                 /* integer */
-    float      buf8[2]     = {1.0F, 2.0F};           /* float */
+    float      buf8[2]     = {1.0, 2.0};             /* float */
 
     /* create 2D attributes with dimension [3][2], 6 elements */
-    hsize_t dims2[2]              = {3, 2};
-    char    buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */
-    char *  buf12a[3][2];                                                       /* VL string */
-    char    buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}};                             /* bitfield, opaque */
-    s_t     buf32[6] = {{1, 2.0F}, {3, 4.0F}, {5, 6.0F}, {7, 8.0F}, {9, 10.0F}, {11, 12.0F}}; /* compound */
+    hsize_t    dims2[2]              = {3, 2};
+    char       buf12[3][2][STR_SIZE] = {{"ab", "cd"}, {"ef", "gh"}, {"ij", "kl"}}; /* string */
+    char *     buf12a[3][2];                                                       /* VL string */
+    char       buf22[3][2] = {{1, 2}, {3, 4}, {5, 6}};                             /* bitfield, opaque */
+    s_t        buf32[6]    = {{1, 2.0}, {3, 4.0}, {5, 6.0}, {7, 8.0}, {9, 10.0}, {11, 12.0}}; /* compound */
     hobj_ref_t buf42[3][2];                                                                   /* reference */
     hvl_t      buf52[3][2];                                                                   /* vlen */
     int buf62[6][3] = {{1, 2, 3}, {4, 5, 6}, {7, 8, 9}, {10, 11, 12}, {13, 14, 15}, {16, 17, 18}}; /* array */
-    int buf72[3][2] = {{1, 2}, {3, 4}, {5, 6}};                     /* integer */
-    float buf82[3][2] = {{1.0F, 2.0F}, {3.0F, 4.0F}, {5.0F, 6.0F}}; /* float */
+    int buf72[3][2] = {{1, 2}, {3, 4}, {5, 6}};               /* integer */
+    float buf82[3][2] = {{1.0, 2.0}, {3.0, 4.0}, {5.0, 6.0}}; /* float */
 
     /* create 3D attributes with dimension [4][3][2], 24 elements */
     hsize_t    dims3[3]                 = {4, 3, 2};
@@ -7579,7 +7579,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, hid_t fid,
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
                     buf33[i][j][k].a = 0;
-                    buf33[i][j][k].b = 0.0F;
+                    buf33[i][j][k].b = 0.0;
                 }
                 else {
                     buf33[i][j][k].a = (char)n++;
@@ -7677,7 +7677,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, hid_t fid,
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
                     buf73[i][j][k] = 0;
-                    buf83[i][j][k] = 0.0F;
+                    buf83[i][j][k] = 0.0;
                 }
                 else {
                     buf73[i][j][k] = n++;
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 062e895..1272ba2 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -196,8 +196,8 @@ const H5L_class_t UD_link_class[1] = {{
 
 #define DIM1  20
 #define DIM2  10
-#define CDIM1 DIM1 / 2
-#define CDIM2 DIM2 / 2
+#define CDIM1 (DIM1 / 2)
+#define CDIM2 (DIM2 / 2)
 #define RANK  2
 
 /* Dataspace of 0 dimension size */
@@ -476,7 +476,7 @@ gent_dataset(void)
 
     for (i = 0; i < 30; i++)
         for (j = 0; j < 20; j++)
-            dset2[i][j] = 0.0001F * (float)j + (float)i;
+            dset2[i][j] = 0.0001 * (double)j + (double)i;
 
     H5Dwrite(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset2_data);
 
@@ -583,7 +583,7 @@ gent_attribute(void)
     attr    = H5Acreate2(root, "attr3", H5T_IEEE_F64BE, space, H5P_DEFAULT, H5P_DEFAULT);
 
     for (i = 0; i < 10; i++)
-        d[i] = 0.1F * (float)i;
+        d[i] = 0.1 * (double)i;
 
     H5Awrite(attr, H5T_NATIVE_DOUBLE, d);
     H5Sclose(space);
@@ -997,7 +997,7 @@ gent_compound_dt(void)
     for (i = 0; i < (int)sdim; i++) {
         dset1[i].a = i;
         dset1[i].b = (float)(i * i);
-        dset1[i].c = (float)(1.0F / (float)(i + 1));
+        dset1[i].c = (double)(1.0 / (double)(i + 1));
 
         dset2[i].a = i;
         dset2[i].b = (float)((float)i + (float)i * 0.1F);
@@ -1184,7 +1184,7 @@ gent_compound_dt2(void)
     for (i = 0; i < (int)sdim; i++) {
         dset1[i].a = i;
         dset1[i].b = (float)(i * i);
-        dset1[i].c = (float)(1.0F / (float)(i + 1));
+        dset1[i].c = (double)(1.0 / (double)(i + 1));
 
         dset2[i].a = i;
         dset2[i].b = (float)((float)i + (float)i * 0.1F);
@@ -1624,7 +1624,7 @@ gent_many(void)
     space2  = H5Screate_simple(1, dims, NULL);
     attr    = H5Acreate2(dataset, "attr3", H5T_IEEE_F64BE, space2, H5P_DEFAULT, H5P_DEFAULT);
     for (i = 0; i < 10; i++)
-        d[i] = 0.1F * (float)i;
+        d[i] = 0.1 * (double)i;
     H5Awrite(attr, H5T_NATIVE_DOUBLE, d);
     H5Sclose(space2);
     H5Aclose(attr);
@@ -2476,7 +2476,7 @@ gent_nestcomp(void)
     for (i = 0; i < 10; i++) {
         s1[i].a      = i;
         s1[i].b      = (float)(i * i);
-        s1[i].c      = 1.0F / (float)(i + 1);
+        s1[i].c      = 1.0 / (double)(i + 1);
         s1[i].d.a    = (char)(65 + i);
         s1[i].d.b[0] = -100.0F;
         s1[i].d.b[1] = 100.0F;
@@ -5017,7 +5017,7 @@ gent_compound_complex(void)
         Array1[m].e = (float)((float)m * 0.96F);
 
         for (n = 0; n < F41_ARRAY_DIMf; n++)
-            Array1[m].f[n] = ((float)m * 1024.9637F);
+            Array1[m].f[n] = ((double)m * 1024.9637);
 
         Array1[m].g = 'm';
     }
@@ -6286,7 +6286,7 @@ gent_ldouble_scalar(void)
     hid_t       tid;
     hid_t       sid;
     hsize_t     dims[1] = {6};
-    long double buf[6]  = {0.0, 1.0, 2.0, 3.0, 4.0, 5.0};
+    long double buf[6]  = {0.0L, 1.0L, 2.0L, 3.0L, 4.0L, 5.0L};
 
     if ((fid = H5Fcreate(FILE88, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto error;
@@ -6946,7 +6946,7 @@ gent_fpformat(void)
 {
     hid_t   fid, sid, did;
     hsize_t dims[1] = {6};
-    double  dbuf[6] = {-0.1234567f, 0.1234567f, 0, 0, 0, 0};
+    double  dbuf[6] = {-0.1234567, 0.1234567, 0, 0, 0, 0};
     float   fbuf[6] = {-0.1234567f, 0.1234567f, 0, 0, 0, 0};
 
     fid = H5Fcreate(FILE60, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -7236,7 +7236,7 @@ gent_packedbits(void)
 
     for (i = 0; i < dims[0]; i++)
         for (j = 0; j < dims[1]; j++)
-            dsetdbl[i][j] = 0.0001F * (float)j + (float)i;
+            dsetdbl[i][j] = 0.0001 * (double)j + (double)i;
 
     H5Dwrite(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetdbl);
 
@@ -7435,7 +7435,7 @@ gent_attr_intsize(void)
 
     for (i = 0; i < dims[0]; i++)
         for (j = 0; j < dims[1]; j++)
-            dsetdbl[i][j] = 0.0001F * (float)j + (float)i;
+            dsetdbl[i][j] = 0.0001 * (double)j + (double)i;
 
     H5Awrite(attr, H5T_NATIVE_DOUBLE, dsetdbl);
 
@@ -7739,7 +7739,7 @@ gent_compound_intsizes(void)
 
         for (n = 0; n < (int)dims[0]; n++)
             for (o = 0; o < (int)dims[1]; o++)
-                Array1[m].dsetdbl[n][o] = 0.0001F * (float)o + (float)n;
+                Array1[m].dsetdbl[n][o] = 0.0001 * (double)o + (double)n;
     }
 
     /* Create the array data type for the 8 bits signed int array             */
@@ -8025,7 +8025,7 @@ gent_compound_attr_intsizes(void)
 
         for (n = 0; n < (int)dims[0]; n++)
             for (o = 0; o < (int)dims[1]; o++)
-                Array1[m].dsetdbl[n][o] = 0.0001F * (float)o + (float)n;
+                Array1[m].dsetdbl[n][o] = 0.0001 * (double)o + (double)n;
     }
 
     /* Create the array data type for the 8 bits signed int array             */
@@ -8528,7 +8528,7 @@ gent_intscalars(void)
 
     for (i = 0; i < dims[0]; i++)
         for (j = 0; j < dims[1]; j++)
-            dsetdbl[i][j] = 0.0001F * (float)j + (float)i;
+            dsetdbl[i][j] = 0.0001 * (double)j + (double)i;
 
     H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetdbl[0]);
 
@@ -8772,7 +8772,7 @@ gent_attr_intscalars(void)
 
     for (i = 0; i < dims[0]; i++)
         for (j = 0; j < dims[1]; j++)
-            dsetdbl[i][j] = 0.0001F * (float)j + (float)i;
+            dsetdbl[i][j] = 0.0001 * (double)j + (double)i;
 
     H5Awrite(attr, tid, dsetdbl[0]);
 
@@ -8971,7 +8971,7 @@ gent_compound_int_array(void)
         dims[0] = F76_DIM8;
 
         for (n = 0; n < (int)dims[0]; n++)
-            Cmpd1[m].dsetdbl[n] = 0.0001F + (float)n;
+            Cmpd1[m].dsetdbl[n] = 0.0001 + (double)n;
     }
 
     /* Create the array data type for the 8 bits signed int array             */
@@ -9204,8 +9204,8 @@ gent_compound_ints(void)
         val64bits <<= 1;
 
         /* Double Dummy set for failure tests */
-        Cmpd1[m].dsetdbl = 0.0001F + (float)m;
-        Cmpd2[m].dsetdbl = 0.0001F + (float)m;
+        Cmpd1[m].dsetdbl = 0.0001 + (double)m;
+        Cmpd2[m].dsetdbl = 0.0001 + (double)m;
     }
 
     /* Create the dataspace                                           */
@@ -9577,7 +9577,7 @@ gent_intattrscalars(void)
 
     for (i = 0; i < dims[0]; i++)
         for (j = 0; j < dims[1]; j++)
-            dsetdbl[i][j] = 0.0001F * (float)j + (float)i;
+            dsetdbl[i][j] = 0.0001 * (double)j + (double)i;
 
     H5Dwrite(dataset, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dsetdbl);
     /* Attribute of double */
@@ -9906,7 +9906,7 @@ gent_intsattrs(void)
 
     for (i = 0; i < dims[0]; i++)
         for (j = 0; j < dims[1]; j++) {
-            dsetdbl[i][j]            = 0.0001F * (float)j + (float)i;
+            dsetdbl[i][j]            = 0.0001 * (double)j + (double)i;
             asetdbl[i * dims[1] + j] = dsetdbl[i][j];
         }
 
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 8d31bfc..57b8a5c 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -104,9 +104,9 @@ static hbool_t not_comparable;
         per            = -1;                                                                                 \
         not_comparable = FALSE;                                                                              \
         both_zero      = FALSE;                                                                              \
-        if (H5_DBL_ABS_EQUAL(0, (double)A) && H5_DBL_ABS_EQUAL(0, (double)B))                                \
+        if (H5_DBL_ABS_EQUAL(0, (double)(A)) && H5_DBL_ABS_EQUAL(0, (double)(B)))                            \
             both_zero = TRUE;                                                                                \
-        if (!H5_DBL_ABS_EQUAL(0, (double)A))                                                                 \
+        if (!H5_DBL_ABS_EQUAL(0, (double)(A)))                                                               \
             per = (double)ABS((double)((B) - (A)) / (double)(A));                                            \
         else                                                                                                 \
             not_comparable = TRUE;                                                                           \
@@ -117,9 +117,9 @@ static hbool_t not_comparable;
         per            = -1;                                                                                 \
         not_comparable = FALSE;                                                                              \
         both_zero      = FALSE;                                                                              \
-        if (H5_DBL_ABS_EQUAL(0, (double)A) && H5_DBL_ABS_EQUAL(0, (double)B))                                \
+        if (H5_DBL_ABS_EQUAL(0, (double)(A)) && H5_DBL_ABS_EQUAL(0, (double)(B)))                            \
             both_zero = TRUE;                                                                                \
-        if (!H5_DBL_ABS_EQUAL(0, (double)A))                                                                 \
+        if (!H5_DBL_ABS_EQUAL(0, (double)(A)))                                                               \
             per = ABS((double)((TYPE)((B) - (A))) / (double)(A));                                            \
         else                                                                                                 \
             not_comparable = TRUE;                                                                           \
@@ -1838,7 +1838,7 @@ diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
 
         /* both not NaN, do the comparison */
         if (!isnan1 && !isnan2) {
-            if (ABS(temp1_double - temp2_double) > opts->delta) {
+            if ((double)ABS(temp1_double - temp2_double) > opts->delta) {
                 opts->print_percentage = 0;
                 print_pos(opts, elem_idx, 0);
                 if (print_data(opts)) {
@@ -1931,7 +1931,7 @@ diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
                 }
                 nfound++;
             }
-            else if (per > opts->percent && ABS(temp1_double - temp2_double) > opts->delta) {
+            else if (per > opts->percent && (double)ABS(temp1_double - temp2_double) > opts->delta) {
                 opts->print_percentage = 1;
                 print_pos(opts, elem_idx, 0);
                 if (print_data(opts)) {
@@ -2887,7 +2887,7 @@ ull2float(unsigned long long ull_value, float *f_value)
     size_t         dst_size;
     int            ret_value = 0;
 
-    H5TOOLS_START_DEBUG("");
+    H5TOOLS_START_DEBUG(" ");
     if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Pcreate failed");
 
diff --git a/tools/perform/chunk.c b/tools/perform/chunk.c
index ada2ed3..1b6793a 100644
--- a/tools/perform/chunk.c
+++ b/tools/perform/chunk.c
@@ -55,20 +55,20 @@
 #define RM_CACHE_STRT 25
 #define RM_CACHE_END  25
 #define RM_CACHE_DELT 5
-#define RM_START      (double)0.50F
-#define RM_END        (double)5.00F
-#define RM_DELTA      (double)0.50F
-#define RM_W0         0.0F
+#define RM_START      0.50
+#define RM_END        5.00
+#define RM_DELTA      0.50
+#define RM_W0         0.0
 #define RM_NRDCC      521
 
 /* Diagonal test */
 #define DIAG_CACHE_STRT 25
 #define DIAG_CACHE_END  25
 #define DIAG_CACHE_DELT 5
-#define DIAG_START      (double)0.50F
-#define DIAG_END        (double)5.00F
-#define DIAG_DELTA      (double)0.50F
-/* #define DIAG_W0		0.65F */
+#define DIAG_START      0.50
+#define DIAG_END        5.00
+#define DIAG_DELTA      0.50
+/* #define DIAG_W0		0.65 */
 /* #define DIAG_NRDCC		521 */
 
 static size_t nio_g;
diff --git a/tools/perform/overhead.c b/tools/perform/overhead.c
index dba8220..2687ce9 100644
--- a/tools/perform/overhead.c
+++ b/tools/perform/overhead.c
@@ -193,7 +193,7 @@ test(fill_t fill_style, const double splits[], hbool_t verbose, hbool_t use_rdcc
     if (!use_rdcc) {
         if (H5Pget_cache(fapl, &mdc_nelmts, NULL, NULL, NULL) < 0)
             goto error;
-        if (H5Pset_cache(fapl, mdc_nelmts, 0, 0, 0.0F) < 0)
+        if (H5Pset_cache(fapl, mdc_nelmts, 0, 0, 0.0) < 0)
             goto error;
     }
     if ((file = H5Fcreate(FILE_NAME_1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
diff --git a/tools/perform/zip_perf.c b/tools/perform/zip_perf.c
index ba9788d..53a9678 100644
--- a/tools/perform/zip_perf.c
+++ b/tools/perform/zip_perf.c
@@ -32,11 +32,10 @@
 #define ONE_MB (ONE_KB * ONE_KB)
 #define ONE_GB (ONE_MB * ONE_KB)
 
-#define MICROSECOND 1000000.0F
+#define MICROSECOND 1000000.0
 
 /* report 0.0 in case t is zero too */
-#define MB_PER_SEC(bytes, t)                                                                                 \
-    ((fabs(t) < (double)0.0000000001F) ? (double)0.0F : ((((double)bytes) / (double)ONE_MB) / (t)))
+#define MB_PER_SEC(bytes, t) ((fabs(t) < 0.0000000001) ? 0.0 : ((((double)(bytes)) / (double)ONE_MB) / (t)))
 
 #ifndef TRUE
 #define TRUE 1
@@ -169,7 +168,7 @@ write_file(Bytef *source, uLongf sourceLen)
 
     /* destination buffer needs to be at least 0.1% larger than sourceLen
      * plus 12 bytes */
-    destLen = (uLongf)((double)sourceLen + ((double)sourceLen * (double)0.1F)) + 12;
+    destLen = (uLongf)((double)sourceLen + ((double)sourceLen * 0.1)) + 12;
     dest    = (Bytef *)HDmalloc(destLen);
 
     if (!dest)
@@ -179,8 +178,8 @@ write_file(Bytef *source, uLongf sourceLen)
     compress_buffer(dest, &destLen, source, sourceLen);
     HDgettimeofday(&timer_stop, NULL);
 
-    compression_time += ((double)timer_stop.tv_sec + ((double)timer_stop.tv_usec) / (double)MICROSECOND) -
-                        ((double)timer_start.tv_sec + ((double)timer_start.tv_usec) / (double)MICROSECOND);
+    compression_time += ((double)timer_stop.tv_sec + ((double)timer_stop.tv_usec) / MICROSECOND) -
+                        ((double)timer_start.tv_sec + ((double)timer_start.tv_usec) / MICROSECOND);
 
     if (report_once_flag) {
         HDfprintf(stdout, "\tCompression Ratio: %g\n", ((double)destLen) / (double)sourceLen);
@@ -448,7 +447,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
             error("out of memory");
         }
 
-        compression_time = 0.0F;
+        compression_time = 0.0;
 
         if (random_test)
             fill_with_random_data(src, src_len);