Much normalization with develop (#701)

* Brings CMake updates from develop

* Brings reduction in pedantic casts from develop

* 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>

* 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>

* Committing clang-format changes

* 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>

* Formatted source

* Bring over some VOL registration changes

* VOL cleanup

* H5VL_request_status_t substitutions

* H5F.c cleanup

* Minor API tweaks from develop

* Moves H5G package init/teardown to H5Gint.c

* H5G cleanup

* H5M cleanup

* H5SM cleanup

* H5T cleanup

* H5R cleanup

* H5Lpublic.h cleanup

* H5L cleanup

* H5O cleanup

* H5A, H5CS, and H5AC cleanup

* Moved H5A init/teardown code to H5Aint.c

* Moves H5D I/O functions to H5D.c

* H5D cleanup

* Misc minor cleanup

* H5P close cleanup

* H5Tpublic.h cleanup

* Fixes err_compat test

* H5PLpublic.h cleanup

* Updates H5Ppublic.h

* H5Fpublic.h updates

* H5A.c cleanup

* Brings over H5Aexists and related changes

* Brings CMake shell testing changes from develop

* Close callback changes

* H5R and H5Tcommit normalization

* err_compat test works now

* H5O tweaks

* Updates VOL registration code

* Brings over H5VL_create_object

* H5Tconv.c reformatting

* H5T.c tweaks

* Brings datatype and reference updates from develop

* Brings VOL plugin loading changes from develop

* Brings event sets from develop

* Brings async functions over

* Tools changes

* Brings over many tools changes from develop

* Brings VOL flags from develop

* Fixes h5dump double/float tests

* Updates h5repack tests

* Brings h5diff test changes from develop

* Last h5dump changes

* Brings test changes from develop

* Committing clang-format changes

* Tidied h5_testing()

* Brings chunk iteration code + misc from develop

* Updates vds test

* Enables external link parallel test

* Brings updated property lists from develop

* H5G changes from develop

* H5MF cleanup

* Brings vfd_swmr test back into CMake

* Updates threadsafe test

* Updates plist test

* Brings recent changes from develop

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

1 files changed, 224 insertions, 71 deletions

diff --git a/test/btree2.c b/test/btree2.c
index f18b65c..aca0c77 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -631,6 +631,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     haddr_t bt2_addr;    /* Address of B-tree created */
     hsize_t record;      /* Record to insert into tree */
     hsize_t idx;         /* Index within B-tree, for iterator */
+    hbool_t found;       /* Whether record was found */
     herr_t  ret;         /* Generic error return value */
 
     /*
@@ -666,8 +667,11 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
         TEST_ERROR
 
     /* Attempt to find record in B-tree with no records */
-    idx = 0;
-    if (H5B2_find(bt2, &idx, find_cb, NULL) != FALSE)
+    idx   = 0;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, NULL) < 0)
+        TEST_ERROR
+    if (found)
         TEST_ERROR
 
     /* Attempt to index record in B-tree with no records */
@@ -698,22 +702,34 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
 
     /* Attempt to find non-existant record in B-tree with 1 record */
     /* (Should not be found, but not fail) */
-    idx = 41;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != FALSE)
+    idx   = 41;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
+        TEST_ERROR
+    if (found)
         TEST_ERROR
 
     /* Try again with NULL 'op' */
     /* (Should not be found, but not fail) */
-    if (H5B2_find(bt2, &idx, NULL, NULL) != FALSE)
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, NULL, NULL) < 0)
+        TEST_ERROR
+    if (found)
         TEST_ERROR
 
     /* Attempt to find existant record in B-tree with 1 record */
-    idx = 42;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != TRUE)
+    idx   = 42;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
+        TEST_ERROR
+    if (!found)
         TEST_ERROR
 
     /* Try again with NULL 'op' */
-    if (H5B2_find(bt2, &idx, NULL, NULL) != TRUE)
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, NULL, NULL) < 0)
+        TEST_ERROR
+    if (!found)
         TEST_ERROR
 
     /* Attempt to index non-existant record in B-tree with 1 record */
@@ -766,13 +782,19 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
 
     /* Attempt to find non-existant record in level-0 B-tree with several records */
     /* (Should not be found, but not fail) */
-    idx = 41;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != FALSE)
+    idx   = 41;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
+        TEST_ERROR
+    if (found)
         TEST_ERROR
 
     /* Attempt to find existant record in level-0 B-tree with several record */
-    idx = 56;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != TRUE)
+    idx   = 56;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
+        TEST_ERROR
+    if (!found)
         TEST_ERROR
 
     /* Attempt to index non-existant record in B-tree with several records */
@@ -852,6 +874,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     hsize_t     idx;         /* Index within B-tree, for iterator */
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
     unsigned    u;           /* Local index variable */
