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/H5FDint.c b/src/H5FDint.c
index 6d90aae..f0f15e0 100644
--- a/src/H5FDint.c
+++ b/src/H5FDint.c
@@ -2034,7 +2034,7 @@ H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr)
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(file && file->cls);
-    HDassert(H5F_addr_defined(addr) && addr <= file->maxaddr);
+    HDassert(H5_addr_defined(addr) && addr <= file->maxaddr);
 
     /* Dispatch to driver, convert to absolute address */
     if ((file->cls->set_eoa)(file, type, addr + file->base_addr) < 0)
@@ -2193,13 +2193,13 @@ H5FD__vsrt_tmp_cmp(const void *element_1, const void *element_2)
     FUNC_ENTER_PACKAGE_NOERR
 
     /* Sanity checks */
-    HDassert(H5F_addr_defined(addr_1));
-    HDassert(H5F_addr_defined(addr_2));
+    HDassert(H5_addr_defined(addr_1));
+    HDassert(H5_addr_defined(addr_2));
 
     /* Compare the addresses */
-    if (H5F_addr_gt(addr_1, addr_2))
+    if (H5_addr_gt(addr_1, addr_2))
         ret_value = 1;
-    else if (H5F_addr_lt(addr_1, addr_2))
+    else if (H5_addr_lt(addr_1, addr_2))
         ret_value = -1;
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2239,11 +2239,11 @@ H5FD_sort_vector_io_req(hbool_t *vector_was_sorted, uint32_t _count, H5FD_mem_t
 
     /* scan the addrs array to see if it is sorted */
     for (i = 1; i < count; i++) {
-        HDassert(H5F_addr_defined(addrs[i - 1]));
+        HDassert(H5_addr_defined(addrs[i - 1]));
 
-        if (H5F_addr_gt(addrs[i - 1], addrs[i]))
+        if (H5_addr_gt(addrs[i - 1], addrs[i]))
             break;
-        else if (H5F_addr_eq(addrs[i - 1], addrs[i]))
+        else if (H5_addr_eq(addrs[i - 1], addrs[i]))
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "duplicate addr in vector")
     }
 
@@ -2298,9 +2298,9 @@ H5FD_sort_vector_io_req(hbool_t *vector_was_sorted, uint32_t _count, H5FD_mem_t
         i = 1;
 
         for (i = 1; i < count; i++) {
-            HDassert(H5F_addr_lt(srt_tmp[i - 1].addr, srt_tmp[i].addr));
+            HDassert(H5_addr_lt(srt_tmp[i - 1].addr, srt_tmp[i].addr));
 
-            if (H5F_addr_eq(addrs[i - 1], addrs[i]))
+            if (H5_addr_eq(addrs[i - 1], addrs[i]))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "duplicate addr in vector")
         }