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/H5HFhdr.c b/src/H5HFhdr.c
index f5a69bb..3606619 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -491,7 +491,7 @@ H5HF__hdr_create(H5F_t *f, const H5HF_create_t *cparam)
     ret_value = hdr->heap_addr;
 
 done:
-    if (!H5F_addr_defined(ret_value) && hdr)
+    if (!H5_addr_defined(ret_value) && hdr)
         if (H5HF__hdr_free(hdr) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTRELEASE, HADDR_UNDEF, "unable to release fractal heap header")
 
@@ -521,7 +521,7 @@ H5HF__hdr_protect(H5F_t *f, haddr_t addr, unsigned flags)
 
     /* Check arguments */
     HDassert(f);
-    HDassert(H5F_addr_defined(addr));
+    HDassert(H5_addr_defined(addr));
 
     /* only H5AC__READ_ONLY_FLAG may appear in flags */
     HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
@@ -1039,7 +1039,7 @@ H5HF__hdr_update_iter(H5HF_hdr_t *hdr, size_t min_dblock_size)
             if (next_row >= hdr->man_dtable.max_direct_rows) {
                 unsigned child_nrows; /* Number of rows in new indirect block */
 
-                HDassert(!H5F_addr_defined(iblock->ents[next_entry].addr));
+                HDassert(!H5_addr_defined(iblock->ents[next_entry].addr));
 
                 /* Compute # of rows in next child indirect block to use */
                 child_nrows =
@@ -1215,8 +1215,8 @@ H5HF__hdr_reverse_iter(H5HF_hdr_t *hdr, haddr_t dblock_addr)
         /* Walk backwards through entries, until we find one that has a child */
         /* (Skip direct block that will be deleted, if we find it) */
         tmp_entry = (int)curr_entry;
-        while (tmp_entry >= 0 && (H5F_addr_eq(iblock->ents[tmp_entry].addr, dblock_addr) ||
-                                  !H5F_addr_defined(iblock->ents[tmp_entry].addr)))
+        while (tmp_entry >= 0 && (H5_addr_eq(iblock->ents[tmp_entry].addr, dblock_addr) ||
+                                  !H5_addr_defined(iblock->ents[tmp_entry].addr)))
             tmp_entry--;
         /* Check for no earlier blocks in this indirect block */
         if (tmp_entry < 0) {
@@ -1446,13 +1446,13 @@ H5HF__hdr_delete(H5HF_hdr_t *hdr)
     /* (must occur before attempting to delete the heap, so indirect blocks
      *  will get unpinned)
      */
-    if (H5F_addr_defined(hdr->fs_addr))
+    if (H5_addr_defined(hdr->fs_addr))
         /* Delete free space manager for heap */
         if (H5HF__space_delete(hdr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to release fractal heap free space manager")
 
     /* Check for root direct/indirect block */
-    if (H5F_addr_defined(hdr->man_dtable.table_addr)) {
+    if (H5_addr_defined(hdr->man_dtable.table_addr)) {
         if (hdr->man_dtable.curr_root_rows == 0) {
             hsize_t dblock_size; /* Size of direct block on disk */
 
@@ -1482,7 +1482,7 @@ H5HF__hdr_delete(H5HF_hdr_t *hdr)
     }     /* end if */
 
     /* Check for 'huge' objects in heap */
-    if (H5F_addr_defined(hdr->huge_bt2_addr)) {
+    if (H5_addr_defined(hdr->huge_bt2_addr)) {
         /* Delete huge objects in heap and their tracker */
         if (H5HF__huge_delete(hdr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,