+    hbool_t     found;       /* Whether record was found */
     herr_t      ret;         /* Generic error return value */
 
     /*
@@ -937,19 +960,28 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
 
     /* Attempt to find non-existant record in level-1 B-tree */
     /* (Should not be found, but not fail) */
-    idx = INSERT_SPLIT_ROOT_NREC + 10;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != FALSE)
+    idx   = INSERT_SPLIT_ROOT_NREC + 10;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
+        TEST_ERROR
+    if (found)
         TEST_ERROR
 
     /* Attempt to find existant record in root of level-1 B-tree */
-    idx = 33;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != TRUE)
+    idx   = 33;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
         FAIL_STACK_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Attempt to find existant record in leaf of level-1 B-tree */
-    idx = 56;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != TRUE)
+    idx   = 56;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
         FAIL_STACK_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Attempt to index non-existant record in level-1 B-tree */
     idx = 0;
@@ -1602,6 +1634,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     H5B2_stat_t bt2_stat;    /* Statistics about B-tree created */
     hsize_t     idx;         /* Index within B-tree, for iterator */
     unsigned    u;           /* Local index variable */
+    hbool_t     found;       /* Whether record was found */
     herr_t      ret;         /* Generic error return value */
 
     /*
@@ -1673,14 +1706,20 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
 
     /* Attempt to find non-existant record in level-2 B-tree */
     /* (Should not be found, but not fail) */
-    idx = INSERT_SPLIT_ROOT_NREC * 30;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != FALSE)
+    idx   = INSERT_SPLIT_ROOT_NREC * 30;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
+        TEST_ERROR
+    if (found)
         TEST_ERROR
 
     /* Attempt to find existant record in root of level-2 B-tree */
-    idx = 948;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != TRUE)
+    idx   = 948;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
         FAIL_STACK_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record = 948;
@@ -1688,9 +1727,12 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
         TEST_ERROR
 
     /* Attempt to find existant record in internal node of level-2 B-tree */
-    idx = 505;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != TRUE)
+    idx   = 505;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
         FAIL_STACK_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record = 505;
@@ -1698,9 +1740,12 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
         TEST_ERROR
 
     /* Attempt to find existant record in leaf of level-2 B-tree */
-    idx = 555;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != TRUE)
+    idx   = 555;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
         FAIL_STACK_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record = 555;
@@ -2957,14 +3002,15 @@ test_insert_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t
     hsize_t     temp_rec;       /* Temporary record */
     H5B2_stat_t bt2_stat;       /* Statistics about B-tree created */
     hsize_t     nrec;           /* Number of records in B-tree */
+    hbool_t     found;          /* Whether record was found */
     herr_t      ret;            /* Generic error return value */
 
     /* Initialize random number seed */
     curr_time = HDtime(NULL);
-#ifdef QAK
-    curr_time = 1109170019;
-    HDfprintf(stderr, "curr_time=%lu\n", (unsigned long)curr_time);
-#endif /* QAK */
+#if 0
+curr_time=1109170019;
+HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
+#endif
     HDsrandom((unsigned)curr_time);
 
     /*
@@ -3062,8 +3108,11 @@ test_insert_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t
 
     /* Attempt to find non-existant record in level-4 B-tree */
     /* (Should not be found, but not fail) */
-    idx = INSERT_MANY * 2;
-    if (H5B2_find(bt2, &idx, find_cb, &idx) != FALSE)
+    idx   = INSERT_MANY * 2;
+    found = FALSE;
+    if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
+        TEST_ERROR
+    if (found)
         TEST_ERROR
 
     /* Find random records */
@@ -3072,8 +3121,11 @@ test_insert_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t
         idx = (hsize_t)(HDrandom() % INSERT_MANY);
 
         /* Attempt to find existant record in root of level-4 B-tree */
-        if (H5B2_find(bt2, &idx, find_cb, &idx) != TRUE)
+        found = FALSE;
+        if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
             FAIL_STACK_ERROR
+        if (!found)
+            TEST_ERROR
     } /* end for */
 
     /* Attempt to index non-existant record in level-4 B-tree, in increasing & decreasing order */
@@ -3186,6 +3238,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     H5B2_test_rec_t record;      /* Record to insert into tree */
     H5B2_test_rec_t modify;      /* Modified value */
     H5B2_test_rec_t find;        /* Record to find */
+    hbool_t         found;       /* Whether record was found */
     herr_t          ret;         /* Generic error return value */
 
     /* Create the file for the test */
@@ -3214,31 +3267,43 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     /* (Should not be found, but not fail) */
     find.key = 10;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != FALSE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (found)
+        TEST_ERROR
 
     /* Try again with NULL 'op' */
     /* (Should not be found, but not fail) */
