Misc fixes and changes from develop.

23 files changed, 259 insertions, 218 deletions

diff --git a/config/commence.am b/config/commence.am
index cdfbfa0..88afe32 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -44,15 +44,15 @@ LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 # Install directories that automake doesn't know about
 docdir = $(exec_prefix)/doc
 
-# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below  
-# has been removed. According to the official description of DESTDIR by Gnu at 
-# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is 
-# prepended to the normal and complete install path that it precedes for the 
-# purpose of installing in a temporary directory which is useful for building 
-# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another 
-# '/' at the beginning of the normal install path.  When DESTDIR is empty the  
-# path then begins with '//', which is incorrect and causes problems at least for 
-# Cygwin.   
+# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below
+# has been removed. According to the official description of DESTDIR by Gnu at
+# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is
+# prepended to the normal and complete install path that it precedes for the
+# purpose of installing in a temporary directory which is useful for building
+# rpms and other packages.  The '/' after ${DESTDIR} will be followed by another
+# '/' at the beginning of the normal install path.  When DESTDIR is empty the
+# path then begins with '//', which is incorrect and causes problems at least for
+# Cygwin.
 
 # Scripts used to build examples
 # If only shared libraries have been installed, have h5cc build examples with
@@ -62,17 +62,17 @@ H5CC_PP=${DESTDIR}$(bindir)/h5pcc
 H5FC=${DESTDIR}$(bindir)/h5fc
 H5FC_PP=${DESTDIR}$(bindir)/h5pfc
 H5CPP=${DESTDIR}$(bindir)/h5c++
-  
+
 
 # H5_CFLAGS holds flags that should be used when building hdf5,
 # but which should not be exported to h5cc for building other programs.
-# AM_CFLAGS is an automake construct which should be used by Makefiles 
+# AM_CFLAGS is an automake construct which should be used by Makefiles
 # instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
 # This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
 
 AM_CFLAGS=@AM_CFLAGS@ @H5_CFLAGS@ @H5_ECFLAGS@
 AM_FCFLAGS=@AM_FCFLAGS@ @H5_FCFLAGS@
-AM_CXXFLAGS=@AM_CXXFLAGS@ @H5_CXXFLAGS@
+AM_CXXFLAGS=@AM_CXXFLAGS@ @H5_CXXFLAGS@ @H5_ECXXFLAGS@
 AM_CPPFLAGS=@AM_CPPFLAGS@ @H5_CPPFLAGS@
 AM_LDFLAGS=@AM_LDFLAGS@ @H5_LDFLAGS@
 
diff --git a/config/conclude.am b/config/conclude.am
index 6e96ba2..744677e 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -25,8 +25,8 @@ LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES)                 \
       $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB)
 PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
         $(EXTRA_PROG)
-chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-TESTS = $(TEST_PROG) $(TEST_SCRIPT) $(EXTRA_TEST) 
+chk_TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST)
+TESTS = $(TEST_PROG) $(TEST_SCRIPT) $(EXTRA_TEST)
 
 TEST_EXTENSIONS = .sh
 SH_LOG_COMPILER = $(SHELL)
@@ -131,28 +131,37 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
                  echo "============================" > $${log}; \
               fi; \
               if test "X$(FORTRAN_API)" = "Xyes"; then \
-                 echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
+                 echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
                  if test -n "$(REALTIMEOUTPUT)"; then \
-                    echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" | tee -a $${log}; \
+                    echo "Fortran API: Test log for $${tname} $(TEST_FLAGS)" | tee -a $${log}; \
                  else \
-                    echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
+                    echo "Fortran API: Test log for $${tname} $(TEST_FLAGS)" >> $${log}; \
                  fi; \
               elif test "X$(CXX_API)" = "Xyes"; then \
-                 echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
+                 echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
                  if test -n "$(REALTIMEOUTPUT)"; then \
-                    echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" | tee -a $${log};\
+                    echo "C++ API: Test log for $${tname} $(TEST_FLAGS)" | tee -a $${log};\
                  else \
-                    echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
+                    echo "C++ API: Test log for $${tname} $(TEST_FLAGS)" >> $${log};\
                  fi; \
               else \
-                 echo "Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
+                 echo "Testing: $${tname} $(TEST_FLAGS)"; \
                  if test -n "$(REALTIMEOUTPUT)"; then \
-                    echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" | tee -a $${log}; \
+                    echo "Test log for $${tname} $(TEST_FLAGS)" | tee -a $${log}; \
                  else \
-                    echo "$(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
+                    echo "Test log for $${tname} $(TEST_FLAGS)" >> $${log}; \
                  fi; \
               fi; \
               if test -n "$(REALTIMEOUTPUT)"; then \
+                if test -n "$(HDF5_DRIVER)"; then \
+                  echo "Virtual file driver (VFD): $(HDF5_DRIVER)" | tee -a $${log}; \
+                fi; \
+              else \
+                if test -n "$(HDF5_DRIVER)"; then \
+                  echo "Virtual file driver (VFD): $(HDF5_DRIVER)" >> $${log}; \
+                fi; \
+              fi; \
+              if test -n "$(REALTIMEOUTPUT)"; then \
                  echo "============================" | tee -a $${log}; \
               else \
                  echo "============================" >> $${log}; \
@@ -183,7 +192,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
               fi; \
 	   fi; \
 	fi
- 
+
 # The dummysh.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 # $${log} is the log file.
diff --git a/config/examples.am b/config/examples.am
index 247dfa8..e06f4ea 100644
--- a/config/examples.am
+++ b/config/examples.am
@@ -33,7 +33,7 @@
 ## INSTALL_TOP_FILES
 ##
 ## EXAMPLEDIR
-## The directory into which examples should be installed. 
+## The directory into which examples should be installed.
 ##
 ## Build rules for $(EXTRA_PROG).
 ## Dependencies for example programs.
@@ -62,7 +62,7 @@ install-data-local:
 uninstall-local:
 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
 
-install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) 
+install-examples: $(EXAMPLEDIR) $(INSTALL_FILES)
 	@for f in X $(INSTALL_FILES); do                                     \
 	  if test $$f != X; then                                             \
 	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
@@ -109,7 +109,7 @@ installcheck-local:
 	  H5CCFLAGS="-shlib" $(MAKE) $(AM_MAKEFLAGS) check;                \
 	else                                                              \
 	  $(MAKE) $(AM_MAKEFLAGS) check;                                   \
-	fi 
+	fi
 	@if test "$(INSTALL_FILES)" -a $(TEST_EXAMPLES_SCRIPT) -a -d $(EXAMPLEDIR); then \
 	    echo "============================";                                         \
 	    echo "Testing $(TEST_EXAMPLES_SCRIPT)";                                      \
diff --git a/config/gnu-warnings/no-developer-general b/config/gnu-warnings/no-developer-general
index 85dc0a3..18831dd 100644
--- a/config/gnu-warnings/no-developer-general
+++ b/config/gnu-warnings/no-developer-general
@@ -2,3 +2,7 @@
 -Wno-inline
 -Wno-missing-format-attribute
 -Wno-missing-noreturn
