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, 36 insertions, 36 deletions

diff --git a/src/H5HP.c b/src/H5HP.c
index 4ef5662..340457b 100644
--- a/src/H5HP.c
+++ b/src/H5HP.c
@@ -46,10 +46,10 @@ struct H5HP_t {
 };
 
 /* Static functions */
-static herr_t H5HP_swim_max(H5HP_t *heap, size_t loc);
-static herr_t H5HP_swim_min(H5HP_t *heap, size_t loc);
-static herr_t H5HP_sink_max(H5HP_t *heap, size_t loc);
-static herr_t H5HP_sink_min(H5HP_t *heap, size_t loc);
+static herr_t H5HP__swim_max(H5HP_t *heap, size_t loc);
+static herr_t H5HP__swim_min(H5HP_t *heap, size_t loc);
+static herr_t H5HP__sink_max(H5HP_t *heap, size_t loc);
+static herr_t H5HP__sink_min(H5HP_t *heap, size_t loc);
 
 /* Declare a free list to manage the H5HP_t struct */
 H5FL_DEFINE_STATIC(H5HP_t);
@@ -60,11 +60,11 @@ H5FL_SEQ_DEFINE_STATIC(H5HP_ent_t);
 
 /*--------------------------------------------------------------------------
  NAME
-    H5HP_swim_max
+    H5HP__swim_max
  PURPOSE
     Restore heap condition by moving an object upward
  USAGE
-    herr_t H5HP_swim_max(heap, loc)
+    herr_t H5HP__swim_max(heap, loc)
         H5HP_t *heap;           IN/OUT: Pointer to heap to modify
         size_t loc;             IN: Location to start from
 
@@ -80,13 +80,13 @@ H5FL_SEQ_DEFINE_STATIC(H5HP_ent_t);
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5HP_swim_max(H5HP_t *heap, size_t loc)
+H5HP__swim_max(H5HP_t *heap, size_t loc)
 {
     int val;                    /* Temporary copy value of object to move in heap */
     H5HP_info_t *obj;           /* Temporary pointer to object to move in heap */
     herr_t ret_value=SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Get copies of the information about the object to move in the heap */
     val=heap->heap[loc].val;
@@ -113,16 +113,16 @@ H5HP_swim_max(H5HP_t *heap, size_t loc)
     heap->heap[loc].obj->heap_loc=loc;
 
     FUNC_LEAVE_NOAPI(ret_value);
-} /* end H5HP_swim_max() */
+} /* end H5HP__swim_max() */
 
 
 /*--------------------------------------------------------------------------
  NAME
-    H5HP_swim_min
+    H5HP__swim_min
  PURPOSE
     Restore heap condition by moving an object upward
  USAGE
-    herr_t H5HP_swim_min(heap, loc)
+    herr_t H5HP__swim_min(heap, loc)
         H5HP_t *heap;           IN/OUT: Pointer to heap to modify
         size_t loc;             IN: Location to start from
 
@@ -138,13 +138,13 @@ H5HP_swim_max(H5HP_t *heap, size_t loc)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5HP_swim_min(H5HP_t *heap, size_t loc)
+H5HP__swim_min(H5HP_t *heap, size_t loc)
 {
     int val;                    /* Temporary copy value of object to move in heap */
     H5HP_info_t *obj;           /* Temporary pointer to object to move in heap */
     herr_t ret_value=SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Get copies of the information about the object to move in the heap */
     val=heap->heap[loc].val;
@@ -171,16 +171,16 @@ H5HP_swim_min(H5HP_t *heap, size_t loc)
     heap->heap[loc].obj->heap_loc=loc;
 
     FUNC_LEAVE_NOAPI(ret_value);
-} /* end H5HP_swim_min() */
+} /* end H5HP__swim_min() */
 
 
 /*--------------------------------------------------------------------------
  NAME
-    H5HP_sink_max
+    H5HP__sink_max
  PURPOSE
     Restore heap condition by moving an object downward
  USAGE
-    herr_t H5HP_sink_max(heap, loc)
+    herr_t H5HP__sink_max(heap, loc)
         H5HP_t *heap;           IN/OUT: Pointer to heap to modify
         size_t loc;             IN: Location to start from
 
@@ -196,13 +196,13 @@ H5HP_swim_min(H5HP_t *heap, size_t loc)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5HP_sink_max(H5HP_t *heap, size_t loc)
+H5HP__sink_max(H5HP_t *heap, size_t loc)
 {
     int val;                    /* Temporary copy value of object to move in heap */
     void *obj;                  /* Temporary pointer to object to move in heap */
     herr_t ret_value=SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Get copies of the information about the object to move in the heap */
     val=heap->heap[loc].val;
@@ -240,16 +240,16 @@ H5HP_sink_max(H5HP_t *heap, size_t loc)
     heap->heap[loc].obj->heap_loc = loc;
 
     FUNC_LEAVE_NOAPI(ret_value);
