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, 8 insertions, 8 deletions

diff --git a/src/H5FO.c b/src/H5FO.c
index 72903c1..cb40254 100644
--- a/src/H5FO.c
+++ b/src/H5FO.c
@@ -116,7 +116,7 @@ H5FO_opened(const H5F_t *f, haddr_t addr)
     HDassert(f);
     HDassert(f->shared);
     HDassert(f->shared->open_objs);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
 
     /* Get the object node from the container */
     if (NULL != (open_obj = (H5FO_open_obj_t *)H5SL_search(f->shared->open_objs, &addr))) {
@@ -162,7 +162,7 @@ H5FO_insert(const H5F_t *f, haddr_t addr, void *obj, hbool_t delete_flag)
     HDassert(f);
     HDassert(f->shared);
     HDassert(f->shared->open_objs);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
     HDassert(obj);
 
     /* Allocate new opened object information structure */
@@ -213,7 +213,7 @@ H5FO_delete(H5F_t *f, haddr_t addr)
     HDassert(f);
     HDassert(f->shared);
     HDassert(f->shared->open_objs);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
 
     /* Remove from container */
     if (NULL == (open_obj = (H5FO_open_obj_t *)H5SL_remove(f->shared->open_objs, &addr)))
@@ -263,7 +263,7 @@ H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted)
     HDassert(f);
     HDassert(f->shared);
     HDassert(f->shared->open_objs);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
 
     /* Get the object node from the container */
     if (NULL != (open_obj = (H5FO_open_obj_t *)H5SL_search(f->shared->open_objs, &addr)))
@@ -306,7 +306,7 @@ H5FO_marked(const H5F_t *f, haddr_t addr)
     HDassert(f);
     HDassert(f->shared);
     HDassert(f->shared->open_objs);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
 
     /* Get the object node from the container */
     if (NULL != (open_obj = (H5FO_open_obj_t *)H5SL_search(f->shared->open_objs, &addr)))
@@ -425,7 +425,7 @@ H5FO_top_incr(const H5F_t *f, haddr_t addr)
     /* Sanity check */
     HDassert(f);
     HDassert(f->obj_count);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
 
     /* Get the object node from the container */
     if (NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr))) {
@@ -479,7 +479,7 @@ H5FO_top_decr(const H5F_t *f, haddr_t addr)
     /* Sanity check */
     HDassert(f);
     HDassert(f->obj_count);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
 
     /* Get the object node from the container */
     if (NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr))) {
@@ -532,7 +532,7 @@ H5FO_top_count(const H5F_t *f, haddr_t addr)
     /* Sanity check */
     HDassert(f);
     HDassert(f->obj_count);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
 
     /* Get the object node from the container */
     if (NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr)))