+# NOTE: -pedantic includes -Woverlength-strings which triggers a warning
+# regarding the library settings string (H5libhdf5_settings). We'll turn
+# it off here but leave it on in the developer flags.
+-Wno-overlength-strings
diff --git a/configure.ac b/configure.ac
index 28437b2..fee80b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,6 +111,7 @@ AC_SUBST([H5_ECFLAGS])
 AC_SUBST([H5_CPPFLAGS])
 AC_SUBST([H5_FCFLAGS])
 AC_SUBST([H5_CXXFLAGS])
+AC_SUBST([H5_ECXXFLAGS])
 AC_SUBST([H5_JNIFLAGS])
 AC_SUBST([H5_JAVACFLAGS])
 AC_SUBST([H5_JAVAFLAGS])
diff --git a/src/H5err.txt b/src/H5err.txt
index aa172e8..75faeeb 100644
--- a/src/H5err.txt
+++ b/src/H5err.txt
@@ -46,7 +46,7 @@
 MAJOR, H5E_ARGS, Invalid arguments to routine
 MAJOR, H5E_RESOURCE, Resource unavailable
 MAJOR, H5E_INTERNAL, Internal error (too specific to document in detail)
-MAJOR, H5E_FILE, File accessibilty
+MAJOR, H5E_FILE, File accessibility
 MAJOR, H5E_IO, Low-level I/O
 MAJOR, H5E_FUNC, Function entry/exit
 MAJOR, H5E_ATOM, Object atom
@@ -82,7 +82,7 @@ MAJOR, H5E_NONE_MAJOR, No error
 # Sections (for grouping minor errors)
 SECTION, ARGS, Argument errors
 SECTION, RESOURCE, Resource errors
-SECTION, FILEACC, File accessibilty errors
+SECTION, FILEACC, File accessibility errors
 SECTION, FILE, Generic low-level file I/O errors
 SECTION, FUNC, Function entry/exit interface errors
 SECTION, ATOM, Object atom related errors
@@ -123,7 +123,7 @@ MINOR, RESOURCE, H5E_CANTGC, Unable to garbage collect
 MINOR, RESOURCE, H5E_CANTGETSIZE, Unable to compute size
 MINOR, RESOURCE, H5E_OBJOPEN, Object is already open
 
-# File accessibilty errors
+# File accessibility errors
 MINOR, FILEACC, H5E_FILEEXISTS, File already exists
 MINOR, FILEACC, H5E_FILEOPEN, File already open
 MINOR, FILEACC, H5E_CANTCREATE, Unable to create file
diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c
index fd67184..72041ed 100644
--- a/src/H5make_libsettings.c
+++ b/src/H5make_libsettings.c
@@ -32,16 +32,15 @@ static const char *FileHeader = "\n\
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <time.h>
 #include "H5private.h"
+
 /* Do NOT use HDfprintf in this file as it is not linked with the library,
  * which contains the H5system.c file in which the function is defined.
  */
 
 #define LIBSETTINGSFNAME "libhdf5.settings"
 
-FILE       *rawoutstream = NULL;
+FILE *rawoutstream = NULL;
 
 
 /*-------------------------------------------------------------------------
@@ -66,7 +65,7 @@ insert_libhdf5_settings(FILE *flibinfo)
     if(NULL == (fsettings = HDfopen(LIBSETTINGSFNAME, "r"))) {
         HDperror(LIBSETTINGSFNAME);
         HDexit(EXIT_FAILURE);
-    } /* end if */
+    }
 
     /* print variable definition and the string */
     /* Do not use const else AIX strings does not show it. */
@@ -77,30 +76,31 @@ insert_libhdf5_settings(FILE *flibinfo)
             /* Start a new line */
             fprintf(flibinfo, "\t\"");
             bol = 0;
-        } /* end if */
+        }
         if(inchar == '\n') {
             /* end of a line */
             fprintf(flibinfo, "\\n\"\n");
             bol++;
-        } /* end if */
+        }
         else
             HDputc(inchar, flibinfo);
-    } /* end while */
+    }
+
     if(HDfeof(fsettings)) {
         /* wrap up */
         if(!bol)
             /* EOF found without a new line */
             fprintf(flibinfo, "\\n\"\n");
         fprintf(flibinfo, ";\n\n");
-    } /* end if */
+    }
     else {
         fprintf(stderr, "Read errors encountered with %s\n", LIBSETTINGSFNAME);
         HDexit(EXIT_FAILURE);
-    } /* end else */
+    }
     if(0 != HDfclose(fsettings)) {
         HDperror(LIBSETTINGSFNAME);
         HDexit(EXIT_FAILURE);
-    } /* end if */
+    }
 #else
     /* print variable definition and an empty string */
     /* Do not use const else AIX strings does not show it. */
@@ -170,12 +170,12 @@ information about the library build configuration\n";
                 n = MIN(sizeof(real_name) - 1, (unsigned)(comma - pwd->pw_gecos));
                 HDstrncpy(real_name, pwd->pw_gecos, n);
                 real_name[n] = '\0';
-            } /* end if */
+            }
             else {
                 HDstrncpy(real_name, pwd->pw_gecos, sizeof(real_name));
                 real_name[sizeof(real_name) - 1] = '\0';
-            } /* end else */
-        } /* end if */
+            }
+        }
         else
             real_name[0] = '\0';
     }
@@ -214,13 +214,15 @@ information about the library build configuration\n";
         if(real_name[0])
             fprintf(rawoutstream, ">");
         HDfputc('\n', rawoutstream);
-    } /* end if */
+    }
+
     fprintf(rawoutstream, " *\n * Purpose:\t\t");
+
     for(s = purpose; *s; s++) {
         HDfputc(*s, rawoutstream);
         if('\n' == *s && s[1])
             fprintf(rawoutstream, " *\t\t\t");
-    } /* end for */
+    }
 
     fprintf(rawoutstream, " *\n * Modifications:\n *\n");
     fprintf(rawoutstream, " *\tDO NOT MAKE MODIFICATIONS TO THIS FILE!\n");
diff --git a/src/H5overflow.txt b/src/H5overflow.txt
index ed71b98..9fb3b89 100644
--- a/src/H5overflow.txt
+++ b/src/H5overflow.txt
@@ -31,6 +31,7 @@
 unsigned, UNSIGNED;
 int8_t, SIGNED;
 int, SIGNED;
+long, SIGNED;
 int64_t, SIGNED;
 uint8_t, UNSIGNED;
 uint16_t, UNSIGNED;
diff --git a/src/H5private.h b/src/H5private.h
index 515b15a..e42f9db 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -301,17 +301,38 @@
  * file). Be sure to update that file if the #ifdefs change here.
  */
 #ifdef __cplusplus
