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

1 files changed, 43 insertions, 43 deletions

diff --git a/src/H5EA.c b/src/H5EA.c
index 94b4336..0220413 100644
--- a/src/H5EA.c
+++ b/src/H5EA.c
@@ -122,8 +122,8 @@ H5EA__new(H5F_t *f, haddr_t ea_addr, hbool_t from_open, void *ctx_udata)
     FUNC_ENTER_PACKAGE
 
     /* Check arguments */
-    HDassert(f);
-    HDassert(H5F_addr_defined(ea_addr));
+    assert(f);
+    assert(H5F_addr_defined(ea_addr));
 
     /* Allocate extensible array wrapper */
     if (NULL == (ea = H5FL_CALLOC(H5EA_t)))
@@ -187,8 +187,8 @@ H5EA_create(H5F_t *f, const H5EA_create_t *cparam, void *ctx_udata)
     FUNC_ENTER_NOAPI(NULL)
 
     /* Check arguments */
-    HDassert(f);
-    HDassert(cparam);
+    assert(f);
+    assert(cparam);
 
     /* H5EA interface sanity check */
     HDcompile_assert(H5EA_NUM_CLS_ID == NELMTS(H5EA_client_class_g));
@@ -235,8 +235,8 @@ H5EA_open(H5F_t *f, haddr_t ea_addr, void *ctx_udata)
     FUNC_ENTER_NOAPI(NULL)
 
     /* Check arguments */
-    HDassert(f);
-    HDassert(H5F_addr_defined(ea_addr));
+    assert(f);
+    assert(H5F_addr_defined(ea_addr));
 
     /* Allocate and initialize new extensible array wrapper */
     if (NULL == (ea = H5EA__new(f, ea_addr, TRUE, ctx_udata)))
@@ -272,8 +272,8 @@ H5EA_get_nelmts(const H5EA_t *ea, hsize_t *nelmts)
     FUNC_ENTER_NOAPI_NOERR
 
     /* Check arguments */
-    HDassert(ea);
-    HDassert(nelmts);
+    assert(ea);
+    assert(nelmts);
 
     /* Retrieve the max. index set */
     *nelmts = ea->hdr->stats.stored.max_idx_set;
@@ -299,9 +299,9 @@ H5EA_get_addr(const H5EA_t *ea, haddr_t *addr)
     FUNC_ENTER_NOAPI_NOERR
 
     /* Check arguments */
-    HDassert(ea);
-    HDassert(ea->hdr);
-    HDassert(addr);
+    assert(ea);
+    assert(ea->hdr);
+    assert(addr);
 
     /* Retrieve the address of the extensible array's header */
     *addr = ea->hdr->addr;
