Updated subfiling_VFD with Selection_io (#1352)

Merged selection_io branch into the subfiling branch.

1 files changed, 65 insertions, 65 deletions

diff --git a/test/btree2.c b/test/btree2.c
index 2d34fa7..9cbb211 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -700,7 +700,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (H5B2_insert(bt2, &record) < 0)
         FAIL_STACK_ERROR
 
-    /* Attempt to find non-existant record in B-tree with 1 record */
+    /* Attempt to find non-existent record in B-tree with 1 record */
     /* (Should not be found, but not fail) */
     idx   = 41;
     found = FALSE;
@@ -717,7 +717,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (found)
         TEST_ERROR
 
-    /* Attempt to find existant record in B-tree with 1 record */
+    /* Attempt to find existent record in B-tree with 1 record */
     idx   = 42;
     found = FALSE;
     if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
@@ -732,7 +732,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (!found)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in B-tree with 1 record */
+    /* Attempt to index non-existent record in B-tree with 1 record */
     idx = 0;
     H5E_BEGIN_TRY
     {
@@ -780,7 +780,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (H5B2_insert(bt2, &record) < 0)
         FAIL_STACK_ERROR
 
-    /* Attempt to find non-existant record in level-0 B-tree with several records */
+    /* Attempt to find non-existent record in level-0 B-tree with several records */
     /* (Should not be found, but not fail) */
     idx   = 41;
     found = FALSE;
@@ -789,7 +789,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (found)
         TEST_ERROR
 
-    /* Attempt to find existant record in level-0 B-tree with several record */
+    /* Attempt to find existent record in level-0 B-tree with several record */
     idx   = 56;
     found = FALSE;
     if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
@@ -797,7 +797,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (!found)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in B-tree with several records */
+    /* Attempt to index non-existent record in B-tree with several records */
     idx = 0;
     H5E_BEGIN_TRY
     {
@@ -958,7 +958,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     if (idx != (INSERT_SPLIT_ROOT_NREC + 2))
         TEST_ERROR
 
-    /* Attempt to find non-existant record in level-1 B-tree */
+    /* Attempt to find non-existent record in level-1 B-tree */
     /* (Should not be found, but not fail) */
     idx   = INSERT_SPLIT_ROOT_NREC + 10;
     found = FALSE;
@@ -967,7 +967,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     if (found)
         TEST_ERROR
 
-    /* Attempt to find existant record in root of level-1 B-tree */
+    /* Attempt to find existent record in root of level-1 B-tree */
     idx   = 33;
     found = FALSE;
     if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
@@ -975,7 +975,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     if (!found)
         TEST_ERROR
 
-    /* Attempt to find existant record in leaf of level-1 B-tree */
+    /* Attempt to find existent record in leaf of level-1 B-tree */
     idx   = 56;
     found = FALSE;
     if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
@@ -983,7 +983,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     if (!found)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in level-1 B-tree */
+    /* Attempt to index non-existent record in level-1 B-tree */
     idx = 0;
     H5E_BEGIN_TRY
     {
@@ -1704,7 +1704,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (idx != ((INSERT_SPLIT_ROOT_NREC * 29) + 5))
         TEST_ERROR
 
-    /* Attempt to find non-existant record in level-2 B-tree */
+    /* Attempt to find non-existent record in level-2 B-tree */
     /* (Should not be found, but not fail) */
     idx   = INSERT_SPLIT_ROOT_NREC * 30;
     found = FALSE;
@@ -1713,7 +1713,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (found)
         TEST_ERROR
 
-    /* Attempt to find existant record in root of level-2 B-tree */
+    /* Attempt to find existent record in root of level-2 B-tree */
     idx   = 948;
     found = FALSE;
     if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
@@ -1726,7 +1726,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)2) < 0)
         TEST_ERROR
 
-    /* Attempt to find existant record in internal node of level-2 B-tree */
+    /* Attempt to find existent record in internal node of level-2 B-tree */
     idx   = 505;
     found = FALSE;
     if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
@@ -1739,7 +1739,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)1) < 0)
         TEST_ERROR
 
-    /* Attempt to find existant record in leaf of level-2 B-tree */
+    /* Attempt to find existent record in leaf of level-2 B-tree */
     idx   = 555;
     found = FALSE;
     if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
