Merge pull request #2702 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_10_normalization to hdf5_1_10

* commit '795a2e5058c6214df1777a073e6b058638377003':
  Normalization with develop.

26 files changed, 213 insertions, 288 deletions

diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h
index 338db5a..7d73752 100644
--- a/src/H5B2pkg.h
+++ b/src/H5B2pkg.h
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Quincey Koziol <koziol@ncsa.uiuc.edu>
+ * Programmer:	Quincey Koziol
  *		Monday, January 31, 2005
  *
  * Purpose:	This file contains declarations which are visible only within
diff --git a/src/H5B2private.h b/src/H5B2private.h
index 0b64381..9303d4f 100644
--- a/src/H5B2private.h
+++ b/src/H5B2private.h
@@ -15,7 +15,7 @@
  *
  * Created:		H5B2private.h
  *			Jan 31 2005
- *			Quincey Koziol <koziol@ncsa.uiuc.edu>
+ *			Quincey Koziol
  *
  * Purpose:		Private header for library accessible B-tree routines.
  *
diff --git a/src/H5Bmodule.h b/src/H5Bmodule.h
index bc46752..c8e1546 100644
--- a/src/H5Bmodule.h
+++ b/src/H5Bmodule.h
@@ -11,7 +11,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Quincey Koziol <koziol@hdfgroup.org>
+ * Programmer:	Quincey Koziol
  *		Saturday, September 12, 2015
  *
  * Purpose:	This file contains declarations which define macros for the
diff --git a/src/H5Bpkg.h b/src/H5Bpkg.h
index a451cab..a57584e 100644
--- a/src/H5Bpkg.h
+++ b/src/H5Bpkg.h
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Quincey Koziol <koziol@ncsa.uiuc.edu>
+ * Programmer:	Quincey Koziol
  *		Thursday, May 15, 2003
  *
  * Purpose:	This file contains declarations which are visible only within
diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h
index 5aa3628..55bf5b3 100644
--- a/src/H5Bprivate.h
+++ b/src/H5Bprivate.h
@@ -15,12 +15,10 @@
  *
  * Created:		H5Bprivate.h
  *			Jul 10 1997
- *			Robb Matzke <matzke@llnl.gov>
+ *			Robb Matzke
  *
  * Purpose:		Private non-prototype header.
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
diff --git a/src/H5CXmodule.h b/src/H5CXmodule.h
index f6a8f29..186f8aa 100644
--- a/src/H5CXmodule.h
+++ b/src/H5CXmodule.h
@@ -11,7 +11,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Quincey Koziol <koziol@lbl.gov>
+ * Programmer:	Quincey Koziol
  *		Sunday, February 25, 2018
  *
  * Purpose:	This file contains declarations which define macros for the
