Convert H5F_addr calls to H5_addr (#3297)

1 files changed, 31 insertions, 31 deletions

diff --git a/test/btree2.c b/test/btree2.c
index a9393b3..b56e238 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -133,7 +133,7 @@ create_btree(H5F_t *f, const H5B2_create_t *cparam, H5B2_t **bt2, haddr_t *bt2_a
         FAIL_STACK_ERROR;
     if (H5B2_get_addr(*bt2, bt2_addr /*out*/) < 0)
         FAIL_STACK_ERROR;
-    if (!H5F_addr_defined(*bt2_addr))
+    if (!H5_addr_defined(*bt2_addr))
         FAIL_STACK_ERROR;
 
     /* Success */
@@ -5271,7 +5271,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Attempt to remove a non-existent record from a B-tree with 1 record */
@@ -5316,7 +5316,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
         FAIL_STACK_ERROR;
 
     /* Make certain that the root node has been freed */
-    if (H5F_addr_defined(root_addr))
+    if (H5_addr_defined(root_addr))
         TEST_ERROR;
 
     PASSED();
@@ -5400,7 +5400,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
         FAIL_STACK_ERROR;
 
     /* Make certain that the root node has not been freed */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     record  = 34;
@@ -5425,7 +5425,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
         FAIL_STACK_ERROR;
 
     /* Make certain that the root node has not been freed */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     record  = 56;
@@ -5450,7 +5450,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
         FAIL_STACK_ERROR;
 
     /* Make certain that the root node has not been freed */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     record  = 38;
@@ -5475,7 +5475,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
         FAIL_STACK_ERROR;
 
     /* Make certain that the root node has been freed */
-    if (H5F_addr_defined(root_addr))
+    if (H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Close the v2 B-tree */
@@ -5557,7 +5557,7 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, const bt
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Attempt to remove a non-existent record from a B-tree with 1 record */
@@ -5785,7 +5785,7 @@ test_remove_level1_redistrib(hid_t fapl, const H5B2_create_t *cparam, const bt2_
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -5980,7 +5980,7 @@ test_remove_level1_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -6155,7 +6155,7 @@ test_remove_level1_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam, const bt
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -6283,7 +6283,7 @@ test_remove_level1_promote(hid_t fapl, const H5B2_create_t *cparam, const bt2_te
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -6501,7 +6501,7 @@ test_remove_level1_promote_2leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -6646,7 +6646,7 @@ test_remove_level1_promote_3leaf_redistrib(hid_t fapl, const H5B2_create_t *cpar
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -6791,7 +6791,7 @@ test_remove_level1_promote_2leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -6933,7 +6933,7 @@ test_remove_level1_promote_3leaf_merge(hid_t fapl, const H5B2_create_t *cparam,
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -7071,7 +7071,7 @@ test_remove_level1_collapse(hid_t fapl, const H5B2_create_t *cparam, const bt2_t
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -7118,7 +7118,7 @@ test_remove_level1_collapse(hid_t fapl, const H5B2_create_t *cparam, const bt2_t
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Close the v2 B-tree */
@@ -7209,7 +7209,7 @@ test_remove_level2_promote(hid_t fapl, const H5B2_create_t *cparam, const bt2_te
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -7492,7 +7492,7 @@ test_remove_level2_promote_2internal_redistrib(hid_t fapl, const H5B2_create_t *
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -7640,7 +7640,7 @@ test_remove_level2_promote_3internal_redistrib(hid_t fapl, const H5B2_create_t *
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -7788,7 +7788,7 @@ test_remove_level2_promote_2internal_merge(hid_t fapl, const H5B2_create_t *cpar
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -7937,7 +7937,7 @@ test_remove_level2_promote_3internal_merge(hid_t fapl, const H5B2_create_t *cpar
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -8086,7 +8086,7 @@ test_remove_level2_2internal_merge_left(hid_t fapl, const H5B2_create_t *cparam,
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -8209,7 +8209,7 @@ test_remove_level2_2internal_merge_right(hid_t fapl, const H5B2_create_t *cparam
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -8331,7 +8331,7 @@ test_remove_level2_3internal_merge(hid_t fapl, const H5B2_create_t *cparam, cons
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -8455,7 +8455,7 @@ test_remove_level2_collapse_right(hid_t fapl, const H5B2_create_t *cparam, const
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (!H5F_addr_defined(root_addr))
+    if (!H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Check for closing & re-opening the B-tree */
@@ -8737,7 +8737,7 @@ fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (H5F_addr_defined(root_addr))
+    if (H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Close the v2 B-tree */
@@ -8821,7 +8821,7 @@ fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (H5F_addr_defined(root_addr))
+    if (H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Close the v2 B-tree */
@@ -8903,7 +8903,7 @@ fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (H5F_addr_defined(root_addr))
+    if (H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Close the v2 B-tree */
@@ -8985,7 +8985,7 @@ fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
         FAIL_STACK_ERROR;
 
     /* Make certain that the address of the root node is defined */
-    if (H5F_addr_defined(root_addr))
+    if (H5_addr_defined(root_addr))
         TEST_ERROR;
 
     /* Close the v2 B-tree */