@@ -1752,7 +1752,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)0) < 0)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in level-2 B-tree */
+    /* Attempt to index non-existent record in level-2 B-tree */
     idx = 0;
     H5E_BEGIN_TRY
     {
@@ -3106,7 +3106,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
     if (idx != INSERT_MANY)
         TEST_ERROR
 
-    /* Attempt to find non-existant record in level-4 B-tree */
+    /* Attempt to find non-existent record in level-4 B-tree */
     /* (Should not be found, but not fail) */
     idx   = INSERT_MANY * 2;
     found = FALSE;
@@ -3120,7 +3120,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
         /* Pick random record */
         idx = (hsize_t)(HDrandom() % INSERT_MANY);
 
-        /* Attempt to find existant record in root of level-4 B-tree */
+        /* Attempt to find existent record in root of level-4 B-tree */
         found = FALSE;
         if (H5B2_find(bt2, &idx, &found, find_cb, &idx) < 0)
             FAIL_STACK_ERROR
@@ -3128,7 +3128,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
             TEST_ERROR
     } /* end for */
 
-    /* Attempt to index non-existant record in level-4 B-tree, in increasing & decreasing order */
+    /* Attempt to index non-existent record in level-4 B-tree, in increasing & decreasing order */
     H5E_BEGIN_TRY
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL);
@@ -3151,12 +3151,12 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
         /* Pick random record */
         idx = (hsize_t)(HDrandom() % INSERT_MANY);
 
-        /* Attempt to find existant record in root of level-4 B-tree */
+        /* Attempt to find existent record in root of level-4 B-tree */
         /* (in increasing order) */
         if (H5B2_index(bt2, H5_ITER_INC, idx, find_cb, &idx) < 0)
             FAIL_STACK_ERROR
 
-        /* Attempt to find existant record in root of level-4 B-tree */
+        /* Attempt to find existent record in root of level-4 B-tree */
         /* (in decreasing order) */
         if (H5B2_index(bt2, H5_ITER_DEC, idx, find_dec_cb, &idx) < 0)
             FAIL_STACK_ERROR
@@ -3263,7 +3263,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (H5B2_update(bt2, &record, no_modify_cb, NULL) < 0)
         FAIL_STACK_ERROR
 
-    /* Attempt to find non-existant record in B-tree with 1 record */
+    /* Attempt to find non-existent record in B-tree with 1 record */
     /* (Should not be found, but not fail) */
     find.key = 10;
     find.val = (hsize_t)-1;
@@ -3285,7 +3285,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (found)
         TEST_ERROR
 
-    /* Attempt to find existant record in B-tree with 1 record */
+    /* Attempt to find existent record in B-tree with 1 record */
     find.key = 42;
     found    = FALSE;
     if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
@@ -3305,7 +3305,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (!found)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in B-tree with 1 record */
+    /* Attempt to index non-existent record in B-tree with 1 record */
     H5E_BEGIN_TRY
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
@@ -3340,7 +3340,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (H5B2_update(bt2, &modify, modify_rec_cb, &modify) < 0)
         FAIL_STACK_ERROR
 
-    /* Attempt to find non-existant record in B-tree with 1 record */
+    /* Attempt to find non-existent record in B-tree with 1 record */
     /* (Should not be found, but not fail) */
     find.key = 10;
     find.val = (hsize_t)-1;
@@ -3382,7 +3382,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (!found)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in B-tree with 1 record */
+    /* Attempt to index non-existent record in B-tree with 1 record */
     H5E_BEGIN_TRY
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
@@ -3437,7 +3437,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (H5B2_update(bt2, &record, no_modify_cb, NULL) < 0)
         FAIL_STACK_ERROR
 
-    /* Attempt to find non-existant record in level-0 B-tree with several records */
+    /* Attempt to find non-existent record in level-0 B-tree with several records */
     /* (Should not be found, but not fail) */
     find.key = 10;
     find.val = (hsize_t)-1;
@@ -3449,7 +3449,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (found)
         TEST_ERROR
 
-    /* Attempt to find existant record in level-0 B-tree with several records */
+    /* Attempt to find existent record in level-0 B-tree with several records */
     find.key = 56;
     found    = FALSE;
     if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