-} /* end H5HP_sink_max() */
+} /* end H5HP__sink_max() */
 
 
 /*--------------------------------------------------------------------------
  NAME
-    H5HP_sink_min
+    H5HP__sink_min
  PURPOSE
     Restore heap condition by moving an object downward
  USAGE
-    herr_t H5HP_sink_min(heap, loc)
+    herr_t H5HP__sink_min(heap, loc)
         H5HP_t *heap;           IN/OUT: Pointer to heap to modify
         size_t loc;             IN: Location to start from
 
@@ -265,13 +265,13 @@ H5HP_sink_max(H5HP_t *heap, size_t loc)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5HP_sink_min(H5HP_t *heap, size_t loc)
+H5HP__sink_min(H5HP_t *heap, size_t loc)
 {
     int val;                    /* Temporary copy value of object to move in heap */
     void *obj;                  /* Temporary pointer to object to move in heap */
     herr_t ret_value=SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Get copies of the information about the object to move in the heap */
     val=heap->heap[loc].val;
@@ -309,7 +309,7 @@ H5HP_sink_min(H5HP_t *heap, size_t loc)
     heap->heap[loc].obj->heap_loc = loc;
 
     FUNC_LEAVE_NOAPI(ret_value);
-} /* end H5HP_sink_min() */
+} /* end H5HP__sink_min() */
 
 
 /*--------------------------------------------------------------------------
@@ -493,11 +493,11 @@ H5HP_insert(H5HP_t *heap, int val, void *obj)
 
     /* Restore heap condition */
     if(heap->type==H5HP_MAX_HEAP) {
-        if(H5HP_swim_max(heap,heap->nobjs)<0)
+        if(H5HP__swim_max(heap,heap->nobjs)<0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "unable to restore heap condition");
     } /* end if */
     else {
-        if(H5HP_swim_min(heap,heap->nobjs)<0)
+        if(H5HP__swim_min(heap,heap->nobjs)<0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "unable to restore heap condition");
     } /* end else */
 
@@ -619,11 +619,11 @@ H5HP_remove(H5HP_t *heap, int *val, void **obj)
     /* Restore heap condition, if there are objects on the heap */
     if(heap->nobjs>0) {
         if(heap->type==H5HP_MAX_HEAP) {
-            if(H5HP_sink_max(heap, (size_t)1) < 0)
+            if(H5HP__sink_max(heap, (size_t)1) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTDELETE, FAIL, "unable to restore heap condition");
         } /* end if */
         else {
-            if(H5HP_sink_min(heap, (size_t)1) < 0)
+            if(H5HP__sink_min(heap, (size_t)1) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTDELETE, FAIL, "unable to restore heap condition");
         } /* end else */
     } /* end if */
@@ -695,21 +695,21 @@ H5HP_change(H5HP_t *heap, int val, void *_obj)
     /* Restore heap condition */
     if(val<old_val) {
         if(heap->type==H5HP_MAX_HEAP) {
-            if(H5HP_sink_max(heap,obj_loc)<0)
+            if(H5HP__sink_max(heap,obj_loc)<0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
         } /* end if */
         else {
-            if(H5HP_swim_min(heap,obj_loc)<0)
+            if(H5HP__swim_min(heap,obj_loc)<0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
         } /* end else */
     } /* end if */
     else {
         if(heap->type==H5HP_MAX_HEAP) {
-            if(H5HP_swim_max(heap,obj_loc)<0)
+            if(H5HP__swim_max(heap,obj_loc)<0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
         } /* end if */
         else {
-            if(H5HP_sink_min(heap,obj_loc)<0)
+            if(H5HP__sink_min(heap,obj_loc)<0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
         } /* end else */
     } /* end else */
@@ -778,11 +778,11 @@ H5HP_incr(H5HP_t *heap, unsigned amt, void *_obj)
 
     /* Restore heap condition */
     if(H5HP_MAX_HEAP == heap->type) {
-        if(H5HP_swim_max(heap, obj_loc) < 0)
+        if(H5HP__swim_max(heap, obj_loc) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition")
     } /* end if */
     else {
-        if(H5HP_sink_min(heap, obj_loc) < 0)
+        if(H5HP__sink_min(heap, obj_loc) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition")
     } /* end else */
 
@@ -851,11 +851,11 @@ H5HP_decr(H5HP_t *heap, unsigned amt, void *_obj)
 
     /* Restore heap condition */
     if(heap->type==H5HP_MAX_HEAP) {
-        if(H5HP_sink_max(heap,obj_loc)<0)
+        if(H5HP__sink_max(heap,obj_loc)<0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
     } /* end if */
     else {
-        if(H5HP_swim_min(heap,obj_loc)<0)
+        if(H5HP__swim_min(heap,obj_loc)<0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESTORE, FAIL, "unable to restore heap condition");
     } /* end else */