Onion VFD: Sync with develop. (#1732)

* Sync with develop. h5dump is broken, so I can't test the tools.

* Committing clang-format changes

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

1 files changed, 9 insertions, 9 deletions

diff --git a/test/dt_arith.c b/test/dt_arith.c
index d73dc4e..3601b95 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -915,7 +915,7 @@ test_derived_flt(void)
     }
 
     if ((tid1 = H5Topen2(file, "new float type 1", H5P_DEFAULT)) < 0)
-        FAIL_PUTS_ERROR("Can't open datatype")
+        FAIL_PUTS_ERROR("Can't open datatype");
     if (H5Tget_fields(tid1, &spos, &epos, &esize, &mpos, &msize) < 0) {
         H5_FAILED();
         HDprintf("Can't get fields\n");
@@ -1075,7 +1075,7 @@ test_derived_flt(void)
     }
 
     if ((tid2 = H5Topen2(file, "new float type 2", H5P_DEFAULT)) < 0)
-        FAIL_PUTS_ERROR("Can't open datatype")
+        FAIL_PUTS_ERROR("Can't open datatype");
     if (H5Tget_fields(tid2, &spos, &epos, &esize, &mpos, &msize) < 0) {
         H5_FAILED();
         HDprintf("Can't get fields\n");
@@ -1351,7 +1351,7 @@ test_derived_integer(void)
     }
 
     if ((tid1 = H5Topen2(file, "new integer type 1", H5P_DEFAULT)) < 0)
-        FAIL_PUTS_ERROR("Can't open datatype")
+        FAIL_PUTS_ERROR("Can't open datatype");
     if (H5Tget_precision(tid1) != 24) {
         H5_FAILED();
         HDprintf("Can't get precision or wrong precision\n");
@@ -1412,7 +1412,7 @@ test_derived_integer(void)
     }
 
     if ((tid2 = H5Topen2(file, "new integer type 2", H5P_DEFAULT)) < 0)
-        FAIL_PUTS_ERROR("Can't open datatype")
+        FAIL_PUTS_ERROR("Can't open datatype");
     if (H5Tget_precision(tid2) != 48) {
         H5_FAILED();
         HDprintf("Can't get precision or wrong precision\n");
@@ -2694,18 +2694,18 @@ my_isnan(dtype_t type, void *val)
     if (FLT_FLOAT == type) {
         float x = 0.0;
         HDmemcpy(&x, val, sizeof(float));
-        retval = !H5_FLT_ABS_EQUAL(x, x);
+        retval = isnan(x);
     }
     else if (FLT_DOUBLE == type) {
         double x = 0.0;
         HDmemcpy(&x, val, sizeof(double));
-        retval = !H5_DBL_ABS_EQUAL(x, x);
+        retval = isnan(x);
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
     }
     else if (FLT_LDOUBLE == type) {
         long double x = 0.0L;
         HDmemcpy(&x, val, sizeof(long double));
-        retval = !H5_LDBL_ABS_EQUAL(x, x);
+        retval = isnan(x);
 #endif
     }
     else {
@@ -3668,8 +3668,8 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
     }
 
     /* Allocate and initialize the source buffer through macro INIT_INTEGER if the source is integer,
-     * INIT_FP_NORM if floating-point.  The BUF will be used for the conversion while the SAVED buffer will be
-     * used for the comparison later.
+     * INIT_FP_NORM if floating-point.  The BUF will be used for the conversion while the SAVED buffer
+     * will be used for the comparison later.
      */
     if (src_type == INT_SCHAR) {
         INIT_INTEGER(signed char, SCHAR_MAX, SCHAR_MIN, src_size, dst_size, src_nbits, buf, saved, nelmts);