@@ -3459,7 +3459,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (!found)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in B-tree with several records */
+    /* Attempt to index non-existent record in B-tree with several records */
     H5E_BEGIN_TRY
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
@@ -3531,7 +3531,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (H5B2_update(bt2, &record, modify_rec_cb, &modify) < 0)
         FAIL_STACK_ERROR
 
-    /* Attempt to find non-existant record in level-0 B-tree with several records */
+    /* Attempt to find non-existent record in level-0 B-tree with several records */
     /* (Should not be found, but not fail) */
     find.key = 41;
     find.val = (hsize_t)-1;
@@ -3543,7 +3543,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (found)
         TEST_ERROR
 
-    /* Attempt to find existant record in level-0 B-tree with several record */
+    /* Attempt to find existent record in level-0 B-tree with several record */
     find.key = 56;
     found    = FALSE;
     if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
@@ -3553,7 +3553,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (!found)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in B-tree with several records */
+    /* Attempt to index non-existent record in B-tree with several records */
     H5E_BEGIN_TRY
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
@@ -3782,7 +3782,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     if (idx.key != (INSERT_SPLIT_ROOT_NREC_REC + 2))
         TEST_ERROR
 
-    /* Attempt to find non-existant record in level-1 B-tree */
+    /* Attempt to find non-existent record in level-1 B-tree */
     /* (Should not be found, but not fail) */
     find.key = 800;
     find.val = (hsize_t)-1;
@@ -3794,7 +3794,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     if (found)
         TEST_ERROR
 
-    /* Attempt to find existant record in root of level-1 B-tree */
+    /* Attempt to find existent record in root of level-1 B-tree */
     find.key = 33;
     find.val = (hsize_t)-1;
     found    = FALSE;
@@ -3807,7 +3807,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     if (!found)
         TEST_ERROR
 
-    /* Attempt to find existant record in leaf of level-1 B-tree */
+    /* Attempt to find existent record in leaf of level-1 B-tree */
     find.key = 56;
     find.val = (hsize_t)-1;
     found    = FALSE;
@@ -3820,7 +3820,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     if (!found)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in level-1 B-tree */
+    /* Attempt to index non-existent record in level-1 B-tree */
     H5E_BEGIN_TRY
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC + 2), index_rec_cb, NULL);
@@ -4578,7 +4578,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (idx.key != ((INSERT_SPLIT_ROOT_NREC_REC * 41) + 4))
         TEST_ERROR
 
-    /* Attempt to find non-existant record in level-2 B-tree */
+    /* Attempt to find non-existent record in level-2 B-tree */
     /* (Should not be found, but not fail) */
     find.key = INSERT_SPLIT_ROOT_NREC_REC * 42;
     find.val = (hsize_t)-1;
@@ -4590,7 +4590,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (found)
         TEST_ERROR
 
-    /* Attempt to find existant record in root of level-2 B-tree */
+    /* Attempt to find existent record in root of level-2 B-tree */
     find.key = 1347;
     find.val = (hsize_t)-1;
     found    = FALSE;
@@ -4606,7 +4606,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)2) < 0)
         TEST_ERROR
 
-    /* Attempt to find existant record in internal node of level-2 B-tree */
+    /* Attempt to find existent record in internal node of level-2 B-tree */
     find.key = 513;
     find.val = (hsize_t)-1;
     found    = FALSE;
@@ -4622,7 +4622,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)1) < 0)
         TEST_ERROR
 
-    /* Attempt to find existant record in leaf of level-2 B-tree */
+    /* Attempt to find existent record in leaf of level-2 B-tree */
     find.key = 555;
     find.val = (hsize_t)-1;
     found    = FALSE;
@@ -4638,7 +4638,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)0) < 0)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in level-2 B-tree */
+    /* Attempt to index non-existent record in level-2 B-tree */
     H5E_BEGIN_TRY
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
@@ -4755,7 +4755,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (idx.key != ((INSERT_SPLIT_ROOT_NREC_REC * 41) + 4))
         TEST_ERROR
 