-#   define H5_ATTR_FORMAT(X,Y,Z)  /*void*/
-#   define H5_ATTR_UNUSED         /*void*/
-#   define H5_ATTR_NDEBUG_UNUSED  /*void*/
-#   define H5_ATTR_NORETURN       /*void*/
-#   define H5_ATTR_CONST          /*void*/
-#   define H5_ATTR_PURE           /*void*/
-#   define H5_ATTR_FALLTHROUGH    /*void*/
+#   define H5_ATTR_FORMAT(X,Y,Z)                /*void*/
+#   define H5_ATTR_UNUSED                       /*void*/
+#   define H5_ATTR_DEPRECATED_USED              /*void*/
+#   define H5_ATTR_NDEBUG_UNUSED                /*void*/
+#   define H5_ATTR_DEBUG_API_USED               /*void*/
+#   define H5_ATTR_PARALLEL_UNUSED              /*void*/
+#   define H5_ATTR_PARALLEL_USED                /*void*/
+#   define H5_ATTR_NORETURN                     /*void*/
+#   define H5_ATTR_CONST                        /*void*/
+#   define H5_ATTR_PURE                         /*void*/
+#   define H5_ATTR_FALLTHROUGH                  /*void*/
 #else /* __cplusplus */
 #if defined(H5_HAVE_ATTRIBUTE) && !defined(__SUNPRO_C)
 #   define H5_ATTR_FORMAT(X,Y,Z)  __attribute__((format(X, Y, Z)))
 #   define H5_ATTR_UNUSED       __attribute__((unused))
+#ifdef H5_HAVE_PARALLEL
+#   define H5_ATTR_PARALLEL_UNUSED       __attribute__((unused))
+#   define H5_ATTR_PARALLEL_USED         /*void*/
+#else
+#   define H5_ATTR_PARALLEL_UNUSED       /*void*/
+#   define H5_ATTR_PARALLEL_USED         __attribute__((unused))
+#endif
+#ifdef H5_NO_DEPRECATED_SYMBOLS
+#define H5_ATTR_DEPRECATED_USED    H5_ATTR_UNUSED
+#else /* H5_NO_DEPRECATED_SYMBOLS */
+#define H5_ATTR_DEPRECATED_USED    /*void*/
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+#ifdef H5_DEBUG_API
+#define H5_ATTR_DEBUG_API_USED    /*void*/
+#else /* H5_DEBUG_API */
+#define H5_ATTR_DEBUG_API_USED    H5_ATTR_UNUSED
+#endif /* H5_DEBUG_API */
 #ifndef NDEBUG
 #define H5_ATTR_NDEBUG_UNUSED     /*void*/
 #else /* NDEBUG */
@@ -326,13 +347,17 @@
 #   define H5_ATTR_FALLTHROUGH  /*void*/
 #endif
 #else
-#   define H5_ATTR_FORMAT(X,Y,Z)  /*void*/
-#   define H5_ATTR_UNUSED         /*void*/
-#   define H5_ATTR_NDEBUG_UNUSED  /*void*/
-#   define H5_ATTR_NORETURN       /*void*/
-#   define H5_ATTR_CONST          /*void*/
-#   define H5_ATTR_PURE           /*void*/
-#   define H5_ATTR_FALLTHROUGH    /*void*/
+#   define H5_ATTR_FORMAT(X,Y,Z)    /*void*/
+#   define H5_ATTR_UNUSED           /*void*/
+#   define H5_ATTR_NDEBUG_UNUSED    /*void*/
+#   define H5_ATTR_DEBUG_API_USED   /*void*/
+#   define H5_ATTR_DEPRECATED_USED  /*void*/
+#   define H5_ATTR_PARALLEL_UNUSED  /*void*/
+#   define H5_ATTR_PARALLEL_USED    /*void*/
+#   define H5_ATTR_NORETURN         /*void*/
+#   define H5_ATTR_CONST            /*void*/
+#   define H5_ATTR_PURE             /*void*/
+#   define H5_ATTR_FALLTHROUGH      /*void*/
 #endif
 #endif /* __cplusplus */
 
@@ -996,9 +1021,12 @@ typedef off_t               h5_stat_size_t;
 #ifndef HDgetrusage
     #define HDgetrusage(X,S)  getrusage(X,S)
 #endif /* HDgetrusage */
-#ifndef HDgets
-    #define HDgets(S)    gets(S)
+
+/* Don't define HDgets - gets() was deprecated in C99 and removed in C11 */
+#ifdef HDgets
+    #undef HDgets
 #endif /* HDgets */
+
 #ifndef HDgettimeofday
     #define HDgettimeofday(S,P)  gettimeofday(S,P)
 #endif /* HDgettimeofday */
@@ -1120,10 +1148,7 @@ typedef off_t               h5_stat_size_t;
     #define HDmemcmp(X,Y,Z)    memcmp(X,Y,Z)
 #endif /* HDmemcmp */
 #ifndef HDmemcpy
-    /* Casts to char pointers are necessary for some compilers (e.g. clang)
-     * and platforms, possibly due to alignment issues.
-     */
-    #define HDmemcpy(X,Y,Z)    memcpy((char*)(X),(const char*)(Y),Z)
+    #define HDmemcpy(X,Y,Z)    memcpy(X,Y,Z)
 #endif /* HDmemcpy */
 #ifndef HDmemmove
     #define HDmemmove(X,Y,Z)  memmove((char*)(X),(const char*)(Y),Z)
@@ -2124,7 +2149,7 @@ H5_DLL herr_t H5CX_pop(void);
  *      are: H5allocate_memory, H5is_library_threadsafe, etc.
  *
  */
-#define FUNC_ENTER_API_NOINIT {{                                              \
+#define FUNC_ENTER_API_NOINIT {{{                                             \
     FUNC_ENTER_API_COMMON                                                     \
     H5_PUSH_FUNC                                                              \
     BEGIN_MPE_LOG                                                             \
@@ -2137,7 +2162,7 @@ H5_DLL herr_t H5CX_pop(void);
  *      are: H5close, H5check_version, etc.
  *
  */
-#define FUNC_ENTER_API_NOINIT_NOERR_NOFS {{                                   \
+#define FUNC_ENTER_API_NOINIT_NOERR_NOFS {{{{                                 \
     FUNC_ENTER_API_VARS                                                       \
     FUNC_ENTER_COMMON_NOERR(H5_IS_API(FUNC));                                 \
     FUNC_ENTER_API_THREADSAFE;                                                \
@@ -2324,14 +2349,14 @@ H5_DLL herr_t H5CX_pop(void);
        (void)H5E_dump_api_stack(TRUE);                                        \
     FUNC_LEAVE_API_THREADSAFE                                                 \
     return(ret_value);                                                        \
-}} /*end scope from beginning of FUNC_ENTER*/
+}}} /*end scope from beginning of FUNC_ENTER*/
 
 /* Use this macro to match the FUNC_ENTER_API_NOINIT_NOERR_NOFS macro */
 #define FUNC_LEAVE_API_NOFS(ret_value)                                        \
     FUNC_LEAVE_API_COMMON(ret_value);                                         \
     FUNC_LEAVE_API_THREADSAFE                                                 \
     return(ret_value);                                                        \
-}} /*end scope from beginning of FUNC_ENTER*/
+}}}} /*end scope from beginning of FUNC_ENTER*/
 
 #define FUNC_LEAVE_NOAPI(ret_value)                                           \
         ;                                                                     \
