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/H5EAdbg.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/H5EAdbg.c')
| -rw-r--r-- | src/H5EAdbg.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/H5EAdbg.c b/src/H5EAdbg.c index c881582..1a7b61a 100644 --- a/src/H5EAdbg.c +++ b/src/H5EAdbg.c @@ -91,8 +91,8 @@ H5EA__hdr_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, co /* Check arguments */ HDassert(f); - HDassert(H5F_addr_defined(addr)); - HDassert(H5F_addr_defined(obj_addr)); + HDassert(H5_addr_defined(addr)); + HDassert(H5_addr_defined(obj_addr)); HDassert(stream); HDassert(indent >= 0); HDassert(fwidth >= 0); @@ -174,13 +174,13 @@ H5EA__iblock_debug(H5F_t *f, haddr_t H5_ATTR_UNUSED addr, FILE *stream, int inde /* Check arguments */ HDassert(f); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); HDassert(stream); HDassert(indent >= 0); HDassert(fwidth >= 0); HDassert(cls); - HDassert(H5F_addr_defined(hdr_addr)); - HDassert(H5F_addr_defined(obj_addr)); + HDassert(H5_addr_defined(hdr_addr)); + HDassert(H5_addr_defined(obj_addr)); /* Check for debugging context callback available */ if (cls->crt_dbg_ctx) @@ -193,7 +193,7 @@ H5EA__iblock_debug(H5F_t *f, haddr_t H5_ATTR_UNUSED addr, FILE *stream, int inde HGOTO_ERROR(H5E_EARRAY, H5E_CANTPROTECT, FAIL, "unable to load extensible array header") /* Sanity check */ - HDassert(H5F_addr_eq(hdr->idx_blk_addr, addr)); + HDassert(H5_addr_eq(hdr->idx_blk_addr, addr)); /* Protect index block */ if (NULL == (iblock = H5EA__iblock_protect(hdr, H5AC__READ_ONLY_FLAG))) @@ -294,13 +294,13 @@ H5EA__sblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, /* Check arguments */ HDassert(f); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); HDassert(stream); HDassert(indent >= 0); HDassert(fwidth >= 0); HDassert(cls); - HDassert(H5F_addr_defined(hdr_addr)); - HDassert(H5F_addr_defined(obj_addr)); + HDassert(H5_addr_defined(hdr_addr)); + HDassert(H5_addr_defined(obj_addr)); /* Check for debugging context callback available */ if (cls->crt_dbg_ctx) @@ -384,13 +384,13 @@ H5EA__dblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, /* Check arguments */ HDassert(f); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); HDassert(stream); HDassert(indent >= 0); HDassert(fwidth >= 0); HDassert(cls); - HDassert(H5F_addr_defined(hdr_addr)); - HDassert(H5F_addr_defined(obj_addr)); + HDassert(H5_addr_defined(hdr_addr)); + HDassert(H5_addr_defined(obj_addr)); HDassert(dblk_nelmts > 0); /* Check for debugging context callback available */ |