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/H5ST.c b/src/H5ST.c
index 3a1020b..2570f72 100644
--- a/src/H5ST.c
+++ b/src/H5ST.c
@@ -70,7 +70,7 @@ done:
 
 /*--------------------------------------------------------------------------
  NAME
-    H5ST_close_internal
+    H5ST__close_internal
  PURPOSE
     Close a TST, deallocating it.
  USAGE
@@ -87,21 +87,21 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5ST_close_internal(H5ST_ptr_t p)
+H5ST__close_internal(H5ST_ptr_t p)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Recursively free TST */
     if(p) {
-        H5ST_close_internal(p->lokid);
+        H5ST__close_internal(p->lokid);
         if(p->splitchar)
-            H5ST_close_internal(p->eqkid);
-        H5ST_close_internal(p->hikid);
+            H5ST__close_internal(p->eqkid);
+        H5ST__close_internal(p->hikid);
         p = H5FL_FREE(H5ST_node_t, p);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5ST_close_internal() */
+} /* end H5ST__close_internal() */
 
 
 /*--------------------------------------------------------------------------
@@ -134,7 +134,7 @@ H5ST_close(H5ST_tree_t *tree)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid TST")
 
     /* Free the TST itself */
-    if(H5ST_close_internal(tree->root) < 0)
+    if(H5ST__close_internal(tree->root) < 0)
         HGOTO_ERROR(H5E_TST, H5E_CANTFREE, FAIL, "can't free TST")
 
     /* Free root node itself */
@@ -270,7 +270,7 @@ done:
 
 /*--------------------------------------------------------------------------
  NAME
-    H5ST_find_internal
+    H5ST__find_internal
  PURPOSE
     Find the node matching a particular key string
  USAGE
@@ -289,11 +289,11 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static H5ST_ptr_t
-H5ST_find_internal(H5ST_ptr_t p, const char *s)
+H5ST__find_internal(H5ST_ptr_t p, const char *s)
 {
     H5ST_ptr_t ret_value = NULL;  /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     while (p) {
         if (*s < p->splitchar)
@@ -308,7 +308,7 @@ H5ST_find_internal(H5ST_ptr_t p, const char *s)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5ST_find_internal() */
+} /* end H5ST__find_internal() */
 
 
 /*--------------------------------------------------------------------------
@@ -338,7 +338,7 @@ H5ST_find(H5ST_tree_t *tree, const char *s)
 
     FUNC_ENTER_NOAPI(NULL)
 
-    if(NULL == (ret_value = H5ST_find_internal(tree->root, s)))
+    if(NULL == (ret_value = H5ST__find_internal(tree->root, s)))
         HGOTO_ERROR(H5E_TST, H5E_NOTFOUND, NULL, "key not found in TST")
 
 done:
@@ -374,7 +374,7 @@ H5ST_locate(H5ST_tree_t *tree, const char *s)
     FUNC_ENTER_NOAPI(NULL)
 
     /* Locate the node to remove */
-    if(NULL == (node = H5ST_find_internal(tree->root, s)))
+    if(NULL == (node = H5ST__find_internal(tree->root, s)))
         HGOTO_ERROR(H5E_TST, H5E_NOTFOUND, NULL, "key not found in TST")
 
     /* Get the pointer to the object to return */
@@ -387,11 +387,11 @@ done:
 
 /*--------------------------------------------------------------------------
  NAME
-    H5ST_findfirst_internal
+    H5ST__findfirst_internal
  PURPOSE
     Find the first node in a TST
  USAGE
-    H5ST_ptr_t H5ST_findfirst_internal(p)
+    H5ST_ptr_t H5ST__findfirst_internal(p)
         H5ST_ptr_t p;      IN: TST to locate first node within
  RETURNS
     Success: Non-NULL
@@ -404,11 +404,11 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static H5ST_ptr_t
-H5ST_findfirst_internal(H5ST_ptr_t p)
+H5ST__findfirst_internal(H5ST_ptr_t p)
 {
     H5ST_ptr_t ret_value = NULL;  /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     while(p) {
         /* Find least node in current tree */
