Hdf5 merge issue 458 v110 (#465)

* close #195. (#196)

* Update HDF5PluginMacros.cmake

* Update HDF5PluginMacros.cmake

* Modify temporary rpath for testing in java example scripts. (#230)

* Fix undefined left shifting of negative numbers (#338)

Undefined Bahavior Sanitizer errored here about left shifting negative numbers.

* Update license url (#332)

* Modify temporary rpath for testing in java example scripts.

* Update URL in source file Copyright headers for web copy of COPYING
file - src and test directories.

* Applied clang-tidy readability-non-const-parameter warning fixes auto… (#429)

* Automatically applied clang-tidy readability-avoid-const-params-in-decls fixes

Removes useless const declarations.

* Fixed most readability-non-const-parameter warnings

These changes were made automatically by clang-tidy, but I manually reverted the changes related to the H5Z_func_t signature.

* Reformat source with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* Added C++11 override keyword where appropriate (#433)

Added H5_OVERRIDE macro for compatibility with both C++11 and older.

* Various clang tidy warning fixes (#448)

* Fixed clang-tidy bugprone-reserved-identifier warnings

* Fixed clang-tidy bugprone-assert-side-effect warnings

* Fixed clang-tidy bugprone-copy-constructor-init warning

* Fixed clang-tidy readability-redundant-preprocessor warning

For error_test.c the removed code was already dead, because it was in the else of an `#if H5_USE_16_API` block.

Based on H5Location.h, I think p_get_ref_obj_type was meant to be in `#ifndef DOXYGEN_SHOULD_SKIP_THIS` and an `#endif` was missing.  Similarly, in the header, getObjTypeByIdx is only in H5_NO_DEPRECATED_SYMBOLS, not DOXYGEN_SHOULD_SKIP_THIS.

* Fixed clang-tidy readability-redundant-string-init warnings

* Fixed some clang-tidy performance-type-promotion-in-math-fn warnings

* Fixed clang-tidy performance-unnecessary-value-param warnings

* Reformat source with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* Removed checks/workarounds for pre-C++89 compatibility (#449)

After 30+ years, just assume that the following exist:
- extension-less includes
- namespaces
- std::
- static_cast
- bool

* Fixed all clang-tidy bugprone-suspicious-string-compare warnings (#451)

* Fixed all clang-tidy bugprone-suspicious-string-compare warnings

This change was generated entirely by clang-tidy itself.

* Reformat code with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* Fix clang-tidy suspicious string compare in H5A.c missed in merge.

Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Co-authored-by: Sean McBride <sean@rogue-research.com>

1 files changed, 37 insertions, 37 deletions

diff --git a/test/fheap.c b/test/fheap.c
index 772cdc0..0fde197 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -422,7 +422,7 @@ add_obj(H5HF_t *fh, size_t obj_off, size_t obj_size, fheap_heap_state_t *state,
         TEST_ERROR
     if (H5HF_read(fh, heap_id, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(obj, shared_robj_g, obj_size))
+    if (HDmemcmp(obj, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* If the heap IDs are to be retained, append them to the list */
@@ -1190,7 +1190,7 @@ fill_heap(H5HF_t *fh, unsigned block_row, size_t obj_size, fheap_heap_state_t *s
 
         /* Check that object is correct */
         wobj = &shared_wobj_g[*curr_off_ptr];
-        if (HDmemcmp(wobj, shared_robj_g, *curr_len_ptr))
+        if (HDmemcmp(wobj, shared_robj_g, *curr_len_ptr) != 0)
             TEST_ERROR
 
         /* Adjust object & ID pointers */
@@ -12696,7 +12696,7 @@ test_huge_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Delete individual objects, if we won't be deleting the entire heap later */
@@ -12849,7 +12849,7 @@ test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert second object too large for managed heap blocks */
@@ -12879,7 +12879,7 @@ test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id2, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Delete individual objects, if we won't be deleting the entire heap later */
@@ -13082,7 +13082,7 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert second object too large for managed heap blocks */
@@ -13112,7 +13112,7 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id2, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert third object too large for managed heap blocks */
@@ -13142,7 +13142,7 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id3, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Delete individual objects, if we won't be deleting the entire heap later */
@@ -13393,7 +13393,7 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert second object too large for managed heap blocks */
@@ -13423,7 +13423,7 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id2, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert third object too large for managed heap blocks */
@@ -13453,7 +13453,7 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id3, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert fourth object small enough to fit into 'normal' heap blocks */
@@ -13490,7 +13490,7 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id4, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert fifth object small enough to fit into 'normal' heap blocks */
@@ -13528,7 +13528,7 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id5, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Delete individual objects, if we won't be deleting the entire heap later */
@@ -13866,7 +13866,7 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Delete individual objects, if we won't be deleting the entire heap later */
@@ -14015,7 +14015,7 @@ test_tiny_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Delete individual objects, if we won't be deleting the entire heap later */
@@ -14168,7 +14168,7 @@ test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert second object small enough to encode in heap ID */
@@ -14198,7 +14198,7 @@ test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id2, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Delete individual objects, if we won't be deleting the entire heap later */
@@ -14414,14 +14414,14 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Check 'op' functionality on first huge object */
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_op(fh, heap_id, op_memcpy, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert second object too large for managed heap blocks */
@@ -14451,14 +14451,14 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id2, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Check 'op' functionality on second huge object */
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_op(fh, heap_id2, op_memcpy, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert third object too large for managed heap blocks */
@@ -14488,14 +14488,14 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id3, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Check 'op' functionality on third huge object */
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_op(fh, heap_id3, op_memcpy, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert fourth object small enough to fit into 'normal' heap blocks */
@@ -14532,14 +14532,14 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id4, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Check 'op' functionality on fourth ('normal') object */
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_op(fh, heap_id4, op_memcpy, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert fifth object small enough to fit into 'normal' heap blocks */
@@ -14577,14 +14577,14 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id5, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Check 'op' functionality on fifth ('normal') object */
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_op(fh, heap_id5, op_memcpy, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert sixth object small enough to encode in heap ID */
@@ -14614,14 +14614,14 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id6, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Check 'op' functionality on sixth ('tiny') object */
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_op(fh, heap_id6, op_memcpy, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Insert seventh object small enough to encode in heap ID */
@@ -14651,14 +14651,14 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id7, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Check 'op' functionality on seventh ('tiny') object */
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_op(fh, heap_id7, op_memcpy, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Delete individual objects, if we won't be deleting the entire heap later */
@@ -15028,7 +15028,7 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Delete individual objects, if we won't be deleting the entire heap later */
@@ -15211,7 +15211,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id1, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Read in ('normal') object #2 */
@@ -15222,7 +15222,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
     HDmemset(shared_robj_g, 0, obj_size);
     if (H5HF_read(fh, heap_id2, shared_robj_g) < 0)
         FAIL_STACK_ERROR
-    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size))
+    if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0)
         TEST_ERROR
 
     /* Delete individual objects, if we won't be deleting the entire heap later */
@@ -16023,7 +16023,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
             FAIL_STACK_ERROR
 
         /* Compare data read in */
-        if (HDmemcmp(rewrite_obj, shared_robj_g, obj_size))
+        if (HDmemcmp(rewrite_obj, shared_robj_g, obj_size) != 0)
             TEST_ERROR
 
         /* Change size of data to write */
@@ -16072,7 +16072,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
             FAIL_STACK_ERROR
 
         /* Compare data read in */
-        if (HDmemcmp(rewrite_obj, shared_robj_g, obj_size))
+        if (HDmemcmp(rewrite_obj, shared_robj_g, obj_size) != 0)
             TEST_ERROR
 
         /* Change size of data to write */
@@ -16331,7 +16331,7 @@ main(void)
         envval = "nomatch";
 
     /* Current VFD that does not support contigous address space */
-    contig_addr_vfd = (hbool_t)(HDstrcmp(envval, "split") && HDstrcmp(envval, "multi"));
+    contig_addr_vfd = (hbool_t)(HDstrcmp(envval, "split") != 0 && HDstrcmp(envval, "multi") != 0);
 
     /* Reset library */
     h5_reset();