More normalization from develop

1 files changed, 10 insertions, 10 deletions

diff --git a/src/H5HFman.c b/src/H5HFman.c
index d26c145..427be00 100644
--- a/src/H5HFman.c
+++ b/src/H5HFman.c
@@ -145,7 +145,7 @@ H5HF__man_insert(H5HF_hdr_t *hdr, size_t obj_size, const void *obj, void *_id)
     HDassert(sec_node->sect_info.state == H5FS_SECT_LIVE);
 
     /* Retrieve direct block address from section */
-    if (H5HF_sect_single_dblock_info(hdr, sec_node, &dblock_addr, &dblock_size) < 0)
+    if (H5HF__sect_single_dblock_info(hdr, sec_node, &dblock_addr, &dblock_size) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve direct block information")
 
     /* Lock direct block */
@@ -189,7 +189,7 @@ H5HF__man_insert(H5HF_hdr_t *hdr, size_t obj_size, const void *obj, void *_id)
     hdr->man_nobjs++;
 
     /* Reduce space available in heap (marks header dirty) */
-    if (H5HF_hdr_adj_free(hdr, -(ssize_t)obj_size) < 0)
+    if (H5HF__hdr_adj_free(hdr, -(ssize_t)obj_size) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't adjust free space for heap")
 
 done:
@@ -206,7 +206,7 @@ done:
 } /* end H5HF__man_insert() */
 
 /*-------------------------------------------------------------------------
- * Function:    H5HF_man_get_obj_len
+ * Function:    H5HF__man_get_obj_len
  *
  * Purpose:     Get the size of a managed heap object
  *
@@ -218,10 +218,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_man_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p)
+H5HF__man_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p)
 {
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /*
      * Check arguments.
@@ -240,7 +240,7 @@ H5HF_man_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p)
     UINT64DECODE_VAR(id, *obj_len_p, hdr->heap_len_size);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5HF_man_get_obj_len() */
+} /* end H5HF__man_get_obj_len() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5HF__man_get_obj_off
@@ -454,7 +454,7 @@ H5HF__man_read(H5HF_hdr_t *hdr, const uint8_t *id, void *obj)
     HDassert(obj);
 
     /* Call the internal 'op' routine routine */
-    if (H5HF__man_op_real(hdr, id, H5HF_op_read, obj, 0) < 0)
+    if (H5HF__man_op_real(hdr, id, H5HF__op_read, obj, 0) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "unable to operate on heap object")
 
 done:
@@ -489,7 +489,7 @@ H5HF__man_write(H5HF_hdr_t *hdr, const uint8_t *id, const void *obj)
 
     /* Call the internal 'op' routine routine */
     /* (Casting away const OK - QAK) */
-    if (H5HF__man_op_real(hdr, id, H5HF_op_write, (void *)obj, H5HF_OP_MODIFY) < 0)
+    if (H5HF__man_op_real(hdr, id, H5HF__op_write, (void *)obj, H5HF_OP_MODIFY) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "unable to operate on heap object")
 
 done:
@@ -629,7 +629,7 @@ H5HF__man_remove(H5HF_hdr_t *hdr, const uint8_t *id)
         HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "object overruns end of direct block")
 
     /* Create free space section node */
-    if (NULL == (sec_node = H5HF_sect_single_new(obj_off, obj_len, iblock, dblock_entry)))
+    if (NULL == (sec_node = H5HF__sect_single_new(obj_off, obj_len, iblock, dblock_entry)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create section for direct block's free space")
 
     /* Unlock indirect block */
@@ -640,7 +640,7 @@ H5HF__man_remove(H5HF_hdr_t *hdr, const uint8_t *id)
     } /* end if */
 
     /* Increase space available in heap (marks header dirty) */
-    if (H5HF_hdr_adj_free(hdr, (ssize_t)obj_len) < 0)
+    if (H5HF__hdr_adj_free(hdr, (ssize_t)obj_len) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't adjust free space for heap")
 
     /* Update statistics about heap */