1 8 Merge dev changes for long double and cmake (#548)

* Update supported platforms

* Merge PR#3 changes from develop

* # WARNING: head commit changed in the meantime

Merge gcc 10 diagnostics option from develop

Merge CMake changes from develop
Merge warnings from develop
Merge #318 OSX changes from develop
Merge tools changes from develop
Merge test macros from develop

* Format updates

* Fix missing semicolon and format fix

* Format update

* Correct actions, remove java option

* Update autotools build files

* Add testfiles

* Fix configure issue with make flags

* Init fapls to default

* Update generated files and fix h5repack id closure

* update format

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
whitespace cleanup
tools sync

* format alignment

* initialize vars

* revert H5private change

* Merge #380 from develop

* Split format source and commit changes on repo push

* Change windows TS to use older VS.

* HDFFV-11229 merge dev changes for long double display in tools

* Committing clang-format changes

* Update unsupported types with precision

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

1 files changed, 8 insertions, 8 deletions

diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 0da4df1..71aec6b 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -27,7 +27,7 @@
 #define F_FORMAT "%-15g %-15g %-15g\n"
 
 #if H5_SIZEOF_LONG_DOUBLE != 0
-#define LD_FORMAT "%-15Lf %-15Lf %-15Lf\n"
+#define LD_FORMAT "%-15Lg %-15Lg %-15Lg\n"
 #endif
 
 #define I_FORMAT    "%-15d %-15d %-15d\n"
@@ -42,7 +42,7 @@
 #define F_FORMAT_P "%-15.10g %-15.10g %-15.10g %-14.10g\n"
 
 #if H5_SIZEOF_LONG_DOUBLE != 0
-#define LD_FORMAT_P "%-15.10Lf %-15.10Lf %-15.10Lf %-14.10Lf\n"
+#define LD_FORMAT_P "%-15.10Lg %-15.10Lg %-15.10Lg %-14.10Lg\n"
 #endif
 
 #define I_FORMAT_P   "%-15d %-15d %-15d %-14f\n"
@@ -59,7 +59,7 @@
 #define F_FORMAT_P_NOTCOMP "%-15.10g %-15.10g %-15.10g not comparable\n"
 
 #if H5_SIZEOF_LONG_DOUBLE != 0
-#define LD_FORMAT_P_NOTCOMP "%-15.10Lf %-15.10Lf %-15.10Lf not comparable\n"
+#define LD_FORMAT_P_NOTCOMP "%-15.10Lg %-15.10Lg %-15.10Lg not comparable\n"
 #endif
 
 #define I_FORMAT_P_NOTCOMP   "%-15d %-15d %-15d not comparable\n"
@@ -2905,7 +2905,10 @@ ull2float(unsigned long long ull_value, float *f_value)
     HDmemcpy(f_value, buf, dst_size);
 
 done:
-    H5E_BEGIN_TRY { H5Pclose(dxpl_id); }
+    H5E_BEGIN_TRY
+    {
+        H5Pclose(dxpl_id);
+    }
     H5E_END_TRY;
 
     if (buf)
@@ -3156,7 +3159,6 @@ print_pos(diff_opt_t *opts, hsize_t idx, size_t u)
                     H5TOOLS_DEBUG("... sset loop:%d with curr_pos:%ld (curr_idx:%ld) - c:%ld b:%ld s:%ld", j,
                                   curr_pos, curr_idx, cnt_idx, blk_idx, str_idx);
                     dim_size = opts->dims[j]; /* Current dimension size */
-                    // elmnt_cnt *= dim_size;    /* Total number of elements in dimension */
                     H5TOOLS_DEBUG("... sset loop:%d with elmnt_cnt:%ld - (prev_dim_size:%ld - dim_size:%ld) "
                                   "- str_cnt:%ld",
                                   j, elmnt_cnt, prev_dim_size, dim_size, str_cnt);
@@ -3179,7 +3181,7 @@ print_pos(diff_opt_t *opts, hsize_t idx, size_t u)
                                       "(curr_idx:%ld - data_idx:%ld)",
                                       i, dim_size, str_cnt, curr_idx, data_idx);
                     }
-                    next_idx += dim_size * str_cnt; // + prev_dim_size;
+                    next_idx += dim_size * str_cnt;
                     H5TOOLS_DEBUG("... sset loop:%d with curr_idx:%ld (next_idx:%ld)", j, curr_idx, next_idx);
                     str_cnt       = 0;
                     prev_str      = str_idx;
@@ -3304,8 +3306,6 @@ get_member_types(hid_t tid, mcomp_t *members)
             get_member_types(members->ids[u], members->m[u]);
         }
     }
-
-    return;
 }
 
 /*-------------------------------------------------------------------------