-    /* Attempt to find non-existant record in level-2 B-tree */
+    /* Attempt to find non-existent record in level-2 B-tree */
     /* (Should not be found, but not fail) */
     find.key = INSERT_SPLIT_ROOT_NREC_REC * 42;
     find.val = (hsize_t)-1;
@@ -4767,7 +4767,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (found)
         TEST_ERROR
 
-    /* Attempt to find existant record in root of level-2 B-tree */
+    /* Attempt to find existent record in root of level-2 B-tree */
     find.key = 1344;
     find.val = (hsize_t)-1;
     found    = FALSE;
@@ -4783,7 +4783,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)2) < 0)
         TEST_ERROR
 
-    /* Attempt to find existant record in internal node of level-2 B-tree */
+    /* Attempt to find existent record in internal node of level-2 B-tree */
     find.key = 512;
     find.val = (hsize_t)-1;
     found    = FALSE;
@@ -4799,7 +4799,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)1) < 0)
         TEST_ERROR
 
-    /* Attempt to find existant record in leaf of level-2 B-tree */
+    /* Attempt to find existent record in leaf of level-2 B-tree */
     find.key = 555;
     find.val = (hsize_t)-1;
     found    = FALSE;
@@ -4815,7 +4815,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)0) < 0)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in level-2 B-tree */
+    /* Attempt to index non-existent record in level-2 B-tree */
     H5E_BEGIN_TRY
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
@@ -4942,7 +4942,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (idx.key != ((INSERT_SPLIT_ROOT_NREC_REC * 41) + 6))
         TEST_ERROR
 
-    /* Attempt to find non-existant record in level-2 B-tree */
+    /* Attempt to find non-existent record in level-2 B-tree */
     /* (Should not be found, but not fail) */
     find.key = INSERT_SPLIT_ROOT_NREC_REC * 42;
     find.val = (hsize_t)-1;
@@ -4954,7 +4954,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (found)
         TEST_ERROR
 
-    /* Attempt to find existant record in root of level-2 B-tree */
+    /* Attempt to find existent record in root of level-2 B-tree */
     find.key = 1345;
     find.val = (hsize_t)-1;
     found    = FALSE;
@@ -4970,7 +4970,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)2) < 0)
         TEST_ERROR
 
-    /* Attempt to find existant record in internal node of level-2 B-tree */
+    /* Attempt to find existent record in internal node of level-2 B-tree */
     find.key = 513;
     find.val = (hsize_t)-1;
     found    = FALSE;
@@ -4986,7 +4986,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)1) < 0)
         TEST_ERROR
 
-    /* Attempt to find existant record in leaf of level-2 B-tree */
+    /* Attempt to find existent record in leaf of level-2 B-tree */
     find.key = 555;
     find.val = (hsize_t)-1;
     found    = FALSE;
@@ -5002,7 +5002,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     if (check_node_depth(bt2, &record, (unsigned)0) < 0)
         TEST_ERROR
 
-    /* Attempt to index non-existant record in level-2 B-tree */
+    /* Attempt to index non-existent record in level-2 B-tree */
     H5E_BEGIN_TRY
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
@@ -5188,7 +5188,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
     if (iter.key != INSERT_MANY_REC)
         TEST_ERROR
 
-    /* Attempt to find non-existant record in level-4 B-tree */
+    /* Attempt to find non-existent record in level-4 B-tree */
     /* (Should not be found, but not fail) */
     find.key = INSERT_MANY_REC * 2;
     find.val = (hsize_t)-1;
@@ -5206,7 +5206,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         find.key = (hsize_t)(HDrandom() % INSERT_MANY_REC);
         find.val = (hsize_t)-1;
 
-        /* Attempt to find existant record in level-4 B-tree */
+        /* Attempt to find existent record in level-4 B-tree */
         found = FALSE;
         if (H5B2_find(bt2, &find, &found, find_rec_cb, &find) < 0)
             FAIL_STACK_ERROR
@@ -5216,7 +5216,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
             TEST_ERROR
     } /* end for */
 
-    /* Attempt to index non-existant record in level-4 B-tree, in increasing & decreasing order */
+    /* Attempt to index non-existent record in level-4 B-tree, in increasing & decreasing order */
     H5E_BEGIN_TRY
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
@@ -5245,7 +5245,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         find.key = (hsize_t)-1;
         find.val = (hsize_t)-1;
 
