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 /src/H5Gtest.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 'src/H5Gtest.c')
-rw-r--r-- | src/H5Gtest.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/H5Gtest.c b/src/H5Gtest.c index bd2697c..fb78775 100644 --- a/src/H5Gtest.c +++ b/src/H5Gtest.c @@ -134,11 +134,11 @@ H5G__is_empty_test(hid_t gid) HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info") /* Check for 'dense' link storage file addresses being defined */ - if (H5F_addr_defined(linfo.fheap_addr)) + if (H5_addr_defined(linfo.fheap_addr)) HGOTO_DONE(FALSE) - if (H5F_addr_defined(linfo.name_bt2_addr)) + if (H5_addr_defined(linfo.name_bt2_addr)) HGOTO_DONE(FALSE) - if (H5F_addr_defined(linfo.corder_bt2_addr)) + if (H5_addr_defined(linfo.corder_bt2_addr)) HGOTO_DONE(FALSE) /* Check for link count */ @@ -368,9 +368,9 @@ H5G__is_new_dense_test(hid_t gid) HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info") /* Check for 'dense' link storage file addresses being defined */ - if (!H5F_addr_defined(linfo.fheap_addr)) + if (!H5_addr_defined(linfo.fheap_addr)) HGOTO_DONE(FALSE) - if (!H5F_addr_defined(linfo.name_bt2_addr)) + if (!H5_addr_defined(linfo.name_bt2_addr)) HGOTO_DONE(FALSE) } /* end if */ @@ -431,9 +431,9 @@ H5G__new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count) HGOTO_ERROR_TAG(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info") /* Check for 'dense' link storage file addresses being defined */ - if (!H5F_addr_defined(linfo.fheap_addr)) + if (!H5_addr_defined(linfo.fheap_addr)) HGOTO_DONE_TAG(FAIL) - if (!H5F_addr_defined(linfo.name_bt2_addr)) + if (!H5_addr_defined(linfo.name_bt2_addr)) HGOTO_DONE_TAG(FAIL) /* Open the name index v2 B-tree */ @@ -445,7 +445,7 @@ H5G__new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count) HGOTO_ERROR_TAG(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index") /* Check if there is a creation order index */ - if (H5F_addr_defined(linfo.corder_bt2_addr)) { + if (H5_addr_defined(linfo.corder_bt2_addr)) { /* Open the creation order index v2 B-tree */ if (NULL == (bt2_corder = H5B2_open(grp->oloc.file, linfo.corder_bt2_addr, NULL))) HGOTO_ERROR_TAG(H5E_SYM, H5E_CANTOPENOBJ, FAIL, @@ -724,7 +724,7 @@ H5G__verify_cached_stabs_test_cb(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, h /* Check arguments */ HDassert(f); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); /* Load the node */ if (NULL == (sn = (H5G_node_t *)H5AC_protect(f, H5AC_SNODE, addr, f, H5AC__READ_ONLY_FLAG))) |