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

1 files changed, 28 insertions, 28 deletions

diff --git a/src/H5ACproxy_entry.c b/src/H5ACproxy_entry.c
index 20889e2..8fa0897 100644
--- a/src/H5ACproxy_entry.c
+++ b/src/H5ACproxy_entry.c
@@ -150,8 +150,8 @@ H5AC_proxy_entry_add_parent(H5AC_proxy_entry_t *pentry, void *_parent)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity checks */
-    HDassert(parent);
-    HDassert(pentry);
+    assert(parent);
+    assert(pentry);
 
     /* Add parent to the list of parents */
     if (NULL == pentry->parents)
@@ -166,7 +166,7 @@ H5AC_proxy_entry_add_parent(H5AC_proxy_entry_t *pentry, void *_parent)
     /* Add flush dependency on parent */
     if (pentry->nchildren > 0) {
         /* Sanity check */
-        HDassert(H5F_addr_defined(pentry->addr));
+        assert(H5F_addr_defined(pentry->addr));
 
         if (H5AC_create_flush_dependency(parent, pentry) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTDEPEND, FAIL, "unable to set flush dependency on proxy entry")
@@ -198,9 +198,9 @@ H5AC_proxy_entry_remove_parent(H5AC_proxy_entry_t *pentry, void *_parent)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity checks */
-    HDassert(pentry);
-    HDassert(pentry->parents);
-    HDassert(parent);
+    assert(pentry);
+    assert(pentry->parents);
+    assert(parent);
 
     /* Remove parent from skip list */
     if (NULL == (rem_parent = (H5AC_info_t *)H5SL_remove(pentry->parents, &parent->addr)))
@@ -211,7 +211,7 @@ H5AC_proxy_entry_remove_parent(H5AC_proxy_entry_t *pentry, void *_parent)
     /* Shut down the skip list, if this is the last parent */
     if (0 == H5SL_count(pentry->parents)) {
         /* Sanity check */
-        HDassert(0 == pentry->nchildren);
+        assert(0 == pentry->nchildren);
 
         if (H5SL_close(pentry->parents) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CLOSEERROR, FAIL, "can't close proxy parent skip list")
@@ -279,8 +279,8 @@ H5AC_proxy_entry_add_child(H5AC_proxy_entry_t *pentry, H5F_t *f, void *child)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity checks */
-    HDassert(pentry);
-    HDassert(child);
+    assert(pentry);
+    assert(child);
 
     /* Check for first child */
     if (0 == pentry->nchildren) {
@@ -372,8 +372,8 @@ H5AC_proxy_entry_remove_child(H5AC_proxy_entry_t *pentry, void *child)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity checks */
-    HDassert(pentry);
-    HDassert(child);
+    assert(pentry);
+    assert(child);
 
     /* Remove flush dependency on proxy entry */
     if (H5AC_destroy_flush_dependency(pentry, child) < 0)
@@ -423,11 +423,11 @@ H5AC_proxy_entry_dest(H5AC_proxy_entry_t *pentry)
     FUNC_ENTER_NOAPI_NOERR
 
     /* Sanity checks */
-    HDassert(pentry);
-    HDassert(NULL == pentry->parents);
-    HDassert(0 == pentry->nchildren);
-    HDassert(0 == pentry->ndirty_children);
-    HDassert(0 == pentry->nunser_children);
+    assert(pentry);
+    assert(NULL == pentry->parents);
+    assert(0 == pentry->nchildren);
+    assert(0 == pentry->ndirty_children);
+    assert(0 == pentry->nunser_children);
 
     /* Free the proxy entry object */
     pentry = H5FL_FREE(H5AC_proxy_entry_t, pentry);
@@ -453,7 +453,7 @@ H5AC__proxy_entry_image_len(const void H5_ATTR_UNUSED *thing, size_t *image_len)
     FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
-    HDassert(image_len);
+    assert(image_len);
 
     /* Set the image length size to 1 byte */
     *image_len = 1;
@@ -482,7 +482,7 @@ H5AC__proxy_entry_serialize(const H5F_t H5_ATTR_UNUSED *f, void H5_ATTR_UNUSED *
     FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */
 
         /* Should never be invoked */
-        HDassert(0 && "Invalid callback?!?");
+        assert(0 && "Invalid callback?!?");
 
     HERROR(H5E_CACHE, H5E_CANTSERIALIZE, "called unreachable fcn.");
 
@@ -510,7 +510,7 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
     FUNC_ENTER_PACKAGE
 
     /* Sanity check */
-    HDassert(pentry);
+    assert(pentry);
 
     switch (action) {
         case H5AC_NOTIFY_ACTION_AFTER_INSERT:
@@ -520,7 +520,7 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
 #ifdef NDEBUG
             HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "invalid notify action from metadata cache")
 #else  /* NDEBUG */
-            HDassert(0 && "Invalid action?!?");
+            assert(0 && "Invalid action?!?");
 #endif /* NDEBUG */
             break;
 
@@ -528,28 +528,28 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
 #ifdef NDEBUG
             HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "invalid notify action from metadata cache")
 #else  /* NDEBUG */
-            HDassert(0 && "Invalid action?!?");
+            assert(0 && "Invalid action?!?");
 #endif /* NDEBUG */
             break;
 
         case H5AC_NOTIFY_ACTION_BEFORE_EVICT:
             /* Sanity checks */
-            HDassert(0 == pentry->ndirty_children);
-            HDassert(0 == pentry->nunser_children);
+            assert(0 == pentry->ndirty_children);
+            assert(0 == pentry->nunser_children);
 
             /* No action */
             break;
 
         case H5AC_NOTIFY_ACTION_ENTRY_DIRTIED:
             /* Sanity checks */
-            HDassert(pentry->ndirty_children > 0);
+            assert(pentry->ndirty_children > 0);
 
             /* No action */
             break;
 
         case H5AC_NOTIFY_ACTION_ENTRY_CLEANED:
             /* Sanity checks */
-            HDassert(0 == pentry->ndirty_children);
+            assert(0 == pentry->ndirty_children);
 
             /* No action */
             break;
@@ -566,7 +566,7 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
 
         case H5AC_NOTIFY_ACTION_CHILD_CLEANED:
             /* Sanity check */
-            HDassert(pentry->ndirty_children > 0);
+            assert(pentry->ndirty_children > 0);
 
             /* Decrement # of dirty children */
             pentry->ndirty_children--;
@@ -589,7 +589,7 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
 
         case H5AC_NOTIFY_ACTION_CHILD_SERIALIZED:
             /* Sanity check */
-            HDassert(pentry->nunser_children > 0);
+            assert(pentry->nunser_children > 0);
 
             /* Decrement # of unserialized children */
             pentry->nunser_children--;
@@ -604,7 +604,7 @@ H5AC__proxy_entry_notify(H5AC_notify_action_t action, void *_thing)
 #ifdef NDEBUG
             HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "unknown notify action from metadata cache")
 #else  /* NDEBUG */
-            HDassert(0 && "Unknown action?!?");
+            assert(0 && "Unknown action?!?");
 #endif /* NDEBUG */
     }  /* end switch */