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/H5B2.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/H5B2.c')
-rw-r--r-- | src/H5B2.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -201,7 +201,7 @@ H5B2_open(H5F_t *f, haddr_t addr, void *ctx_udata) /* Check arguments. */ HDassert(f); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); /* Look up the B-tree header */ if (NULL == (hdr = H5B2__hdr_protect(f, addr, ctx_udata, H5AC__READ_ONLY_FLAG))) @@ -315,7 +315,7 @@ H5B2_update(H5B2_t *bt2, void *udata, H5B2_modify_t op, void *op_data) hdr = bt2->hdr; /* Check if the root node is allocated yet */ - if (!H5F_addr_defined(hdr->root.addr)) { + if (!H5_addr_defined(hdr->root.addr)) { /* Create root node as leaf node in B-tree */ if (H5B2__create_leaf(hdr, hdr, &(hdr->root)) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create root node") @@ -1117,7 +1117,7 @@ H5B2_neighbor(H5B2_t *bt2, H5B2_compare_t range, void *udata, H5B2_found_t op, v hdr = bt2->hdr; /* Check for empty tree */ - if (!H5F_addr_defined(hdr->root.addr)) + if (!H5_addr_defined(hdr->root.addr)) HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "B-tree has no records") /* Attempt to find neighbor record in B-tree */ @@ -1428,7 +1428,7 @@ H5B2_close(H5B2_t *bt2) H5B2_hdr_t *hdr; /* Another pointer to v2 B-tree header */ /* Sanity check */ - HDassert(H5F_addr_defined(bt2_addr)); + HDassert(H5_addr_defined(bt2_addr)); #ifndef NDEBUG { @@ -1516,7 +1516,7 @@ H5B2_delete(H5F_t *f, haddr_t addr, void *ctx_udata, H5B2_remove_t op, void *op_ /* Check arguments. */ HDassert(f); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); /* Lock the v2 B-tree header into memory */ if (NULL == (hdr = H5B2__hdr_protect(f, addr, ctx_udata, H5AC__NO_FLAGS_SET))) |