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, 53 insertions, 79 deletions

diff --git a/src/H5Oint.c b/src/H5Oint.c
index 6b0b10f..0ff5481 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.c
@@ -99,36 +99,36 @@ hbool_t H5_PKG_INIT_VAR = FALSE;
  * message.
  */
 const H5O_msg_class_t *const H5O_msg_class_g[] = {
-    H5O_MSG_NULL,        /*0x0000 Null                */
-    H5O_MSG_SDSPACE,        /*0x0001 Dataspace            */
-    H5O_MSG_LINFO,        /*0x0002 Link information        */
-    H5O_MSG_DTYPE,        /*0x0003 Datatype            */
-    H5O_MSG_FILL,           /*0x0004 Old data storage -- fill value */
-    H5O_MSG_FILL_NEW,        /*0x0005 New data storage -- fill value */
-    H5O_MSG_LINK,        /*0x0006 Link                 */
-    H5O_MSG_EFL,        /*0x0007 Data storage -- external data files */
-    H5O_MSG_LAYOUT,        /*0x0008 Data Layout            */
+    H5O_MSG_NULL,               /*0x0000 Null                            */
+    H5O_MSG_SDSPACE,            /*0x0001 Dataspace                       */
+    H5O_MSG_LINFO,              /*0x0002 Link information                */
+    H5O_MSG_DTYPE,              /*0x0003 Datatype                        */
+    H5O_MSG_FILL,               /*0x0004 Old data storage -- fill value  */
+    H5O_MSG_FILL_NEW,           /*0x0005 New data storage -- fill value  */
+    H5O_MSG_LINK,               /*0x0006 Link                            */
+    H5O_MSG_EFL,                /*0x0007 Data storage -- external data files */
+    H5O_MSG_LAYOUT,             /*0x0008 Data Layout                     */
 #ifdef H5O_ENABLE_BOGUS
-    H5O_MSG_BOGUS_VALID,    /*0x0009 "Bogus valid" (for testing)    */
+    H5O_MSG_BOGUS_VALID,        /*0x0009 "Bogus valid" (for testing)     */
 #else /* H5O_ENABLE_BOGUS */
-    NULL,            /*0x0009 "Bogus valid" (for testing)    */
+    NULL,                       /*0x0009 "Bogus valid" (for testing)     */
 #endif /* H5O_ENABLE_BOGUS */
-    H5O_MSG_GINFO,        /*0x000A Group information        */
-    H5O_MSG_PLINE,        /*0x000B Data storage -- filter pipeline */
-    H5O_MSG_ATTR,        /*0x000C Attribute            */
-    H5O_MSG_NAME,        /*0x000D Object name            */
-    H5O_MSG_MTIME,        /*0x000E Object modification date and time */
-    H5O_MSG_SHMESG,        /*0x000F File-wide shared message table */
-    H5O_MSG_CONT,        /*0x0010 Object header continuation    */
-    H5O_MSG_STAB,        /*0x0011 Symbol table            */
-    H5O_MSG_MTIME_NEW,        /*0x0012 New Object modification date and time */
-    H5O_MSG_BTREEK,        /*0x0013 Non-default v1 B-tree 'K' values */
-    H5O_MSG_DRVINFO,        /*0x0014 Driver info settings        */
-    H5O_MSG_AINFO,        /*0x0015 Attribute information        */
-    H5O_MSG_REFCOUNT,        /*0x0016 Object's ref. count        */
-    H5O_MSG_FSINFO,        /*0x0017 Free-space manager info        */
-    H5O_MSG_MDCI,               /*0x0018 Metadata cache image           */
-    H5O_MSG_UNKNOWN        /*0x0019 Placeholder for unknown message */
+    H5O_MSG_GINFO,              /*0x000A Group information               */
+    H5O_MSG_PLINE,              /*0x000B Data storage -- filter pipeline */
+    H5O_MSG_ATTR,               /*0x000C Attribute                       */
+    H5O_MSG_NAME,               /*0x000D Object name                     */
+    H5O_MSG_MTIME,              /*0x000E Object modification date and time */
+    H5O_MSG_SHMESG,             /*0x000F File-wide shared message table  */
+    H5O_MSG_CONT,               /*0x0010 Object header continuation      */
+    H5O_MSG_STAB,               /*0x0011 Symbol table                    */
+    H5O_MSG_MTIME_NEW,          /*0x0012 New Object modification date and time */
+    H5O_MSG_BTREEK,             /*0x0013 Non-default v1 B-tree 'K' values */
+    H5O_MSG_DRVINFO,            /*0x0014 Driver info settings            */
+    H5O_MSG_AINFO,              /*0x0015 Attribute information           */
+    H5O_MSG_REFCOUNT,           /*0x0016 Object's ref. count             */
+    H5O_MSG_FSINFO,             /*0x0017 Free-space manager info         */
+    H5O_MSG_MDCI,               /*0x0018 Metadata cache image            */
+    H5O_MSG_UNKNOWN             /*0x0019 Placeholder for unknown message */
 };
 
 /* Format version bounds for object header */
