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

1 files changed, 29 insertions, 29 deletions

diff --git a/src/H5HFiter.c b/src/H5HFiter.c
index 6d40979..0059029 100644
--- a/src/H5HFiter.c
+++ b/src/H5HFiter.c
@@ -88,10 +88,10 @@ H5HF__man_iter_init(H5HF_block_iter_t *biter)
     /*
      * Check arguments.
      */
-    HDassert(biter);
+    assert(biter);
 
     /* Reset block iterator information */
-    HDmemset(biter, 0, sizeof(H5HF_block_iter_t));
+    memset(biter, 0, sizeof(H5HF_block_iter_t));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF__man_iter_init() */
@@ -128,11 +128,11 @@ H5HF__man_iter_start_offset(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, hsize_t o
     /*
      * Check arguments.
      */
-    HDassert(biter);
-    HDassert(!biter->ready);
+    assert(biter);
+    assert(!biter->ready);
 
     /* Check for empty heap */
-    HDassert(offset >= hdr->man_dtable.cparam.start_block_size);
+    assert(offset >= hdr->man_dtable.cparam.start_block_size);
 
     /* Allocate level structure */
     if (NULL == (biter->curr = H5FL_MALLOC(H5HF_block_loc_t)))
@@ -225,7 +225,7 @@ H5HF__man_iter_start_offset(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, hsize_t o
         /* Or, if the offset has just filled up a direct or indirect block */
         if (curr_offset == (col * hdr->man_dtable.row_block_size[row]) ||
             row < hdr->man_dtable.max_direct_rows) {
-            HDassert(curr_offset - (col * hdr->man_dtable.row_block_size[row]) == 0);
+            assert(curr_offset - (col * hdr->man_dtable.row_block_size[row]) == 0);
             break; /* Done now */
         }          /* end if */
         /* Indirect block row */
@@ -275,7 +275,7 @@ H5HF__man_iter_set_entry(const H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsign
     /*
      * Check arguments.
      */
-    HDassert(biter);
+    assert(biter);
 
     /* Set location context */
     biter->curr->entry = entry;
@@ -310,10 +310,10 @@ H5HF__man_iter_start_entry(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, H5HF_indir
     /*
      * Check arguments.
      */
-    HDassert(hdr);
-    HDassert(biter);
-    HDassert(!biter->ready);
-    HDassert(iblock);
+    assert(hdr);
+    assert(biter);
+    assert(!biter->ready);
+    assert(iblock);
 
     /* Create new location for iterator */
     if (NULL == (new_loc = H5FL_MALLOC(H5HF_block_loc_t)))
@@ -367,7 +367,7 @@ H5HF__man_iter_reset(H5HF_block_iter_t *biter)
     /*
      * Check arguments.
      */
-    HDassert(biter);
+    assert(biter);
 
     /* Free any location contexts that exist */
     if (biter->curr) {
@@ -424,16 +424,16 @@ H5HF__man_iter_next(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsigned nentries
     /*
      * Check arguments.
      */
-    HDassert(biter);
-    HDassert(biter->curr);
-    HDassert(biter->curr->context);
-    HDassert(biter->curr->row < biter->curr->context->nrows);
+    assert(biter);
+    assert(biter->curr);
+    assert(biter->curr->context);
+    assert(biter->curr->row < biter->curr->context->nrows);
 
     /* Advance entry in current block */
     biter->curr->entry += nentries;
     biter->curr->row = biter->curr->entry / hdr->man_dtable.cparam.width;
     biter->curr->col = biter->curr->entry % hdr->man_dtable.cparam.width;
-    /*    HDassert(biter->curr->row <= biter->curr->context->nrows); */
+    /*    assert(biter->curr->row <= biter->curr->context->nrows); */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF__man_iter_next() */
@@ -461,11 +461,11 @@ H5HF__man_iter_up(H5HF_block_iter_t *biter)
     /*
      * Check arguments.
      */
-    HDassert(biter);
-    HDassert(biter->ready);
-    HDassert(biter->curr);
-    HDassert(biter->curr->up);
-    HDassert(biter->curr->context);
+    assert(biter);
+    assert(biter->ready);
+    assert(biter->curr);
+    assert(biter->curr->up);
+    assert(biter->curr->context);
 
     /* Release hold on current location's indirect block */
     if (H5HF__iblock_decr(biter->curr->context) < 0)
@@ -507,10 +507,10 @@ H5HF__man_iter_down(H5HF_block_iter_t *biter, H5HF_indirect_t *iblock)
     /*
      * Check arguments.
      */
-    HDassert(biter);
-    HDassert(biter->ready);
-    HDassert(biter->curr);
-    HDassert(biter->curr->context);
+    assert(biter);
+    assert(biter->ready);
+    assert(biter->curr);
+    assert(biter->curr->context);
 
     /* Create new location to move down to */
     if (NULL == (down_loc = H5FL_MALLOC(H5HF_block_loc_t)))
@@ -559,8 +559,8 @@ H5HF__man_iter_curr(H5HF_block_iter_t *biter, unsigned *row, unsigned *col, unsi
     /*
      * Check arguments.
      */
-    HDassert(biter);
-    HDassert(biter->ready);
+    assert(biter);
+    assert(biter->ready);
 
     /* Retrieve the information asked for */
     if (row)
@@ -595,7 +595,7 @@ H5HF__man_iter_ready(H5HF_block_iter_t *biter)
     /*
      * Check arguments.
      */
-    HDassert(biter);
+    assert(biter);
 
     FUNC_LEAVE_NOAPI(biter->ready)
 } /* end H5HF__man_iter_ready() */