@@ -428,7 +428,7 @@ H5ST_findfirst_internal(H5ST_ptr_t p)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5ST_findfirst_internal() */
+} /* end H5ST__findfirst_internal() */
 
 
 /*--------------------------------------------------------------------------
@@ -456,7 +456,7 @@ H5ST_findfirst(H5ST_tree_t *tree)
 
     FUNC_ENTER_NOAPI(NULL)
 
-    if(NULL == (ret_value = H5ST_findfirst_internal(tree->root)))
+    if(NULL == (ret_value = H5ST__findfirst_internal(tree->root)))
         HGOTO_ERROR(H5E_TST,H5E_NOTFOUND,NULL,"no nodes in TST");
 
 done:
@@ -466,11 +466,11 @@ done:
 
 /*--------------------------------------------------------------------------
  NAME
-    H5ST_getnext
+    H5ST__getnext
  PURPOSE
     Internal routine to find the next node in a given level of a TST
  USAGE
-    H5ST_ptr_t H5ST_getnext(p)
+    H5ST_ptr_t H5ST__getnext(p)
         H5ST_ptr_t *p;       IN: Pointer to node to find next node from
  RETURNS
     Success: Non-NULL
@@ -483,11 +483,11 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static H5ST_ptr_t
-H5ST_getnext(H5ST_ptr_t p)
+H5ST__getnext(H5ST_ptr_t p)
 {
     H5ST_ptr_t ret_value = NULL;  /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* If the node to continue from has higher-valued nodes attached */
     if(p->hikid) {
@@ -519,7 +519,7 @@ H5ST_getnext(H5ST_ptr_t p)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5ST_getnext() */
+} /* end H5ST__getnext() */
 
 
 /*--------------------------------------------------------------------------
@@ -550,9 +550,9 @@ H5ST_findnext(H5ST_ptr_t p)
 
     /* Find the next node at the current level, or go back up the tree */
     do {
-        q = H5ST_getnext(p);
+        q = H5ST__getnext(p);
         if(q) {
-            HGOTO_DONE(H5ST_findfirst_internal(q->eqkid));
+            HGOTO_DONE(H5ST__findfirst_internal(q->eqkid));
         } /* end if */
         else
             p = p->up;
@@ -565,11 +565,11 @@ done:
 
 /*--------------------------------------------------------------------------
  NAME
-    H5ST_delete_internal
+    H5ST__delete_internal
  PURPOSE
     Delete a node from a TST
  USAGE
-    herr_t H5ST_delete_internal(root,p)
+    herr_t H5ST__delete_internal(root,p)
         H5ST_ptr_t *root;       IN/OUT: Root of TST to delete node from
         H5ST_ptr_t p;       IN: Node to delete
  RETURNS
@@ -584,12 +584,12 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5ST_delete_internal(H5ST_ptr_t *root, H5ST_ptr_t p)
+H5ST__delete_internal(H5ST_ptr_t *root, H5ST_ptr_t p)
 {
     H5ST_ptr_t q,               /* Temporary pointer to TST node */
         newp;                   /* Pointer to node which will replace deleted node in tree */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Find node to replace one being deleted */
     if(p->lokid) {
@@ -628,7 +628,7 @@ H5ST_delete_internal(H5ST_ptr_t *root, H5ST_ptr_t p)
 
             /* If we deleted the last node in the TST, delete the upper node also */
             if(NULL == newp)
-                H5ST_delete_internal(root, p->up);
+                H5ST__delete_internal(root, p->up);
         } /* end if */
         else /* Deleted last node at top level of tree */
             *root = newp;
@@ -637,7 +637,7 @@ H5ST_delete_internal(H5ST_ptr_t *root, H5ST_ptr_t p)
     p = H5FL_FREE(H5ST_node_t, p);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5ST_delete_internal() */
+} /* end H5ST__delete_internal() */
 
 
 /*--------------------------------------------------------------------------
@@ -667,7 +667,7 @@ H5ST_delete(H5ST_tree_t *tree, H5ST_ptr_t p)
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    if(H5ST_delete_internal(&tree->root, p) < 0)
+    if(H5ST__delete_internal(&tree->root, p) < 0)
         HGOTO_ERROR(H5E_TST, H5E_CANTDELETE, FAIL, "can't delete node from TST")
 
 done:
@@ -703,14 +703,14 @@ H5ST_remove(H5ST_tree_t *tree, const char *s)
     FUNC_ENTER_NOAPI(NULL)
 
     /* Locate the node to remove */
-    if(NULL == (node = H5ST_find_internal(tree->root, s)))
+    if(NULL == (node = H5ST__find_internal(tree->root, s)))
         HGOTO_ERROR(H5E_TST, H5E_NOTFOUND, NULL, "key not found in TST")
 
     /* Get the pointer to the object to return */
     ret_value = node->eqkid;
 
     /* Remove the node from the TST */
-    if(H5ST_delete_internal(&tree->root, node) < 0)
+    if(H5ST__delete_internal(&tree->root, node) < 0)
         HGOTO_ERROR(H5E_TST, H5E_CANTDELETE, NULL, "can't delete node from TST")
 
 done: