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/H5B2internal.c b/src/H5B2internal.c
index 312dee0..6fe586f 100644
--- a/src/H5B2internal.c
+++ b/src/H5B2internal.c
@@ -153,7 +153,7 @@ done:
                                 "unable to remove v2 B-tree internal node from cache")
 
             /* Release internal node's disk space */
-            if (H5F_addr_defined(node_ptr->addr) &&
+            if (H5_addr_defined(node_ptr->addr) &&
                 H5MF_xfree(hdr->f, H5FD_MEM_BTREE, node_ptr->addr, (hsize_t)hdr->node_size) < 0)
                 HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL,
                             "unable to release file space for v2 B-tree internal node")
@@ -192,7 +192,7 @@ H5B2__protect_internal(H5B2_hdr_t *hdr, void *parent, H5B2_node_ptr_t *node_ptr,
     /* Check arguments. */
     HDassert(hdr);
     HDassert(node_ptr);
-    HDassert(H5F_addr_defined(node_ptr->addr));
+    HDassert(H5_addr_defined(node_ptr->addr));
     HDassert(depth > 0);
 
     /* only H5AC__READ_ONLY_FLAG may appear in flags */
@@ -292,7 +292,7 @@ H5B2__neighbor_internal(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_n
     HDassert(hdr);
     HDassert(depth > 0);
     HDassert(curr_node_ptr);
-    HDassert(H5F_addr_defined(curr_node_ptr->addr));
+    HDassert(H5_addr_defined(curr_node_ptr->addr));
     HDassert(op);
 
     /* Lock current B-tree node */
@@ -369,7 +369,7 @@ H5B2__insert_internal(H5B2_hdr_t *hdr, uint16_t depth, unsigned *parent_cache_in
     HDassert(hdr);
     HDassert(depth > 0);
     HDassert(curr_node_ptr);
-    HDassert(H5F_addr_defined(curr_node_ptr->addr));
+    HDassert(H5_addr_defined(curr_node_ptr->addr));
 
     /* Lock current B-tree node */
     if (NULL ==
@@ -540,7 +540,7 @@ H5B2__update_internal(H5B2_hdr_t *hdr, uint16_t depth, unsigned *parent_cache_in
     HDassert(hdr);
     HDassert(depth > 0);
     HDassert(curr_node_ptr);
-    HDassert(H5F_addr_defined(curr_node_ptr->addr));
+    HDassert(H5_addr_defined(curr_node_ptr->addr));
 
     /* Lock current B-tree node */
     if (NULL ==
@@ -748,7 +748,7 @@ H5B2__shadow_internal(H5B2_internal_t *internal, H5B2_node_ptr_t *curr_node_ptr)
      */
     HDassert(internal);
     HDassert(curr_node_ptr);
-    HDassert(H5F_addr_defined(curr_node_ptr->addr));
+    HDassert(H5_addr_defined(curr_node_ptr->addr));
     hdr = internal->hdr;
     HDassert(hdr);
     HDassert(hdr->swmr_write);
@@ -823,7 +823,7 @@ H5B2__remove_internal(H5B2_hdr_t *hdr, hbool_t *depth_decreased, void *swap_loc,
     HDassert(depth > 0);
     HDassert(parent_cache_info);
     HDassert(curr_node_ptr);
-    HDassert(H5F_addr_defined(curr_node_ptr->addr));
+    HDassert(H5_addr_defined(curr_node_ptr->addr));
 
     /* Lock current B-tree node */
     if (NULL == (internal = H5B2__protect_internal(hdr, parent_cache_info, curr_node_ptr, depth, FALSE,
@@ -1067,7 +1067,7 @@ H5B2__remove_internal_by_idx(H5B2_hdr_t *hdr, hbool_t *depth_decreased, void *sw
     HDassert(depth > 0);
     HDassert(parent_cache_info);
     HDassert(curr_node_ptr);
-    HDassert(H5F_addr_defined(curr_node_ptr->addr));
+    HDassert(H5_addr_defined(curr_node_ptr->addr));
 
     /* Lock current B-tree node */
     if (NULL == (internal = H5B2__protect_internal(hdr, parent_cache_info, curr_node_ptr, depth, FALSE,
@@ -1402,7 +1402,7 @@ H5B2__assert_internal(hsize_t parent_all_nrec, const H5B2_hdr_t H5_ATTR_NDEBUG_U
     for (u = 0; u < internal->nrec + 1; u++) {
         tot_all_nrec += internal->node_ptrs[u].all_nrec;
 
-        HDassert(H5F_addr_defined(internal->node_ptrs[u].addr));
+        HDassert(H5_addr_defined(internal->node_ptrs[u].addr));
         HDassert(internal->node_ptrs[u].addr > 0);
         for (v = 0; v < u; v++)
             HDassert(internal->node_ptrs[u].addr != internal->node_ptrs[v].addr);
@@ -1442,7 +1442,7 @@ H5B2__assert_internal2(hsize_t parent_all_nrec, const H5B2_hdr_t H5_ATTR_NDEBUG_
     for (u = 0; u < internal->nrec + 1; u++) {
         tot_all_nrec += internal->node_ptrs[u].all_nrec;
 
-        HDassert(H5F_addr_defined(internal->node_ptrs[u].addr));
+        HDassert(H5_addr_defined(internal->node_ptrs[u].addr));
         HDassert(internal->node_ptrs[u].addr > 0);
         for (v = 0; v < u; v++)
             HDassert(internal->node_ptrs[u].addr != internal->node_ptrs[v].addr);