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, 30 insertions, 35 deletions

diff --git a/src/H5Oginfo.c b/src/H5Oginfo.c
index d6190c6..75016e5 100644
--- a/src/H5Oginfo.c
+++ b/src/H5Oginfo.c
@@ -15,7 +15,7 @@
  *
  * Created:             H5Oginfo.c
  *                      Aug 23 2005
- *                      Quincey Koziol <koziol@ncsa.uiuc.edu>
+ *                      Quincey Koziol
  *
  * Purpose:             Group Information messages.
  *
@@ -32,11 +32,11 @@
 
 
 /* PRIVATE PROTOTYPES */
-static void *H5O_ginfo_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags,
+static void *H5O__ginfo_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags,
     unsigned *ioflags, size_t p_size, const uint8_t *p);
-static herr_t H5O_ginfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_ginfo_copy(const void *_mesg, void *_dest);
-static size_t H5O_ginfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
+static herr_t H5O__ginfo_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
+static void *H5O__ginfo_copy(const void *_mesg, void *_dest);
+static size_t H5O__ginfo_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O__ginfo_free(void *_mesg);
 static herr_t H5O__ginfo_debug(H5F_t *f, const void *_mesg, FILE * stream,
     int indent, int fwidth);
@@ -47,10 +47,10 @@ const H5O_msg_class_t H5O_MSG_GINFO[1] = {{
     "ginfo",                 	/*message name for debugging    */
     sizeof(H5O_ginfo_t),     	/*native message size           */
     0,				/* messages are sharable?       */
-    H5O_ginfo_decode,        	/*decode message                */
-    H5O_ginfo_encode,        	/*encode message                */
-    H5O_ginfo_copy,          	/*copy the native value         */
-    H5O_ginfo_size,          	/*size of symbol table entry    */
+    H5O__ginfo_decode,        	/*decode message                */
+    H5O__ginfo_encode,        	/*encode message                */
+    H5O__ginfo_copy,          	/*copy the native value         */
+    H5O__ginfo_size,          	/*size of symbol table entry    */
     NULL,                   	/*default reset method          */
     H5O__ginfo_free,	        /* free method			*/
     NULL,	        	/* file delete method		*/
@@ -78,7 +78,7 @@ H5FL_DEFINE_STATIC(H5O_ginfo_t);
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_ginfo_decode
+ * Function:    H5O__ginfo_decode
  *
  * Purpose:     Decode a message and return a pointer to
  *              a newly allocated one.
@@ -88,13 +88,12 @@ H5FL_DEFINE_STATIC(H5O_ginfo_t);
  *              Failure:        NULL
  *
  * Programmer:  Quincey Koziol
- *              koziol@ncsa.uiuc.edu
  *              Aug 30 2005
  *
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_ginfo_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
+H5O__ginfo_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
     unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
     size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
@@ -102,7 +101,7 @@ H5O_ginfo_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
     unsigned char       flags;          /* Flags for encoding group info */
     void                *ret_value = NULL;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* check args */
     HDassert(p);
@@ -151,29 +150,28 @@ done:
             ginfo = H5FL_FREE(H5O_ginfo_t, ginfo);
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_ginfo_decode() */
+} /* end H5O__ginfo_decode() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_ginfo_encode
+ * Function:    H5O__ginfo_encode
  *
  * Purpose:     Encodes a message.
  *
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Quincey Koziol
- *              koziol@ncsa.uiuc.edu
  *              Aug 30 2005
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
+H5O__ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
     const H5O_ginfo_t  *ginfo = (const H5O_ginfo_t *) _mesg;
     unsigned char       flags = 0;          /* Flags for encoding group info */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* check args */
     HDassert(p);
@@ -200,11 +198,11 @@ H5O_ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5O_ginfo_encode() */
+} /* end H5O__ginfo_encode() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_ginfo_copy
+ * Function:    H5O__ginfo_copy
  *
  * Purpose:     Copies a message from _MESG to _DEST, allocating _DEST if
  *              necessary.
@@ -214,19 +212,18 @@ H5O_ginfo_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
  *              Failure:        NULL
  *
  * Programmer:  Quincey Koziol
- *              koziol@ncsa.uiuc.edu
  *              Aug 30 2005
  *
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_ginfo_copy(const void *_mesg, void *_dest)
+H5O__ginfo_copy(const void *_mesg, void *_dest)
 {
     const H5O_ginfo_t   *ginfo = (const H5O_ginfo_t *)_mesg;
     H5O_ginfo_t         *dest = (H5O_ginfo_t *)_dest;
     void                *ret_value = NULL;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* check args */
     HDassert(ginfo);
@@ -241,11 +238,11 @@ H5O_ginfo_copy(const void *_mesg, void *_dest)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_ginfo_copy() */
+} /* end H5O__ginfo_copy() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_ginfo_size
+ * Function:    H5O__ginfo_size
  *
  * Purpose:     Returns the size of the raw message in bytes not counting
  *              the message type or size fields, but only the data fields.
@@ -256,33 +253,32 @@ done:
  *              Failure:        zero
  *
  * Programmer:  Quincey Koziol
- *              koziol@ncsa.uiuc.edu
  *              Aug 30 2005
  *
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_ginfo_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
+H5O__ginfo_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
 {
     const H5O_ginfo_t   *ginfo = (const H5O_ginfo_t *)_mesg;
     size_t ret_value = 0;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Set return value */
     ret_value = 1 +                     /* Version */
                 1 +                     /* Flags */
                 (ginfo->store_link_phase_change ? (
-            (size_t)(2 +                 /* "Max compact" links */
-                    2)                   /* "Min dense" links */
+           (size_t)(2 +                 /* "Max compact" links */
+                    2)                  /* "Min dense" links */
                 ) : 0) +                /* "Min dense" links */
                 (ginfo->store_est_entry_info ? (
-            (size_t)(2 +                 /* Estimated # of entries in group */
-                    2)                   /* Estimated length of name of entry in group */
+           (size_t)(2 +                 /* Estimated # of entries in group */
+                    2)                  /* Estimated length of name of entry in group */
                 ) : 0);
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_ginfo_size() */
+} /* end H5O__ginfo_size() */
 
 
 /*-------------------------------------------------------------------------
@@ -300,7 +296,7 @@ H5O_ginfo_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_sha
 static herr_t
 H5O__ginfo_free(void *mesg)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     HDassert(mesg);
 
@@ -318,7 +314,6 @@ H5O__ginfo_free(void *mesg)
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Quincey Koziol
- *              koziol@ncsa.uiuc.edu
  *              Aug 30 2005
  *
  *-------------------------------------------------------------------------