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/H5B2leaf.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/H5B2leaf.c')
| -rw-r--r-- | src/H5B2leaf.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5B2leaf.c b/src/H5B2leaf.c index 9bc39de..390c9d6 100644 --- a/src/H5B2leaf.c +++ b/src/H5B2leaf.c @@ -142,7 +142,7 @@ done: "unable to remove v2 B-tree leaf node from cache") /* Release leaf node's disk space */ - if (H5F_addr_defined(node_ptr->addr) && + if (H5_addr_defined(node_ptr->addr) && H5MF_xfree(hdr->f, H5FD_MEM_BTREE, node_ptr->addr, (hsize_t)hdr->node_size) < 0) HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to release file space for v2 B-tree leaf node") @@ -180,7 +180,7 @@ H5B2__protect_leaf(H5B2_hdr_t *hdr, void *parent, H5B2_node_ptr_t *node_ptr, hbo /* Check arguments. */ HDassert(hdr); HDassert(node_ptr); - HDassert(H5F_addr_defined(node_ptr->addr)); + HDassert(H5_addr_defined(node_ptr->addr)); /* only H5AC__READ_ONLY_FLAG may appear in flags */ HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0); @@ -275,7 +275,7 @@ H5B2__neighbor_leaf(H5B2_hdr_t *hdr, H5B2_node_ptr_t *curr_node_ptr, void *neigh /* Check arguments. */ HDassert(hdr); HDassert(curr_node_ptr); - HDassert(H5F_addr_defined(curr_node_ptr->addr)); + HDassert(H5_addr_defined(curr_node_ptr->addr)); HDassert(op); /* Lock current B-tree node */ @@ -347,7 +347,7 @@ H5B2__insert_leaf(H5B2_hdr_t *hdr, H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_ /* Check arguments. */ HDassert(hdr); HDassert(curr_node_ptr); - HDassert(H5F_addr_defined(curr_node_ptr->addr)); + HDassert(H5_addr_defined(curr_node_ptr->addr)); /* Lock current B-tree node */ if (NULL == (leaf = H5B2__protect_leaf(hdr, parent, curr_node_ptr, FALSE, H5AC__NO_FLAGS_SET))) @@ -461,7 +461,7 @@ H5B2__update_leaf(H5B2_hdr_t *hdr, H5B2_node_ptr_t *curr_node_ptr, H5B2_update_s /* Check arguments. */ HDassert(hdr); HDassert(curr_node_ptr); - HDassert(H5F_addr_defined(curr_node_ptr->addr)); + HDassert(H5_addr_defined(curr_node_ptr->addr)); /* Lock current B-tree node */ if (NULL == (leaf = H5B2__protect_leaf(hdr, parent, curr_node_ptr, FALSE, H5AC__NO_FLAGS_SET))) @@ -708,7 +708,7 @@ H5B2__shadow_leaf(H5B2_leaf_t *leaf, H5B2_node_ptr_t *curr_node_ptr) */ HDassert(leaf); HDassert(curr_node_ptr); - HDassert(H5F_addr_defined(curr_node_ptr->addr)); + HDassert(H5_addr_defined(curr_node_ptr->addr)); hdr = leaf->hdr; HDassert(hdr); HDassert(hdr->swmr_write); @@ -775,7 +775,7 @@ H5B2__remove_leaf(H5B2_hdr_t *hdr, H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_ /* Check arguments. */ HDassert(hdr); HDassert(curr_node_ptr); - HDassert(H5F_addr_defined(curr_node_ptr->addr)); + HDassert(H5_addr_defined(curr_node_ptr->addr)); /* Lock current B-tree node */ if (NULL == (leaf = H5B2__protect_leaf(hdr, parent, curr_node_ptr, FALSE, H5AC__NO_FLAGS_SET))) @@ -881,7 +881,7 @@ H5B2__remove_leaf_by_idx(H5B2_hdr_t *hdr, H5B2_node_ptr_t *curr_node_ptr, H5B2_n /* Check arguments. */ HDassert(hdr); HDassert(curr_node_ptr); - HDassert(H5F_addr_defined(curr_node_ptr->addr)); + HDassert(H5_addr_defined(curr_node_ptr->addr)); /* Lock B-tree leaf node */ if (NULL == (leaf = H5B2__protect_leaf(hdr, parent, curr_node_ptr, FALSE, H5AC__NO_FLAGS_SET))) |