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/H5Otest.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/H5Otest.c')
-rw-r--r-- | src/H5Otest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Otest.c b/src/H5Otest.c index 143286c..687d7c6 100644 --- a/src/H5Otest.c +++ b/src/H5Otest.c @@ -115,7 +115,7 @@ H5O__is_attr_dense_test(hid_t oid) } /* end if */ /* Check if dense storage is being used */ - if (H5F_addr_defined(ainfo.fheap_addr)) { + if (H5_addr_defined(ainfo.fheap_addr)) { /* Check for any messages in object header */ HDassert(H5O__msg_count_real(oh, H5O_MSG_ATTR) == 0); @@ -192,7 +192,7 @@ H5O__is_attr_empty_test(hid_t oid) if (oh->version > H5O_VERSION_1) { if (ainfo_exists) { /* Check for using dense storage */ - if (H5F_addr_defined(ainfo.fheap_addr)) { + if (H5_addr_defined(ainfo.fheap_addr)) { /* Check for any messages in object header */ HDassert(nattrs == 0); @@ -294,7 +294,7 @@ H5O__num_attrs_test(hid_t oid, hsize_t *nattrs) /* Check for later version of object header format */ if (oh->version > H5O_VERSION_1) { /* Check for using dense storage */ - if (H5F_addr_defined(ainfo.fheap_addr)) { + if (H5_addr_defined(ainfo.fheap_addr)) { /* Check for any messages in object header */ HDassert(obj_nattrs == 0); @@ -391,9 +391,9 @@ H5O__attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count) } /* end if */ /* Check for 'dense' attribute storage file addresses being defined */ - if (!H5F_addr_defined(ainfo.fheap_addr)) + if (!H5_addr_defined(ainfo.fheap_addr)) HGOTO_DONE_TAG(FAIL) - if (!H5F_addr_defined(ainfo.name_bt2_addr)) + if (!H5_addr_defined(ainfo.name_bt2_addr)) HGOTO_DONE_TAG(FAIL) /* Open the name index v2 B-tree */ @@ -405,7 +405,7 @@ H5O__attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count) HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index") /* Check if there is a creation order index */ - if (H5F_addr_defined(ainfo.corder_bt2_addr)) { + if (H5_addr_defined(ainfo.corder_bt2_addr)) { /* Open the creation order index v2 B-tree */ if (NULL == (bt2_corder = H5B2_open(loc->file, ainfo.corder_bt2_addr, NULL))) HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, |