diff --git a/src/H5Cimage.c b/src/H5Cimage.c
index 2139d81..ee286d9 100644
--- a/src/H5Cimage.c
+++ b/src/H5Cimage.c
@@ -1139,22 +1139,22 @@ H5C__load_cache_image(H5F_t *f)
      */
     if(H5F_addr_defined(cache_ptr->image_addr)) {
         /* Sanity checks */
-	HDassert(cache_ptr->image_len > 0);
+        HDassert(cache_ptr->image_len > 0);
         HDassert(cache_ptr->image_buffer == NULL);
 
-	/* Allocate space for the image */
+        /* Allocate space for the image */
         if(NULL == (cache_ptr->image_buffer = H5MM_malloc(cache_ptr->image_len + 1)))
             HGOTO_ERROR(H5E_CACHE, H5E_CANTALLOC, FAIL, "memory allocation failed for cache image buffer")
 
-	/* Load the image from file */
-	if(H5C__read_cache_image(f, cache_ptr) < 0)
+        /* Load the image from file */
+        if(H5C__read_cache_image(f, cache_ptr) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_READERROR, FAIL, "Can't read metadata cache image block")
 
-	/* Reconstruct cache contents, from image */
-	if(H5C__reconstruct_cache_contents(f, cache_ptr) < 0)
+        /* Reconstruct cache contents, from image */
+        if(H5C__reconstruct_cache_contents(f, cache_ptr) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTDECODE, FAIL, "Can't reconstruct cache contents from image block")
 
-	/* Free the image buffer */
+        /* Free the image buffer */
         cache_ptr->image_buffer = H5MM_xfree(cache_ptr->image_buffer);
 
         /* Update stats -- must do this now, as we are about
diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c
index 3cae564..2f2f3fc 100644
--- a/src/H5Cmpio.c
+++ b/src/H5Cmpio.c
@@ -18,7 +18,7 @@
  *              Quincey Koziol
  *
  * Purpose:     Functions in this file implement support for parallel I/O for
- *        generic cache code.
+ *              generic cache code.
  *
  *-------------------------------------------------------------------------
  */
@@ -34,14 +34,14 @@
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"        /* Generic Functions            */
+#include "H5private.h"          /* Generic Functions                    */
 #include "H5ACprivate.h"        /* Metadata cache                       */
-#include "H5Cpkg.h"        /* Cache                */
+#include "H5Cpkg.h"             /* Cache                                */
 #include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5Fpkg.h"        /* Files                */
-#include "H5FDprivate.h"    /* File drivers                */
-#include "H5MMprivate.h"    /* Memory management            */
+#include "H5Eprivate.h"         /* Error handling                       */
+#include "H5Fpkg.h"             /* Files                                */
+#include "H5FDprivate.h"        /* File drivers                         */
+#include "H5MMprivate.h"        /* Memory management                    */
 
 
 #ifdef H5_HAVE_PARALLEL
@@ -81,80 +81,80 @@ static herr_t H5C__flush_candidates_in_ring(H5F_t *f, H5C_ring_t ring,
 /*******************/
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5C_apply_candidate_list
  *
  * Purpose:     Apply the supplied candidate list.
  *
- *        We used to do this by simply having each process write
- *        every mpi_size-th entry in the candidate list, starting
- *        at index mpi_rank, and mark all the others clean.
+ *              We used to do this by simply having each process write
+ *              every mpi_size-th entry in the candidate list, starting
+ *              at index mpi_rank, and mark all the others clean.
  *
- *        However, this can cause unnecessary contention in a file
- *        system by increasing the number of processes writing to
- *        adjacent locations in the HDF5 file.
+ *              However, this can cause unnecessary contention in a file
+ *              system by increasing the number of processes writing to
+ *              adjacent locations in the HDF5 file.
  *
- *        To attempt to minimize this, we now arange matters such
- *        that each process writes n adjacent entries in the
- *        candidate list, and marks all others clean.  We must do
- *        this in such a fashion as to guarantee that each entry
- *        on the candidate list is written by exactly one process,
- *        and marked clean by all others.
+ *              To attempt to minimize this, we now arange matters such
+ *              that each process writes n adjacent entries in the
+ *              candidate list, and marks all others clean.  We must do
+ *              this in such a fashion as to guarantee that each entry
+ *              on the candidate list is written by exactly one process,
+ *              and marked clean by all others.
  *
- *        To do this, first construct a table mapping mpi_rank
- *        to the index of the first entry in the candidate list to
- *        be written by the process of that mpi_rank, and then use
- *        the table to control which entries are written and which
- *        are marked as clean as a function of the mpi_rank.
+ *              To do this, first construct a table mapping mpi_rank
+ *              to the index of the first entry in the candidate list to
+ *              be written by the process of that mpi_rank, and then use
+ *              the table to control which entries are written and which
+ *              are marked as clean as a function of the mpi_rank.
  *
- *        Note that the table must be identical on all processes, as
- *        all see the same candidate list, mpi_size, and mpi_rank --
- *        the inputs used to construct the table.
+ *              Note that the table must be identical on all processes, as
+ *              all see the same candidate list, mpi_size, and mpi_rank --
+ *              the inputs used to construct the table.
  *
- *        We construct the table as follows.  Let:
+ *              We construct the table as follows.  Let:
  *
- *            n = num_candidates / mpi_size;
+ *                  n = num_candidates / mpi_size;
  *
- *            m = num_candidates % mpi_size;
+ *                  m = num_candidates % mpi_size;
  *
- *        Now allocate an array of integers of length mpi_size + 1,
- *        and call this array candidate_assignment_table.
+ *              Now allocate an array of integers of length mpi_size + 1,
+ *              and call this array candidate_assignment_table.
  *
- *        Conceptually, if the number of candidates is a multiple
- *        of the mpi_size, we simply pass through the candidate list
- *        and assign n entries to each process to flush, with the
- *        index of the first entry to flush in the location in
- *        the candidate_assignment_table indicated by the mpi_rank
- *        of the process.
+ *              Conceptually, if the number of candidates is a multiple
+ *              of the mpi_size, we simply pass through the candidate list
+ *              and assign n entries to each process to flush, with the
+ *              index of the first entry to flush in the location in
+ *              the candidate_assignment_table indicated by the mpi_rank
+ *              of the process.
  *
- *        In the more common case in which the candidate list isn't
- *        isn't a multiple of the mpi_size, we pretend it is, and
- *        give num_candidates % mpi_size processes one extra entry
- *        each to make things work out.
+ *              In the more common case in which the candidate list isn't
+ *              isn't a multiple of the mpi_size, we pretend it is, and
+ *              give num_candidates % mpi_size processes one extra entry
+ *              each to make things work out.
  *
- *        Once the table is constructed, we determine the first and
- *        last entry this process is to flush as follows:
+ *              Once the table is constructed, we determine the first and
+ *              last entry this process is to flush as follows:
  *
- *         first_entry_to_flush = candidate_assignment_table[mpi_rank]
+ *                  first_entry_to_flush = candidate_assignment_table[mpi_rank]
  *
- *        last_entry_to_flush =
- *            candidate_assignment_table[mpi_rank + 1] - 1;
+ *              last_entry_to_flush =
+ *                  candidate_assignment_table[mpi_rank + 1] - 1;
  *
- *        With these values determined, we simply scan through the
- *        candidate list, marking all entries in the range
- *        [first_entry_to_flush, last_entry_to_flush] for flush,
- *        and all others to be cleaned.
+ *              With these values determined, we simply scan through the
+ *              candidate list, marking all entries in the range
+ *              [first_entry_to_flush, last_entry_to_flush] for flush,
+ *              and all others to be cleaned.
  *
- *        Finally, we scan the LRU from tail to head, flushing
- *        or marking clean the candidate entries as indicated.
- *        If necessary, we scan the pinned list as well.
+ *              Finally, we scan the LRU from tail to head, flushing
+ *              or marking clean the candidate entries as indicated.
+ *              If necessary, we scan the pinned list as well.
  *
- *        Note that this function will fail if any protected or
- *        clean entries appear on the candidate list.
+ *              Note that this function will fail if any protected or
+ *              clean entries appear on the candidate list.
  *
- *        This function is used in managing sync points, and
- *        shouldn't be used elsewhere.
+ *              This function is used in managing sync points, and
+ *              shouldn't be used elsewhere.
  *
  * Return:      Success:        SUCCEED
  *
@@ -174,22 +174,22 @@ H5C_apply_candidate_list(H5F_t * f,
                          int mpi_size)
 {
     int                 i;
-    int            m;
-    int            n;
-    unsigned        first_entry_to_flush;
-    unsigned        last_entry_to_flush;
-    unsigned        total_entries_to_clear = 0;
-    unsigned        total_entries_to_flush = 0;
+    int                 m;
+    int                 n;
+    unsigned            first_entry_to_flush;
+    unsigned            last_entry_to_flush;
+    unsigned            total_entries_to_clear = 0;
+    unsigned            total_entries_to_flush = 0;
     int               * candidate_assignment_table = NULL;
     unsigned            entries_to_flush[H5C_RING_NTYPES];
     unsigned            entries_to_clear[H5C_RING_NTYPES];
-    haddr_t        addr;
-    H5C_cache_entry_t *    entry_ptr = NULL;
+    haddr_t             addr;
+    H5C_cache_entry_t * entry_ptr = NULL;
 #if H5C_DO_SANITY_CHECKS
-    haddr_t        last_addr;
+    haddr_t             last_addr;
 #endif /* H5C_DO_SANITY_CHECKS */
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
-    char        tbl_buf[1024];
+    char                tbl_buf[1024];
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
     unsigned            u;                      /* Local index variable */
     herr_t              ret_value = SUCCEED;    /* Return value */
@@ -407,15 +407,15 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C_apply_candidate_list() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5C_construct_candidate_list__clean_cache
  *
  * Purpose:     Construct the list of entries that should be flushed to
- *        clean all entries in the cache.
+ *              clean all entries in the cache.
  *
- *        This function is used in managing sync points, and
- *        shouldn't be used elsewhere.
+ *              This function is used in managing sync points, and
+ *              shouldn't be used elsewhere.
  *
  * Return:      Success:        SUCCEED
  *
@@ -456,7 +456,7 @@ H5C_construct_candidate_list__clean_cache(H5C_t * cache_ptr)
         H5C_cache_entry_t *entry_ptr;
         unsigned nominated_entries_count = 0;
         size_t  nominated_entries_size = 0;
-        haddr_t    nominated_addr;
+        haddr_t nominated_addr;
 
         HDassert( cache_ptr->slist_len > 0 );
 
@@ -516,15 +516,15 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C_construct_candidate_list__clean_cache() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5C_construct_candidate_list__min_clean
  *
  * Purpose:     Construct the list of entries that should be flushed to
- *        get the cache back within its min clean constraints.
+ *              get the cache back within its min clean constraints.
  *
- *        This function is used in managing sync points, and
- *        shouldn't be used elsewhere.
+ *              This function is used in managing sync points, and
+ *              shouldn't be used elsewhere.
  *
  * Return:      Success:        SUCCEED
  *
@@ -581,7 +581,7 @@ H5C_construct_candidate_list__min_clean(H5C_t * cache_ptr)
                 (nominated_entries_count < cache_ptr->slist_len) &&
                 (entry_ptr != NULL) &&
                 (!entry_ptr->flush_me_last)) {
-            haddr_t        nominated_addr;
+            haddr_t nominated_addr;
 
             HDassert( ! (entry_ptr->is_protected) );
             HDassert( ! (entry_ptr->is_read_only) );
@@ -605,30 +605,30 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C_construct_candidate_list__min_clean() */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5C_mark_entries_as_clean
  *
  * Purpose:     When the H5C code is used to implement the metadata caches
- *        in PHDF5, only the cache with MPI_rank 0 is allowed to
- *        actually write entries to disk -- all other caches must
- *        retain dirty entries until they are advised that the
- *        entries are clean.
+ *              in PHDF5, only the cache with MPI_rank 0 is allowed to
+ *              actually write entries to disk -- all other caches must
+ *              retain dirty entries until they are advised that the
+ *              entries are clean.
  *
- *        This function exists to allow the H5C code to receive these
- *        notifications.
+ *              This function exists to allow the H5C code to receive these
+ *              notifications.
  *
- *        The function receives a list of entry base addresses
- *        which must refer to dirty entries in the cache.  If any
- *        of the entries are either clean or don't exist, the
- *        function flags an error.
+ *              The function receives a list of entry base addresses
+ *              which must refer to dirty entries in the cache.  If any
+ *              of the entries are either clean or don't exist, the
+ *              function flags an error.
  *
- *        The function scans the list of entries and flushes all
- *        those that are currently unprotected with the
- *        H5C__FLUSH_CLEAR_ONLY_FLAG.  Those that are currently
- *        protected are flagged for clearing when they are
- *        unprotected.
+ *              The function scans the list of entries and flushes all
+ *              those that are currently unprotected with the
+ *              H5C__FLUSH_CLEAR_ONLY_FLAG.  Those that are currently
+ *              protected are flagged for clearing when they are
+ *              unprotected.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -643,22 +643,22 @@ H5C_mark_entries_as_clean(H5F_t *  f,
                           haddr_t * ce_array_ptr)
 {
     H5C_t *             cache_ptr;
-    unsigned        entries_cleared;
+    unsigned            entries_cleared;
     unsigned            pinned_entries_cleared;
     hbool_t             progress;
-    unsigned        entries_examined;
-    unsigned        initial_list_len;
-    haddr_t        addr;
-    unsigned        pinned_entries_marked = 0;
+    unsigned            entries_examined;
+    unsigned            initial_list_len;
+    haddr_t             addr;
+    unsigned            pinned_entries_marked = 0;
 #if H5C_DO_SANITY_CHECKS
-    unsigned        protected_entries_marked = 0;
-    unsigned        other_entries_marked = 0;
-    haddr_t        last_addr;
+    unsigned            protected_entries_marked = 0;
+    unsigned            other_entries_marked = 0;
+    haddr_t             last_addr;
 #endif /* H5C_DO_SANITY_CHECKS */
-    H5C_cache_entry_t *    clear_ptr = NULL;
-    H5C_cache_entry_t *    entry_ptr = NULL;
+    H5C_cache_entry_t * clear_ptr = NULL;
+    H5C_cache_entry_t * entry_ptr = NULL;
     unsigned            u;
-    herr_t        ret_value = SUCCEED;      /* Return value */
+    herr_t              ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -705,7 +705,7 @@ H5C_mark_entries_as_clean(H5F_t *  f,
 
         if(entry_ptr == NULL) {
 #if H5C_DO_SANITY_CHECKS
-        HDfprintf(stdout,
+            HDfprintf(stdout,
                   "H5C_mark_entries_as_clean: entry[%u] = %a not in cache.\n",
                       u,
                       addr);
@@ -714,7 +714,7 @@ H5C_mark_entries_as_clean(H5F_t *  f,
         } /* end if */
         else if(!entry_ptr->is_dirty) {
 #if H5C_DO_SANITY_CHECKS
-        HDfprintf(stdout,
+            HDfprintf(stdout,
                       "H5C_mark_entries_as_clean: entry %a is not dirty!?!\n",
                       addr);
 #endif /* H5C_DO_SANITY_CHECKS */
@@ -734,13 +734,13 @@ H5C_mark_entries_as_clean(H5F_t *  f,
             } /* end if */
 
             entry_ptr->clear_on_unprotect = TRUE;
-        if(entry_ptr->is_pinned)
-        pinned_entries_marked++;
+            if(entry_ptr->is_pinned)
+                pinned_entries_marked++;
 #if H5C_DO_SANITY_CHECKS
-        else if(entry_ptr->is_protected)
-        protected_entries_marked++;
-        else
-        other_entries_marked++;
+            else if(entry_ptr->is_protected)
+                protected_entries_marked++;
+            else
+                other_entries_marked++;
 #endif /* H5C_DO_SANITY_CHECKS */
         }
     }
@@ -854,7 +854,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C_mark_entries_as_clean() */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5C_clear_coll_entries
@@ -872,9 +872,9 @@ done:
 herr_t
 H5C_clear_coll_entries(H5C_t *cache_ptr, hbool_t partial)
 {
-    uint32_t        clear_cnt;
-    H5C_cache_entry_t *    entry_ptr = NULL;
-    herr_t              ret_value = SUCCEED;
+    uint32_t                clear_cnt;
+    H5C_cache_entry_t *     entry_ptr = NULL;
+    herr_t                  ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -901,7 +901,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C_clear_coll_entries */
 
-
+
 /*-------------------------------------------------------------------------
  *
  * Function:    H5C__collective_write
@@ -1079,11 +1079,11 @@ done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5C__collective_write() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5C__flush_candidate_entries
  *
- * Purpose:    Flush or clear (as indicated) the candidate entries that
+ * Purpose:     Flush or clear (as indicated) the candidate entries that
  *              have been marked in the metadata cache.  In so doing,
  *              observe rings and flush dependencies.
  *
@@ -1112,9 +1112,9 @@ done:
  * Return:      Non-negative on success/Negative on failure.
  *
  * Programmer:  John Mainzer
- *        2/10/17
+ *              2/10/17
  *
- * Changes:    None.
+ * Changes:     None.
  *
  *-------------------------------------------------------------------------
  */
@@ -1123,17 +1123,17 @@ H5C__flush_candidate_entries(H5F_t *f, unsigned entries_to_flush[H5C_RING_NTYPES
     unsigned entries_to_clear[H5C_RING_NTYPES])
 {
 #if H5C_DO_SANITY_CHECKS
-    int            i;
+    int             i;
     uint32_t        index_len = 0;
-    size_t        index_size = (size_t)0;
-    size_t        clean_index_size = (size_t)0;
-    size_t        dirty_index_size = (size_t)0;
-    size_t        slist_size = (size_t)0;
+    size_t          index_size = (size_t)0;
+    size_t          clean_index_size = (size_t)0;
+    size_t          dirty_index_size = (size_t)0;
+    size_t          slist_size = (size_t)0;
     uint32_t        slist_len = 0;
 #endif /* H5C_DO_SANITY_CHECKS */
-    H5C_ring_t        ring;
+    H5C_ring_t      ring;
     H5C_t             * cache_ptr;
-    herr_t        ret_value = SUCCEED;
+    herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
@@ -1163,7 +1163,7 @@ H5C__flush_candidate_entries(H5F_t *f, unsigned entries_to_flush[H5C_RING_NTYPES
         clean_index_size += cache_ptr->clean_index_ring_size[i];
         dirty_index_size += cache_ptr->dirty_index_ring_size[i];
 
-    slist_len += cache_ptr->slist_ring_len[i];
+        slist_len += cache_ptr->slist_ring_len[i];
         slist_size += cache_ptr->slist_ring_size[i];
     } /* end for */
 
@@ -1201,11 +1201,11 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C__flush_candidate_entries() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5C__flush_candidates_in_ring
  *
- * Purpose:    Flush or clear (as indicated) the candidate entries
+ * Purpose:     Flush or clear (as indicated) the candidate entries
  *              contained in the specified cache and ring.  All candidate
  *              entries in rings outside the specified ring must have been
  *              flushed (or cleared) on entry.
@@ -1234,7 +1234,7 @@ done:
  * Return:      Non-negative on success/Negative on failure.
  *
  * Programmer:  John Mainzer
- *        2/10/17
+ *              2/10/17
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/H5Dmodule.h b/src/H5Dmodule.h
index b259b69..27ccf54 100644
--- a/src/H5Dmodule.h
+++ b/src/H5Dmodule.h
@@ -11,7 +11,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Quincey Koziol <koziol@hdfgroup.org>
+ * Programmer:	Quincey Koziol
  *		Saturday, September 12, 2015
  *
  * Purpose:	This file contains declarations which define macros for the
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index 3353a8e..3899a3b 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:    Quincey Koziol <koziol@ncsa.uiuc.edu>
+ * Programmer:    Quincey Koziol
  *        Monday, April 14, 2003
  *
  * Purpose:    This file contains declarations which are visible only within
diff --git a/src/H5EAmodule.h b/src/H5EAmodule.h
index d3e06b7..c3a4c7c 100644
--- a/src/H5EAmodule.h
+++ b/src/H5EAmodule.h
@@ -11,7 +11,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Quincey Koziol <koziol@hdfgroup.org>
+ * Programmer:	Quincey Koziol
  *		Saturday, September 12, 2015
  *
  * Purpose:	This file contains declarations which define macros for the
diff --git a/src/H5EApkg.h b/src/H5EApkg.h
index bb3f39c..b70231d 100644
--- a/src/H5EApkg.h
+++ b/src/H5EApkg.h
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:      Quincey Koziol <koziol@hdfgroup.org>
+ * Programmer:      Quincey Koziol
  *                  Tuesday, June 17, 2008
  *
  * Purpose:         This file contains declarations which are visible only
diff --git a/src/H5EAprivate.h b/src/H5EAprivate.h
index 1195256..af0ef3a 100644
--- a/src/H5EAprivate.h
+++ b/src/H5EAprivate.h
@@ -15,7 +15,7 @@
  *
  * Created:     H5EAprivate.h
  *              Jun 17 2008
- *              Quincey Koziol <koziol@hdfgroup.org>
+ *              Quincey Koziol
  *
  * Purpose:     Private header for library accessible extensible
  *              array routines.
diff --git a/src/H5EAsblock.c b/src/H5EAsblock.c
index b4671f8..fb7c458 100644
--- a/src/H5EAsblock.c
+++ b/src/H5EAsblock.c
@@ -15,7 +15,7 @@
  *
  * Created:		H5EAsblock.c
  *			Sep 30 2008
- *			Quincey Koziol <koziol@hdfgroup.org>
+ *			Quincey Koziol
  *
  * Purpose:		Super block routines for extensible arrays.
  *
@@ -98,7 +98,6 @@ H5FL_BLK_DEFINE(page_init);
  * Return:	Non-NULL pointer to super block on success/NULL on failure
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Sep 30 2008
  *
  *-------------------------------------------------------------------------
@@ -179,7 +178,6 @@ END_FUNC(PKG)   /* end H5EA__sblock_alloc() */
  * Return:	Valid file address on success/HADDR_UNDEF on failure
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Sep 30 2008
  *
  *-------------------------------------------------------------------------
@@ -267,7 +265,6 @@ END_FUNC(PKG)   /* end H5EA__sblock_create() */
  * Return:	Non-NULL pointer to data block on success/NULL on failure
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Sep 30 2008
  *
  *-------------------------------------------------------------------------
@@ -328,7 +325,6 @@ END_FUNC(PKG)   /* end H5EA__sblock_protect() */
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Sep 30 2008
  *
  *-------------------------------------------------------------------------
@@ -359,7 +355,6 @@ END_FUNC(PKG)   /* end H5EA__sblock_unprotect() */
  * Return:	SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Sep 30 2008
  *
  *-------------------------------------------------------------------------
@@ -408,7 +403,6 @@ END_FUNC(PKG)   /* end H5EA__sblock_delete() */
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Sep 30 2008
  *
  *-------------------------------------------------------------------------
diff --git a/src/H5Glink.c b/src/H5Glink.c
index 04ccbc5..26747e4 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -15,7 +15,7 @@
  *
  * Created:		H5Glink.c
  *			Nov 13 2006
- *			Quincey Koziol <koziol@hdfgroup.org>
+ *			Quincey Koziol
  *
  * Purpose:		Functions for handling links in groups.
  *
@@ -96,7 +96,6 @@ static int H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2);
  *              (i.e. same as strcmp())
  *
  * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
  *		Sep  5 2005
  *
  *-------------------------------------------------------------------------
@@ -123,7 +122,6 @@ H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2)
  *              (i.e. opposite strcmp())
  *
  * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
  *		Sep 25 2006
  *
  *-------------------------------------------------------------------------
@@ -149,7 +147,6 @@ H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2)
  *              as equal, their order in the sorted array is undefined.
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Nov  6 2006
  *
  *-------------------------------------------------------------------------
@@ -184,7 +181,6 @@ H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2)
  *              as equal, their order in the sorted array is undefined.
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Nov  6 2006
  *
  *-------------------------------------------------------------------------
@@ -215,7 +211,6 @@ H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Sep 16 2006
  *
  *-------------------------------------------------------------------------
@@ -556,7 +551,6 @@ done:
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
  *		Nov 13 2006
  *
  *-------------------------------------------------------------------------
diff --git a/src/H5Gloc.c b/src/H5Gloc.c
index de9268c..6b1ec24 100644
--- a/src/H5Gloc.c
+++ b/src/H5Gloc.c
@@ -15,7 +15,7 @@
  *
  * Created:		H5Gloc.c
  *			Sep 13 2005
- *			Quincey Koziol <koziol@ncsa.uiuc.edu>
+ *			Quincey Koziol
  *
  * Purpose:		Functions for working with group "locations"
  *
diff --git a/src/H5Gname.c b/src/H5Gname.c
index 1367b18..c7e2cab 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -15,7 +15,7 @@
  *
  * Created:		H5Gname.c
  *			Sep 12 2005
- *			Quincey Koziol <koziol@ncsa.uiuc.edu>
+ *			Quincey Koziol
  *
  * Purpose:		Functions for handling group hierarchy paths.
  *
@@ -121,7 +121,6 @@ H5FL_BLK_EXTERN(str_buf);
  *		Failure:	Ptr to the null terminator of NAME.
  *
  * Programmer:	Robb Matzke
- *		matzke@llnl.gov
  *		Aug 11 1997
  *
  *-------------------------------------------------------------------------
@@ -214,7 +213,7 @@ done:
  * Return: TRUE for valid prefix, FALSE for not a valid prefix, FAIL
  *              on error
  *
- * Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
+ * Programmer: Quincey Koziol
  *
  * Date: September 24, 2002
  *
@@ -279,7 +278,7 @@ done:
  *
  * Return: Pointer to reference counted string on success, NULL on error
  *
- * Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
+ * Programmer: Quincey Koziol
  *
  * Date: August 19, 2005
  *
@@ -341,7 +340,7 @@ done:
  * Return:	Success:	Non-NULL, combined path
  *		Failure:	NULL
  *
- * Programmer:	Quincey Koziol, koziol@ncsa.uiuc.edu
+ * Programmer:	Quincey Koziol
  *              Tuesday, October 11, 2005
  *
  *-------------------------------------------------------------------------
@@ -377,7 +376,7 @@ H5G_build_fullpath_refstr_str(H5RS_str_t *prefix_r, const char *name)
  *
  * Return: Pointer to reference counted string on success, NULL on error
  *
- * Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
+ * Programmer: Quincey Koziol
  *
  * Date: August 19, 2005
  *
@@ -446,7 +445,7 @@ H5G__name_init(H5G_name_t *name, const char *path)
  * Return:	Success:	Non-negative
  *		Failure:	Negative
  *
- * Programmer:	Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer:	Pedro Vicente
  *              Thursday, August 22, 2002
  *
  *-------------------------------------------------------------------------
@@ -550,10 +549,6 @@ H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth)
  * Programmer:	Quincey Koziol
  *              Tuesday, December 13, 2005
  *
- * Modifications: Leon Arber
- * 		  Oct. 18, 2006
- * 		  Added functionality to get the name for a reference.
- *
  *-------------------------------------------------------------------------
  */
 ssize_t
@@ -649,7 +644,7 @@ H5G_name_reset(H5G_name_t *name)
  *
  * Return:	Success
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: August 22, 2002
  *
@@ -787,7 +782,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: June 5, 2002
  *
@@ -1067,7 +1062,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: June 11, 2002
  *
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 1566057..c48d8dc 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -15,7 +15,7 @@
  *
  * Created:	    H5Gnode.c
  *              Jun 26 1997
- *              Robb Matzke <matzke@llnl.gov>
+ *              Robb Matzke
  *
  * Purpose:     Functions for handling symbol table nodes.  A
  *              symbol table node is a small collection of symbol
@@ -145,8 +145,6 @@ H5FL_SEQ_DEFINE(H5G_entry_t);
  * Programmer:  Robb Matzke
  *              Wednesday, October  8, 1997
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static H5UC_t *
@@ -169,7 +167,6 @@ H5G_node_get_shared(const H5F_t *f, const void H5_ATTR_UNUSED *_udata)
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Robb Matzke
- *              matzke@llnl.gov
  *              Jul  8 1997
  *
  *-------------------------------------------------------------------------
@@ -199,7 +196,6 @@ H5G_node_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Robb Matzke
- *              matzke@llnl.gov
  *              Jul  8 1997
  *
  *-------------------------------------------------------------------------
@@ -270,7 +266,6 @@ H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Quincey Koziol
- *              koziol@ncsa.uiuc.edu
  *              Jan 15 2003
  *
  *-------------------------------------------------------------------------
@@ -310,7 +305,6 @@ H5G__node_free(H5G_node_t *sym)
  *          Failure:    Negative
  *
  * Programmer:  Robb Matzke
- *              matzke@llnl.gov
  *              Jun 23 1997
  *
  *-------------------------------------------------------------------------
@@ -382,11 +376,8 @@ done:
  *          Failure:    FAIL (same as LT_KEY<RT_KEY)
  *
  * Programmer:  Robb Matzke
- *              matzke@llnl.gov
  *              Jun 23 1997
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -439,11 +430,8 @@ done:
  *          Failure:    FAIL (same as UDATA < LT_KEY)
  *
  * Programmer:  Robb Matzke
- *              matzke@llnl.gov
  *              Jun 23 1997
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -501,7 +489,6 @@ done:
  *              Failure:    Negative if not found.
  *
  * Programmer:  Robb Matzke
- *              matzke@llnl.gov
  *              Jun 23 1997
  *
  *-------------------------------------------------------------------------
@@ -591,7 +578,6 @@ done:
  *              Failure:    H5B_INS_ERROR, NEW_NODE_P might not be initialized.
  *
  * Programmer:  Robb Matzke
- *              matzke@llnl.gov
  *              Jun 24 1997
  *
  *-------------------------------------------------------------------------
@@ -952,7 +938,6 @@ done:
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Robb Matzke
- *              matzke@llnl.gov
  *              Jun 24 1997
  *
  *-------------------------------------------------------------------------
@@ -1370,7 +1355,6 @@ done:
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Quincey Koziol
- *              koziol@hdfgroup.org
  *              Nov 19 2006
  *
  *-------------------------------------------------------------------------
@@ -1477,7 +1461,6 @@ H5G__node_iterate_size(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key,
  * Return:      0(zero) on success/Negative on failure
  *
  * Programmer:  Robb Matzke
- *              matzke@llnl.gov
  *              Aug  4 1997
  *
  *-------------------------------------------------------------------------
diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c
index b0a2d60..6340aac 100644
--- a/src/H5Gtraverse.c
+++ b/src/H5Gtraverse.c
@@ -32,18 +32,17 @@
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5Dprivate.h"         /* Datasets                             */
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5Gpkg.h"		/* Groups		  		*/
-#include "H5HLprivate.h"	/* Local Heaps				*/
-#include "H5Iprivate.h"		/* IDs					*/
-#include "H5Lprivate.h"		/* Links				*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Ppublic.h"		/* Property Lists			*/
-#include "H5WBprivate.h"        /* Wrapped Buffers                      */
+#include "H5private.h"          /* Generic Functions                        */
+#include "H5CXprivate.h"        /* API Contexts                             */
+#include "H5Dprivate.h"         /* Datasets                                 */
+#include "H5Eprivate.h"         /* Error handling                           */
+#include "H5Fprivate.h"         /* File access                              */
+#include "H5Gpkg.h"             /* Groups                                   */
+#include "H5Iprivate.h"         /* IDs                                      */
+#include "H5Lprivate.h"         /* Links                                    */
+#include "H5MMprivate.h"        /* Memory management                        */
+#include "H5Ppublic.h"          /* Property Lists                           */
+#include "H5WBprivate.h"        /* Wrapped Buffers                          */
 
 
 /****************/
@@ -359,8 +358,7 @@ done:
  */
 herr_t
 H5G__traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
-    unsigned target, hbool_t last_comp, H5G_loc_t *obj_loc,
-    hbool_t *obj_exists)
+    unsigned target, hbool_t last_comp, H5G_loc_t *obj_loc, hbool_t *obj_exists)
 {
     size_t nlinks;                      /* # of soft / UD links left to traverse */
     herr_t ret_value = SUCCEED;         /* Return value */
@@ -372,13 +370,13 @@ H5G__traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
     HDassert(lnk);
     HDassert(obj_loc);
 
-    /*
-     * If we found a symbolic link then we should follow it.  But if this
+    /* If we found a symbolic link then we should follow it.  But if this
      * is the last component of the name and the H5G_TARGET_SLINK bit of
      * TARGET is set then we don't follow it.
      */
     if(H5L_TYPE_SOFT == lnk->type &&
             (0 == (target & H5G_TARGET_SLINK) || !last_comp)) {
+
         /* Get the # of soft / UD links left to traverse */
         if(H5CX_get_nlinks(&nlinks) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "unable to retrieve # of soft / UD links to traverse")
@@ -403,6 +401,7 @@ H5G__traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
      */
     if(lnk->type >= H5L_TYPE_UD_MIN &&
             (0 == (target & H5G_TARGET_UDLINK) || !last_comp) ) {
+
         /* Get the # of soft / UD links left to traverse */
         if(H5CX_get_nlinks(&nlinks) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "unable to retrieve # of soft / UD links to traverse")
diff --git a/src/H5HLmodule.h b/src/H5HLmodule.h
index b0fd750..712c7c1 100644
--- a/src/H5HLmodule.h
+++ b/src/H5HLmodule.h
@@ -11,7 +11,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Quincey Koziol <koziol@hdfgroup.org>
+ * Programmer:	Quincey Koziol
  *		Saturday, September 12, 2015
  *
  * Purpose:	This file contains declarations which define macros for the
diff --git a/src/H5HLpkg.h b/src/H5HLpkg.h
index 44a2cfb..9891e10 100644
--- a/src/H5HLpkg.h
+++ b/src/H5HLpkg.h
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer: Quincey Koziol <koziol@hdfgroup.org>
+ * Programmer: Quincey Koziol
  *             Wednesday, July 9, 2003
  *
  * Purpose:     This file contains declarations which are visible
diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h
index 7a53b25..60505ee 100644
--- a/src/H5HLprivate.h
+++ b/src/H5HLprivate.h
@@ -15,7 +15,7 @@
  *
  * Created:         H5HLprivate.h
  *                  Jul 16 1997
- *                  Robb Matzke <matzke@llnl.gov>
+ *                  Robb Matzke
  *
  * Purpose:         Private declarations for the H5HL (local heap) package.
  *
diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index 87fb771..0f14a4b 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -37,9 +37,9 @@
 /* PRIVATE PROTOTYPES */
 static void *H5O__stab_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_stab_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void *H5O_stab_copy(const void *_mesg, void *_dest);
-static size_t H5O_stab_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
+static herr_t H5O__stab_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
+static void *H5O__stab_copy(const void *_mesg, void *_dest);
+static size_t H5O__stab_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O__stab_free(void *_mesg);
 static herr_t H5O__stab_delete(H5F_t *f, H5O_t *open_oh, void *_mesg);
 static void *H5O__stab_copy_file(H5F_t *file_src, void *native_src,
@@ -58,9 +58,9 @@ const H5O_msg_class_t H5O_MSG_STAB[1] = {{
     sizeof(H5O_stab_t),     	/*native message size           */
     0,				/* messages are sharable?       */
     H5O__stab_decode,        	/*decode message                */
-    H5O_stab_encode,        	/*encode message                */
-    H5O_stab_copy,          	/*copy the native value         */
-    H5O_stab_size,          	/*size of symbol table entry    */
+    H5O__stab_encode,        	/*encode message                */
+    H5O__stab_copy,          	/*copy the native value         */
+    H5O__stab_size,          	/*size of symbol table entry    */
     NULL,                   	/*default reset method          */
     H5O__stab_free,	        /* free method			*/
     H5O__stab_delete,	        /* file delete method		*/
@@ -111,7 +111,7 @@ H5O__stab_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh,
 
     /* decode */
     if(NULL == (stab = H5FL_CALLOC(H5O_stab_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     H5F_addr_decode(f, &p, &(stab->btree_addr));
     H5F_addr_decode(f, &p, &(stab->heap_addr));
 
@@ -129,7 +129,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_stab_encode
+ * Function:    H5O__stab_encode
  *
  * Purpose:     Encodes a symbol table message.
  *
@@ -142,11 +142,11 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_stab_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
+H5O__stab_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
     const H5O_stab_t       *stab = (const H5O_stab_t *) _mesg;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* check args */
     HDassert(f);
@@ -158,11 +158,11 @@ H5O_stab_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
     H5F_addr_encode(f, &p, stab->heap_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-}
+} /* end H5O__stab_encode() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_stab_copy
+ * Function:    H5O__stab_copy
  *
  * Purpose:     Copies a message from _MESG to _DEST, allocating _DEST if
  *              necessary.
@@ -178,18 +178,18 @@ H5O_stab_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, con
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_stab_copy(const void *_mesg, void *_dest)
+H5O__stab_copy(const void *_mesg, void *_dest)
 {
     const H5O_stab_t    *stab = (const H5O_stab_t *) _mesg;
     H5O_stab_t          *dest = (H5O_stab_t *) _dest;
     void                *ret_value = NULL;     /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* check args */
     HDassert(stab);
     if(!dest && NULL == (dest = H5FL_MALLOC(H5O_stab_t)))
-	HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
+        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
 
     /* copy */
     *dest = *stab;
@@ -199,11 +199,11 @@ H5O_stab_copy(const void *_mesg, void *_dest)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_stab_copy() */
+} /* end H5O__stab_copy() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_stab_size
+ * Function:    H5O__stab_size
  *
  * Purpose:     Returns the size of the raw message in bytes not counting
  *              the message type or size fields, but only the data fields.
@@ -220,17 +220,17 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_stab_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void H5_ATTR_UNUSED *_mesg)
+H5O__stab_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void H5_ATTR_UNUSED *_mesg)
 {
     size_t ret_value = 0;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Set return value */
     ret_value = (size_t)(2 * H5F_SIZEOF_ADDR(f));
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_stab_size() */
+} /* end H5O__stab_size() */
 
 
 /*-------------------------------------------------------------------------
@@ -327,14 +327,14 @@ H5O__stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst,
 
     /* Get the old local heap's size and use that as the hint for the new heap */
     if(H5HL_get_size(file_src, stab_src->heap_addr, &size_hint) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, NULL, "can't query local heap size")
+        HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, NULL, "can't query local heap size")
 
     /* Set copy metadata tag */
     H5_BEGIN_TAG(H5AC__COPIED_TAG);
 
     /* Create components of symbol table message */
     if(H5G__stab_create_components(file_dst, stab_dst, size_hint) < 0)
-	HGOTO_ERROR_TAG(H5E_SYM, H5E_CANTINIT, NULL, "can't create symbol table components")
+        HGOTO_ERROR_TAG(H5E_SYM, H5E_CANTINIT, NULL, "can't create symbol table components")
 
     /* Reset metadata tag */
     H5_END_TAG
diff --git a/src/H5Zfletcher32.c b/src/H5Zfletcher32.c
index 4d75d14..c40e9b4 100644
--- a/src/H5Zfletcher32.c
+++ b/src/H5Zfletcher32.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Raymond Lu <slu@ncsa.uiuc.edu>
+ * Programmer:  Raymond Lu
  *              Jan 3, 2003
  */
 
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index dfc984a..1c8d415 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -400,8 +400,6 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
  * Return:      Always succeeds.
  * Programmer:  Bill Wendling
  *              26. August 2003
- * Modifications:
-  *              Leon Arber:  Added FUNC_ENTER / FUNC_LEAVE pairs
 *
  *-------------------------------------------------------------------------
  */
@@ -565,8 +563,6 @@ done:
  * Return:      Nothing
  * Programmer:  Bill Wendling
  *              25. August 2003
- * Modifications:
- *              Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
  *
  *-------------------------------------------------------------------------
  */
@@ -634,8 +630,6 @@ done:
  *              NULLure:    NULL
  * Programmer:  Bill Wendling
  *              26. August 2003
- * Modifications:
-  *              Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
 *
  *-------------------------------------------------------------------------
  */
@@ -728,8 +722,6 @@ done:
  *              NULLure:    NULL
  * Programmer:  Bill Wendling
  *              26. August 2003
- * Modifications:
-  *              Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
 *
  *-------------------------------------------------------------------------
  */
@@ -828,8 +820,6 @@ done:
  *              NULLure:    NULL
  * Programmer:  Bill Wendling
  *              26. August 2003
- * Modifications:
- *              Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
  *
  *-------------------------------------------------------------------------
  */
@@ -972,8 +962,6 @@ done:
  *              NULLure:    NULL
  * Programmer:  Bill Wendling
  *              26. August 2003
- * Modifications:
- *              Leon Arber: Added FUNC_ENTER / FUNC_LEAVE pairs
  *
  *-------------------------------------------------------------------------
  */
@@ -1002,7 +990,6 @@ done:
  * Return:      SUCCEED if transform applied successfully, FAIL otherwise
  * Programmer:  Leon Arber
  * 		5/1/04
- * Modifications:
  *
  *-------------------------------------------------------------------------
  */
@@ -1115,8 +1102,6 @@ done:
  * Return:      Nothing
  * Programmer:  Leon Arber
  * 		5/1/04
- * Modifications:
- *
  *
  * Notes:   In the case of a polynomial data transform (ie, the left and right subtree
  * are both of type H5Z_XFORM_SYMBOL), the convention is that the left hand side
@@ -1213,8 +1198,6 @@ done:
  * Function:    H5Z_find_type
  * Return:      Native type of datatype that is passed in
  * Programmer:  Leon Arber, 4/20/04
- * Modifications:
- *
  *
  *-------------------------------------------------------------------------
  */
@@ -1301,7 +1284,6 @@ done:
  *              of the one passed in.
  * Programmer:  Leon Arber
  *              April 1, 2004.
- * Modifications:
  *
  *-------------------------------------------------------------------------
  */
@@ -1375,7 +1357,6 @@ done:
  * Return:      TRUE or FALSE
  * Programmer:  Raymond Lu
  *              15 March 2012
- * Modifications:
  *
  *-------------------------------------------------------------------------
  */
@@ -1404,7 +1385,6 @@ H5Z_op_is_numbs(H5Z_node* _tree)
  * Return:      TRUE or FALSE
  * Programmer:  Raymond Lu
  *              15 March 2012
- * Modifications:
  *
  *-------------------------------------------------------------------------
  */
@@ -1490,11 +1470,6 @@ H5Z_xform_reduce_tree(H5Z_node* tree)
  * Return:      None.
  * Programmer:  Leon Arber
  *              April 1, 2004.
- * Modifications:
- *              Raymond Lu
- *              15 March 2012
- *              I added a new macro H5Z_XFORM_DO_OP6 to handle the special
- *              operations like -x or +x when the left operand is empty.
  *
  *-------------------------------------------------------------------------
  */
@@ -1525,14 +1500,10 @@ H5Z_do_op(H5Z_node* tree)
  *      Success: SUCCEED
  *      Failure: FAIL
  *
- * Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
+ * Programmer: Quincey Koziol
  *
  * Date: May 4, 2004
  *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 H5Z_data_xform_t *
@@ -1616,14 +1587,10 @@ done:
  *      Success: SUCCEED
  *      Failure: FAIL
  *
- * Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
+ * Programmer: Quincey Koziol
  *
  * Date: May 4, 2004
  *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -1662,7 +1629,7 @@ H5Z_xform_destroy(H5Z_data_xform_t *data_xform_prop)
  *      Success: SUCCEED
  *      Failure: FAIL
  *
- * Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
+ * Programmer: Quincey Koziol
  *
  * Date: May 4, 2004
  *
@@ -1742,14 +1709,12 @@ done:
  *
  * Return:  TRUE for no data transform, FALSE for a data transform
  *
- * Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
+ * Programmer: Quincey Koziol
  *
  * Date: May 4, 2004
  *
  * Comments: Can't fail
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 hbool_t
@@ -1773,12 +1738,10 @@ H5Z_xform_noop(const H5Z_data_xform_t *data_xform_prop)
  * Return:
  *          Pointer to a copy of the string in the data_xform property.
  *
- * Programmer: Leon Arber, larber@ncsa.uiuc.edu
+ * Programmer: Leon Arber
  *
  * Date: Sept. 4, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 const char *
diff --git a/src/H5dbg.c b/src/H5dbg.c
index 214d865..df93c8a 100644
--- a/src/H5dbg.c
+++ b/src/H5dbg.c
@@ -15,7 +15,7 @@
  *
  * Created:        H5dbg.c
  *            Mar  4 2006
- *            Quincey Koziol <koziol@ncsa.uiuc.edu>
+ *            Quincey Koziol
  *
  * Purpose:        Generic debugging routines
  *
@@ -61,7 +61,7 @@
 /*******************/
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5_buffer_dump
  *
@@ -70,7 +70,6 @@
  * Return:    Non-negative on success/Negative on failure
  *
  * Programmer:    Quincey Koziol
- *        koziol@ncsa.uiuc.edu
  *        Mar  4 2006
  *
  *-------------------------------------------------------------------------