@@ -218,7 +218,7 @@ H5O__init_package(void)
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_set_version
+ * Function:    H5O__set_version
  *
  * Purpose:     Sets the correct version to encode the object header.
  *              Chooses the oldest version possible, unless the file's
@@ -232,12 +232,12 @@ H5O__init_package(void)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_set_version(H5F_t *f, H5O_t *oh, uint8_t oh_flags, hbool_t store_msg_crt_idx)
+H5O__set_version(H5F_t *f, H5O_t *oh, uint8_t oh_flags, hbool_t store_msg_crt_idx)
 {
     uint8_t version;            /* Message version */
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_STATIC
 
     /* check arguments */
     HDassert(f);
@@ -261,7 +261,7 @@ H5O_set_version(H5F_t *f, H5O_t *oh, uint8_t oh_flags, hbool_t store_msg_crt_idx
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_set_version() */
+} /* end H5O__set_version() */
 
 
 /*-------------------------------------------------------------------------
@@ -279,17 +279,8 @@ done:
  *        Failure:    Negative
  *
  * Programmer:    Robb Matzke
- *        matzke@llnl.gov
  *        Aug  5 1997
  *
- * Changes:     2018 August 17
- *              Jacob Smith
- *              Refactor out the operations into two separate steps --
- *              preparation and application -- to facilitate overriding the
- *              library-default size allocated for the object header. This
- *              function is retained as a wrapper, to minimize changes to
- *              unaffected calling functions.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -307,13 +298,13 @@ H5O_create(H5F_t *f, size_t size_hint, size_t initial_rc, hid_t ocpl_id, H5O_loc
     /* create object header in freelist
      * header version is set internally
      */
-    oh = H5O__create_ohdr(f, ocpl_id);
+    oh = H5O_create_ohdr(f, ocpl_id);
     if(NULL == oh)
         HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "Can't instantiate object header")
 
     /* apply object header information to file
      */
-    if(H5O__apply_ohdr(f, oh, ocpl_id, size_hint, initial_rc, loc) < 0)
+    if(H5O_apply_ohdr(f, oh, ocpl_id, size_hint, initial_rc, loc) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "Can't apply object header to file")
 
 done:
@@ -325,7 +316,7 @@ done:
 
 
 /*-----------------------------------------------------------------------------
- * Function:   H5O__create_ohdr
+ * Function:   H5O_create_ohdr
  *
  * Purpose:    Create the object header, set version and flags.
  *
@@ -338,7 +329,7 @@ done:
  *-----------------------------------------------------------------------------
  */
 H5O_t *
-H5O__create_ohdr(H5F_t *f, hid_t ocpl_id)
+H5O_create_ohdr(H5F_t *f, hid_t ocpl_id)
 {
     H5P_genplist_t *oc_plist;
     H5O_t          *oh = NULL;        /* Object header in Freelist */
@@ -363,20 +354,18 @@ H5O__create_ohdr(H5F_t *f, hid_t ocpl_id)
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, NULL, "not a property list")
 
     /* Get any object header status flags set by properties */
