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/H5Bdbg.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/H5Bdbg.c')
| -rw-r--r-- | src/H5Bdbg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Bdbg.c b/src/H5Bdbg.c index b134772..6e4c4b2 100644 --- a/src/H5Bdbg.c +++ b/src/H5Bdbg.c @@ -63,7 +63,7 @@ H5B_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, const H5 * Check arguments. */ HDassert(f); - HDassert(H5F_addr_defined(addr)); + HDassert(H5_addr_defined(addr)); HDassert(stream); HDassert(indent >= 0); HDassert(fwidth >= 0); @@ -212,13 +212,13 @@ H5B__assert(H5F_t *f, haddr_t addr, const H5B_class_t *type, void *udata) /* Check node header */ HDassert(bt->level == cur->level); if (cur->next && cur->next->level == bt->level) - HDassert(H5F_addr_eq(bt->right, cur->next->addr)); + HDassert(H5_addr_eq(bt->right, cur->next->addr)); else - HDassert(!H5F_addr_defined(bt->right)); + HDassert(!H5_addr_defined(bt->right)); if (prev && prev->level == bt->level) - HDassert(H5F_addr_eq(bt->left, prev->addr)); + HDassert(H5_addr_eq(bt->left, prev->addr)); else - HDassert(!H5F_addr_defined(bt->left)); + HDassert(!H5_addr_defined(bt->left)); if (cur->level > 0) { unsigned u; @@ -229,7 +229,7 @@ H5B__assert(H5F_t *f, haddr_t addr, const H5B_class_t *type, void *udata) * have then the tree has a cycle. */ for (tmp = head; tmp; tmp = tmp->next) - HDassert(H5F_addr_ne(tmp->addr, bt->child[u])); + HDassert(H5_addr_ne(tmp->addr, bt->child[u])); /* Add the child node to the end of the queue */ tmp = (struct child_t *)H5MM_calloc(sizeof(struct child_t)); |