-    if (H5B2_find(bt2, &find, NULL, NULL) != FALSE)
+    found = FALSE;
+    if (H5B2_find(bt2, &find, &found, NULL, NULL) < 0)
         FAIL_STACK_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (found)
+        TEST_ERROR
 
     /* Attempt to find existant record in B-tree with 1 record */
     find.key = 42;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != 72)
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Try again with NULL 'op' */
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, NULL, NULL) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, NULL, NULL) < 0)
         FAIL_STACK_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Attempt to index non-existant record in B-tree with 1 record */
     H5E_BEGIN_TRY
@@ -3279,31 +3344,43 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     /* (Should not be found, but not fail) */
     find.key = 10;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != FALSE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (found)
+        TEST_ERROR
 
     /* Try again with NULL 'op' */
     /* (Should not be found, but not fail) */
-    if (H5B2_find(bt2, &find, NULL, NULL) != FALSE)
+    found = FALSE;
+    if (H5B2_find(bt2, &find, &found, NULL, NULL) < 0)
         FAIL_STACK_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (found)
+        TEST_ERROR
 
     /* Attempt to find modified record in B-tree with 1 record */
     find.key = 42;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != 43)
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Try again with NULL 'op' */
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, NULL, NULL) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, NULL, NULL) < 0)
         FAIL_STACK_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Attempt to index non-existant record in B-tree with 1 record */
     H5E_BEGIN_TRY
@@ -3364,17 +3441,23 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     /* (Should not be found, but not fail) */
     find.key = 10;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != FALSE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         TEST_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (found)
+        TEST_ERROR
 
     /* Attempt to find existant record in level-0 B-tree with several records */
     find.key = 56;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         TEST_ERROR
     if (find.val != 12)
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Attempt to index non-existant record in B-tree with several records */
     H5E_BEGIN_TRY
@@ -3452,17 +3535,23 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     /* (Should not be found, but not fail) */
     find.key = 41;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != FALSE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         TEST_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (found)
+        TEST_ERROR
 
     /* Attempt to find existant record in level-0 B-tree with several record */
     find.key = 56;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         TEST_ERROR
     if (find.val != 22)
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Attempt to index non-existant record in B-tree with several records */
     H5E_BEGIN_TRY
@@ -3562,6 +3651,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     H5B2_test_rec_t idx;         /* Index within B-tree, for iterator */
     H5B2_stat_t     bt2_stat;    /* Statistics about B-tree created */
     unsigned        u;           /* Local index variable */
+    hbool_t         found;       /* Whether record was found */
     herr_t          ret;         /* Generic error return value */
 
     /*
@@ -3696,30 +3786,39 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     /* (Should not be found, but not fail) */
     find.key = 800;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != FALSE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         TEST_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (found)
+        TEST_ERROR
 
     /* Attempt to find existant record in root of level-1 B-tree */
     find.key = 33;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.key != 33)
         TEST_ERROR
     if (find.val != 67)
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Attempt to find existant record in leaf of level-1 B-tree */
     find.key = 56;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.key != 56)
         TEST_ERROR
     if (find.val != 113)
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Attempt to index non-existant record in level-1 B-tree */
     H5E_BEGIN_TRY
@@ -4402,6 +4501,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     H5B2_test_rec_t idx;         /* Index within B-tree, for iterator */
     H5B2_stat_t     bt2_stat;    /* Statistics about B-tree created */
     unsigned        u;           /* Local index variable */
+    hbool_t         found;       /* Whether record was found */
     herr_t          ret;         /* Generic error return value */
 
     /*
@@ -4482,18 +4582,24 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     /* (Should not be found, but not fail) */
     find.key = INSERT_SPLIT_ROOT_NREC_REC * 42;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != FALSE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         TEST_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (found)
+        TEST_ERROR
 
     /* Attempt to find existant record in root of level-2 B-tree */
     find.key = 1347;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != (1347 * 2))
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record.key = 1347;
@@ -4503,10 +4609,13 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     /* Attempt to find existant record in internal node of level-2 B-tree */
     find.key = 513;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != (513 * 2))
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record.key = 513;
@@ -4516,10 +4625,13 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     /* Attempt to find existant record in leaf of level-2 B-tree */
     find.key = 555;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != (555 * 2))
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record.key = 555;
@@ -4647,18 +4759,24 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     /* (Should not be found, but not fail) */
     find.key = INSERT_SPLIT_ROOT_NREC_REC * 42;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != FALSE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         TEST_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (found)