-    if(H5P_DATASET_CREATE_DEFAULT == ocpl_id)
-    {
+    if(H5P_DATASET_CREATE_DEFAULT == ocpl_id) {
         /* If the OCPL is the default DCPL, we can get the header flags from the
          * API context. Otherwise we have to call H5P_get */
         if(H5CX_get_ohdr_flags(&oh_flags) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get object header flags")
     }
-    else
-    {
+    else {
         if(H5P_get(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &oh_flags) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get object header flags")
     }
 
-    if(H5O_set_version(f, oh, oh_flags, H5F_STORE_MSG_CRT_IDX(f)) < 0)
+    if(H5O__set_version(f, oh, oh_flags, H5F_STORE_MSG_CRT_IDX(f)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, NULL, "can't set version of object header")
 
     oh->flags = oh_flags;
@@ -388,11 +377,11 @@ done:
         HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, NULL, "can't delete object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5O__create_ohdr() */
+} /* H5O_create_ohdr() */
 
 
 /*-----------------------------------------------------------------------------
- * Function:   H5O__apply_ohdr
+ * Function:   H5O_apply_ohdr
  *
  * Purpose:    Initialize and set the object header in the file.
  *             Record some information at `loc_out`.
@@ -406,7 +395,7 @@ done:
  *-----------------------------------------------------------------------------
  */
 herr_t
-H5O__apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t initial_rc, H5O_loc_t *loc_out)
+H5O_apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t initial_rc, H5O_loc_t *loc_out)
 {
     haddr_t         oh_addr;
     size_t          oh_size;
@@ -563,7 +552,7 @@ H5O__apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t ini
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
-} /* H5O__apply_ohdr() */
+} /* H5O_apply_ohdr() */
 
 
 /*-------------------------------------------------------------------------
@@ -663,7 +652,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_open_by_idx
+ * Function:    H5O__open_by_idx
  *
  * Purpose:     Internal routine to open an object by index within group
  *
@@ -676,7 +665,7 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5O_open_by_idx(const H5G_loc_t *loc, const char *name, H5_index_t idx_type,
+H5O__open_by_idx(const H5G_loc_t *loc, const char *name, H5_index_t idx_type,
     H5_iter_order_t order, hsize_t n, H5I_type_t *opened_type)
 {
     H5G_loc_t   obj_loc;                /* Location used to open group */
@@ -685,7 +674,7 @@ H5O_open_by_idx(const H5G_loc_t *loc, const char *name, H5_index_t idx_type,
     hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
     void *ret_value = NULL;             /* Return value */
 
-    FUNC_ENTER_NOAPI(NULL)
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(loc);
@@ -711,11 +700,11 @@ done:
             HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, NULL, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_open_by_idx() */
+} /* end H5O__open_by_idx() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_open_by_addr
+ * Function:    H5O__open_by_addr
  *
  * Purpose:     Internal routine to open an object by its address
  *
@@ -728,14 +717,14 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5O_open_by_addr(const H5G_loc_t *loc, haddr_t addr, H5I_type_t *opened_type)
+H5O__open_by_addr(const H5G_loc_t *loc, haddr_t addr, H5I_type_t *opened_type)
 {
     H5G_loc_t   obj_loc;                /* Location used to open group */
     H5G_name_t  obj_path;                /* Opened object group hier. path */
     H5O_loc_t   obj_oloc;                /* Opened object object location */
     void *ret_value = NULL;             /* Return value */
 
-    FUNC_ENTER_NOAPI(NULL)
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(loc);
@@ -754,7 +743,7 @@ H5O_open_by_addr(const H5G_loc_t *loc, haddr_t addr, H5I_type_t *opened_type)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_open_by_addr() */
+} /* end H5O__open_by_addr() */
 
 
 /*-------------------------------------------------------------------------
@@ -868,7 +857,6 @@ done:
  *              Failure:    -1
  *
  * Programmer:    Robb Matzke
- *        matzke@llnl.gov
  *        Aug  5 1997
  *
  *-------------------------------------------------------------------------
@@ -983,7 +971,6 @@ done:
  *        Failure:    Negative
  *
  * Programmer:    Robb Matzke
- *        matzke@llnl.gov
  *        Aug  5 1997
  *
  *-------------------------------------------------------------------------
@@ -1032,7 +1019,6 @@ done:
  *        Failure:    NULL
  *
  * Programmer:    Quincey Koziol
- *        koziol@ncsa.uiuc.edu
  *        Dec 31 2002
  *
  *-------------------------------------------------------------------------
@@ -1218,7 +1204,6 @@ done:
  *        Failure:    NULL
  *
  * Programmer:    Quincey Koziol
- *        koziol@hdfgroup.org
  *        Jul 13 2008
  *
  *-------------------------------------------------------------------------
@@ -1265,7 +1250,6 @@ done:
  *        Failure:    Negative
  *
  * Programmer:    Quincey Koziol
- *        koziol@hdfgroup.org
  *        Jul 13 2008
  *
  *-------------------------------------------------------------------------
@@ -1301,7 +1285,6 @@ done:
  *        Failure:    Negative
  *
  * Programmer:    Quincey Koziol
- *        koziol@ncsa.uiuc.edu
  *        Dec 31 2002
  *
  *-------------------------------------------------------------------------
@@ -1497,7 +1480,6 @@ done:
  * Return:    Non-negative on success/Negative on failure
  *
  * Programmer:    Quincey Koziol
- *              <koziol@ncsa.uiuc.edu>
  *              Tuesday, January 21, 2003
  *
  *-------------------------------------------------------------------------
@@ -1569,7 +1551,6 @@ done:
  * Return:    Non-negative on success/Negative on failure
  *
  * Programmer:    Quincey Koziol
- *        koziol@ncsa.uiuc.edu
  *        Mar 19 2003
  *
  *-------------------------------------------------------------------------
@@ -1632,7 +1613,6 @@ done:
  * Return:    Non-negative on success/Negative on failure
  *
  * Programmer:    Quincey Koziol
- *        koziol@ncsa.uiuc.edu
  *        Mar 19 2003
  *
  *-------------------------------------------------------------------------
@@ -1695,7 +1675,7 @@ H5O_obj_type(const H5O_loc_t *loc, H5O_type_t *obj_type)
 
 done:
     if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
-    HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5O_obj_type() */
@@ -1733,10 +1713,9 @@ H5O__obj_type_real(const H5O_t *oh, H5O_type_t *obj_type)
         /* Set type to "unknown" */
         *obj_type = H5O_TYPE_UNKNOWN;
     }