diff --git a/src/H5public.h b/src/H5public.h
index a3e9e74..fe4e33c 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -349,5 +349,5 @@ H5_DLL void *H5resize_memory(void *mem, size_t size);
 }
 #endif
 #endif /* _H5public_H */
- 
+
 
diff --git a/src/H5system.c b/src/H5system.c
index 4b5e290..a7ca3f8 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -105,8 +105,7 @@ static hbool_t H5_ntzset = FALSE;
  *      format_templ in the code below, but early (4.4.7, at least) gcc only
  *      allows diagnostic pragmas to be toggled outside of functions.
  */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+H5_GCC_DIAG_OFF(format-nonliteral)
 int
 HDfprintf(FILE *stream, const char *fmt, ...)
 {
@@ -432,7 +431,7 @@ HDfprintf(FILE *stream, const char *fmt, ...)
     HDva_end(ap);
     return nout;
 } /* end HDfprintf() */
-#pragma GCC diagnostic pop
+H5_GCC_DIAG_ON(format-nonliteral)
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5timer.c b/src/H5timer.c
index a9ad519..4b1ec06 100644
--- a/src/H5timer.c
+++ b/src/H5timer.c
@@ -13,11 +13,11 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:        H5timer.c
- *            Aug 21 2006
- *            Quincey Koziol <koziol@hdfgroup.org>
+ * Created:		H5timer.c
+ *			Aug 21 2006
+ *			Quincey Koziol <koziol@hdfgroup.org>
  *
- * Purpose:        Internal 'timer' routines & support routines.
+ * Purpose:		Internal 'timer' routines & support routines.
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,7 @@
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"        /* Generic Functions            */
+#include "H5private.h"		/* Generic Functions			*/
 
 /* We need this for the struct rusage declaration */
 #if defined(H5_HAVE_GETRUSAGE) && defined(H5_HAVE_SYS_RESOURCE_H)
@@ -76,16 +76,16 @@
 /* Local Variables */
 /*******************/
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5_timer_reset
+ * Function:	H5_timer_reset
  *
- * Purpose:    Resets the timer struct to zero.  Use this to reset a timer
- *        that's being used as an accumulator for summing times.
+ * Purpose:	Resets the timer struct to zero.  Use this to reset a timer
+ *		that's being used as an accumulator for summing times.
  *
- * Return:    void
+ * Return:	void
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Thursday, April 16, 1998
  *
  *-------------------------------------------------------------------------
