summaryrefslogtreecommitdiffstats
path: root/src/H5Fmount.c
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2023-06-05 15:04:56 (GMT)
committerGitHub <noreply@github.com>2023-06-05 15:04:56 (GMT)
commit7ecf1d09afa9379186c2ace158fb60d4afd96f0e (patch)
tree529564764b9cc063dcf0f8741ce45d5c2fd11095 /src/H5Fmount.c
parente3559c7b64e7963e3515c2ebfd7f1abad810ed19 (diff)
downloadhdf5-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/H5Fmount.c')
-rw-r--r--src/H5Fmount.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Fmount.c b/src/H5Fmount.c
index 6c8543a..ac193d7 100644
--- a/src/H5Fmount.c
+++ b/src/H5Fmount.c
@@ -177,7 +177,7 @@ H5F_mount(const H5G_loc_t *loc, const char *name, H5F_t *child, hid_t H5_ATTR_UN
md = (lt + rt) / 2;
oloc = H5G_oloc(parent->shared->mtab.child[md].group);
- cmp = H5F_addr_cmp(mp_loc.oloc->addr, oloc->addr);
+ cmp = H5_addr_cmp(mp_loc.oloc->addr, oloc->addr);
if (cmp < 0)
rt = md;
else if (cmp > 0)
@@ -295,7 +295,7 @@ H5F_unmount(const H5G_loc_t *loc, const char *name)
mnt_oloc = H5G_oloc(child->shared->root_grp);
child_idx = -1;
- if (child->parent && H5F_addr_eq(mp_oloc.addr, mnt_oloc->addr)) {
+ if (child->parent && H5_addr_eq(mp_oloc.addr, mnt_oloc->addr)) {
unsigned u; /*counters */
/*
@@ -326,7 +326,7 @@ H5F_unmount(const H5G_loc_t *loc, const char *name)
while (lt < rt && cmp) {
md = (lt + rt) / 2;
mnt_oloc = H5G_oloc(parent->shared->mtab.child[md].group);
- cmp = H5F_addr_cmp(mp_oloc.addr, mnt_oloc->addr);
+ cmp = H5_addr_cmp(mp_oloc.addr, mnt_oloc->addr);
if (cmp < 0)
rt = md;
else
@@ -621,7 +621,7 @@ H5F_traverse_mount(H5O_loc_t *oloc /*in,out*/)
while (lt < rt && cmp) {
md = (lt + rt) / 2;
mnt_oloc = H5G_oloc(parent->shared->mtab.child[md].group);
- cmp = H5F_addr_cmp(oloc->addr, mnt_oloc->addr);
+ cmp = H5_addr_cmp(oloc->addr, mnt_oloc->addr);
if (cmp < 0)
rt = md;
else