-        /* Attempt to find existant record in level-4 B-tree */
+        /* Attempt to find existent record in level-4 B-tree */
         /* (in increasing order) */
         if (H5B2_index(bt2, H5_ITER_INC, idx, index_rec_cb, &find) < 0)
             FAIL_STACK_ERROR
@@ -5258,7 +5258,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         find.key = (hsize_t)-1;
         find.val = (hsize_t)-1;
 
-        /* Attempt to find existant record in level-4 B-tree */
+        /* Attempt to find existent record in level-4 B-tree */
         /* (in decreasing order) */
         if (H5B2_index(bt2, H5_ITER_DEC, idx, index_rec_cb, &find) < 0)
             FAIL_STACK_ERROR
@@ -5377,7 +5377,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
 
     PASSED();
 
-    TESTING("B-tree remove: non-existant record from 1 record B-tree");
+    TESTING("B-tree remove: non-existent record from 1 record B-tree");
 
     /* Check for closing & re-opening the B-tree */
     if (reopen_btree(f, &bt2, bt2_addr, tparam) < 0)
@@ -5404,7 +5404,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     if (!H5F_addr_defined(root_addr))
         TEST_ERROR
 
-    /* Attempt to remove a non-existant record from a B-tree with 1 record */
+    /* Attempt to remove a non-existent record from a B-tree with 1 record */
     record = 0;
     H5E_BEGIN_TRY
     {
@@ -5418,7 +5418,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     PASSED();
 
     /* Attempt to remove a record from a B-tree with 1 record */
-    TESTING("B-tree remove: existant record from 1 record B-tree");
+    TESTING("B-tree remove: existent record from 1 record B-tree");
 
     /* Check for closing & re-opening the B-tree */
     if (reopen_btree(f, &bt2, bt2_addr, tparam) < 0)
@@ -5482,8 +5482,8 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
 
     PASSED();
 
-    /* Attempt to remove a non-existant record from a level-0 B-tree with mult. record */
-    TESTING("B-tree remove: non-existant record from level-0 B-tree");
+    /* Attempt to remove a non-existent record from a level-0 B-tree with mult. record */
+    TESTING("B-tree remove: non-existent record from level-0 B-tree");
 
     /* Check for closing & re-opening the B-tree */
     if (reopen_btree(f, &bt2, bt2_addr, tparam) < 0)
@@ -5502,7 +5502,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     PASSED();
 
     /* Attempt to remove a record from a level-0 B-tree with mult. record */
-    TESTING("B-tree remove: mult. existant records from level-0 B-tree");
+    TESTING("B-tree remove: mult. existent records from level-0 B-tree");
 
     /* Check for closing & re-opening the B-tree */
     if (reopen_btree(f, &bt2, bt2_addr, tparam) < 0)
@@ -5660,7 +5660,7 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, const bt
     herr_t   ret;         /* Generic error return value */
 
     /* B-tree record removal tests */
-    TESTING("B-tree remove: non-existant record from level-1 B-tree");
+    TESTING("B-tree remove: non-existent record from level-1 B-tree");
 
     /* Create the file for the test */
     if (create_file(&file, &f, fapl) < 0)
@@ -5693,7 +5693,7 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, const bt
     if (!H5F_addr_defined(root_addr))
         TEST_ERROR
 
-    /* Attempt to remove a non-existant record from a B-tree with 1 record */
+    /* Attempt to remove a non-existent record from a B-tree with 1 record */
     record = (INSERT_SPLIT_ROOT_NREC * 2) + 1;
     H5E_BEGIN_TRY
     {
@@ -9748,7 +9748,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
     /*
      * Test modifying records
      */
-    TESTING("B-tree modify: attempt to modify non-existant record");
+    TESTING("B-tree modify: attempt to modify non-existent record");
 
     /* Create the file for the test */
     if (create_file(&file, &f, fapl) < 0)
@@ -9771,7 +9771,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
     if (bt2_stat.depth != 2)
         TEST_ERROR
 
-    /* Attempt to modify a non-existant record */
+    /* Attempt to modify a non-existent record */
     record = 3;
     modify = 4;
     H5E_BEGIN_TRY