@@ -97,15 +97,15 @@ H5_timer_reset (H5_timer_t *timer)
     HDmemset(timer, 0, sizeof *timer);
 } /* end H5_timer_reset() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5_timer_begin
+ * Function:	H5_timer_begin
  *
- * Purpose:    Initialize a timer to time something.
+ * Purpose:	Initialize a timer to time something.
  *
- * Return:    void
+ * Return:	void
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Thursday, April 16, 1998
  *
  *-------------------------------------------------------------------------
@@ -114,10 +114,10 @@ void
 H5_timer_begin (H5_timer_t *timer)
 {
 #ifdef H5_HAVE_GETRUSAGE
-    struct rusage    rusage;
+    struct rusage	rusage;
 #endif
 #ifdef H5_HAVE_GETTIMEOFDAY
-    struct timeval    etime;
+    struct timeval	etime;
 #endif
 
     HDassert(timer);
@@ -140,18 +140,18 @@ H5_timer_begin (H5_timer_t *timer)
 #endif
 } /* end H5_timer_begin() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5_timer_end
+ * Function:	H5_timer_end
  *
- * Purpose:    This function should be called at the end of a timed region.
- *        The SUM is an optional pointer which will accumulate times.
- *        TMS is the same struct that was passed to H5_timer_start().
- *        On return, TMS will contain total times for the timed region.
+ * Purpose:	This function should be called at the end of a timed region.
+ *		The SUM is an optional pointer which will accumulate times.
+ *		TMS is the same struct that was passed to H5_timer_start().
+ *		On return, TMS will contain total times for the timed region.
  *
- * Return:    void
+ * Return:	void
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Thursday, April 16, 1998
  *
  *-------------------------------------------------------------------------
@@ -159,7 +159,7 @@ H5_timer_begin (H5_timer_t *timer)
 void
 H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/)
 {
-    H5_timer_t        now;
+    H5_timer_t		now;
 
     HDassert(timer);
     H5_timer_begin(&now);
@@ -175,28 +175,28 @@ H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/)
     }
 } /* end H5_timer_end() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5_bandwidth
+ * Function:	H5_bandwidth
  *
- * Purpose:    Prints the bandwidth (bytes per second) in a field 10
- *        characters wide widh four digits of precision like this:
+ * Purpose:	Prints the bandwidth (bytes per second) in a field 10
+ *		characters wide widh four digits of precision like this:
  *
- *                    NaN    If <=0 seconds
- *            1234. TB/s
- *             123.4 TB/s
- *            12.34 GB/s
- *            1.234 MB/s
- *            4.000 kB/s
- *            1.000  B/s
- *            0.000  B/s    If NBYTES==0
- *            1.2345e-10    For bandwidth less than 1
- *            6.7893e+94    For exceptionally large values
- *            6.678e+106    For really big values
+ * 			       NaN	If <=0 seconds
+ *			1234. TB/s
+ * 			123.4 TB/s
+ *			12.34 GB/s
+ *			1.234 MB/s
+ *			4.000 kB/s
+ *			1.000  B/s
+ *			0.000  B/s	If NBYTES==0
+ *			1.2345e-10	For bandwidth less than 1
+ *			6.7893e+94	For exceptionally large values
+ *			6.678e+106	For really big values
  *
- * Return:    void
+ * Return:	void
  *
- * Programmer:    Robb Matzke
+ * Programmer:	Robb Matzke
  *              Wednesday, August  5, 1998
  *
  *-------------------------------------------------------------------------
@@ -204,7 +204,7 @@ H5_timer_end (H5_timer_t *sum/*in,out*/, H5_timer_t *timer/*in,out*/)
 void
 H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds)
 {
-    double    bw;
+    double	bw;
 
     if(nseconds <= (double)0.0F)
         HDstrcpy(buf, "       NaN");
@@ -237,15 +237,15 @@ H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds)
     }
 } /* end H5_bandwidth() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5_now
+ * Function:	H5_now
  *
- * Purpose:    Retrieves the current time, as seconds after the UNIX epoch.
+ * Purpose:	Retrieves the current time, as seconds after the UNIX epoch.
  *
- * Return:    # of seconds from the epoch (can't fail)
+ * Return:	# of seconds from the epoch (can't fail)
  *
- * Programmer:    Quincey Koziol
+ * Programmer:	Quincey Koziol
  *              Tuesday, November 28, 2006
  *
  *-------------------------------------------------------------------------
@@ -253,7 +253,7 @@ H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds)
 time_t
 H5_now(void)
 {
-    time_t    now;                    /* Current time */
+    time_t	now;                    /* Current time */
 
 #ifdef H5_HAVE_GETTIMEOFDAY
     {
diff --git a/src/H5trace.c b/src/H5trace.c
index eef268c..afcf309 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -25,7 +25,7 @@
 /****************/
 /* Module Setup */
 /****************/
-#define H5I_FRIEND		/*suppress error about including H5Ipkg	  */
+#define H5I_FRIEND        /*suppress error about including H5Ipkg      */
 
 /***********/
 /* Headers */
@@ -78,7 +78,7 @@
 /*******************/
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5_trace
  *
@@ -133,8 +133,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
     /* FUNC_ENTER() should not be called */
 
     if(!out)
-        return 0.0F;	/*tracing is off*/
-    va_start(ap, type);
+        return 0.0F;    /*tracing is off*/
+    HDva_start(ap, type);
 
     if(H5_debug_g.ttop) {
         if(returning) {
@@ -153,7 +153,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
     } /* end if */
 
     /* Get time for event */
-    if(H5_DBL_ABS_EQUAL(first_time.etime, H5_DOUBLE(0.0)))
+    if(H5_DBL_ABS_EQUAL(first_time.etime, (double)0.0f))
         H5_timer_begin(&first_time);
     if(H5_debug_g.ttimes)
         H5_timer_begin(&event_time);
@@ -172,7 +172,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
         if(current_depth < last_call_depth) {
             /* We are at the beginning of a line */
             if(H5_debug_g.ttimes) {
-                char tmp[128];
+                char tmp[320];
 
                 HDsprintf(tmp, "%.6f", event_time.etime-first_time.etime);
                 HDfprintf(out, " %*s ", (int)HDstrlen(tmp), "");
@@ -226,7 +226,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
          * name is the null pointer then don't print the argument or the
          * following `='.  This is used for return values.
          */
-        argname = va_arg(ap, char *);
+        argname = HDva_arg(ap, char *);
         if(argname) {
             unsigned n = (unsigned)MAX (0, (int)HDstrlen(argname) - 3);
 
@@ -242,7 +242,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
 
         /* The value */
         if(ptr)
-            vp = va_arg(ap, void *);
+            vp = HDva_arg(ap, void *);
         switch(type[0]) {
             case 'a':
                 if(ptr) {
@@ -252,7 +252,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    haddr_t addr = va_arg(ap, haddr_t);
+                    haddr_t addr = HDva_arg(ap, haddr_t);
 
                     HDfprintf(out, "%a", addr);
                 } /* end else */
@@ -266,8 +266,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                     } /* end if */
                 else {
-                    /* Can't pass hbool_t to va_arg() */
-                    hbool_t bool_var = (hbool_t)va_arg(ap, int);
+                    /* Can't pass hbool_t to HDva_arg() */
+                    hbool_t bool_var = (hbool_t)HDva_arg(ap, int);
                     if(TRUE == bool_var)
                         HDfprintf(out, "TRUE");
                     else if(!bool_var)
@@ -285,7 +285,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    double dbl = va_arg(ap, double);
+                    double dbl = HDva_arg(ap, double);
 
                     HDfprintf(out, "%g", dbl);
                 } /* end else */
@@ -301,7 +301,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_alloc_time_t alloc_time = (H5D_alloc_time_t)va_arg(ap, int);
+                            H5D_alloc_time_t alloc_time = (H5D_alloc_time_t)HDva_arg(ap, int);
 
                             switch(alloc_time) {
                                 case H5D_ALLOC_TIME_ERROR:
@@ -339,7 +339,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5FD_mpio_collective_opt_t opt = (H5FD_mpio_collective_opt_t)va_arg(ap, int);
+                            H5FD_mpio_collective_opt_t opt = (H5FD_mpio_collective_opt_t)HDva_arg(ap, int);
 
                             switch(opt) {
                                 case H5FD_MPIO_COLLECTIVE_IO:
@@ -365,7 +365,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_fill_time_t fill_time = (H5D_fill_time_t)va_arg(ap, int);
+                            H5D_fill_time_t fill_time = (H5D_fill_time_t)HDva_arg(ap, int);
 
                             switch(fill_time) {
                                 case H5D_FILL_TIME_ERROR:
@@ -399,7 +399,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_fill_value_t fill_value = (H5D_fill_value_t)va_arg(ap, int);
+                            H5D_fill_value_t fill_value = (H5D_fill_value_t)HDva_arg(ap, int);
 
                             switch(fill_value) {
                                 case H5D_FILL_VALUE_ERROR:
@@ -433,7 +433,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5FD_mpio_chunk_opt_t opt = (H5FD_mpio_chunk_opt_t)va_arg(ap, int);
+                            H5FD_mpio_chunk_opt_t opt = (H5FD_mpio_chunk_opt_t)HDva_arg(ap, int);
 
                             switch(opt) {
                                 case H5FD_MPIO_CHUNK_DEFAULT:
@@ -463,7 +463,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_mpio_actual_io_mode_t actual_io_mode = (H5D_mpio_actual_io_mode_t)va_arg(ap, int);
+                            H5D_mpio_actual_io_mode_t actual_io_mode = (H5D_mpio_actual_io_mode_t)HDva_arg(ap, int);
 
                             switch(actual_io_mode) {
                                 case H5D_MPIO_NO_COLLECTIVE:
@@ -501,7 +501,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_chunk_index_t idx = (H5D_chunk_index_t)va_arg(ap, int);
+                            H5D_chunk_index_t idx = (H5D_chunk_index_t)HDva_arg(ap, int);
 
                             switch(idx) {
                                 case H5D_CHUNK_IDX_BTREE:
@@ -547,7 +547,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_layout_t layout = (H5D_layout_t)va_arg(ap, int);
+                            H5D_layout_t layout = (H5D_layout_t)HDva_arg(ap, int);
 
                             switch(layout) {
                                 case H5D_LAYOUT_ERROR:
@@ -589,7 +589,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_mpio_no_collective_cause_t nocol_cause_mode = (H5D_mpio_no_collective_cause_t)va_arg(ap, int);
+                            H5D_mpio_no_collective_cause_t nocol_cause_mode = (H5D_mpio_no_collective_cause_t)HDva_arg(ap, int);
                             hbool_t flag_already_displayed = FALSE;
 
                             /* Check for all bit-flags which might be set */
@@ -636,7 +636,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_mpio_actual_chunk_opt_mode_t chunk_opt_mode = (H5D_mpio_actual_chunk_opt_mode_t)va_arg(ap, int);
+                            H5D_mpio_actual_chunk_opt_mode_t chunk_opt_mode = (H5D_mpio_actual_chunk_opt_mode_t)HDva_arg(ap, int);
 
                             switch(chunk_opt_mode) {
                                 case H5D_MPIO_NO_CHUNK_OPTIMIZATION:
@@ -666,7 +666,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_space_status_t space_status = (H5D_space_status_t)va_arg(ap, int);
+                            H5D_space_status_t space_status = (H5D_space_status_t)HDva_arg(ap, int);
 
                             switch(space_status) {
                                 case H5D_SPACE_STATUS_NOT_ALLOCATED:
@@ -700,7 +700,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5FD_mpio_xfer_t transfer = (H5FD_mpio_xfer_t)va_arg(ap, int);
+                            H5FD_mpio_xfer_t transfer = (H5FD_mpio_xfer_t)HDva_arg(ap, int);
 
                             switch(transfer) {
                                 case H5FD_MPIO_INDEPENDENT:
@@ -726,7 +726,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5D_vds_view_t view = (H5D_vds_view_t)va_arg(ap, int);
+                            H5D_vds_view_t view = (H5D_vds_view_t)HDva_arg(ap, int);
 
                             switch(view) {
                                 case H5D_VDS_ERROR:
@@ -762,11 +762,11 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                        HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    herr_t status = va_arg(ap, herr_t);
+                    herr_t status = HDva_arg(ap, herr_t);
 
                     if(status >= 0)
                        HDfprintf(out, "SUCCEED");
-                    else 
+                    else
                        HDfprintf(out, "FAIL");
                 } /* end else */
                 break;
@@ -781,7 +781,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5E_direction_t direction = (H5E_direction_t)va_arg(ap, int);
+                            H5E_direction_t direction = (H5E_direction_t)HDva_arg(ap, int);
 
                             switch(direction) {
                                 case H5E_WALK_UPWARD:
@@ -807,7 +807,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5E_error2_t *error = va_arg(ap, H5E_error2_t *);
+                            H5E_error2_t *error = HDva_arg(ap, H5E_error2_t *);
 
                            HDfprintf(out, "0x%lx", (unsigned long)error);
                         } /* end else */
@@ -821,7 +821,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5E_type_t etype = (H5E_type_t)va_arg(ap, int);
+                            H5E_type_t etype = (H5E_type_t)HDva_arg(ap, int);
 
                             switch(etype) {
                                 case H5E_MAJOR:
@@ -855,7 +855,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5F_close_degree_t degree = (H5F_close_degree_t)va_arg(ap, int);
+                            H5F_close_degree_t degree = (H5F_close_degree_t)HDva_arg(ap, int);
 
                             switch(degree) {
                                 case H5F_CLOSE_DEFAULT:
@@ -889,7 +889,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5F_fspace_strategy_t fs_strategy = (H5F_fspace_strategy_t)va_arg(ap, int);
+                            H5F_fspace_strategy_t fs_strategy = (H5F_fspace_strategy_t)HDva_arg(ap, int);
 
                             switch(fs_strategy) {
                                 case H5F_FSPACE_STRATEGY_FSM_AGGR:
@@ -924,7 +924,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5F_mem_t mem_type = (H5F_mem_t)va_arg(ap, int);
+                            H5F_mem_t mem_type = (H5F_mem_t)HDva_arg(ap, int);
 
                             switch(mem_type) {
                                 case H5FD_MEM_NOLIST:
@@ -975,7 +975,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5F_scope_t scope = (H5F_scope_t)va_arg(ap, int);
+                            H5F_scope_t scope = (H5F_scope_t)HDva_arg(ap, int);
 
                             switch(scope) {
                                 case H5F_SCOPE_LOCAL:
@@ -1010,7 +1010,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5F_libver_t libver_vers = (H5F_libver_t)va_arg(ap, int);
+                            H5F_libver_t libver_vers = (H5F_libver_t)HDva_arg(ap, int);
 
                             switch(libver_vers) {
                                 case H5F_LIBVER_EARLIEST:
@@ -1052,7 +1052,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5G_obj_t obj_type = (H5G_obj_t)va_arg(ap, int);
+                            H5G_obj_t obj_type = (H5G_obj_t)HDva_arg(ap, int);
 
                             switch(obj_type) {
                                 case H5G_UNKNOWN:
@@ -1100,7 +1100,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5G_stat_t *statbuf = va_arg(ap, H5G_stat_t*);
+                            H5G_stat_t *statbuf = HDva_arg(ap, H5G_stat_t*);
 
                             HDfprintf(out, "0x%lx", (unsigned long)statbuf);
                         }
@@ -1134,7 +1134,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    hsize_t hsize = va_arg(ap, hsize_t);
+                    hsize_t hsize = HDva_arg(ap, hsize_t);
 
                     if(H5S_UNLIMITED == hsize)
                         HDfprintf(out, "H5S_UNLIMITED");
@@ -1164,7 +1164,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            hssize_t hssize = va_arg(ap, hssize_t);
+                            hssize_t hssize = HDva_arg(ap, hssize_t);
 
                             HDfprintf(out, "%Hd", hssize);
                             asize[argno] = (hssize_t)hssize;
@@ -1185,7 +1185,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    hid_t obj = va_arg(ap, hid_t);
+                    hid_t obj = HDva_arg(ap, hid_t);
 
                     if(H5P_DEFAULT == obj)
                         HDfprintf(out, "H5P_DEFAULT");
@@ -1373,7 +1373,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5_index_t idx_type = (H5_index_t)va_arg(ap, int);
+                            H5_index_t idx_type = (H5_index_t)HDva_arg(ap, int);
 
                             switch(idx_type) {
                                 case H5_INDEX_UNKNOWN:
@@ -1407,7 +1407,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5_iter_order_t order = (H5_iter_order_t)va_arg(ap, int);
+                            H5_iter_order_t order = (H5_iter_order_t)HDva_arg(ap, int);
 
                             switch(order) {
                                 case H5_ITER_UNKNOWN:
@@ -1454,7 +1454,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            int is = va_arg(ap, int);
+                            int is = HDva_arg(ap, int);
 
                             HDfprintf (out, "%d", is);
                             asize[argno] = is;
@@ -1469,7 +1469,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5I_type_t id_type = (H5I_type_t)va_arg(ap, int);
+                            H5I_type_t id_type = (H5I_type_t)HDva_arg(ap, int);
 
                             switch (id_type) {
                                 case H5I_UNINIT:
@@ -1560,7 +1560,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            unsigned iu = va_arg(ap, unsigned);
+                            unsigned iu = HDva_arg(ap, unsigned);
 
                             HDfprintf(out, "%u", iu);
                             asize[argno] = iu;
@@ -1583,7 +1583,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5L_type_t link_type = (H5L_type_t)va_arg(ap, int);
+                            H5L_type_t link_type = (H5L_type_t)HDva_arg(ap, int);
 
                             switch(link_type) {
                                 case H5L_TYPE_ERROR:
@@ -1630,7 +1630,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         } /* end if */
 #ifdef H5_HAVE_PARALLEL
                         else {
-                            MPI_Comm comm = va_arg(ap, MPI_Comm);
+                            MPI_Comm comm = HDva_arg(ap, MPI_Comm);
 
                             HDfprintf(out, "%ld", (long)comm);
                         } /* end else */
@@ -1646,7 +1646,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         } /* end if */
 #ifdef H5_HAVE_PARALLEL
                         else {
-                            MPI_Info info = va_arg(ap, MPI_Info);
+                            MPI_Info info = HDva_arg(ap, MPI_Info);
 
                             HDfprintf(out, "%ld", (long)info);
                         } /* end else */
@@ -1661,7 +1661,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5FD_mem_t mt = (H5FD_mem_t)va_arg(ap, int);
+                            H5FD_mem_t mt = (H5FD_mem_t)HDva_arg(ap, int);
 
                             switch(mt) {
                                 case H5FD_MEM_NOLIST:
@@ -1720,7 +1720,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    off_t offset = va_arg(ap, off_t);
+                    off_t offset = HDva_arg(ap, off_t);
 
                     HDfprintf (out, "%ld", (long)offset);
                 } /* end else */
@@ -1736,7 +1736,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5O_type_t objtype = (H5O_type_t)va_arg(ap, int);
+                            H5O_type_t objtype = (H5O_type_t)HDva_arg(ap, int);
 
                             switch(objtype) {
                                 case H5O_TYPE_UNKNOWN:
@@ -1756,7 +1756,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                     break;
 
                                 case H5O_TYPE_NTYPES:
-                                    HDfprintf(out, "H5O_TYPE_TYPES");
+                                    HDfprintf(out, "H5O_TYPE_NTYPES");
                                     break;
 
                                 default:
@@ -1780,7 +1780,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    hid_t pclass_id = va_arg(ap, hid_t);
+                    hid_t pclass_id = HDva_arg(ap, hid_t);
                     char *class_name = NULL;
                     H5P_genclass_t *pclass;
 
@@ -1804,7 +1804,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    hobj_ref_t ref = va_arg(ap, hobj_ref_t);
+                    hobj_ref_t ref = HDva_arg(ap, hobj_ref_t);
 
                     HDfprintf(out, "Reference Object=%a", ref);
                 } /* end else */
@@ -1820,7 +1820,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5R_type_t reftype = (H5R_type_t)va_arg(ap, int);
+                            H5R_type_t reftype = (H5R_type_t)HDva_arg(ap, int);
 
                             switch(reftype) {
                                 case H5R_BADTYPE:
@@ -1862,7 +1862,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5S_class_t cls = (H5S_class_t)va_arg(ap, int);
+                            H5S_class_t cls = (H5S_class_t)HDva_arg(ap, int);
 
                             switch(cls) {
                                 case H5S_NO_CLASS:
@@ -1896,7 +1896,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5S_seloper_t so = (H5S_seloper_t)va_arg(ap, int);
+                            H5S_seloper_t so = (H5S_seloper_t)HDva_arg(ap, int);
 
                             switch(so) {
                                 case H5S_SELECT_NOOP:
@@ -1954,7 +1954,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5S_sel_type st = (H5S_sel_type)va_arg(ap, int);
+                            H5S_sel_type st = (H5S_sel_type)HDva_arg(ap, int);
 
                             switch(st) {
                                 case H5S_SEL_ERROR:
@@ -2002,7 +2002,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    const char *str = va_arg(ap, const char *);
+                    const char *str = HDva_arg(ap, const char *);
 
                     HDfprintf(out, "\"%s\"", str);
                 } /* end else */
@@ -2018,7 +2018,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_cset_t cset = (H5T_cset_t)va_arg(ap, int);
+                            H5T_cset_t cset = (H5T_cset_t)HDva_arg(ap, int);
 
                             switch(cset) {
                                 case H5T_CSET_ERROR:
@@ -2065,7 +2065,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_direction_t direct = (H5T_direction_t)va_arg(ap, int);
+                            H5T_direction_t direct = (H5T_direction_t)HDva_arg(ap, int);
 
                             switch(direct) {
                                 case H5T_DIR_DEFAULT:
@@ -2095,7 +2095,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_pers_t pers = (H5T_pers_t)va_arg(ap, int);
+                            H5T_pers_t pers = (H5T_pers_t)HDva_arg(ap, int);
 
                             switch(pers) {
                                 case H5T_PERS_DONTCARE:
@@ -2125,7 +2125,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_norm_t norm = (H5T_norm_t)va_arg(ap, int);
+                            H5T_norm_t norm = (H5T_norm_t)HDva_arg(ap, int);
 
                             switch(norm) {
                                 case H5T_NORM_ERROR:
@@ -2159,7 +2159,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_order_t order = (H5T_order_t)va_arg(ap, int);
+                            H5T_order_t order = (H5T_order_t)HDva_arg(ap, int);
 
                             switch(order) {
                                 case H5T_ORDER_ERROR:
@@ -2201,7 +2201,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_pad_t pad = (H5T_pad_t)va_arg(ap, int);
+                            H5T_pad_t pad = (H5T_pad_t)HDva_arg(ap, int);
 
                             switch(pad) {
                                 case H5T_PAD_ERROR:
@@ -2239,7 +2239,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_sign_t sign = (H5T_sign_t)va_arg(ap, int);
+                            H5T_sign_t sign = (H5T_sign_t)HDva_arg(ap, int);
 
                             switch(sign) {
                                 case H5T_SGN_ERROR:
@@ -2273,7 +2273,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_class_t type_class = (H5T_class_t)va_arg(ap, int);
+                            H5T_class_t type_class = (H5T_class_t)HDva_arg(ap, int);
 
                             switch(type_class) {
                                 case H5T_NO_CLASS:
@@ -2343,7 +2343,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5T_str_t str = (H5T_str_t)va_arg(ap, int);
+                            H5T_str_t str = (H5T_str_t)HDva_arg(ap, int);
 
                             switch(str) {
                                 case H5T_STR_ERROR:
@@ -2399,7 +2399,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    htri_t tri_var = va_arg (ap, htri_t);
+                    htri_t tri_var = HDva_arg (ap, htri_t);
 
                     if(tri_var>0)
                         HDfprintf (out, "TRUE");
@@ -2429,7 +2429,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            unsigned long iul = va_arg(ap, unsigned long);
+                            unsigned long iul = HDva_arg(ap, unsigned long);
 
                             HDfprintf(out, "%lu", iul);
                             asize[argno] = (hssize_t)iul;
@@ -2453,7 +2453,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            unsigned long long iull = va_arg(ap, unsigned long long);
+                            unsigned long long iull = HDva_arg(ap, unsigned long long);
 
                             HDfprintf(out, "%llu", iull);
                             asize[argno] = (hssize_t)iull;
@@ -2487,7 +2487,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    vp = va_arg (ap, void *);
+                    vp = HDva_arg (ap, void *);
 
                     if(vp)
                         HDfprintf(out, "0x%lx", (unsigned long)vp);
@@ -2513,7 +2513,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                         HDfprintf(out, "NULL");
                 } /* end if */
                 else {
-                    size_t size = va_arg(ap, size_t);
+                    size_t size = HDva_arg(ap, size_t);
 
                     HDfprintf(out, "%Zu", size);
                     asize[argno] = (hssize_t)size;
@@ -2530,7 +2530,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5Z_SO_scale_type_t scale_type = (H5Z_SO_scale_type_t)va_arg(ap, int);
+                            H5Z_SO_scale_type_t scale_type = (H5Z_SO_scale_type_t)HDva_arg(ap, int);
 
                             switch(scale_type) {
                                 case H5Z_SO_FLOAT_DSCALE:
@@ -2560,7 +2560,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5Z_class2_t *filter = va_arg(ap, H5Z_class2_t*);
+                            H5Z_class2_t *filter = HDva_arg(ap, H5Z_class2_t*);
 
                             HDfprintf(out, "0x%lx", (unsigned long)filter);
                         } /* end else */
@@ -2574,7 +2574,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5Z_EDC_t edc = (H5Z_EDC_t)va_arg(ap, int);
+                            H5Z_EDC_t edc = (H5Z_EDC_t)HDva_arg(ap, int);
 
                             if(H5Z_DISABLE_EDC == edc)
                                 HDfprintf(out, "H5Z_DISABLE_EDC");
@@ -2593,7 +2593,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            H5Z_filter_t id = va_arg(ap, H5Z_filter_t);
+                            H5Z_filter_t id = HDva_arg(ap, H5Z_filter_t);
 
                             if(H5Z_FILTER_DEFLATE == id)
                                 HDfprintf(out, "H5Z_FILTER_DEFLATE");
@@ -2619,7 +2619,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                                 HDfprintf(out, "NULL");
                         } /* end if */
                         else {
-                            ssize_t ssize = va_arg(ap, ssize_t);
+                            ssize_t ssize = HDva_arg(ap, ssize_t);
 
                             HDfprintf(out, "%Zd", ssize);
                             asize[argno] = (hssize_t)ssize;
@@ -2647,7 +2647,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
                 (event_time.etime - *returning));
 
 error:
-    va_end(ap);
+    HDva_end(ap);
     if(returning)
         HDfprintf(out, ";\n");
     else {
diff --git a/src/H5vers.txt b/src/H5vers.txt
index 0303bf5..1834f65 100644
--- a/src/H5vers.txt
+++ b/src/H5vers.txt
@@ -20,7 +20,7 @@
 # Blank lines and lines beginning with '#' are ignored
 #
 # The format of this file is as follows:
-#  <type>: <base routine name>; <list of parameter types for function>; <version introduced>, <list of revised versions>
+#  <type>: <base routine name>; <list of versioned parameter types for function>; <version introduced>, <list of revised versions>
 #
 # Where <type> is either 'FUNCTION' or 'TYPEDEF'
 #
diff --git a/src/Makefile.am b/src/Makefile.am
index 7126e44..dbbac99 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -136,14 +136,14 @@ include_HEADERS = hdf5.h H5api_adpt.h H5overflow.h H5pubconf.h H5public.h H5vers
         H5Apublic.h H5ACpublic.h \
         H5Cpublic.h H5Dpublic.h \
         H5Epubgen.h H5Epublic.h H5Fpublic.h \
-        H5FDpublic.h H5FDcore.h H5FDdirect.h \
-        H5FDfamily.h H5FDhdfs.h H5FDlog.h H5FDmpi.h H5FDmpio.h \
-        H5FDmulti.h H5FDros3.h H5FDsec2.h H5FDstdio.h H5FDwindows.h \
+        H5FDpublic.h H5FDcore.h H5FDdirect.h H5FDfamily.h H5FDhdfs.h \
+        H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmulti.h H5FDros3.h \
+        H5FDsec2.h H5FDstdio.h H5FDwindows.h \
         H5Gpublic.h  H5Ipublic.h H5Lpublic.h \
         H5MMpublic.h H5Opublic.h H5Ppublic.h \
         H5PLextern.h H5PLpublic.h \
-        H5Rpublic.h H5Spublic.h \
-        H5Tpublic.h H5Zpublic.h
+        H5Rpublic.h H5Spublic.h H5Tpublic.h \
+        H5Zpublic.h
 
 # install libhdf5.settings in lib directory
 settingsdir=$(libdir)
diff --git a/src/hdf5.lnt b/src/hdf5.lnt
index 3d7d5b2..995e3f6 100644
--- a/src/hdf5.lnt
+++ b/src/hdf5.lnt
@@ -55,7 +55,7 @@
         H5FO.c
 
         H5Tcommit.c
-	H5Tcompound.c
+        H5Tcompound.c
 
         H5Tcset.c
         H5Tenum.c
diff --git a/tools/test/h5dump/errfiles/tall-1.err b/tools/test/h5dump/errfiles/tall-1.err
index f4c2d91..8503b9e 100644
--- a/tools/test/h5dump/errfiles/tall-1.err
+++ b/tools/test/h5dump/errfiles/tall-1.err
@@ -24,5 +24,5 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     major: Links
     minor: Unable to open file
   #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
-    major: File accessibilty
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2A.err b/tools/test/h5dump/errfiles/tall-2A.err
index f4c2d91..8503b9e 100644
--- a/tools/test/h5dump/errfiles/tall-2A.err
+++ b/tools/test/h5dump/errfiles/tall-2A.err
@@ -24,5 +24,5 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     major: Links
     minor: Unable to open file
   #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
-    major: File accessibilty
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2A0.err b/tools/test/h5dump/errfiles/tall-2A0.err
index f4c2d91..8503b9e 100644
--- a/tools/test/h5dump/errfiles/tall-2A0.err
+++ b/tools/test/h5dump/errfiles/tall-2A0.err
@@ -24,5 +24,5 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     major: Links
     minor: Unable to open file
   #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
-    major: File accessibilty
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2B.err b/tools/test/h5dump/errfiles/tall-2B.err
index f4c2d91..8503b9e 100644
--- a/tools/test/h5dump/errfiles/tall-2B.err
+++ b/tools/test/h5dump/errfiles/tall-2B.err
@@ -24,5 +24,5 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     major: Links
     minor: Unable to open file
   #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
-    major: File accessibilty
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/textlink.err b/tools/test/h5dump/errfiles/textlink.err
index 4a5f545..96a7475 100644
--- a/tools/test/h5dump/errfiles/textlink.err
+++ b/tools/test/h5dump/errfiles/textlink.err
@@ -24,7 +24,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     major: Links
     minor: Unable to open file
   #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'filename', temp_file_name = 'filename'
-    major: File accessibilty
+    major: File accessibility
     minor: Unable to open file
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
@@ -52,5 +52,5 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     major: Links
     minor: Unable to open file
   #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'anotherfile', temp_file_name = 'anotherfile'
-    major: File accessibilty
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/torderlinks1.err b/tools/test/h5dump/errfiles/torderlinks1.err
index 648906b..e151d78 100644
--- a/tools/test/h5dump/errfiles/torderlinks1.err
+++ b/tools/test/h5dump/errfiles/torderlinks1.err
@@ -24,5 +24,5 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     major: Links
     minor: Unable to open file
   #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
-    major: File accessibilty
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/torderlinks2.err b/tools/test/h5dump/errfiles/torderlinks2.err
index 648906b..e151d78 100644
--- a/tools/test/h5dump/errfiles/torderlinks2.err
+++ b/tools/test/h5dump/errfiles/torderlinks2.err
@@ -24,5 +24,5 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     major: Links
     minor: Unable to open file
   #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
-    major: File accessibilty
+    major: File accessibility
     minor: Unable to open file