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

1 files changed, 98 insertions, 98 deletions

diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c
index e8a5299..f5e4b34 100644
--- a/src/H5MFaggr.c
+++ b/src/H5MFaggr.c
@@ -91,14 +91,14 @@ H5MF_aggr_vfd_alloc(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size)
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 #ifdef H5MF_AGGR_DEBUG
-    HDfprintf(stderr, "%s: alloc_type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)alloc_type, size);
+    fprintf(stderr, "%s: alloc_type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)alloc_type, size);
 #endif /* H5MF_AGGR_DEBUG */
 
     /* check arguments */
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(f->shared->lf);
-    HDassert(size > 0);
+    assert(f);
+    assert(f->shared);
+    assert(f->shared->lf);
+    assert(size > 0);
 
     /* Couldn't find anything from the free space manager, go allocate some */
     if (alloc_type != H5FD_MEM_DRAW && alloc_type != H5FD_MEM_GHEAP) {
@@ -115,12 +115,12 @@ H5MF_aggr_vfd_alloc(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size)
     } /* end else */
 
     /* Sanity check for overlapping into file's temporary allocation space */
-    HDassert(H5F_addr_le((ret_value + size), f->shared->tmp_addr));
+    assert(H5F_addr_le((ret_value + size), f->shared->tmp_addr));
 
 done:
 #ifdef H5MF_AGGR_DEBUG
-    HDfprintf(stderr, "%s: Leaving: ret_value = %" PRIuHADDR ", size = %" PRIuHSIZE "\n", __func__, ret_value,
-              size);
+    fprintf(stderr, "%s: Leaving: ret_value = %" PRIuHADDR ", size = %" PRIuHSIZE "\n", __func__, ret_value,
+            size);
 #endif /* H5MF_AGGR_DEBUG */
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -150,20 +150,20 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
 
     FUNC_ENTER_PACKAGE
 #ifdef H5MF_AGGR_DEBUG
-    HDfprintf(stderr, "%s: type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)type, size);
+    fprintf(stderr, "%s: type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)type, size);
 #endif /* H5MF_AGGR_DEBUG */
 
     /* check args */
-    HDassert(f);
-    HDassert(aggr);
-    HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
-             aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
-    HDassert(other_aggr);
-    HDassert(other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
-             other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
-    HDassert(other_aggr->feature_flag != aggr->feature_flag);
-    HDassert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
-    HDassert(size > 0);
+    assert(f);
+    assert(aggr);
+    assert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+           aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    assert(other_aggr);
+    assert(other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+           other_aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+    assert(other_aggr->feature_flag != aggr->feature_flag);
+    assert(type >= H5FD_MEM_DEFAULT && type < H5FD_MEM_NTYPES);
+    assert(size > 0);
 
     /* Get the EOA for the file */
     if (HADDR_UNDEF == (eoa = H5F_get_eoa(f, type)))
@@ -199,8 +199,8 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
             H5FD_mem_t alloc_type, other_alloc_type; /* Current aggregator & 'other' aggregator types */
 
 #ifdef H5MF_AGGR_DEBUG
-            HDfprintf(stderr, "%s: aggr = {%" PRIuHADDR ", %" PRIuHSIZE ", %" PRIuHSIZE "}\n", __func__,
-                      aggr->addr, aggr->tot_size, aggr->size);
+            fprintf(stderr, "%s: aggr = {%" PRIuHADDR ", %" PRIuHSIZE ", %" PRIuHSIZE "}\n", __func__,
+                    aggr->addr, aggr->tot_size, aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
 
             /* Turn off alignment if allocation < threshold */
@@ -268,7 +268,7 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
 
                     /* Allocate another block */
 #ifdef H5MF_AGGR_DEBUG
-                    HDfprintf(stderr, "%s: Allocating block\n", __func__);
+                    fprintf(stderr, "%s: Allocating block\n", __func__);
 #endif /* H5MF_AGGR_DEBUG */
 
                     if (aggr_frag_size > (ext_size - size))
@@ -320,7 +320,7 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
                          * been allocated in an aligned manner if the aggregator
                          * block is larger than the threshold */
                         if (eoa_frag_size && !alignment) {
-                            HDassert(eoa_frag_addr + eoa_frag_size == new_space);
+                            assert(eoa_frag_addr + eoa_frag_size == new_space);
                             aggr->addr     = eoa_frag_addr;
                             aggr->size     = aggr->alloc_size + eoa_frag_size;
                             aggr->tot_size = aggr->size;
@@ -380,15 +380,15 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
         } /* end else */
 
         /* Sanity check for overlapping into file's temporary allocation space */
-        HDassert(H5F_addr_le((ret_value + size), f->shared->tmp_addr));
+        assert(H5F_addr_le((ret_value + size), f->shared->tmp_addr));
 
         /* Post-condition sanity check */
         if (H5F_ALIGNMENT(f) && size >= H5F_THRESHOLD(f))
-            HDassert(!((ret_value + H5FD_get_base_addr(f->shared->lf)) % H5F_ALIGNMENT(f)));
+            assert(!((ret_value + H5FD_get_base_addr(f->shared->lf)) % H5F_ALIGNMENT(f)));
 
 done:
 #ifdef H5MF_AGGR_DEBUG
-        HDfprintf(stderr, "%s: ret_value = %" PRIuHADDR "\n", __func__, ret_value);
+        fprintf(stderr, "%s: ret_value = %" PRIuHADDR "\n", __func__, ret_value);
 #endif /* H5MF_AGGR_DEBUG */
         FUNC_LEAVE_NOAPI(ret_value)
     } /* end H5MF__aggr_alloc() */
@@ -426,10 +426,10 @@ done:
         FUNC_ENTER_PACKAGE
 
         /* Check args */
-        HDassert(f);
-        HDassert(aggr);
-        HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
-                 aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+        assert(f);
+        assert(aggr);
+        assert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+               aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
 
         /* Check if this aggregator is active */
         if (f->shared->feature_flags & aggr->feature_flag) {
@@ -524,12 +524,12 @@ done:
         FUNC_ENTER_PACKAGE_NOERR
 
         /* Check args */
-        HDassert(f);
-        HDassert(aggr);
-        HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
-                 aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
-        HDassert(sect);
-        HDassert(shrink);
+        assert(f);
+        assert(aggr);
+        assert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+               aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+        assert(sect);
+        assert(shrink);
 
         /* Check if this aggregator is active */
         if (f->shared->feature_flags & aggr->feature_flag) {
@@ -537,11 +537,11 @@ done:
             if (H5F_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr) ||
                 H5F_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr)) {
 #ifdef H5MF_AGGR_DEBUG
-                HDfprintf(stderr,
-                          "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins aggr = {%" PRIuHADDR
-                          ", %" PRIuHSIZE "}\n",
-                          "H5MF__aggr_can_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
-                          aggr->size);
+                fprintf(stderr,
+                        "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins aggr = {%" PRIuHADDR
+                        ", %" PRIuHSIZE "}\n",
+                        "H5MF__aggr_can_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
+                        aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
                 /* Check if aggregator would get too large and should be absorbed into section */
                 if ((aggr->size + sect->sect_info.size) >= aggr->alloc_size)
@@ -578,37 +578,37 @@ done:
         FUNC_ENTER_PACKAGE_NOERR
 
         /* Check args */
-        HDassert(f);
-        HDassert(aggr);
-        HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
-                 aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
-        HDassert(f->shared->feature_flags & aggr->feature_flag);
-        HDassert(sect);
+        assert(f);
+        assert(aggr);
+        assert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+               aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+        assert(f->shared->feature_flags & aggr->feature_flag);
+        assert(sect);
 
         /* Check if aggregator would get too large and should be absorbed into section */
         if ((aggr->size + sect->sect_info.size) >= aggr->alloc_size && allow_sect_absorb) {
             /* Check if the section adjoins the beginning or end of the aggregator */
             if (H5F_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr)) {
 #ifdef H5MF_AGGR_DEBUG
-                HDfprintf(stderr,
-                          "%s: aggr {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins front of section = {%" PRIuHADDR
-                          ", %" PRIuHSIZE "}\n",
-                          "H5MF__aggr_absorb", aggr->addr, aggr->size, sect->sect_info.addr,
-                          sect->sect_info.size);
+                fprintf(stderr,
+                        "%s: aggr {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins front of section = {%" PRIuHADDR
+                        ", %" PRIuHSIZE "}\n",
+                        "H5MF__aggr_absorb", aggr->addr, aggr->size, sect->sect_info.addr,
+                        sect->sect_info.size);
 #endif /* H5MF_AGGR_DEBUG */
                 /* Absorb aggregator onto end of section */
                 sect->sect_info.size += aggr->size;
             } /* end if */
             else {
                 /* Sanity check */
-                HDassert(H5F_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr));
+                assert(H5F_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr));
 
 #ifdef H5MF_AGGR_DEBUG
-                HDfprintf(stderr,
-                          "%s: aggr {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins end of section = {%" PRIuHADDR
-                          ", %" PRIuHSIZE "}\n",
-                          "H5MF__aggr_absorb", aggr->addr, aggr->size, sect->sect_info.addr,
-                          sect->sect_info.size);
+                fprintf(stderr,
+                        "%s: aggr {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins end of section = {%" PRIuHADDR
+                        ", %" PRIuHSIZE "}\n",
+                        "H5MF__aggr_absorb", aggr->addr, aggr->size, sect->sect_info.addr,
+                        sect->sect_info.size);
 #endif /* H5MF_AGGR_DEBUG */
                 /* Absorb aggregator onto beginning of section */
                 sect->sect_info.addr -= aggr->size;
@@ -624,11 +624,11 @@ done:
             /* Check if the section adjoins the beginning or end of the aggregator */
             if (H5F_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr)) {
 #ifdef H5MF_AGGR_DEBUG
-                HDfprintf(stderr,
-                          "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins front of aggr = {%" PRIuHADDR
-                          ", %" PRIuHSIZE "}\n",
-                          "H5MF__aggr_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
-                          aggr->size);
+                fprintf(stderr,
+                        "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins front of aggr = {%" PRIuHADDR
+                        ", %" PRIuHSIZE "}\n",
+                        "H5MF__aggr_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
+                        aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
                 /* Absorb section onto front of aggregator */
                 aggr->addr -= sect->sect_info.size;
@@ -641,20 +641,20 @@ done:
             } /* end if */
             else {
                 /* Sanity check */
-                HDassert(H5F_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr));
+                assert(H5F_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr));
 
 #ifdef H5MF_AGGR_DEBUG
-                HDfprintf(stderr,
-                          "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins end of aggr = {%" PRIuHADDR
-                          ", %" PRIuHSIZE "}\n",
-                          "H5MF__aggr_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
-                          aggr->size);
+                fprintf(stderr,
+                        "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins end of aggr = {%" PRIuHADDR
+                        ", %" PRIuHSIZE "}\n",
+                        "H5MF__aggr_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
+                        aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
                 /* Absorb section onto end of aggregator */
                 aggr->size += sect->sect_info.size;
             } /* end if */
             /* Sanity check */
-            HDassert(!allow_sect_absorb || (aggr->size < aggr->alloc_size));
+            assert(!allow_sect_absorb || (aggr->size < aggr->alloc_size));
         } /* end else */
 
         FUNC_LEAVE_NOAPI(SUCCEED)
@@ -678,10 +678,10 @@ done:
         FUNC_ENTER_PACKAGE_NOERR
 
         /* Check args */
-        HDassert(f);
-        HDassert(aggr);
-        HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
-                 aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+        assert(f);
+        assert(aggr);
+        assert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+               aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
 
         /* Check if this aggregator is active */
         if (f->shared->feature_flags & aggr->feature_flag) {
@@ -715,10 +715,10 @@ done:
         FUNC_ENTER_PACKAGE
 
         /* Check args */
-        HDassert(f);
-        HDassert(aggr);
-        HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
-                 aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+        assert(f);
+        assert(aggr);
+        assert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+               aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
 
         /* Set the type of memory in the file */
         alloc_type = (aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA
@@ -734,8 +734,8 @@ done:
             tmp_addr = aggr->addr;
             tmp_size = aggr->size;
 #ifdef H5MF_AGGR_DEBUG
-            HDfprintf(stderr, "%s: tmp_addr = %" PRIuHADDR ", tmp_size = %" PRIuHSIZE "\n", __func__,
-                      tmp_addr, tmp_size);
+            fprintf(stderr, "%s: tmp_addr = %" PRIuHADDR ", tmp_size = %" PRIuHSIZE "\n", __func__, tmp_addr,
+                    tmp_size);
 #endif /* H5MF_AGGR_DEBUG */
 
             /* Reset aggregator block information */
@@ -780,9 +780,9 @@ done:
         FUNC_ENTER_NOAPI(FAIL)
 
         /* Check args */
-        HDassert(f);
-        HDassert(f->shared);
-        HDassert(f->shared->lf);
+        assert(f);
+        assert(f->shared);
+        assert(f->shared->lf);
 
         /* Retrieve metadata aggregator info, if available */
         if (H5MF__aggr_query(f, &(f->shared->meta_aggr), &ma_addr, &ma_size) < 0)
@@ -840,10 +840,10 @@ done:
         FUNC_ENTER_PACKAGE
 
         /* Sanity check */
-        HDassert(f);
-        HDassert(aggr);
-        HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
-                 aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+        assert(f);
+        assert(aggr);
+        assert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+               aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
 
         /* Get the EOA for the file */
         if (HADDR_UNDEF == (eoa = H5F_get_eoa(f, type)))
@@ -878,15 +878,15 @@ done:
         FUNC_ENTER_PACKAGE
 
         /* Sanity check */
-        HDassert(f);
-        HDassert(f->shared->lf);
-        HDassert(aggr);
-        HDassert(H5F_addr_defined(aggr->addr));
-        HDassert(aggr->size > 0);
-        HDassert(H5F_INTENT(f) & H5F_ACC_RDWR);
-        HDassert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
-                 aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
-        HDassert(f->shared->feature_flags & aggr->feature_flag);
+        assert(f);
+        assert(f->shared->lf);
+        assert(aggr);
+        assert(H5F_addr_defined(aggr->addr));
+        assert(aggr->size > 0);
+        assert(H5F_INTENT(f) & H5F_ACC_RDWR);
+        assert(aggr->feature_flag == H5FD_FEAT_AGGREGATE_METADATA ||
+               aggr->feature_flag == H5FD_FEAT_AGGREGATE_SMALLDATA);
+        assert(f->shared->feature_flags & aggr->feature_flag);
 
         /* Free the remaining space at EOA in the aggregator */
         if (H5F__free(f, type, aggr->addr, aggr->size) < 0)
@@ -923,8 +923,8 @@ done:
         FUNC_ENTER_PACKAGE
 
         /* Check args */
-        HDassert(f);
-        HDassert(f->shared);
+        assert(f);
+        assert(f->shared);
 
         if ((ma_status = H5MF__aggr_can_shrink_eoa(f, H5FD_MEM_DEFAULT, &(f->shared->meta_aggr))) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query metadata aggregator stats")