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/H5B2hdr.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/H5B2hdr.c')
| -rw-r--r-- | src/H5B2hdr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c index 270789f..68f1f3d 100644 --- a/src/H5B2hdr.c +++ b/src/H5B2hdr.c @@ -317,7 +317,7 @@ H5B2__hdr_create(H5F_t *f, const H5B2_create_t *cparam, void *ctx_udata) ret_value = hdr->addr; done: - if (!H5F_addr_defined(ret_value)) + if (!H5_addr_defined(ret_value)) if (hdr) { /* Remove from cache, if inserted */ if (inserted) @@ -326,7 +326,7 @@ done: "unable to remove v2 B-tree header from cache") /* Release header's disk space */ - if (H5F_addr_defined(hdr->addr) && + if (H5_addr_defined(hdr->addr) && H5MF_xfree(f, H5FD_MEM_BTREE, hdr->addr, (hsize_t)hdr->hdr_size) < 0) HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, HADDR_UNDEF, "unable to free v2 B-tree header") @@ -513,7 +513,7 @@ H5B2__hdr_protect(H5F_t *f, haddr_t hdr_addr, void *ctx_udata, unsigned flags) /* Sanity check */ HDassert(f); - HDassert(H5F_addr_defined(hdr_addr)); + HDassert(H5_addr_defined(hdr_addr)); /* only the H5AC__READ_ONLY_FLAG may appear in flags */ HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0); @@ -702,7 +702,7 @@ H5B2__hdr_delete(H5B2_hdr_t *hdr) #endif /* NDEBUG */ /* Delete all nodes in B-tree */ - if (H5F_addr_defined(hdr->root.addr)) + if (H5_addr_defined(hdr->root.addr)) if (H5B2__delete_node(hdr, hdr->depth, &hdr->root, hdr, hdr->remove_op, hdr->remove_op_data) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTDELETE, FAIL, "unable to delete B-tree nodes") |