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.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/H5AC.c b/src/H5AC.c
index 178e59e..71f7fc9 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -584,7 +584,7 @@ H5AC_expunge_entry(H5F_t *f, const H5AC_class_t *type, haddr_t addr, unsigned fl
     HDassert(f->shared->cache);
     HDassert(type);
     HDassert(type->serialize);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
 
     if (H5C_expunge_entry(f, type, addr, flags) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "H5C_expunge_entry() failed")
@@ -689,7 +689,7 @@ H5AC_get_entry_status(const H5F_t *f, haddr_t addr, unsigned *status)
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if ((f == NULL) || (!H5F_addr_defined(addr)) || (status == NULL))
+    if ((f == NULL) || (!H5_addr_defined(addr)) || (status == NULL))
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad param(s) on entry")
 
     if (H5C_get_entry_status(f, addr, NULL, &in_cache, &is_dirty, &is_protected, &is_pinned, &is_corked,
@@ -747,7 +747,7 @@ H5AC_insert_entry(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing,
     HDassert(f->shared->cache);
     HDassert(type);
     HDassert(type->serialize);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
     HDassert(thing);
 
     /* Check for invalid access request */
@@ -1040,9 +1040,9 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne
     HDassert(f);
     HDassert(f->shared->cache);
     HDassert(type);
-    HDassert(H5F_addr_defined(old_addr));
-    HDassert(H5F_addr_defined(new_addr));
-    HDassert(H5F_addr_ne(old_addr, new_addr));
+    HDassert(H5_addr_defined(old_addr));
+    HDassert(H5_addr_defined(new_addr));
+    HDassert(H5_addr_ne(old_addr, new_addr));
 
 #ifdef H5_HAVE_PARALLEL
     /* Log moving the entry */
@@ -1319,7 +1319,7 @@ H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *udata, unsi
     HDassert(f->shared->cache);
     HDassert(type);
     HDassert(type->serialize);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
 
     /* Check for unexpected flags -- H5C__FLUSH_COLLECTIVELY_FLAG
      * only permitted in the parallel case.
@@ -1599,7 +1599,7 @@ H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing, un
     HDassert(type);
     HDassert(type->deserialize);
     HDassert(type->image_len);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
     HDassert(thing);
     HDassert(((H5AC_info_t *)thing)->addr == addr);
     HDassert(((H5AC_info_t *)thing)->type == type);
@@ -2427,7 +2427,7 @@ H5AC_cork(H5F_t *f, haddr_t obj_addr, unsigned action, hbool_t *corked)
     HDassert(f);
     HDassert(f->shared);
     HDassert(f->shared->cache);
-    HDassert(H5F_addr_defined(obj_addr));
+    HDassert(H5_addr_defined(obj_addr));
     HDassert(action == H5AC__SET_CORK || action == H5AC__UNCORK || action == H5AC__GET_CORKED);
 
     /*  Skip the search on "tag_list" when there are no "corked" objects.
@@ -2510,7 +2510,7 @@ H5AC_get_entry_ring(const H5F_t *f, haddr_t addr, H5AC_ring_t *ring)
 
     /* Sanity check */
     HDassert(f);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
     HDassert(ring);
 
     /* Retrieve the ring value for the entry at address */