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

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

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

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

* Committing clang-format changes

* Removes gratuitous (double)x.yF casts

* Committing clang-format changes

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

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

* Committing clang-format changes

* Adds consts to a few global variables

* Cleans up a const warning left over from previous constification

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

* Purges UFAIL from the library (#637)

* Committing clang-format changes

* Purges UFAIL from the library

* H5HL_insert change requested in PR

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

* Bmr dev hdffv 11223 (#640)

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

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

* Committing clang-format changes

* Updated for test files

* Updated for HDFFV-11223

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

* Committing clang-format changes

* Restore "error:" in line 2666.

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

This reverts commit 426b50484841118cf633fd6147302a63a30fd746.

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

1 files changed, 11 insertions, 11 deletions

diff --git a/test/timer.c b/test/timer.c
index 24f3245..bb474ca 100644
--- a/test/timer.c
+++ b/test/timer.c
@@ -144,7 +144,7 @@ test_timer_system_user(void)
     /* The system and user times may not be present on some systems.  They
      * will be -1.0 if they are not.
      */
-    if (timer.initial.system < (double)0.0f || timer.initial.user < (double)0.0f) {
+    if (timer.initial.system < 0.0 || timer.initial.user < 0.0) {
         SKIPPED();
         HDprintf("NOTE: No suitable way to get system/user times on this platform.\n");
         return 0;
@@ -165,7 +165,7 @@ test_timer_system_user(void)
         TEST_ERROR;
 
     /* System and user times should be non-negative. */
-    if (times.system < (double)0.0f || times.user < (double)0.0f)
+    if (times.system < 0.0 || times.user < 0.0)
         TEST_ERROR;
 
     PASSED();
@@ -224,7 +224,7 @@ test_timer_elapsed(void)
         TEST_ERROR;
 
     /* Elapsed time should be non-negative. */
-    if (times.elapsed < (double)0.0f)
+    if (times.elapsed < 0.0)
         TEST_ERROR;
 
     PASSED();
@@ -260,11 +260,11 @@ test_timer_functionality(void)
 
     /* Times should be initialized to zero */
     err = H5_timer_get_times(timer, &times);
-    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, (double)0.0f))
+    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, 0.0))
         TEST_ERROR;
 
     err = H5_timer_get_total_times(timer, &times);
-    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, (double)0.0f))
+    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, 0.0))
         TEST_ERROR;
 
     /********************
@@ -289,11 +289,11 @@ test_timer_functionality(void)
 
     /* Times should be positive and non-negative */
     err = H5_timer_get_times(timer, &times);
-    if (err < 0 || times.elapsed < (double)0.0f)
+    if (err < 0 || times.elapsed < 0.0)
         TEST_ERROR;
 
     err = H5_timer_get_total_times(timer, &times);
-    if (err < 0 || times.elapsed < (double)0.0f)
+    if (err < 0 || times.elapsed < 0.0)
         TEST_ERROR;
 
     /**********************
@@ -306,11 +306,11 @@ test_timer_functionality(void)
         TEST_ERROR;
 
     err = H5_timer_get_times(timer, &times);
-    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, (double)0.0f))
+    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, 0.0))
         TEST_ERROR;
 
     err = H5_timer_get_total_times(timer, &times);
-    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, (double)0.0f))
+    if (err < 0 || !H5_DBL_ABS_EQUAL(times.elapsed, 0.0))
         TEST_ERROR;
 
     /* Timer state should flip */
@@ -326,12 +326,12 @@ test_timer_functionality(void)
 
     /* Times should be non-negative */
     err = H5_timer_get_times(timer, &times);
-    if (err < 0 || times.elapsed < (double)0.0f)
+    if (err < 0 || times.elapsed < 0.0)
         TEST_ERROR;
     prev_etime = times.elapsed;
 
     err = H5_timer_get_total_times(timer, &times);
-    if (err < 0 || times.elapsed < (double)0.0f)
+    if (err < 0 || times.elapsed < 0.0)
         TEST_ERROR;
     prev_total_etime = times.elapsed;