diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/btree2.c | 62 | ||||
-rw-r--r-- | test/cache.c | 2 | ||||
-rw-r--r-- | test/cache_common.h | 2 | ||||
-rw-r--r-- | test/cache_image.c | 12 | ||||
-rw-r--r-- | test/earray.c | 2 | ||||
-rw-r--r-- | test/farray.c | 2 | ||||
-rw-r--r-- | test/fheap.c | 96 | ||||
-rw-r--r-- | test/freespace.c | 52 | ||||
-rw-r--r-- | test/gheap.c | 2 | ||||
-rw-r--r-- | test/links.c | 26 | ||||
-rw-r--r-- | test/mf.c | 52 |
11 files changed, 155 insertions, 155 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 */ diff --git a/test/cache.c b/test/cache.c index 203c09a..fce0ef1 100644 --- a/test/cache.c +++ b/test/cache.c @@ -34014,7 +34014,7 @@ takedown_cache(H5F_t *file_ptr, hbool_t dump_stats, hbool_t dump_detailed_stats) if (saved_fid != -1) { - if (H5F_addr_defined(saved_actual_base_addr)) { + if (H5_addr_defined(saved_actual_base_addr)) { if (NULL == file_ptr) { file_ptr = (H5F_t *)H5VL_object_verify(saved_fid, H5I_FILE); diff --git a/test/cache_common.h b/test/cache_common.h index e91099c..83c5e6a 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -424,7 +424,7 @@ typedef struct test_entry_t { k = H5C__HASH_FCN(Addr); \ (entry_ptr) = (cache_ptr)->index[k]; \ while (entry_ptr) { \ - if (H5F_addr_eq(Addr, (entry_ptr)->addr)) { \ + if (H5_addr_eq(Addr, (entry_ptr)->addr)) { \ H5C_TEST__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, k) \ if ((entry_ptr) != (cache_ptr)->index[k]) { \ if ((entry_ptr)->ht_next) \ diff --git a/test/cache_image.c b/test/cache_image.c index 7977454..8ee152c 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -7214,9 +7214,9 @@ get_free_sections_test(hbool_t single_file_vfd) /* file_ptr->shared->first_alloc_dealloc is set to FALSE if the * file is opened R/O. */ - if ((!H5F_addr_defined(file_ptr->shared->eoa_fsm_fsalloc)) || - (!H5F_addr_defined(file_ptr->shared->cache->image_addr)) || - (H5F_addr_gt(file_ptr->shared->eoa_fsm_fsalloc, file_ptr->shared->cache->image_addr))) { + if ((!H5_addr_defined(file_ptr->shared->eoa_fsm_fsalloc)) || + (!H5_addr_defined(file_ptr->shared->cache->image_addr)) || + (H5_addr_gt(file_ptr->shared->eoa_fsm_fsalloc, file_ptr->shared->cache->image_addr))) { pass = FALSE; failure_mssg = "unexpected cache image status (1).\n"; @@ -7319,9 +7319,9 @@ get_free_sections_test(hbool_t single_file_vfd) */ if (pass) { - if ((!H5F_addr_defined(file_ptr->shared->eoa_fsm_fsalloc)) || - (!H5F_addr_defined(file_ptr->shared->cache->image_addr)) || - (H5F_addr_gt(file_ptr->shared->eoa_fsm_fsalloc, file_ptr->shared->cache->image_addr))) { + if ((!H5_addr_defined(file_ptr->shared->eoa_fsm_fsalloc)) || + (!H5_addr_defined(file_ptr->shared->cache->image_addr)) || + (H5_addr_gt(file_ptr->shared->eoa_fsm_fsalloc, file_ptr->shared->cache->image_addr))) { pass = FALSE; failure_mssg = "unexpected cache image status (2).\n"; diff --git a/test/earray.c b/test/earray.c index cc79987..eed4bd2 100644 --- a/test/earray.c +++ b/test/earray.c @@ -491,7 +491,7 @@ create_array(H5F_t *f, const H5EA_create_t *cparam, H5EA_t **ea, haddr_t *ea_add TEST_ERROR; if (H5EA_get_addr(*ea, ea_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(*ea_addr)) + if (!H5_addr_defined(*ea_addr)) TEST_ERROR; HDmemset(&state, 0, sizeof(state)); state.hdr_size = EA_HDR_SIZE; diff --git a/test/farray.c b/test/farray.c index b772ce3..e5bd6b6 100644 --- a/test/farray.c +++ b/test/farray.c @@ -316,7 +316,7 @@ create_array(H5F_t *f, const H5FA_create_t *cparam, H5FA_t **fa, haddr_t *fa_add /* Check status of array */ if (H5FA_get_addr(*fa, fa_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(*fa_addr)) + if (!H5_addr_defined(*fa_addr)) TEST_ERROR; /* Check array stats */ diff --git a/test/fheap.c b/test/fheap.c index 8709879..bcf1ab0 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -659,7 +659,7 @@ open_heap(char *filename, hid_t fapl, const H5HF_create_t *cparam, const fheap_t TEST_ERROR; if (H5HF_get_heap_addr(*fh, fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(*fh_addr)) + if (!H5_addr_defined(*fh_addr)) TEST_ERROR; HDmemset(state, 0, sizeof(fheap_heap_state_t)); if (check_stats(*fh, state)) @@ -704,7 +704,7 @@ open_heap(char *filename, hid_t fapl, const H5HF_create_t *cparam, const fheap_t TEST_ERROR; if (H5HF_get_heap_addr(*fh, fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(*fh_addr)) + if (!H5_addr_defined(*fh_addr)) TEST_ERROR; HDmemset(state, 0, sizeof(fheap_heap_state_t)); if (check_stats(*fh, state)) @@ -857,7 +857,7 @@ del_objs_half_refill(H5F_t *f, H5HF_t **fh, fheap_test_param_t *tparam, fheap_he if (tparam->reopen_heap) { if (H5HF_get_heap_addr(*fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) TEST_ERROR; } /* end if */ @@ -954,7 +954,7 @@ del_objs(H5F_t *f, H5HF_t **fh, fheap_test_param_t *tparam, fheap_heap_state_t * if (tparam->reopen_heap) { if (H5HF_get_heap_addr(*fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) TEST_ERROR; } /* end if */ @@ -1857,7 +1857,7 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) TEST_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) TEST_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -1982,7 +1982,7 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) TEST_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) TEST_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -2137,7 +2137,7 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) TEST_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) TEST_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -2307,7 +2307,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) TEST_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) TEST_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -2814,7 +2814,7 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) /* Get heap's address */ if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) TEST_ERROR; /* Close the fractal heap */ @@ -2928,7 +2928,7 @@ test_size(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) /* Get heap's address */ if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) TEST_ERROR; /* Get an empty heap's size */ @@ -3069,7 +3069,7 @@ test_reopen_hdr(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) /* Get heap's address */ if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) TEST_ERROR; /* Insert an object */ @@ -3202,7 +3202,7 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa TEST_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) TEST_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -3315,7 +3315,7 @@ test_man_insert_first(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa TEST_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) TEST_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -3416,7 +3416,7 @@ test_man_insert_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -3513,7 +3513,7 @@ test_man_insert_root_mult(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -3612,7 +3612,7 @@ test_man_insert_force_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_par FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -3718,7 +3718,7 @@ test_man_insert_fill_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -3825,7 +3825,7 @@ test_man_insert_third_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -3936,7 +3936,7 @@ test_man_fill_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -4032,7 +4032,7 @@ test_man_start_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -4135,7 +4135,7 @@ test_man_fill_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -4236,7 +4236,7 @@ test_man_start_third_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -4347,7 +4347,7 @@ test_man_fill_fourth_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -4444,7 +4444,7 @@ test_man_fill_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -4540,7 +4540,7 @@ test_man_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_ FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -4642,7 +4642,7 @@ test_man_second_direct_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhe FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -4752,7 +4752,7 @@ test_man_fill_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_ FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -4855,7 +4855,7 @@ test_man_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -4966,7 +4966,7 @@ test_man_fill_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -5070,7 +5070,7 @@ test_man_fill_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fheap_te FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -5172,7 +5172,7 @@ test_man_start_2nd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -5281,7 +5281,7 @@ test_man_recursive_indirect_two_deep(hid_t fapl, H5HF_create_t *cparam, fheap_te FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -5384,7 +5384,7 @@ test_man_start_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -5494,7 +5494,7 @@ test_man_fill_first_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -5605,7 +5605,7 @@ test_man_fill_3rd_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -5713,7 +5713,7 @@ test_man_fill_all_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -5822,7 +5822,7 @@ test_man_start_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -5937,7 +5937,7 @@ test_man_fill_first_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -6058,7 +6058,7 @@ test_man_fill_4th_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -6170,7 +6170,7 @@ test_man_fill_all_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -6284,7 +6284,7 @@ test_man_start_5th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); @@ -6416,7 +6416,7 @@ test_man_remove_bogus(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -6575,7 +6575,7 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -6740,7 +6740,7 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -6934,7 +6934,7 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -7104,7 +7104,7 @@ test_man_remove_two_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -7345,7 +7345,7 @@ test_man_remove_three_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) @@ -7650,7 +7650,7 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ FAIL_STACK_ERROR; if (H5HF_get_heap_addr(fh, &fh_addr) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fh_addr)) + if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; HDmemset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) diff --git a/test/freespace.c b/test/freespace.c index bc41044..60238d8 100644 --- a/test/freespace.c +++ b/test/freespace.c @@ -223,10 +223,10 @@ TEST_sect_can_merge(const H5FS_section_info_t *_sect1, const H5FS_section_info_t HDassert(sect1); HDassert(sect2); HDassert(sect1->sect_info.type == sect2->sect_info.type); /* Checks "MERGE_SYM" flag */ - HDassert(H5F_addr_lt(sect1->sect_info.addr, sect2->sect_info.addr)); + HDassert(H5_addr_lt(sect1->sect_info.addr, sect2->sect_info.addr)); /* Check if second section adjoins first section */ - ret_value = H5F_addr_eq(sect1->sect_info.addr + sect1->sect_info.size, sect2->sect_info.addr); + ret_value = H5_addr_eq(sect1->sect_info.addr + sect1->sect_info.size, sect2->sect_info.addr); return ret_value; } /* TEST_sect_can_merge() */ @@ -250,7 +250,7 @@ TEST_sect_merging(H5FS_section_info_t **_sect1, H5FS_section_info_t *_sect2, voi HDassert((sect2->sect_info.type == TEST_FSPACE_SECT_TYPE) || (sect2->sect_info.type == TEST_FSPACE_SECT_TYPE_NEW) || (sect2->sect_info.type == TEST_FSPACE_SECT_TYPE_NONE)); - HDassert(H5F_addr_eq((*sect1)->sect_info.addr + (*sect1)->sect_info.size, sect2->sect_info.addr)); + HDassert(H5_addr_eq((*sect1)->sect_info.addr + (*sect1)->sect_info.size, sect2->sect_info.addr)); /* Add second section's size to first section */ (*sect1)->sect_info.size += sect2->sect_info.size; @@ -488,7 +488,7 @@ test_fs_create(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; if (frsp->nclasses != nclasses) TEST_ERROR; @@ -513,7 +513,7 @@ test_fs_create(hid_t fapl) (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; if (frsp->nclasses != nclasses) TEST_ERROR; @@ -630,7 +630,7 @@ test_fs_sect_add(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; if (NULL == (sect_node = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) @@ -695,7 +695,7 @@ test_fs_sect_add(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* Create free list section node */ @@ -770,7 +770,7 @@ test_fs_sect_add(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; if (NULL == (sect_node = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) @@ -840,7 +840,7 @@ test_fs_sect_add(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; if (NULL == (sect_node = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) @@ -963,7 +963,7 @@ test_fs_sect_find(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; HDmemset(&state, 0, sizeof(frspace_state_t)); @@ -994,7 +994,7 @@ test_fs_sect_find(hid_t fapl) (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; if (frsp->nclasses != nclasses) TEST_ERROR; @@ -1121,7 +1121,7 @@ test_fs_sect_find(hid_t fapl) (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; if (frsp->nclasses != nclasses) TEST_ERROR; @@ -1200,7 +1200,7 @@ test_fs_sect_find(hid_t fapl) (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; if (frsp->nclasses != nclasses) TEST_ERROR; @@ -1350,7 +1350,7 @@ test_fs_sect_merge(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -1479,7 +1479,7 @@ test_fs_sect_merge(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -1582,7 +1582,7 @@ test_fs_sect_merge(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -1828,7 +1828,7 @@ test_fs_sect_shrink(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -1930,7 +1930,7 @@ test_fs_sect_shrink(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -2030,7 +2030,7 @@ test_fs_sect_shrink(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -2172,7 +2172,7 @@ test_fs_sect_change_class(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -2276,7 +2276,7 @@ test_fs_sect_change_class(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -2460,7 +2460,7 @@ test_fs_sect_extend(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -2537,7 +2537,7 @@ test_fs_sect_extend(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -2611,7 +2611,7 @@ test_fs_sect_extend(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -2686,7 +2686,7 @@ test_fs_sect_extend(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; /* @@ -2819,7 +2819,7 @@ test_fs_sect_iterate(hid_t fapl) (hsize_t)FSPACE_THRHD_DEF, (hsize_t)FSPACE_ALIGN_DEF))) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_addr)) + if (!H5_addr_defined(fs_addr)) TEST_ERROR; for (i = 1; i <= NUM_SECTIONS; i++) { diff --git a/test/gheap.c b/test/gheap.c index 4369b1b..58b7fe2 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -109,7 +109,7 @@ test_1(hid_t fapl) HDputs(" Unable to insert object into global heap"); nerrors++; } - else if (u && H5F_addr_gt(obj[u - 1].addr, obj[u].addr)) { + else if (u && H5_addr_gt(obj[u - 1].addr, obj[u].addr)) { H5_FAILED(); HDputs(" Collection addresses are not monotonically increasing"); nerrors++; diff --git a/test/links.c b/test/links.c index 9e4d2e3..516c195 100644 --- a/test/links.c +++ b/test/links.c @@ -2165,7 +2165,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) HDprintf(" %d: Unexpected object type should have been a dataset\n", __LINE__); TEST_ERROR; } /* end if */ - if (H5F_addr_ne(oinfo1.addr, oinfo2.addr)) { + if (H5_addr_ne(oinfo1.addr, oinfo2.addr)) { H5_FAILED(); HDputs(" Hard link test failed. Link seems not to point to the "); HDputs(" expected file location."); @@ -2210,7 +2210,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) HDprintf(" %d: Unexpected object type should have been a dataset\n", __LINE__); TEST_ERROR; } /* end if */ - if (H5F_addr_ne(oinfo1.addr, oinfo2.addr)) { + if (H5_addr_ne(oinfo1.addr, oinfo2.addr)) { H5_FAILED(); HDputs(" Soft link test failed. Link seems not to point to the "); HDputs(" expected file location."); @@ -5377,7 +5377,7 @@ link_info_by_idx_old_deprec(hid_t fapl) if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (H5F_addr_ne(linfo.u.address, objno[u])) + if (H5_addr_ne(linfo.u.address, objno[u])) TEST_ERROR; } /* end if */ else { @@ -5400,7 +5400,7 @@ link_info_by_idx_old_deprec(hid_t fapl) if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (H5F_addr_ne(linfo.u.address, objno[u])) + if (H5_addr_ne(linfo.u.address, objno[u])) TEST_ERROR; } /* end if */ else { @@ -5429,7 +5429,7 @@ link_info_by_idx_old_deprec(hid_t fapl) if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; - if (H5F_addr_ne(linfo.u.address, objno[dec_u])) + if (H5_addr_ne(linfo.u.address, objno[dec_u])) TEST_ERROR; } /* end if */ else { @@ -6007,11 +6007,11 @@ delete_by_idx_old_deprec(hid_t fapl) if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { - if (H5F_addr_ne(linfo.u.address, objno[u + 1])) + if (H5_addr_ne(linfo.u.address, objno[u + 1])) TEST_ERROR; } /* end if */ else { - if (H5F_addr_ne(linfo.u.address, objno[dec_u])) + if (H5_addr_ne(linfo.u.address, objno[dec_u])) TEST_ERROR; } /* end else */ @@ -6081,11 +6081,11 @@ delete_by_idx_old_deprec(hid_t fapl) if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { - if (H5F_addr_ne(linfo.u.address, objno[(u * 2) + 1])) + if (H5_addr_ne(linfo.u.address, objno[(u * 2) + 1])) TEST_ERROR; } /* end if */ else { - if (H5F_addr_ne(linfo.u.address, objno[dec_u])) + if (H5_addr_ne(linfo.u.address, objno[dec_u])) TEST_ERROR; } /* end else */ @@ -6115,11 +6115,11 @@ delete_by_idx_old_deprec(hid_t fapl) if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { - if (H5F_addr_ne(linfo.u.address, objno[(u * 2) + 3])) + if (H5_addr_ne(linfo.u.address, objno[(u * 2) + 3])) TEST_ERROR; } /* end if */ else { - if (H5F_addr_ne(linfo.u.address, objno[dec_u])) + if (H5_addr_ne(linfo.u.address, objno[dec_u])) TEST_ERROR; } /* end else */ @@ -6208,7 +6208,7 @@ link_iterate_deprec_cb(hid_t group_id, const char *link_name, const H5L_info1_t return H5_ITER_ERROR; if (info->cset != my_info.cset) return H5_ITER_ERROR; - if (H5F_addr_ne(info->u.address, my_info.u.address)) + if (H5_addr_ne(info->u.address, my_info.u.address)) return H5_ITER_ERROR; } /* end if */ @@ -6707,7 +6707,7 @@ link_iterate_old_deprec_cb(hid_t group_id, const char *link_name, const H5L_info return H5_ITER_ERROR; if (info->cset != my_info.cset) return H5_ITER_ERROR; - if (H5F_addr_ne(info->u.address, my_info.u.address)) + if (H5_addr_ne(info->u.address, my_info.u.address)) return H5_ITER_ERROR; } /* end if */ @@ -1000,7 +1000,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) check_addr = H5MF_alloc_tmp(f, (hsize_t)(maxaddr / 3)); } H5E_END_TRY; - if (H5F_addr_defined(check_addr)) + if (H5_addr_defined(check_addr)) TEST_ERROR; /* Test that pushing normal space allocation into temporary space fails */ @@ -1009,7 +1009,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) check_addr = H5MF_alloc(f, H5FD_MEM_DRAW, (hsize_t)(maxaddr / 3)); } H5E_END_TRY; - if (H5F_addr_defined(check_addr)) + if (H5_addr_defined(check_addr)) TEST_ERROR; /* Free the normal block (so the file doesn't blow up to a huge size) */ @@ -6402,7 +6402,7 @@ test_mf_fs_persist_split(void) FAIL_STACK_ERROR; /* Verify that the H5FD_MEM_SUPER free-space manager is there */ - if (!H5F_addr_defined(f->shared->fs_addr[type])) + if (!H5_addr_defined(f->shared->fs_addr[type])) TEST_ERROR; /* Start up H5FD_MEM_SUPER free-space manager */ @@ -6426,7 +6426,7 @@ test_mf_fs_persist_split(void) TEST_ERROR; /* Verify that the free-space manager for H5FD_MEM_DRAW is there */ - if (!H5F_addr_defined(f->shared->fs_addr[stype])) + if (!H5_addr_defined(f->shared->fs_addr[stype])) TEST_ERROR; /* Start up H5FD_MEM_DRAW free-space manager */ @@ -6486,11 +6486,11 @@ test_mf_fs_persist_split(void) FAIL_STACK_ERROR; /* Verify that the free-space manager for H5FD_MEM_DRAW is not there */ - if (H5F_addr_defined(f->shared->fs_addr[stype])) + if (H5_addr_defined(f->shared->fs_addr[stype])) TEST_ERROR; /* Verify that the free-space manager for H5FD_MEM_SUPER is there */ - if (!H5F_addr_defined(f->shared->fs_addr[type])) + if (!H5_addr_defined(f->shared->fs_addr[type])) TEST_ERROR; /* Start up H5FD_MEM_SUPER free-space manager */ @@ -6530,7 +6530,7 @@ test_mf_fs_persist_split(void) FAIL_STACK_ERROR; /* Verify that the H5FD_MEM_SUPER free-space manager is there */ - if (!H5F_addr_defined(f->shared->fs_addr[type])) + if (!H5_addr_defined(f->shared->fs_addr[type])) TEST_ERROR; /* Start up H5FD_MEM_SUPER free-space manager */ @@ -6720,7 +6720,7 @@ test_mf_fs_persist_multi(void) FAIL_STACK_ERROR; /* Verify that the H5FD_MEM_SUPER free-space manager is there */ - if (!H5F_addr_defined(f->shared->fs_addr[type])) + if (!H5_addr_defined(f->shared->fs_addr[type])) TEST_ERROR; /* Start up H5FD_MEM_SUPER free-space manager */ @@ -6744,7 +6744,7 @@ test_mf_fs_persist_multi(void) TEST_ERROR; /* Verify that the free-space manager for H5FD_MEM_DRAW is there */ - if (!H5F_addr_defined(f->shared->fs_addr[stype])) + if (!H5_addr_defined(f->shared->fs_addr[stype])) TEST_ERROR; /* Start up H5FD_MEM_DRAW free-space manager */ @@ -6802,7 +6802,7 @@ test_mf_fs_persist_multi(void) FAIL_STACK_ERROR; /* Verify that the free-space manager for H5FD_MEM_SUPER is there */ - if (!H5F_addr_defined(f->shared->fs_addr[type])) + if (!H5_addr_defined(f->shared->fs_addr[type])) TEST_ERROR; /* Start up H5FD_MEM_SUPER free-space manager */ @@ -6824,11 +6824,11 @@ test_mf_fs_persist_multi(void) TEST_ERROR; /* Verify that the free-space manager for H5FD_MEM_DRAW is not there */ - if (H5F_addr_defined(f->shared->fs_addr[stype])) + if (H5_addr_defined(f->shared->fs_addr[stype])) TEST_ERROR; /* Verify that the free-space manager for H5FD_MEM_BTREE is there */ - if (!H5F_addr_defined(f->shared->fs_addr[btype])) + if (!H5_addr_defined(f->shared->fs_addr[btype])) TEST_ERROR; /* Start up H5FD_MEM_BTREE free-space manager */ @@ -6868,7 +6868,7 @@ test_mf_fs_persist_multi(void) FAIL_STACK_ERROR; /* If H5FD_MEM_SUPER is there, should not find block #1 & #3 */ - if (H5F_addr_defined(f->shared->fs_addr[type])) { + if (H5_addr_defined(f->shared->fs_addr[type])) { /* Start up H5FD_MEM_SUPER free-space manager */ if (H5MF__open_fstype(f, (H5F_mem_page_t)type) < 0) FAIL_STACK_ERROR; @@ -6887,7 +6887,7 @@ test_mf_fs_persist_multi(void) } /* Verify that the H5FD_MEM_GHEAP free-space manager is there */ - if (!H5F_addr_defined(f->shared->fs_addr[gtype])) + if (!H5_addr_defined(f->shared->fs_addr[gtype])) TEST_ERROR; /* Start up H5FD_MEM_GHEAP free-space manager */ @@ -7022,7 +7022,7 @@ test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) H5MF__alloc_to_fs_type(f->shared, type, TBLOCK_SIZE6, (H5F_mem_page_t *)&tt); /* Verify that H5FD_MEM_SUPER free-space manager is there */ - if (!H5F_addr_defined(f->shared->fs_addr[tt])) + if (!H5_addr_defined(f->shared->fs_addr[tt])) TEST_ERROR; /* Start up H5FD_MEM_SUPER free-space manager */ @@ -7065,7 +7065,7 @@ test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Verify that H5FD_MEM_SUPER free-space manager is there */ - if (!H5F_addr_defined(f->shared->fs_addr[tt])) + if (!H5_addr_defined(f->shared->fs_addr[tt])) TEST_ERROR; /* Retrieve block #5 from H5FD_MEM_SUPER free-space manager */ @@ -7200,7 +7200,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) H5MF__alloc_to_fs_type(f->shared, type, TBLOCK_SIZE4, (H5F_mem_page_t *)&fs_type); /* Verify that the H5FD_MEM_SUPER free-space manager is not there */ - if (H5F_addr_defined(f->shared->fs_addr[fs_type])) + if (H5_addr_defined(f->shared->fs_addr[fs_type])) TEST_ERROR; /* Put block #3 to H5FD_MEM_SUPER free-space manager */ @@ -7219,7 +7219,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Verify that H5FD_MEM_SUPER free-space manager is there */ - if (!H5F_addr_defined(f->shared->fs_addr[fs_type])) + if (!H5_addr_defined(f->shared->fs_addr[fs_type])) TEST_ERROR; /* Start up H5FD_MEM_SUPER free-space manager */ @@ -7231,7 +7231,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) if (H5FS_stat_info(f, f->shared->fs_man[fs_type], &fs_stat) < 0) FAIL_STACK_ERROR; - if (!H5F_addr_defined(fs_stat.addr)) + if (!H5_addr_defined(fs_stat.addr)) TEST_ERROR; if (fs_stat.tot_space < TBLOCK_SIZE3) @@ -7259,7 +7259,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) if (NULL == (f = (H5F_t *)H5VL_object(file))) FAIL_STACK_ERROR; /* Verify that the H5FD_MEM_SUPER free-space manager is not there */ - if (H5F_addr_defined(f->shared->fs_addr[fs_type])) + if (H5_addr_defined(f->shared->fs_addr[fs_type])) TEST_ERROR; /* Closing */ @@ -7428,7 +7428,7 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for } } else { - if (H5F_addr_defined(f->shared->fs_addr[tt])) + if (H5_addr_defined(f->shared->fs_addr[tt])) TEST_ERROR; } @@ -7618,7 +7618,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format /* Free-space manager should be empty */ if (!(fs_type == H5F_FSPACE_STRATEGY_PAGE && fs_persist)) - if (H5F_addr_defined(f->shared->fs_addr[tt])) + if (H5_addr_defined(f->shared->fs_addr[tt])) TEST_ERROR; /* Closing */ @@ -7936,13 +7936,13 @@ test_page_alloc_xfree(const char *env_h5_drvr, hid_t fapl) /* Verify that the large generic manager is there */ H5MF__alloc_to_fs_type(f->shared, H5FD_MEM_DRAW, TBLOCK_SIZE5000, (H5F_mem_page_t *)&fs_type); - if (!H5F_addr_defined(f->shared->fs_addr[fs_type])) + if (!H5_addr_defined(f->shared->fs_addr[fs_type])) TEST_ERROR; /* Verify that the small metadata manager is there */ H5MF__alloc_to_fs_type(f->shared, H5FD_MEM_OHDR, f->shared->fs_page_size - 1, (H5F_mem_page_t *)&fs_type); - if (!H5F_addr_defined(f->shared->fs_addr[fs_type])) + if (!H5_addr_defined(f->shared->fs_addr[fs_type])) TEST_ERROR; /* Set up to use the small metadata manager */ @@ -7960,7 +7960,7 @@ test_page_alloc_xfree(const char *env_h5_drvr, hid_t fapl) TEST_ERROR; /* Verify that the small raw data manager is there */ - if (!H5F_addr_defined(f->shared->fs_addr[H5F_MEM_PAGE_DRAW])) + if (!H5_addr_defined(f->shared->fs_addr[H5F_MEM_PAGE_DRAW])) TEST_ERROR; /* Set up to use the small raw data manager */ @@ -8566,7 +8566,7 @@ test_page_large(const char *env_h5_drvr, hid_t fapl) /* Allocate a large data block with gaddr3--should be on another page */ /* Allocate 2 pages + 3808 bytes; 288 bytes in free-space manager */ gaddr3 = H5MF_alloc(f, H5FD_MEM_DRAW, (hsize_t)TBLOCK_SIZE12000); - if (!H5F_addr_defined(gaddr3)) + if (!H5_addr_defined(gaddr3)) TEST_ERROR; /* Free the block with gaddr2 */ |