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/H5ACproxy_entry.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/H5ACproxy_entry.c')
| -rw-r--r-- | src/H5ACproxy_entry.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5ACproxy_entry.c b/src/H5ACproxy_entry.c index 20889e2..0af6450 100644 --- a/src/H5ACproxy_entry.c +++ b/src/H5ACproxy_entry.c @@ -166,7 +166,7 @@ H5AC_proxy_entry_add_parent(H5AC_proxy_entry_t *pentry, void *_parent) /* Add flush dependency on parent */ if (pentry->nchildren > 0) { /* Sanity check */ - HDassert(H5F_addr_defined(pentry->addr)); + HDassert(H5_addr_defined(pentry->addr)); if (H5AC_create_flush_dependency(parent, pentry) < 0) HGOTO_ERROR(H5E_CACHE, H5E_CANTDEPEND, FAIL, "unable to set flush dependency on proxy entry") @@ -205,7 +205,7 @@ H5AC_proxy_entry_remove_parent(H5AC_proxy_entry_t *pentry, void *_parent) /* Remove parent from skip list */ if (NULL == (rem_parent = (H5AC_info_t *)H5SL_remove(pentry->parents, &parent->addr))) HGOTO_ERROR(H5E_CACHE, H5E_CANTREMOVE, FAIL, "unable to remove proxy entry parent from skip list") - if (!H5F_addr_eq(rem_parent->addr, parent->addr)) + if (!H5_addr_eq(rem_parent->addr, parent->addr)) HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "removed proxy entry parent not the same as real parent") /* Shut down the skip list, if this is the last parent */ @@ -285,7 +285,7 @@ H5AC_proxy_entry_add_child(H5AC_proxy_entry_t *pentry, H5F_t *f, void *child) /* Check for first child */ if (0 == pentry->nchildren) { /* Get an address, if the proxy doesn't already have one */ - if (!H5F_addr_defined(pentry->addr)) + if (!H5_addr_defined(pentry->addr)) if (HADDR_UNDEF == (pentry->addr = H5MF_alloc_tmp(f, 1))) HGOTO_ERROR(H5E_CACHE, H5E_CANTALLOC, FAIL, "temporary file space allocation failed for proxy entry") |