@@ -341,14 +341,14 @@ H5EA__lookup_elmt(const H5EA_t *ea, hsize_t idx, hbool_t will_extend, unsigned t
     FUNC_ENTER_PACKAGE
 
     /* Check arguments */
-    HDassert(ea);
-    HDassert(hdr);
-    HDassert(thing);
-    HDassert(thing_elmt_buf);
-    HDassert(thing_unprot_func);
+    assert(ea);
+    assert(hdr);
+    assert(thing);
+    assert(thing_elmt_buf);
+    assert(thing_unprot_func);
 
     /* only the H5AC__READ_ONLY_FLAG may be set in thing_acc */
-    HDassert((thing_acc & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
+    assert((thing_acc & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
 
     /* Set the shared array header's file context for this operation */
     hdr->f = ea->f;
@@ -403,7 +403,7 @@ H5EA__lookup_elmt(const H5EA_t *ea, hsize_t idx, hbool_t will_extend, unsigned t
             /* Compute the data block index in index block */
             dblk_idx = (size_t)(hdr->sblk_info[sblk_idx].start_dblk +
                                 (elmt_idx / hdr->sblk_info[sblk_idx].dblk_nelmts));
-            HDassert(dblk_idx < iblock->ndblk_addrs);
+            assert(dblk_idx < iblock->ndblk_addrs);
 
             /* Check if the data block has been allocated on disk yet */
             if (!H5F_addr_defined(iblock->dblk_addrs[dblk_idx])) {
@@ -490,7 +490,7 @@ H5EA__lookup_elmt(const H5EA_t *ea, hsize_t idx, hbool_t will_extend, unsigned t
 
             /* Compute the data block index in super block */
             dblk_idx = (size_t)(elmt_idx / sblock->dblk_nelmts);
-            HDassert(dblk_idx < sblock->ndblks);
+            assert(dblk_idx < sblock->ndblks);
 
             /* Check if the data block has been allocated on disk yet */
             if (!H5F_addr_defined(sblock->dblk_addrs[dblk_idx])) {
@@ -616,8 +616,8 @@ H5EA__lookup_elmt(const H5EA_t *ea, hsize_t idx, hbool_t will_extend, unsigned t
     }         /* end else */
 
     /* Sanity checks */
-    HDassert(*thing != NULL);
-    HDassert(*thing_unprot_func != NULL);
+    assert(*thing != NULL);
+    assert(*thing_unprot_func != NULL);
 
 done:
     /* Reset 'thing' info on error */
@@ -679,8 +679,8 @@ H5EA_set(const H5EA_t *ea, hsize_t idx, const void *elmt)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
-    HDassert(ea);
-    HDassert(hdr);
+    assert(ea);
+    assert(hdr);
 
     /* Set the shared array header's file context for this operation */
     hdr->f = ea->f;
@@ -692,9 +692,9 @@ H5EA_set(const H5EA_t *ea, hsize_t idx, const void *elmt)
         HGOTO_ERROR(H5E_EARRAY, H5E_CANTPROTECT, FAIL, "unable to protect array metadata")
 
     /* Sanity check */
-    HDassert(thing);
-    HDassert(thing_elmt_buf);
-    HDassert(thing_unprot_func);
+    assert(thing);
+    assert(thing_elmt_buf);
+    assert(thing_unprot_func);
 
     /* Set element in thing's element buffer */
     H5MM_memcpy(thing_elmt_buf + (hdr->cparam.cls->nat_elmt_size * thing_elmt_idx), elmt,
@@ -742,8 +742,8 @@ H5EA_get(const H5EA_t *ea, hsize_t idx, void *elmt)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
-    HDassert(ea);
-    HDassert(hdr);
+    assert(ea);
+    assert(hdr);
 
     /* Check for element beyond max. element in array */
     if (idx >= hdr->stats.stored.max_idx_set) {
@@ -805,9 +805,9 @@ H5EA_depend(H5EA_t *ea, H5AC_proxy_entry_t *parent)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
-    HDassert(ea);
-    HDassert(hdr);
-    HDassert(parent);
+    assert(ea);
+    assert(hdr);
+    assert(parent);
 
     /*
      * Check to see if a flush dependency between the extensible array
@@ -816,7 +816,7 @@ H5EA_depend(H5EA_t *ea, H5AC_proxy_entry_t *parent)
      */
     if (NULL == hdr->parent) {
         /* Sanity check */
-        HDassert(hdr->top_proxy);
+        assert(hdr->top_proxy);
 
         /* Set the shared array header's file context for this operation */
         hdr->f = ea->f;
@@ -853,7 +853,7 @@ H5EA_close(H5EA_t *ea)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
-    HDassert(ea);
+    assert(ea);
 
     /* Close the header, if it was set */
     if (ea->hdr) {
@@ -889,9 +889,9 @@ H5EA_close(H5EA_t *ea)
                                 "unable to check metadata cache status for extensible array header")
 
                 /* Sanity checks on header */
-                HDassert(hdr_status & H5AC_ES__IN_CACHE);
-                HDassert(hdr_status & H5AC_ES__IS_PINNED);
-                HDassert(!(hdr_status & H5AC_ES__IS_PROTECTED));
+                assert(hdr_status & H5AC_ES__IN_CACHE);
+                assert(hdr_status & H5AC_ES__IS_PINNED);
+                assert(!(hdr_status & H5AC_ES__IS_PROTECTED));
             }
 #endif /* NDEBUG */
 
@@ -954,8 +954,8 @@ H5EA_delete(H5F_t *f, haddr_t ea_addr, void *ctx_udata)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check arguments */
-    HDassert(f);
-    HDassert(H5F_addr_defined(ea_addr));
+    assert(f);
+    assert(H5F_addr_defined(ea_addr));
 
     /* Lock the array header into memory */
     if (NULL == (hdr = H5EA__hdr_protect(f, ea_addr, ctx_udata, H5AC__NO_FLAGS_SET)))
@@ -1005,9 +1005,9 @@ H5EA_iterate(H5EA_t *ea, H5EA_operator_t op, void *udata)
     FUNC_ENTER_NOAPI(H5_ITER_ERROR)
 
     /* Check arguments */
-    HDassert(ea);
-    HDassert(op);
-    HDassert(udata);
+    assert(ea);
+    assert(op);
+    assert(udata);
 
     /* Allocate space for a native array element */
     if (NULL == (elmt = H5FL_BLK_MALLOC(ea_native_elmt, ea->hdr->cparam.cls->nat_elmt_size)))
@@ -1052,8 +1052,8 @@ H5EA_patch_file(H5EA_t *ea, H5F_t *f)
     FUNC_ENTER_NOAPI_NOERR
 
     /* Check arguments */
-    HDassert(ea);
-    HDassert(f);
+    assert(ea);
+    assert(f);
 
     if (ea->f != f || ea->hdr->f != f)
         ea->f = ea->hdr->f = f;