+        TEST_ERROR
 
     /* Attempt to find existant record in root of level-2 B-tree */
     find.key = 1344;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != (1344 * 2))
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record.key = 1344;
@@ -4668,10 +4786,13 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     /* Attempt to find existant record in internal node of level-2 B-tree */
     find.key = 512;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != (512 * 2))
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record.key = 512;
@@ -4681,10 +4802,13 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     /* Attempt to find existant record in leaf of level-2 B-tree */
     find.key = 555;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != (555 * 2))
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record.key = 555;
@@ -4822,18 +4946,24 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     /* (Should not be found, but not fail) */
     find.key = INSERT_SPLIT_ROOT_NREC_REC * 42;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != FALSE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         TEST_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (found)
+        TEST_ERROR
 
     /* Attempt to find existant record in root of level-2 B-tree */
     find.key = 1345;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != (1345 * 2))
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record.key = 1345;
@@ -4843,10 +4973,13 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     /* Attempt to find existant record in internal node of level-2 B-tree */
     find.key = 513;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != (513 * 2))
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record.key = 513;
@@ -4856,10 +4989,13 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     /* Attempt to find existant record in leaf of level-2 B-tree */
     find.key = 555;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         FAIL_STACK_ERROR
     if (find.val != (555 * 2))
         TEST_ERROR
+    if (!found)
+        TEST_ERROR
 
     /* Check with B-tree */
     record.key = 555;
@@ -4960,6 +5096,7 @@ test_update_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t
     H5B2_stat_t      bt2_stat;    /* Statistics about B-tree created */
     hsize_t          nrec;        /* Number of records in B-tree */
     unsigned         u;           /* Local index variable */
+    hbool_t          found;       /* Whether record was found */
     herr_t           ret;         /* Generic error return value */
 
     /* Initialize random number seed */
@@ -5055,10 +5192,13 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
     /* (Should not be found, but not fail) */
     find.key = INSERT_MANY_REC * 2;
     find.val = (hsize_t)-1;
-    if (H5B2_find(bt2, &find, find_rec_cb, &find) != FALSE)
+    found    = FALSE;
+    if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
         TEST_ERROR
     if (find.val != (hsize_t)-1)
         TEST_ERROR
+    if (found)
+        TEST_ERROR
 
     /* Find random records */
     for (u = 0; u < FIND_MANY_REC; u++) {
@@ -5067,10 +5207,13 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         find.val = (hsize_t)-1;
 
         /* Attempt to find existant record in level-4 B-tree */
-        if (H5B2_find(bt2, &find, find_rec_cb, &find) != TRUE)
+        found = FALSE;
+        if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
             FAIL_STACK_ERROR
         if (find.val != (find.key * 2))
             TEST_ERROR
+        if (!found)
+            TEST_ERROR
     } /* end for */
 
     /* Attempt to index non-existant record in level-4 B-tree, in increasing & decreasing order */
@@ -9600,6 +9743,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
     H5B2_stat_t           bt2_stat;    /* Statistics about B-tree created */
     H5B2_node_info_test_t ninfo;       /* B-tree node info */
     unsigned              u;           /* Local index variable */
+    hbool_t               rec_found;   /* Whether record was found */
     herr_t                ret;         /* Generic error return value */
 
     /*
@@ -9669,12 +9813,15 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
         TEST_ERROR
 
     /* Attempt to find modified record */
-    record = 4331;
-    found  = 4331;
-    if (H5B2_find(bt2, &record, find_cb, &found) != TRUE)
+    record    = 4331;
+    found     = 4331;
+    rec_found = FALSE;
+    if (H5B2_find(bt2, &record, &rec_found, find_cb, &found) < 0)
         FAIL_STACK_ERROR
     if (found != 4331)
         TEST_ERROR
+    if (!rec_found)
+        TEST_ERROR
 
     /* Attempt to find original record */
     record = 4330;
@@ -9717,12 +9864,15 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
         TEST_ERROR
 
     /* Attempt to find modified record */
-    record = 5352;
-    found  = 5352;
-    if (H5B2_find(bt2, &record, find_cb, &found) != TRUE)
+    record    = 5352;
+    found     = 5352;
+    rec_found = FALSE;
+    if (H5B2_find(bt2, &record, &rec_found, find_cb, &found) < 0)
         STACK_ERROR
     if (found != 5352)
         TEST_ERROR
+    if (!rec_found)
+        TEST_ERROR
 
     /* Attempt to find original record */
     record = 5350;
@@ -9765,12 +9915,15 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
         TEST_ERROR
 
     /* Attempt to find modified record */
-    record = 9448;
-    found  = 9448;
-    if (H5B2_find(bt2, &record, find_cb, &found) != TRUE)
+    record    = 9448;
+    found     = 9448;
+    rec_found = FALSE;
+    if (H5B2_find(bt2, &record, &rec_found, find_cb, &found) < 0)
         STACK_ERROR
     if (found != 9448)
         TEST_ERROR
+    if (!rec_found)
+        TEST_ERROR
 
     /* Attempt to find original record */
     record = 9445;