Clean up private / package / static namespace issues (function naming, which

header file, FUNC_ENTER / LEAVE, etc).  Removed remaining personal email
addresses from library source code (still needs cleaned from other directories).
Misc. warning, style, and whitespace cleanup.

1 files changed, 12 insertions, 30 deletions

diff --git a/src/H5HFspace.c b/src/H5HFspace.c
index ad5ff0f..b518996 100644
--- a/src/H5HFspace.c
+++ b/src/H5HFspace.c
@@ -15,7 +15,7 @@
  *
  * Created:		H5HFspace.c
  *			May  2 2006
- *			Quincey Koziol <koziol@ncsa.uiuc.edu>
+ *			Quincey Koziol
  *
  * Purpose:		Space allocation routines for fractal heaps.
  *
@@ -89,7 +89,6 @@
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
  *		May  2 2006
  *
  *-------------------------------------------------------------------------
@@ -153,7 +152,6 @@ done:
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
  *		May 15 2006
  *
  *-------------------------------------------------------------------------
@@ -198,7 +196,6 @@ done:
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
  *		May  2 2006
  *
  *-------------------------------------------------------------------------
@@ -237,7 +234,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5HF_space_revert_root_cb
+ * Function:	H5HF__space_revert_root_cb
  *
  * Purpose:	Callback routine from iterator, to reset 'parent' pointers in
  *		sections, when the heap is changing from having a root indirect
@@ -247,18 +244,17 @@ done:
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Feb 24 2012
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_space_revert_root_cb(H5FS_section_info_t *_sect, void H5_ATTR_UNUSED *_udata)
+H5HF__space_revert_root_cb(H5FS_section_info_t *_sect, void H5_ATTR_UNUSED *_udata)
 {
     H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect;       /* Section to dump info */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /*
      * Check arguments.
@@ -279,7 +275,7 @@ H5HF_space_revert_root_cb(H5FS_section_info_t *_sect, void H5_ATTR_UNUSED *_udat
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5HF_space_revert_root_cb() */
+} /* end H5HF__space_revert_root_cb() */
 
 
 /*-------------------------------------------------------------------------
@@ -292,7 +288,6 @@ done:
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Feb 23 2012
  *
  *-------------------------------------------------------------------------
@@ -312,7 +307,7 @@ H5HF__space_revert_root(const H5HF_hdr_t *hdr)
     /* Only need to scan the sections if the free space has been initialized */
     if(hdr->fspace)
         /* Iterate over all sections, resetting the parent pointers in 'single' sections */
-        if(H5FS_sect_iterate(hdr->f, hdr->fspace, H5HF_space_revert_root_cb, NULL) < 0)
+        if(H5FS_sect_iterate(hdr->f, hdr->fspace, H5HF__space_revert_root_cb, NULL) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over sections to reset parent pointers")
 
 done:
@@ -321,7 +316,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5HF_space_create_root_cb
+ * Function:	H5HF__space_create_root_cb
  *
  * Purpose:	Callback routine from iterator, to set 'parent' pointers in
  *		sections to newly created root indirect block, when the heap
@@ -331,19 +326,18 @@ done:
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Feb 24 2012
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_space_create_root_cb(H5FS_section_info_t *_sect, void *_udata)
+H5HF__space_create_root_cb(H5FS_section_info_t *_sect, void *_udata)
 {
     H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect;       /* Section to dump info */
     H5HF_indirect_t *root_iblock = (H5HF_indirect_t *)_udata;	/* User data for callback */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /*
      * Check arguments.
@@ -357,7 +351,7 @@ H5HF_space_create_root_cb(H5FS_section_info_t *_sect, void *_udata)
     HDassert(sect->sect_info.type == H5HF_FSPACE_SECT_SINGLE);
 
     /* Increment ref. count on new root indirect block */
-    if(H5HF_iblock_incr(root_iblock) < 0)
+    if(H5HF__iblock_incr(root_iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on section's indirect block")
 
     /* Set parent info ("live" section must _NOT_ have a parent right now) */
@@ -370,7 +364,7 @@ H5HF_space_create_root_cb(H5FS_section_info_t *_sect, void *_udata)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5HF_space_create_root_cb() */
+} /* end H5HF__space_create_root_cb() */
 
 
 /*-------------------------------------------------------------------------
@@ -384,7 +378,6 @@ done:
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Feb 24 2012
  *
  *-------------------------------------------------------------------------
@@ -405,7 +398,7 @@ H5HF__space_create_root(const H5HF_hdr_t *hdr, H5HF_indirect_t *root_iblock)
     /* Only need to scan the sections if the free space has been initialized */
     if(hdr->fspace)
         /* Iterate over all sections, seting the parent pointers in 'single' sections to the new indirect block */
-        if(H5FS_sect_iterate(hdr->f, hdr->fspace, H5HF_space_create_root_cb, root_iblock) < 0)
+        if(H5FS_sect_iterate(hdr->f, hdr->fspace, H5HF__space_create_root_cb, root_iblock) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over sections to set parent pointers")
 
 done:
@@ -422,7 +415,6 @@ done:
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		August 14 2007
  *
  *-------------------------------------------------------------------------
@@ -467,7 +459,6 @@ done:
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
  *		July 24 2006
  *
  *-------------------------------------------------------------------------
@@ -505,7 +496,6 @@ done:
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
  *		May  2 2006
  *
  *-------------------------------------------------------------------------
@@ -529,9 +519,6 @@ H5HF__space_close(H5HF_hdr_t *hdr)
         /* Retrieve the number of sections for this heap */
         if(H5FS_sect_stats(hdr->fspace, NULL, &nsects) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOUNT, FAIL, "can't query free space section count")
-#ifdef QAK
-HDfprintf(stderr, "%s: nsects = %Hu\n", FUNC, nsects);
-#endif /* QAK */
 
         /* Close the free space for the heap */
         if(H5FS_close(hdr->f, hdr->fspace) < 0)
@@ -560,7 +547,6 @@ done:
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
  *		Aug  7 2006
  *
  *-------------------------------------------------------------------------
@@ -596,7 +582,6 @@ done:
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
  *		July 10 2006
  *
  *-------------------------------------------------------------------------
@@ -607,9 +592,6 @@ H5HF__space_sect_change_class(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, uint16
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_PACKAGE
-#ifdef QAK
-HDfprintf(stderr, "%s: Called\n", FUNC);
-#endif /* QAK */
 
     /*
      * Check arguments.