diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-06-05 15:04:56 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-05 15:04:56 (GMT) |
commit | 7ecf1d09afa9379186c2ace158fb60d4afd96f0e (patch) | |
tree | 529564764b9cc063dcf0f8741ce45d5c2fd11095 /test/btree2.c | |
parent | e3559c7b64e7963e3515c2ebfd7f1abad810ed19 (diff) | |
download | hdf5-7ecf1d09afa9379186c2ace158fb60d4afd96f0e.zip hdf5-7ecf1d09afa9379186c2ace158fb60d4afd96f0e.tar.gz hdf5-7ecf1d09afa9379186c2ace158fb60d4afd96f0e.tar.bz2 |
Convert H5F haddr_t macros to H5 (#3039)
Several macros for handling haddr_t values exist in H5Fprivate.h
and have H5F prefixes, even though they have nothing to do with
a particular file (e.g., H5F_addr_lt()).
These macros have been moved to H5private.h and renamed to have
an H5 prefix.
Affected macros:
H5F_addr_overflow
H5F_addr_defined
H5F_addr_eq
H5F_addr_ne
H5F_addr_lt
H5F_addr_le
H5F_addr_gt
H5F_addr_ge
H5F_addr_cmp
H5F_addr_overlap
H5F_addr_pow2 was unused and removed instead of converted.
Diffstat (limited to 'test/btree2.c')
-rw-r--r-- | test/btree2.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/test/btree2.c b/test/btree2.c index 35d35d7..573f45c 100644 --- a/test/btree2.c +++ b/test/btree2.c @@ -145,7 +145,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 */ @@ -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 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 */ @@ -5445,7 +5445,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(); @@ -5529,7 +5529,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; @@ -5554,7 +5554,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; @@ -5579,7 +5579,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; @@ -5604,7 +5604,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 */ @@ -5689,7 +5689,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 */ @@ -5920,7 +5920,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 */ @@ -6118,7 +6118,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 */ @@ -6296,7 +6296,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 */ @@ -6427,7 +6427,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 */ @@ -6648,7 +6648,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 */ @@ -6796,7 +6796,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 */ @@ -6944,7 +6944,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 */ @@ -7089,7 +7089,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 */ @@ -7230,7 +7230,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 */ @@ -7277,7 +7277,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 */ @@ -7371,7 +7371,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 */ @@ -7657,7 +7657,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 */ @@ -7808,7 +7808,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 */ @@ -7959,7 +7959,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 */ @@ -8111,7 +8111,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 */ @@ -8263,7 +8263,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 */ @@ -8389,7 +8389,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 */ @@ -8514,7 +8514,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 */ @@ -8641,7 +8641,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 */ @@ -8929,7 +8929,7 @@ HDfprintf(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 */ @@ -9013,7 +9013,7 @@ HDfprintf(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 */ @@ -9095,7 +9095,7 @@ HDfprintf(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 */ @@ -9177,7 +9177,7 @@ HDfprintf(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 */ |