-    else {
+    else
         /* Set object type */
         *obj_type = obj_class->type;
-    }
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__obj_type_real() */
@@ -1922,7 +1901,6 @@ H5O_loc_reset(H5O_loc_t *loc)
  *            Failure:    Negative
  *
  * Programmer:    Quincey Koziol
- *              koziol@ncsa.uiuc.edu
  *              Monday, September 19, 2005
  *
  *-------------------------------------------------------------------------
@@ -2130,7 +2108,7 @@ H5O_get_hdr_info(const H5O_loc_t *loc, H5O_hdr_info_t *hdr)
 
 done:
     if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
-    HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
+        HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_get_hdr_info() */
@@ -2941,7 +2919,6 @@ done:
  * Return:    Non-negative on success/Negative on failure
  *
  * Programmer:    Quincey Koziol
- *        koziol@hdfgroup.org
  *        Jul 13 2008
  *
  *-------------------------------------------------------------------------
@@ -2977,7 +2954,6 @@ done:
  * Return:    Non-negative on success/Negative on failure
  *
  * Programmer:    Quincey Koziol
- *        koziol@hdfgroup.org
  *        Jul 13 2008
  *
  *-------------------------------------------------------------------------
@@ -3014,7 +2990,6 @@ done:
  * Return:     Non-negative on success/Negative on failure
  *
  * Programmer: Quincey Koziol
- *             koziol@hdfgroup.org
  *             Oct 08 2010
  *
  *-------------------------------------------------------------------------
@@ -3080,7 +3055,6 @@ H5O_get_proxy(const H5O_t *oh)
  * Return:    Non-negative on success/Negative on failure
  *
  * Programmer:    Quincey Koziol
- *        koziol@ncsa.uiuc.edu
  *        Jan 15 2003
  *
  *-------------------------------------------------------------------------