Brings over most of the HD prefix removal (#3293)

1 files changed, 39 insertions, 39 deletions

diff --git a/src/H5FO.c b/src/H5FO.c
index 72903c1..323797c 100644
--- a/src/H5FO.c
+++ b/src/H5FO.c
@@ -73,8 +73,8 @@ H5FO_create(const H5F_t *f)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(f->shared);
+    assert(f);
+    assert(f->shared);
 
     /* Create container used to store open object info */
     if ((f->shared->open_objs = H5SL_create(H5SL_TYPE_HADDR, NULL)) == NULL)
@@ -113,15 +113,15 @@ H5FO_opened(const H5F_t *f, haddr_t addr)
     FUNC_ENTER_NOAPI_NOERR
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->open_objs);
-    HDassert(H5F_addr_defined(addr));
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->open_objs);
+    assert(H5F_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))) {
         ret_value = open_obj->obj;
-        HDassert(ret_value != NULL);
+        assert(ret_value != NULL);
     } /* end if */
     else
         ret_value = NULL;
@@ -159,11 +159,11 @@ H5FO_insert(const H5F_t *f, haddr_t addr, void *obj, hbool_t delete_flag)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->open_objs);
-    HDassert(H5F_addr_defined(addr));
-    HDassert(obj);
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->open_objs);
+    assert(H5F_addr_defined(addr));
+    assert(obj);
 
     /* Allocate new opened object information structure */
     if ((open_obj = H5FL_MALLOC(H5FO_open_obj_t)) == NULL)
@@ -210,10 +210,10 @@ H5FO_delete(H5F_t *f, haddr_t addr)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->open_objs);
-    HDassert(H5F_addr_defined(addr));
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->open_objs);
+    assert(H5F_addr_defined(addr));
 
     /* Remove from container */
     if (NULL == (open_obj = (H5FO_open_obj_t *)H5SL_remove(f->shared->open_objs, &addr)))
@@ -260,10 +260,10 @@ H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted)
     FUNC_ENTER_NOAPI_NOERR
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->open_objs);
-    HDassert(H5F_addr_defined(addr));
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->open_objs);
+    assert(H5F_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)))
@@ -303,10 +303,10 @@ H5FO_marked(const H5F_t *f, haddr_t addr)
     FUNC_ENTER_NOAPI_NOERR
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->open_objs);
-    HDassert(H5F_addr_defined(addr));
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->open_objs);
+    assert(H5F_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)))
@@ -341,9 +341,9 @@ H5FO_dest(const H5F_t *f)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->open_objs);
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->open_objs);
 
     /* Check if the object info set is empty */
     if (H5SL_count(f->shared->open_objs) != 0)
@@ -385,7 +385,7 @@ H5FO_top_create(H5F_t *f)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
-    HDassert(f);
+    assert(f);
 
     /* Create container used to store open object info */
     if ((f->obj_count = H5SL_create(H5SL_TYPE_HADDR, NULL)) == NULL)
@@ -423,9 +423,9 @@ H5FO_top_incr(const H5F_t *f, haddr_t addr)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(f->obj_count);
-    HDassert(H5F_addr_defined(addr));
+    assert(f);
+    assert(f->obj_count);
+    assert(H5F_addr_defined(addr));
 
     /* Get the object node from the container */
     if (NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr))) {
@@ -477,9 +477,9 @@ H5FO_top_decr(const H5F_t *f, haddr_t addr)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(f->obj_count);
-    HDassert(H5F_addr_defined(addr));
+    assert(f);
+    assert(f->obj_count);
+    assert(H5F_addr_defined(addr));
 
     /* Get the object node from the container */
     if (NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr))) {
@@ -530,9 +530,9 @@ H5FO_top_count(const H5F_t *f, haddr_t addr)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(f->obj_count);
-    HDassert(H5F_addr_defined(addr));
+    assert(f);
+    assert(f->obj_count);
+    assert(H5F_addr_defined(addr));
 
     /* Get the object node from the container */
     if (NULL != (obj_count = (H5FO_obj_count_t *)H5SL_search(f->obj_count, &addr)))
@@ -569,8 +569,8 @@ H5FO_top_dest(H5F_t *f)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity check */
-    HDassert(f);
-    HDassert(f->obj_count);
+    assert(f);
+    assert(f->obj_count);
 
     /* Check if the object count set is empty */
     if (H5SL_count(f->obj_count) != 0)