Merge changes from develop

Comments and whitespace
Skip file-locking and cache changes

23 files changed, 169 insertions, 267 deletions

diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c
index 8a43589..fc29302 100644
--- a/hl/fortran/src/H5IMcc.c
+++ b/hl/fortran/src/H5IMcc.c
@@ -29,7 +29,7 @@ herr_t H5IM_get_palette(hid_t loc_id, const char *image_name, int pal_number, hi
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -121,7 +121,7 @@ H5IMmake_image_8bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -236,7 +236,7 @@ H5IMmake_image_24bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -292,7 +292,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -385,7 +385,7 @@ H5IMmake_palettef(hid_t loc_id, const char *pal_name, const hsize_t *pal_dims, i
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -421,7 +421,7 @@ H5IMget_palettef(hid_t loc_id, const char *image_name, int pal_number, int_f *pa
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c
index f892e51..b01ed30 100644
--- a/hl/fortran/src/H5IMfc.c
+++ b/hl/fortran/src/H5IMfc.c
@@ -24,7 +24,7 @@
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -79,7 +79,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -129,7 +129,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -192,7 +192,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -269,7 +269,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 06, 2004
  *
@@ -315,7 +315,7 @@ h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 06, 2004
  *
@@ -365,7 +365,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 06, 2004
  *
@@ -425,7 +425,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 06, 2004
  *
@@ -485,7 +485,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 06 2004
  *
@@ -541,7 +541,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 06 2004
  *
@@ -600,7 +600,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 06 2004
  *
@@ -653,7 +653,7 @@ done:
  *
  * Return: true, false, fail
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 06, 2004
  *
diff --git a/hl/fortran/src/H5IMff.F90 b/hl/fortran/src/H5IMff.F90
index ffa18aa..3438e7f 100644
--- a/hl/fortran/src/H5IMff.F90
+++ b/hl/fortran/src/H5IMff.F90
@@ -41,7 +41,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -95,7 +95,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -142,7 +142,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -204,7 +204,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -267,7 +267,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -313,7 +313,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -364,7 +364,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -416,7 +416,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -467,7 +467,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -516,7 +516,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -567,7 +567,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -619,7 +619,7 @@ CONTAINS
 !
 ! Return: true, false, fail
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index afe6419..0813f66 100644
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -24,7 +24,7 @@
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: September 09, 2004
  *
@@ -88,7 +88,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: September 09, 2004
  *
@@ -143,7 +143,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: September 09, 2004
  *
@@ -203,7 +203,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: September 09, 2004
  *
@@ -256,7 +256,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -358,7 +358,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -442,7 +442,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -512,7 +512,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: September 09, 2004
  *
@@ -567,7 +567,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: September 09, 2004
  *
@@ -613,7 +613,7 @@ h5ltfind_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: September 09, 2004
  *
@@ -686,7 +686,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -749,7 +749,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: September 09, 2004
  *
diff --git a/hl/fortran/src/H5LTff.F90 b/hl/fortran/src/H5LTff.F90
index bc8734f..5cd255c 100644
--- a/hl/fortran/src/H5LTff.F90
+++ b/hl/fortran/src/H5LTff.F90
@@ -164,7 +164,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 1, 2004
   !
@@ -385,7 +385,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -426,7 +426,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -595,7 +595,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -770,7 +770,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -933,7 +933,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -983,7 +983,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 22, 2004
   !
@@ -1092,7 +1092,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1143,7 +1143,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1193,7 +1193,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1245,7 +1245,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1350,7 +1350,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1397,7 +1397,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1443,7 +1443,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1490,7 +1490,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1551,7 +1551,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 30, 2004
   !
@@ -1600,7 +1600,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1644,7 +1644,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 30, 2004
   !
@@ -1703,7 +1703,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: October 05, 2004
   !
@@ -1757,7 +1757,7 @@ CONTAINS
   !
   ! Return: Success: 0, Failure: -1
   !
-  ! Programmer: pvn@ncsa.uiuc.edu
+  ! Programmer: Pedro Vicente
   !
   ! Date: September 30, 2004
   !
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index c95600b..35d31cc 100644
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -26,7 +26,7 @@
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 06, 2004
  *
@@ -296,7 +296,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 12, 2004
  *
@@ -344,7 +344,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 12, 2004
  *
@@ -392,7 +392,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 12, 2004
  *
@@ -436,7 +436,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 12, 2004
  *
@@ -480,7 +480,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 13, 2004
  *
@@ -527,7 +527,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 13, 2004
  *
@@ -572,7 +572,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 12, 2004
  *
@@ -617,7 +617,7 @@ done:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: October 13, 2004
  *
diff --git a/hl/fortran/src/H5TBff.F90 b/hl/fortran/src/H5TBff.F90
index c3db01e..e39af97 100644
--- a/hl/fortran/src/H5TBff.F90
+++ b/hl/fortran/src/H5TBff.F90
@@ -172,7 +172,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -424,7 +424,7 @@ CONTAINS
 !
 ! Purpose: Writes one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 12, 2004
 !
@@ -505,7 +505,7 @@ CONTAINS
 !
 ! Purpose: Reads one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 12, 2004
 !
@@ -586,7 +586,7 @@ CONTAINS
 !
 ! Purpose: Writes one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 12, 2004
 !
@@ -661,7 +661,7 @@ CONTAINS
 !
 ! Purpose: Reads one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 12, 2004
 !
@@ -734,7 +734,7 @@ CONTAINS
 !
 ! Purpose: Inserts one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 13, 2004
 !
@@ -807,7 +807,7 @@ CONTAINS
 !
 ! Purpose: Inserts one field
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 13, 2004
 !
@@ -858,7 +858,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 13, 2004
 !
@@ -909,7 +909,7 @@ CONTAINS
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: pvn@ncsa.uiuc.edu
+! Programmer: Pedro Vicente
 !
 ! Date: October 13, 2004
 !
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index e127fa2..216cf46 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -11,9 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 #include "H5DSprivate.h"
 #include "H5LTprivate.h"
 #include "H5IMprivate.h"
@@ -34,17 +31,12 @@ static hid_t  H5DS_get_REFLIST_type(void);
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: January 04, 2005
  *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-
 herr_t
 H5DSset_scale(hid_t dsid, const char *dimname)
 {
@@ -105,17 +97,12 @@ H5DSset_scale(hid_t dsid, const char *dimname)
  *           If DSID is not a Dimension Scale
  *           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: December 20, 2004
  *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-
 herr_t
 H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx)
 {
@@ -558,19 +545,12 @@ out:
  * Note that a scale may be associated with more than dimension of the same dataset.
  * If so, the detach operation only deletes one of the associations, for DID.
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: December 20, 2004
  *
- * Comments:
- *
- * Modifications: Function didn't delete DIMENSION_LIST attribute, when
- *                all dimension scales were detached from a dataset; added.
- *                                                           2010/05/13 EIP
- *
  *-------------------------------------------------------------------------
  */
-
 herr_t
 H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx)
 {
@@ -944,17 +924,12 @@ out:
  *           If DSID is not a Dimension Scale
  *           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: February 18, 2005
  *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-
 htri_t
 H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx)
 {
@@ -1263,17 +1238,12 @@ out:
  *       C. Negative causes the iterator to immediately return that value,
  *           indicating failure.
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: January 31, 2005
  *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-
 herr_t
 H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx, H5DS_iterate_t visitor, void *visitor_data)
 {
@@ -1433,17 +1403,12 @@ out:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: January 11, 2005
  *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-
 herr_t
 H5DSset_label(hid_t did, unsigned int idx, const char *label)
 {
@@ -1459,6 +1424,9 @@ H5DSset_label(hid_t did, unsigned int idx, const char *label)
         char **      buf;       /* discarding the 'const' qualifier in the free */
         char const **const_buf; /* buf calls */
     } u;
+
+    HDmemset(&u, 0, sizeof(u));
+
     /*-------------------------------------------------------------------------
      * parameter checking
      *-------------------------------------------------------------------------
@@ -1638,16 +1606,10 @@ out:
  *
  * Return: 0 if no label found, size of label if found, Failure: FAIL
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: January 11, 2005
  *
- * Comments:
- *
- * Modifications:
- *     JIRA HDFFV-7673: Added a check to see if the label name exists,
- *     if not then returns zero. July 30, 2011. MSB
- *
  *-------------------------------------------------------------------------
  */
 ssize_t
@@ -1793,19 +1755,12 @@ out:
  *
  * Return: size of name if found, zero if not found,  Failure: FAIL
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: January 04, 2005
  *
- * Comments:
- *
- * Modifications:
- *  The size of the name returned should not include the NULL termination
- *  in its value so as to be consistent with other HDF5 APIs.
- *
  *-------------------------------------------------------------------------
  */
-
 ssize_t
 H5DSget_scale_name(hid_t did, char *name, size_t size)
 {
@@ -1917,17 +1872,12 @@ out:
  *
  * Return: 1, is, 0, not, FAIL, error
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: January 04, 2005
  *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-
 htri_t
 H5DSis_scale(hid_t did)
 {
@@ -1939,7 +1889,7 @@ H5DSis_scale(hid_t did)
     char *     buf;          /* Name of attribute */
     hsize_t    storage_size; /* Size of storage for attribute */
 
-    /*-------------------------------------------------------------------------
+    /*------------------------------------------------------------------------
      * parameter checking
      *-------------------------------------------------------------------------
      */
@@ -2021,17 +1971,12 @@ out:
  *   Success: number of scales
  *   Failure: FAIL
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: January 13, 2005
  *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-
 int
 H5DSget_num_scales(hid_t did, unsigned int idx)
 {
@@ -2144,17 +2089,12 @@ out:
  *
  * Return: true, false, fail
  *
- * Programmer: pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: March 19, 2005
  *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-
 static herr_t
 H5DS_is_reserved(hid_t did)
 {
@@ -2235,17 +2175,12 @@ out:
  *
  * Return: Type identifier on success and negative on failure
  *
- * Programmer: epourmal@hdfgroup.org
+ * Programmer: Elena Pourmal
  *
  * Date: May 22, 2010
  *
- * Comments:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-
 static hid_t
 H5DS_get_REFLIST_type(void)
 {
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index e08d006..fb2ccb3 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -13,8 +13,6 @@
 
 #include "H5IMprivate.h"
 #include "H5LTprivate.h"
-#include <string.h>
-#include <stdlib.h>
 
 /*-------------------------------------------------------------------------
  * Function: H5IMmake_image_8bit
@@ -23,7 +21,7 @@
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: June 13, 2001
  *
@@ -75,7 +73,7 @@ H5IMmake_image_8bit(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: June 13, 2001
  *
@@ -151,7 +149,7 @@ H5IMmake_image_24bit(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t
  *
  * Return:
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 28, 2001
  *
@@ -192,7 +190,7 @@ find_palette(hid_t loc_id, const char *name, const H5A_info_t *ainfo, void *op_d
  *
  * Return: Success: 1, Failure: 0
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 11, 2001
  *
@@ -218,7 +216,7 @@ H5IM_find_palette(hid_t loc_id)
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: July 25, 2001
  *
@@ -386,7 +384,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: June 13, 2001
  *
@@ -433,7 +431,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 01, 2001
  *
@@ -485,7 +483,7 @@ H5IMmake_palette(hid_t loc_id, const char *pal_name, const hsize_t *pal_dims, co
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 01, 2001
  *
@@ -655,7 +653,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: September 10, 2001
  *
@@ -752,7 +750,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: July 22, 2001
  *
@@ -837,7 +835,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: July 22, 2001
  *
@@ -946,7 +944,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: August 30, 2001
  *
@@ -1048,7 +1046,7 @@ out:
  *
  * Return: true, false, fail
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: August 30, 2001
  *
@@ -1148,7 +1146,7 @@ out:
  *
  * Return: true, false, fail
  *
- * Programmer: Pedro Vicente Nunes, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: August 30, 2001
  *
diff --git a/hl/src/H5LD.c b/hl/src/H5LD.c
index 55c60dd..73043a5 100644
--- a/hl/src/H5LD.c
+++ b/hl/src/H5LD.c
@@ -11,10 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <stdio.h>
 #include "H5LDprivate.h"
 
 /*-------------------------------------------------------------------------
diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index f397365..7e18d33 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-
 #include "H5PTprivate.h"
 #include "H5TBprivate.h"
 
@@ -52,8 +50,8 @@ static herr_t H5PT_get_index(htbl_t *table_id, hsize_t *pt_index);
  *
  * Return: Success: table ID, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu (Author of H5PTcreate_fl)
- *             James Laird, jlaird@ncsa.uiuc.edu (Author of H5PTcreate_fl)
+ * Programmer: Nat Furrer (Author of H5PTcreate_fl)
+ *             James Laird (Author of H5PTcreate_fl)
  *
  * Date: March 12, 2004
  *
@@ -177,8 +175,8 @@ error:
  *
  * Return: Success: table ID, Failure: Negative
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 12, 2004
  *
@@ -293,8 +291,8 @@ error:
  *
  * Return: Success: table ID, Failure: Negative
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 10, 2004
  *
@@ -418,8 +416,8 @@ H5PT_free_id(void *id)
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 10, 2004
  *
@@ -466,8 +464,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: April 21, 2004
  *
@@ -520,8 +518,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 12, 2004
  *
@@ -570,8 +568,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 10, 2004
  *
@@ -614,8 +612,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 12, 2004
  *
@@ -663,8 +661,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *  		   James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *  		   James Laird
  *
  * Date: March 12, 2004
  *
@@ -716,8 +714,8 @@ H5PT_get_index(htbl_t *table, hsize_t *pt_index)
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: April 23, 2004
  *
@@ -777,8 +775,8 @@ H5PTget_index(hid_t table_id, hsize_t *pt_index)
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 12, 2004
  *
@@ -814,8 +812,8 @@ error:
  *
  * Return: Success: SUCCEED, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 12, 2004
  *
@@ -844,8 +842,8 @@ H5PTis_valid(hid_t table_id)
  *
  * Return: True: 1, False: 0, Failure: FAIL
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: April 14, 2004
  *
@@ -894,8 +892,8 @@ error:
  * Return: Success: SUCCEED, Failure: FAIL
  *          -2 if memory was reclaimed but another error occurred
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: April 12, 2004
  *
diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c
index 5d51856..a3dfdae 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -11,9 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "H5LTprivate.h"
 #include "H5TBprivate.h"
 
@@ -46,7 +43,7 @@ static hid_t H5TB_create_type(hid_t loc_id, const char *dset_name, size_t type_s
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *             Quincey Koziol
  *
  * Date: January 17, 2001
@@ -257,7 +254,7 @@ out:
  * Return: Success: 0, Failure: -1
  *
  * Programmers:
- *  Pedro Vicente, pvn@ncsa.uiuc.edu
+ *  Pedro Vicente
  *  Quincey Koziol
  *
  * Date: November 19, 2001
@@ -323,7 +320,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 19, 2001
  *
@@ -415,7 +412,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 21, 2001
  *
@@ -573,7 +570,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 21, 2001
  *
@@ -738,7 +735,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 20, 2001
  *
@@ -811,7 +808,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 19, 2001
  *
@@ -877,7 +874,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 19, 2001
  *
@@ -1034,7 +1031,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 19, 2001
  *
@@ -1192,7 +1189,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 26, 2001
  *
@@ -1352,7 +1349,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 26, 2001
  *
@@ -1504,7 +1501,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: December 5, 2001
  *
@@ -1633,7 +1630,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: December 10, 2001
  *
@@ -1989,7 +1986,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: January 30, 2002
  *
@@ -2406,7 +2403,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: January 30, 2002
  *
@@ -2858,7 +2855,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: January 30, 2001
  *
@@ -2884,7 +2881,7 @@ H5TBAget_title(hid_t loc_id, char *table_title)
  *
  * Return: Success: TRUE/FALSE, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: January 30, 2002
  *
@@ -2954,7 +2951,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 19, 2001
  *
@@ -3039,7 +3036,7 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 19, 2001
  *
@@ -3156,7 +3153,7 @@ out:
  *
  * Return: Success: TRUE/FALSE, Failure: N/A
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: November 19, 2001
  *
@@ -3197,7 +3194,7 @@ H5TB_find_field(const char *field, const char *field_list)
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: December 6, 2001
  *
@@ -3258,7 +3255,7 @@ out:
  *
  * Return: Success: the memory type ID, Failure: -1
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: March 31, 2004
  *
@@ -3354,8 +3351,8 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 8, 2004
  *
@@ -3419,8 +3416,8 @@ out:
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Nat Furrer, nfurrer@ncsa.uiuc.edu
- *             James Laird, jlaird@ncsa.uiuc.edu
+ * Programmer: Nat Furrer
+ *             James Laird
  *
  * Date: March 8, 2004
  *
diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c
index 0138e19..27c3a0b 100644
--- a/hl/test/gen_test_ds.c
+++ b/hl/test/gen_test_ds.c
@@ -23,8 +23,6 @@
  *              in test_ds.c will read them.
  */
 
-#include <stdlib.h>
-#include <string.h>
 #include "h5hltest.h"
 #include "H5DSpublic.h"
 #include "H5LTpublic.h"
diff --git a/hl/test/h5hltest.h b/hl/test/h5hltest.h
index d694f0c..4ccdd78 100644
--- a/hl/test/h5hltest.h
+++ b/hl/test/h5hltest.h
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Quincey Koziol <koziol@ncsa.uiuc.edu>
+ * Programmer:  Quincey Koziol
  *              Friday, April 28, 2006
  *
  * Purpose:     Test support stuff.
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index cd7f09d..9e56ff0 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
 #include "h5hltest.h"
 #include "H5srcdir.h"
 #include "H5DSpublic.h"
diff --git a/hl/test/test_dset_append.c b/hl/test/test_dset_append.c
index c5cffca..9c5efdd 100644
--- a/hl/test/test_dset_append.c
+++ b/hl/test/test_dset_append.c
@@ -11,10 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "h5hltest.h"
 #include "H5DOpublic.h"
 
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index 2eea47d..0cdb2d3 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -11,10 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "h5hltest.h"
 #include "H5srcdir.h"
 #include "H5LTpublic.h"
diff --git a/hl/test/test_ld.c b/hl/test/test_ld.c
index 28a0ba0..cc98fc9 100644
--- a/hl/test/test_ld.c
+++ b/hl/test/test_ld.c
@@ -11,11 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <setjmp.h>
 #include "h5hltest.h"
 #include "H5srcdir.h"
 #include "H5LDpublic.h"
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index a255e50..558211e 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
 #include "h5hltest.h"
 #include "H5srcdir.h"
 #include "H5LTpublic.h"
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index fe17d38..1224f0f 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
 #include "h5hltest.h"
 #include "H5PTpublic.h"
 #include "H5TBpublic.h"
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 3f953d4..2f98f4a 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
 #include "h5hltest.h"
 #include "H5srcdir.h"
 #include "H5TBpublic.h"
diff --git a/hl/tools/gif2h5/h52gifgentst.c b/hl/tools/gif2h5/h52gifgentst.c
index 9bd7874..020fe26 100644
--- a/hl/tools/gif2h5/h52gifgentst.c
+++ b/hl/tools/gif2h5/h52gifgentst.c
@@ -22,7 +22,7 @@
  *
  * Purpose: generate files for h52gif testing
  *
- * Programmer: Pedro Vicente, pvn@hdfgroup.org
+ * Programmer: Pedro Vicente
  *
  * Date: March 15, 2007
  *
diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c
index 9bf8047..0190545 100644
--- a/hl/tools/h5watch/h5watch.c
+++ b/hl/tools/h5watch/h5watch.c
@@ -182,7 +182,7 @@ doprint(hid_t did, hsize_t *start, hsize_t *block, int rank)
     info.dset_format     = "DSET-%s ";
     info.dset_hidefileno = 0;
 
-    info.obj_format     = "-%lu:" H5_PRINTF_HADDR_FMT;
+    info.obj_format     = "-%lu:%" PRIuHADDR;
     info.obj_hidefileno = 0;
 
     info.dset_blockformat_pre = "%sBlk%lu: ";
@@ -340,7 +340,8 @@ monitor_dataset(hid_t fid, char *dsetname)
         if (i != ndims) {
             /* Printing changes in dimension sizes */
             for (u = 0; u < ndims; u++) {
-                HDfprintf(stdout, "dimension %u: %Hu->%Hu", (unsigned)u, prev_dims[u], cur_dims[u]);
+                HDfprintf(stdout, "dimension %d: %" PRIuHSIZE "->%" PRIuHSIZE "", u, prev_dims[u],
+                          cur_dims[u]);
                 if (cur_dims[u] > prev_dims[u])
                     HDfprintf(stdout, " (increases)\n");
                 else if (cur_dims[u] < prev_dims[u])