From e26a95c95a62ddf15fb509ff2273b274f648384d Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 30 Nov 2017 16:25:42 -0600
Subject: Test increase of version

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02bb516..da2382b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.3)
 PROJECT (HDF5 C CXX)
 
 #-----------------------------------------------------------------------------
-- 
cgit v0.12


From cf09927977d43fe5036224f4c3d163d0218bb8d3 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 1 Dec 2017 13:34:10 -0600
Subject: H5detect and make_libsettings need the include folder

---
 src/CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a825958..616b53d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -613,6 +613,9 @@ set (H5_PRIVATE_HEADERS
 #-----------------------------------------------------------------------------
 add_executable (H5detect ${HDF5_SRC_DIR}/H5detect.c)
 TARGET_C_PROPERTIES (H5detect STATIC " " " ")
+if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
+  target_include_directories (H5detect PUBLIC ${MPI_C_INCLUDE_DIRS})
+endif ()
 if (MSVC OR MINGW)
   target_link_libraries (H5detect "ws2_32.lib")
 endif ()
@@ -627,6 +630,9 @@ add_custom_command (
 
 add_executable (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c)
 TARGET_C_PROPERTIES (H5make_libsettings STATIC " " " ")
+if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
+  target_include_directories (H5make_libsettings PUBLIC ${MPI_C_INCLUDE_DIRS})
+endif ()
 if (MSVC OR MINGW)
   target_link_libraries (H5make_libsettings "ws2_32.lib")
 endif ()
-- 
cgit v0.12


From fd4de809a743ed32a2042e611851eb6acb623c34 Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Sun, 17 Dec 2017 21:29:50 -0600
Subject: Snapshot version 1.8 release 21 (snap1)

---
 README.txt                            | 2 +-
 c++/src/cpp_doc_config                | 2 +-
 config/cmake/scripts/HDF5config.cmake | 2 +-
 configure.ac                          | 2 +-
 release_docs/RELEASE.txt              | 2 +-
 src/H5public.h                        | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index cae4018..2f71026 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap1 currently under development
+HDF5 version 1.8.21-snap2 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index f0aaa51..a44864f 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap1, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap2, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 769db0e..492a6b7 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
-set (CTEST_SOURCE_VERSEXT "-snap1")
+set (CTEST_SOURCE_VERSEXT "-snap2")
 
 ##############################################################################
 # handle input parameters to script.
diff --git a/configure.ac b/configure.ac
index 4d3ba3d..b236963 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap1], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap2], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index e0d37d7..f430106 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap1 currently under development
+HDF5 version 1.8.21-snap2 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index d01229b..9d54967 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap1"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap2"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap1"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap2"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
-- 
cgit v0.12


From a608cd4e09213433ec7799777da4a0a98a03ed42 Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Tue, 19 Dec 2017 09:19:51 -0600
Subject: napshot version 1.8 release 21 (snap1)

---
 configure | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index 58ff0e9..1671c32 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap0.
+# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap2.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.8.21-snap0'
-PACKAGE_STRING='HDF5 1.8.21-snap0'
+PACKAGE_VERSION='1.8.21-snap2'
+PACKAGE_STRING='HDF5 1.8.21-snap2'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.8.21-snap0 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.8.21-snap2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.8.21-snap0:";;
+     short | recursive ) echo "Configuration of HDF5 1.8.21-snap2:";;
    esac
   cat <<\_ACEOF
 
@@ -1745,7 +1745,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.8.21-snap0
+HDF5 configure 1.8.21-snap2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2682,7 +2682,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.8.21-snap0, which was
+It was created by HDF5 $as_me 1.8.21-snap2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3553,7 +3553,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.8.21-snap0'
+ VERSION='1.8.21-snap2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -29313,7 +29313,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-HDF5 config.lt 1.8.21-snap0
+HDF5 config.lt 1.8.21-snap2
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -31373,7 +31373,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.8.21-snap0, which was
+This file was extended by HDF5 $as_me 1.8.21-snap2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31439,7 +31439,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.8.21-snap0
+HDF5 config.status 1.8.21-snap2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-- 
cgit v0.12


From 1aa2c22264c70dcbff7cfefef08a6b588261b27e Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 20 Dec 2017 10:28:00 -0600
Subject: HDFFV-10307 Add HDtupper() call for Windows drive

---
 src/H5system.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/H5system.c b/src/H5system.c
index be21d83..398ffee 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -782,7 +782,7 @@ H5_build_extpath(const char *name, char **extpath /*out*/)
          * Unix: does not apply
          */
         if(H5_CHECK_ABS_DRIVE(name)) {
-            drive = name[0] - 'A' + 1;
+            drive = HDtoupper(name[0]) - 'A' + 1;
             retcwd = HDgetdcwd(drive, cwdpath, MAX_PATH_LEN);
             HDstrncpy(new_name, &name[2], name_len);
         } /* end if */
@@ -876,7 +876,7 @@ H5_combine_path(const char* path1, const char* path2, char **full_name /*out*/)
         if(NULL == (*full_name = (char *)H5MM_strdup(path2)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
-    } /* end if */ 
+    } /* end if */
     else if(H5_CHECK_ABS_PATH(path2)) {
 
         /* On windows path2 is a path absolute name */
-- 
cgit v0.12


From 1dbec5a7c30115f98f7ff1785772fd30b1a4f7e9 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 20 Dec 2017 12:46:53 -0600
Subject: Update with latest from CMake master

---
 config/cmake_ext_mod/FindMPI.cmake | 287 ++++++++++++++++++++++---------------
 1 file changed, 170 insertions(+), 117 deletions(-)

diff --git a/config/cmake_ext_mod/FindMPI.cmake b/config/cmake_ext_mod/FindMPI.cmake
index 8084472..d01dd35 100644
--- a/config/cmake_ext_mod/FindMPI.cmake
+++ b/config/cmake_ext_mod/FindMPI.cmake
@@ -347,7 +347,7 @@ function (_MPI_check_compiler LANG QUERY_FLAG OUTPUT_VARIABLE RESULT_VARIABLE)
   # library that has invalid or missing version information there would be warning
   # messages emitted by ld.so in the compiler output. In either case, we'll treat
   # the output as invalid.
-  if("${WRAPPER_OUTPUT}" MATCHES "undefined reference|unrecognized|need to set|no version information available")
+  if("${WRAPPER_OUTPUT}" MATCHES "undefined reference|unrecognized|need to set|no version information available|command not found")
     set(WRAPPER_RETURN 255)
   endif()
   # Ensure that no error output might be passed upwards.
@@ -615,6 +615,16 @@ function (_MPI_interrogate_compiler lang)
     endif()
   endif()
 
+  if(MPI_${LANG}_EXTRA_COMPILE_DEFINITIONS)
+    list(APPEND MPI_COMPILE_DEFINITIONS_WORK "${MPI_${LANG}_EXTRA_COMPILE_DEFINITIONS}")
+  endif()
+  if(MPI_${LANG}_EXTRA_COMPILE_OPTIONS)
+    list(APPEND MPI_COMPILE_OPTIONS_WORK "${MPI_${LANG}_EXTRA_COMPILE_OPTIONS}")
+  endif()
+  if(MPI_${LANG}_EXTRA_LIB_NAMES)
+    list(APPEND MPI_PLAIN_LIB_NAMES_WORK "${MPI_${LANG}_EXTRA_LIB_NAMES}")
+  endif()
+
   # If we found MPI, set up all of the appropriate cache entries
   if(NOT MPI_${LANG}_COMPILE_OPTIONS)
     set(MPI_${LANG}_COMPILE_OPTIONS          ${MPI_COMPILE_OPTIONS_WORK}     CACHE STRING "MPI ${LANG} compilation options"            FORCE)
@@ -823,33 +833,43 @@ endfunction()
 
 macro(_MPI_assemble_libraries LANG)
   set(MPI_${LANG}_LIBRARIES "")
-  foreach(mpilib IN LISTS MPI_${LANG}_LIB_NAMES)
-    list(APPEND MPI_${LANG}_LIBRARIES ${MPI_${mpilib}_LIBRARY})
-  endforeach()
+  # Only for libraries do we need to check whether the compiler's linking stage is separate.
+  if(NOT "${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}" OR NOT MPI_${LANG}_WORKS_IMPLICIT)
+    foreach(mpilib IN LISTS MPI_${LANG}_LIB_NAMES)
+      list(APPEND MPI_${LANG}_LIBRARIES ${MPI_${mpilib}_LIBRARY})
+    endforeach()
+  endif()
 endmacro()
 
 macro(_MPI_assemble_include_dirs LANG)
-  set(MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS}")
-  if("${LANG}" MATCHES "(C|CXX)")
-    if(MPI_${LANG}_HEADER_DIR)
-      list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_HEADER_DIR}")
-    endif()
-  else() # Fortran
-    if(MPI_${LANG}_F77_HEADER_DIR)
-      list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_F77_HEADER_DIR}")
+  if("${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
+    set(MPI_${LANG}_INCLUDE_DIRS "")
+  else()
+    set(MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS}")
+    if("${LANG}" MATCHES "(C|CXX)")
+      if(MPI_${LANG}_HEADER_DIR)
+        list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_HEADER_DIR}")
+      endif()
+    else() # Fortran
+      if(MPI_${LANG}_F77_HEADER_DIR)
+        list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_F77_HEADER_DIR}")
+      endif()
+      if(MPI_${LANG}_MODULE_DIR AND NOT "${MPI_${LANG}_MODULE_DIR}" IN_LIST MPI_${LANG}_INCLUDE_DIRS)
+        list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_MODULE_DIR}")
+      endif()
     endif()
-    if(MPI_${LANG}_MODULE_DIR AND NOT "${MPI_${LANG}_MODULE_DIR}" IN_LIST MPI_${LANG}_INCLUDE_DIRS)
-      list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_MODULE_DIR}")
+    if(MPI_${LANG}_ADDITIONAL_INCLUDE_VARS)
+      foreach(MPI_ADDITIONAL_INC_DIR IN LISTS MPI_${LANG}_ADDITIONAL_INCLUDE_VARS)
+        list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${MPI_ADDITIONAL_INC_DIR}_INCLUDE_DIR}")
+      endforeach()
     endif()
   endif()
-  if(MPI_${LANG}_ADDITIONAL_INCLUDE_VARS)
-    foreach(mpiadditionalinclude IN LISTS MPI_${LANG}_ADDITIONAL_INCLUDE_VARS)
-      list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${mpiadditionalinclude}_INCLUDE_DIR}")
-    endforeach()
-  endif()
 endmacro()
 
 function(_MPI_split_include_dirs LANG)
+  if("${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
+    return()
+  endif()
   # Backwards compatibility: Search INCLUDE_PATH if given.
   if(MPI_${LANG}_INCLUDE_PATH)
     list(APPEND MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS "${MPI_${LANG}_INCLUDE_PATH}")
@@ -885,6 +905,13 @@ function(_MPI_split_include_dirs LANG)
     endif()
     mark_as_advanced(MPI_${LANG}_F77_HEADER_DIR MPI_${LANG}_MODULE_DIR)
   endif()
+  # Remove duplicates and default system directories from the list.
+  if(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS)
+    foreach(MPI_IMPLICIT_INC_DIR IN LISTS CMAKE_${LANG}_IMPLICIT_LINK_DIRECTORIES)
+      list(REMOVE_ITEM MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS ${MPI_IMPLICIT_INC_DIR})
+    endforeach()
+  endif()
   set(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS ${MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS} CACHE STRING "MPI ${LANG} additional include directories" FORCE)
 endfunction()
 
@@ -1014,7 +1041,7 @@ elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
 elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "FreeBSD")
   # FreeBSD ships mpich under the normal system paths - but available openmpi implementations
   # will be found in /usr/local/mpi/<name>
-  MPI_search_mpi_prefix_folder("/usr/local/mpi/")
+  MPI_search_mpi_prefix_folder("/usr/local/mpi")
 endif()
 
 # Most MPI distributions have some form of mpiexec or mpirun which gives us something we can look for.
@@ -1050,48 +1077,54 @@ mark_as_advanced(MPIEXEC_EXECUTABLE MPIEXEC_NUMPROC_FLAG MPIEXEC_PREFLAGS MPIEXE
 #
 # Once we find the new variables, we translate them back into their old
 # equivalents below.
-foreach (LANG IN ITEMS C CXX)
-  # Old input variables.
-  set(_MPI_OLD_INPUT_VARS COMPILER COMPILE_FLAGS INCLUDE_PATH LINK_FLAGS)
-
-  # Set new vars based on their old equivalents, if the new versions are not already set.
-  foreach (var ${_MPI_OLD_INPUT_VARS})
-    if (NOT MPI_${LANG}_${var} AND MPI_${var})
-      set(MPI_${LANG}_${var} "${MPI_${var}}")
-    endif()
-  endforeach()
-
-  # Chop the old compile flags into options and definitions
-  if(MPI_${LANG}_COMPILE_FLAGS)
-    unset(MPI_${LANG}_COMPILE_OPTIONS)
-    unset(MPI_${LANG}_COMPILE_DEFINITIONS)
-    separate_arguments(MPI_SEPARATE_FLAGS NATIVE_COMMAND "${MPI_${LANG}_COMPILE_FLAGS}")
-    foreach(_MPI_FLAG IN LISTS MPI_SEPARATE_FLAGS)
-      if("${_MPI_FLAG}" MATCHES "^ *[-/D]([^ ]+)")
-        list(APPEND MPI_${LANG}_COMPILE_DEFINITIONS "${CMAKE_MATCH_1}")
-      else()
-        list(APPEND MPI_${LANG}_COMPILE_FLAGS "${_MPI_FLAG}")
+if(NOT MPI_IGNORE_LEGACY_VARIABLES)
+  foreach (LANG IN ITEMS C CXX)
+    # Old input variables.
+    set(_MPI_OLD_INPUT_VARS COMPILER COMPILE_FLAGS INCLUDE_PATH LINK_FLAGS)
+
+    # Set new vars based on their old equivalents, if the new versions are not already set.
+    foreach (var ${_MPI_OLD_INPUT_VARS})
+      if (NOT MPI_${LANG}_${var} AND MPI_${var})
+        set(MPI_${LANG}_${var} "${MPI_${var}}")
       endif()
     endforeach()
-    unset(MPI_SEPARATE_FLAGS)
-  endif()
 
-  # If a list of libraries was given, we'll split it into new-style cache variables
-  if(NOT MPI_${LANG}_LIB_NAMES)
-    foreach(_MPI_LIB IN LISTS MPI_${LANG}_LIBRARIES MPI_LIBRARY MPI_EXTRA_LIBRARY)
-      get_filename_component(_MPI_PLAIN_LIB_NAME "${_MPI_LIB}" NAME_WE)
-      get_filename_component(_MPI_LIB_NAME "${_MPI_LIB}" NAME)
-      get_filename_component(_MPI_LIB_DIR "${_MPI_LIB}" DIRECTORY)
-      list(APPEND MPI_PLAIN_LIB_NAMES_WORK "${_MPI_PLAIN_LIB_NAME}")
-      find_library(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY
-        NAMES "${_MPI_LIB_NAME}" "lib${_MPI_LIB_NAME}"
-        HINTS ${_MPI_LIB_DIR} $ENV{MPI_LIB}
-        DOC "Location of the ${_MPI_PLAIN_LIB_NAME} library for MPI"
-      )
-      mark_as_advanced(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY)
-    endforeach()
-  endif()
-endforeach()
+    # Chop the old compile flags into options and definitions
+
+    unset(MPI_${LANG}_EXTRA_COMPILE_DEFINITIONS)
+    unset(MPI_${LANG}_EXTRA_COMPILE_OPTIONS)
+    if(MPI_${LANG}_COMPILE_FLAGS)
+      separate_arguments(MPI_SEPARATE_FLAGS NATIVE_COMMAND "${MPI_${LANG}_COMPILE_FLAGS}")
+      foreach(_MPI_FLAG IN LISTS MPI_SEPARATE_FLAGS)
+        if("${_MPI_FLAG}" MATCHES "^ *[-/D]([^ ]+)")
+          list(APPEND MPI_${LANG}_EXTRA_COMPILE_DEFINITIONS "${CMAKE_MATCH_1}")
+        else()
+          list(APPEND MPI_${LANG}_EXTRA_COMPILE_OPTIONS "${_MPI_FLAG}")
+        endif()
+      endforeach()
+      unset(MPI_SEPARATE_FLAGS)
+    endif()
+
+    # If a list of libraries was given, we'll split it into new-style cache variables
+    unset(MPI_${LANG}_EXTRA_LIB_NAMES)
+    if(NOT MPI_${LANG}_LIB_NAMES)
+      foreach(_MPI_LIB IN LISTS MPI_${LANG}_LIBRARIES MPI_LIBRARY MPI_EXTRA_LIBRARY)
+        if(_MPI_LIB)
+          get_filename_component(_MPI_PLAIN_LIB_NAME "${_MPI_LIB}" NAME_WE)
+          get_filename_component(_MPI_LIB_NAME "${_MPI_LIB}" NAME)
+          get_filename_component(_MPI_LIB_DIR "${_MPI_LIB}" DIRECTORY)
+          list(APPEND MPI_${LANG}_EXTRA_LIB_NAMES "${_MPI_PLAIN_LIB_NAME}")
+          find_library(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY
+            NAMES "${_MPI_LIB_NAME}" "lib${_MPI_LIB_NAME}"
+            HINTS ${_MPI_LIB_DIR} $ENV{MPI_LIB}
+            DOC "Location of the ${_MPI_PLAIN_LIB_NAME} library for MPI"
+          )
+          mark_as_advanced(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY)
+        endif()
+      endforeach()
+    endif()
+  endforeach()
+endif()
 #=============================================================================
 
 unset(MPI_VERSION)
@@ -1100,6 +1133,11 @@ unset(MPI_VERSION_MINOR)
 
 unset(_MPI_MIN_VERSION)
 
+# If the user specified a library name we assume they prefer that library over a wrapper. If not, they can disable skipping manually.
+if(NOT DEFINED MPI_SKIP_COMPILER_WRAPPER AND MPI_GUESS_LIBRARY_NAME)
+  set(MPI_SKIP_COMPILER_WRAPPER TRUE)
+endif()
+
 # This loop finds the compilers and sends them off for interrogation.
 foreach(LANG IN ITEMS C CXX Fortran)
   if(CMAKE_${LANG}_COMPILER_LOADED)
@@ -1121,6 +1159,8 @@ foreach(LANG IN ITEMS C CXX Fortran)
       mark_as_advanced(MPI_CXX_SKIP_MPICXX)
     endif()
     if(NOT (MPI_${LANG}_LIB_NAMES AND (MPI_${LANG}_INCLUDE_PATH OR MPI_${LANG}_INCLUDE_DIRS OR MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS)))
+      set(MPI_${LANG}_TRIED_IMPLICIT FALSE)
+      set(MPI_${LANG}_WORKS_IMPLICIT FALSE)
       if(NOT MPI_${LANG}_COMPILER AND NOT MPI_ASSUME_NO_BUILTIN_MPI)
         # Should the imported targets be empty, we effectively try whether the compiler supports MPI on its own, which is the case on e.g.
         # Cray PrgEnv.
@@ -1130,80 +1170,90 @@ foreach(LANG IN ITEMS C CXX Fortran)
         # If the compiler can build MPI code on its own, it functions as an MPI compiler and we'll set the variable to point to it.
         if(MPI_${LANG}_WORKS)
           set(MPI_${LANG}_COMPILER "${CMAKE_${LANG}_COMPILER}" CACHE FILEPATH "MPI compiler for ${LANG}" FORCE)
+          set(MPI_${LANG}_WORKS_IMPLICIT TRUE)
         endif()
+        set(MPI_${LANG}_TRIED_IMPLICIT TRUE)
       endif()
 
-      # If the user specified a library name we assume they prefer that library over a wrapper. If not, they can disable skipping manually.
-      if(NOT DEFINED MPI_SKIP_COMPILER_WRAPPER AND MPI_GUESS_LIBRARY_NAME)
-        set(MPI_SKIP_COMPILER_WRAPPER TRUE)
-      endif()
-      if(NOT MPI_SKIP_COMPILER_WRAPPER)
-        if(MPI_${LANG}_COMPILER)
-          # If the user supplies a compiler *name* instead of an absolute path, assume that we need to find THAT compiler.
-          if (NOT IS_ABSOLUTE "${MPI_${LANG}_COMPILER}")
-            # Get rid of our default list of names and just search for the name the user wants.
-            set(_MPI_${LANG}_COMPILER_NAMES "${MPI_${LANG}_COMPILER}")
-            unset(MPI_${LANG}_COMPILER CACHE)
+      if(NOT "${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}" OR NOT MPI_${LANG}_WORKS)
+        set(MPI_${LANG}_WRAPPER_FOUND FALSE)
+        set(MPI_PINNED_COMPILER FALSE)
+
+        if(NOT MPI_SKIP_COMPILER_WRAPPER)
+          if(MPI_${LANG}_COMPILER)
+            # If the user supplies a compiler *name* instead of an absolute path, assume that we need to find THAT compiler.
+            if (NOT IS_ABSOLUTE "${MPI_${LANG}_COMPILER}")
+              # Get rid of our default list of names and just search for the name the user wants.
+              set(_MPI_${LANG}_COMPILER_NAMES "${MPI_${LANG}_COMPILER}")
+              unset(MPI_${LANG}_COMPILER CACHE)
+            endif()
+            # If the user specifies a compiler, we don't want to try to search libraries either.
+            set(MPI_PINNED_COMPILER TRUE)
+          endif()
+
+          # If we have an MPI base directory, we'll try all compiler names in that one first.
+          # This should prevent mixing different MPI environments
+          if(_MPI_BASE_DIR)
+            find_program(MPI_${LANG}_COMPILER
+              NAMES  ${_MPI_${LANG}_COMPILER_NAMES}
+              PATH_SUFFIXES bin sbin
+              HINTS  ${_MPI_BASE_DIR}
+              NO_DEFAULT_PATH
+              DOC    "MPI compiler for ${LANG}"
+            )
           endif()
-          # If the user specifies a compiler, we don't want to try to search libraries either.
-          set(MPI_PINNED_COMPILER TRUE)
-        else()
-          set(MPI_PINNED_COMPILER FALSE)
-        endif()
 
-        # If we have an MPI base directory, we'll try all compiler names in that one first.
-        # This should prevent mixing different MPI environments
-        if(_MPI_BASE_DIR)
+          # If the base directory did not help (for example because the mpiexec isn't in the same directory as the compilers),
+          # we shall try searching in the default paths.
           find_program(MPI_${LANG}_COMPILER
             NAMES  ${_MPI_${LANG}_COMPILER_NAMES}
             PATH_SUFFIXES bin sbin
-            HINTS  ${_MPI_BASE_DIR}
-            NO_DEFAULT_PATH
             DOC    "MPI compiler for ${LANG}"
           )
-        endif()
 
-        # If the base directory did not help (for example because the mpiexec isn't in the same directory as the compilers),
-        # we shall try searching in the default paths.
-        find_program(MPI_${LANG}_COMPILER
-          NAMES  ${_MPI_${LANG}_COMPILER_NAMES}
-          PATH_SUFFIXES bin sbin
-          DOC    "MPI compiler for ${LANG}"
-        )
-
-        if(MPI_${LANG}_COMPILER STREQUAL CMAKE_${LANG}_COMPILER)
-          set(MPI_SKIP_GUESSING TRUE)
-        elseif(MPI_${LANG}_COMPILER)
-          _MPI_interrogate_compiler(${LANG})
-        else()
-          set(MPI_${LANG}_WRAPPER_FOUND FALSE)
+          if("${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
+            set(MPI_PINNED_COMPILER TRUE)
+
+            # If we haven't made the implicit compiler test yet, perform it now.
+            if(NOT MPI_${LANG}_TRIED_IMPLICIT)
+              _MPI_create_imported_target(${LANG})
+              _MPI_check_lang_works(${LANG})
+            endif()
+
+            # Should the MPI compiler not work implicitly for MPI, still interrogate it.
+            # Otherwise, MPI compilers for which CMake has separate linking stages, e.g. Intel MPI on Windows where link.exe is being used
+            # directly during linkage instead of CMAKE_<LANG>_COMPILER will not work.
+            if(NOT MPI_${LANG}_WORKS)
+              set(MPI_${LANG}_WORKS_IMPLICIT FALSE)
+              _MPI_interrogate_compiler(${LANG})
+            else()
+              set(MPI_${LANG}_WORKS_IMPLICIT TRUE)
+            endif()
+          elseif(MPI_${LANG}_COMPILER)
+            _MPI_interrogate_compiler(${LANG})
+          endif()
         endif()
-      else()
-        set(MPI_${LANG}_WRAPPER_FOUND FALSE)
-        set(MPI_PINNED_COMPILER FALSE)
-      endif()
 
-      if(NOT MPI_${LANG}_WRAPPER_FOUND AND NOT MPI_PINNED_COMPILER)
-        # For C++, we may use the settings for C. Should a given compiler wrapper for C++ not exist, but one for C does, we copy over the
-        # settings for C. An MPI distribution that is in this situation would be IBM Platform MPI.
-        if("${LANG}" STREQUAL "CXX" AND MPI_C_WRAPPER_FOUND)
-          set(MPI_${LANG}_COMPILE_OPTIONS          ${MPI_C_COMPILE_OPTIONS}     CACHE STRING "MPI ${LANG} compilation options"           )
-          set(MPI_${LANG}_COMPILE_DEFINITIONS      ${MPI_C_COMPILE_DEFINITIONS} CACHE STRING "MPI ${LANG} compilation definitions"       )
-          set(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS  ${MPI_C_INCLUDE_DIRS}        CACHE STRING "MPI ${LANG} additional include directories")
-          set(MPI_${LANG}_LINK_FLAGS               ${MPI_C_LINK_FLAGS}          CACHE STRING "MPI ${LANG} linker flags"                  )
-          set(MPI_${LANG}_LIB_NAMES                ${MPI_C_LIB_NAMES}           CACHE STRING "MPI ${LANG} libraries to link against"     )
-          set(MPI_${LANG}_WRAPPER_FOUND TRUE)
-        elseif(NOT MPI_SKIP_GUESSING)
-          _MPI_guess_settings(${LANG})
+        if(NOT MPI_SKIP_GUESSING AND NOT MPI_${LANG}_WRAPPER_FOUND AND NOT MPI_PINNED_COMPILER)
+          # For C++, we may use the settings for C. Should a given compiler wrapper for C++ not exist, but one for C does, we copy over the
+          # settings for C. An MPI distribution that is in this situation would be IBM Platform MPI.
+          if("${LANG}" STREQUAL "CXX" AND MPI_C_WRAPPER_FOUND)
+            set(MPI_${LANG}_COMPILE_OPTIONS          ${MPI_C_COMPILE_OPTIONS}     CACHE STRING "MPI ${LANG} compilation options"           )
+            set(MPI_${LANG}_COMPILE_DEFINITIONS      ${MPI_C_COMPILE_DEFINITIONS} CACHE STRING "MPI ${LANG} compilation definitions"       )
+            set(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS  ${MPI_C_INCLUDE_DIRS}        CACHE STRING "MPI ${LANG} additional include directories")
+            set(MPI_${LANG}_LINK_FLAGS               ${MPI_C_LINK_FLAGS}          CACHE STRING "MPI ${LANG} linker flags"                  )
+            set(MPI_${LANG}_LIB_NAMES                ${MPI_C_LIB_NAMES}           CACHE STRING "MPI ${LANG} libraries to link against"     )
+          else()
+            _MPI_guess_settings(${LANG})
+          endif()
         endif()
       endif()
     endif()
 
     _MPI_split_include_dirs(${LANG})
-    if(NOT MPI_${LANG}_COMPILER STREQUAL CMAKE_${LANG}_COMPILER)
-      _MPI_assemble_include_dirs(${LANG})
-      _MPI_assemble_libraries(${LANG})
-    endif()
+    _MPI_assemble_include_dirs(${LANG})
+    _MPI_assemble_libraries(${LANG})
+
     _MPI_adjust_compile_definitions(${LANG})
     # We always create imported targets even if they're empty
     _MPI_create_imported_target(${LANG})
@@ -1217,7 +1267,9 @@ foreach(LANG IN ITEMS C CXX Fortran)
     set(MPI_${LANG}_COMPILE_DEFINITIONS      "" CACHE STRING "MPI ${LANG} compilation definitions"       )
     set(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS  "" CACHE STRING "MPI ${LANG} additional include directories")
     set(MPI_${LANG}_LINK_FLAGS               "" CACHE STRING "MPI ${LANG} linker flags"                  )
-    set(MPI_${LANG}_LIB_NAMES                "" CACHE STRING "MPI ${LANG} libraries to link against"     )
+    if(NOT MPI_${LANG}_COMPILER STREQUAL CMAKE_${LANG}_COMPILER)
+      set(MPI_${LANG}_LIB_NAMES                "" CACHE STRING "MPI ${LANG} libraries to link against"   )
+    endif()
     mark_as_advanced(MPI_${LANG}_COMPILE_OPTIONS MPI_${LANG}_COMPILE_DEFINITIONS MPI_${LANG}_LINK_FLAGS
       MPI_${LANG}_LIB_NAMES MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS MPI_${LANG}_COMPILER)
 
@@ -1337,7 +1389,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
     set(MPI_${LANG}_FIND_VERSION_EXACT ${MPI_FIND_VERSION_EXACT})
 
     unset(MPI_${LANG}_REQUIRED_VARS)
-    if (MPI_${LANG}_WRAPPER_FOUND OR MPI_${LANG}_GUESS_FOUND)
+    if (NOT "${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
       foreach(mpilibname IN LISTS MPI_${LANG}_LIB_NAMES)
         list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${mpilibname}_LIBRARY")
       endforeach()
@@ -1448,6 +1500,7 @@ if (MPI_NUMLIBS GREATER 1)
 else()
   set(MPI_EXTRA_LIBRARY "MPI_EXTRA_LIBRARY-NOTFOUND")
 endif()
+set(MPI_IGNORE_LEGACY_VARIABLES TRUE)
 #=============================================================================
 
 # unset these vars to cleanup namespace
-- 
cgit v0.12


From c7bf2222f1cbe97b9fc1e29e21717632874b63b9 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 20 Dec 2017 13:42:41 -0600
Subject: Reworked MPI includes to be used as default with parallel

---
 CMakeLists.txt          |  1 +
 examples/CMakeLists.txt |  4 ++--
 src/CMakeLists.txt      | 16 ++--------------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da2382b..759530b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -542,6 +542,7 @@ if (HDF5_ENABLE_PARALLEL)
     # Used by Fortran + MPI
     CHECK_SYMBOL_EXISTS (MPI_Comm_c2f "${MPI_C_INCLUDE_DIRS}/mpi.h"  H5_HAVE_MPI_MULTI_LANG_Comm)
     CHECK_SYMBOL_EXISTS (MPI_Info_c2f "${MPI_C_INCLUDE_DIRS}/mpi.h"  H5_HAVE_MPI_MULTI_LANG_Info)
+    INCLUDE_DIRECTORIES (${MPI_C_INCLUDE_DIRS})
   else ()
     message (STATUS "Parallel libraries not found")
   endif ()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index c9dfed6..e310026 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -55,13 +55,13 @@ if (H5_HAVE_PARALLEL)
   add_executable (ph5example ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c)
   TARGET_NAMING (ph5example STATIC)
   TARGET_C_PROPERTIES (ph5example STATIC " " " ")
-  target_link_libraries (ph5example ${HDF5_LIB_TARGET})
+  target_link_libraries (ph5example ${HDF5_LIB_TARGET} ${MPI_C_LIBRARIES})
   set_target_properties (ph5example PROPERTIES FOLDER examples)
   if (BUILD_SHARED_LIBS)
     add_executable (ph5example-shared ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c)
     TARGET_NAMING (ph5example-shared SHARED)
     TARGET_C_PROPERTIES (ph5example-shared SHARED " " " ")
-    target_link_libraries (ph5example-shared ${HDF5_LIBSH_TARGET})
+    target_link_libraries (ph5example-shared ${HDF5_LIBSH_TARGET} ${MPI_C_LIBRARIES})
     set_target_properties (ph5example-shared PROPERTIES FOLDER examples)
   endif ()
 endif ()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 616b53d..dc180c3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -613,9 +613,6 @@ set (H5_PRIVATE_HEADERS
 #-----------------------------------------------------------------------------
 add_executable (H5detect ${HDF5_SRC_DIR}/H5detect.c)
 TARGET_C_PROPERTIES (H5detect STATIC " " " ")
-if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
-  target_include_directories (H5detect PUBLIC ${MPI_C_INCLUDE_DIRS})
-endif ()
 if (MSVC OR MINGW)
   target_link_libraries (H5detect "ws2_32.lib")
 endif ()
@@ -630,9 +627,6 @@ add_custom_command (
 
 add_executable (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c)
 TARGET_C_PROPERTIES (H5make_libsettings STATIC " " " ")
-if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
-  target_include_directories (H5make_libsettings PUBLIC ${MPI_C_INCLUDE_DIRS})
-endif ()
 if (MSVC OR MINGW)
   target_link_libraries (H5make_libsettings "ws2_32.lib")
 endif ()
@@ -702,10 +696,7 @@ add_library (${HDF5_LIB_TARGET} STATIC ${common_SRCS} ${H5_PUBLIC_HEADERS} ${H5_
 TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_LIB_TARGET} PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS})
 if (NOT WIN32)
-  target_link_libraries (${HDF5_LIB_TARGET} PUBLIC dl)
-endif ()
-if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
-  target_include_directories (${HDF5_LIB_TARGET} PUBLIC ${MPI_C_INCLUDE_DIRS})
+  target_link_libraries (${HDF5_LIB_TARGET} PUBLIC ${CMAKE_DL_LIBS})
 endif ()
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET})
 H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} STATIC)
@@ -728,10 +719,7 @@ if (BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_LIBSH_TARGET} PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS})
   if (NOT WIN32)
-    target_link_libraries (${HDF5_LIBSH_TARGET} PUBLIC dl)
-  endif ()
-  if (H5_HAVE_PARALLEL AND MPI_C_FOUND)
-    target_include_directories (${HDF5_LIBSH_TARGET} PUBLIC ${MPI_C_INCLUDE_DIRS})
+    target_link_libraries (${HDF5_LIBSH_TARGET} PUBLIC ${CMAKE_DL_LIBS})
   endif ()
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_LIBSH_TARGET}")
   H5_SET_LIB_OPTIONS (${HDF5_LIBSH_TARGET} ${HDF5_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
-- 
cgit v0.12


From 68c9914f9b5501cc8470775e689cb2c2c64fe912 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 20 Dec 2017 13:53:54 -0600
Subject: Skip test if 1.6 API enabled

---
 test/CMakeTests.cmake | 74 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 30 deletions(-)

diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index f7b12ee..4a71f43 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -505,21 +505,28 @@ add_test (NAME H5TEST-clear-error_test-objects
     WORKING_DIRECTORY
         ${HDF5_TEST_BINARY_DIR}/H5TEST
 )
-add_test (NAME H5TEST-error_test COMMAND "${CMAKE_COMMAND}"
-    -D "TEST_PROGRAM=$<TARGET_FILE:error_test>"
-    -D "TEST_ARGS:STRING="
-    -D "TEST_EXPECT=0"
-    -D "TEST_MASK_ERROR=true"
-    -D "TEST_OUTPUT=error_test.txt"
-    -D "TEST_REFERENCE=error_test_1"
-    -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST"
-    -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-)
-set_tests_properties (H5TEST-error_test PROPERTIES
-    DEPENDS H5TEST-clear-error_test-objects
-    ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5_PLUGIN_PRELOAD=::"
-    WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
-)
+if (HDF5_USE_16_API_DEFAULT)
+  add_test (
+      NAME H5TEST-error_test-SKIPPED
+      COMMAND ${CMAKE_COMMAND} -E echo "SKIP $<TARGET_FILE:error_test>"
+  )
+else ()
+  add_test (NAME H5TEST-error_test COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:error_test>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_MASK_ERROR=true"
+      -D "TEST_OUTPUT=error_test.txt"
+      -D "TEST_REFERENCE=error_test_1"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST"
+      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  )
+  set_tests_properties (H5TEST-error_test PROPERTIES
+      DEPENDS H5TEST-clear-error_test-objects
+      ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5_PLUGIN_PRELOAD=::"
+      WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
+  )
+endif ()
 
 #-- Adding test for links_env
 add_test (NAME H5TEST-clear-links_env-objects
@@ -660,21 +667,28 @@ if (BUILD_SHARED_LIBS AND TEST_SHARED_PROGRAMS)
       WORKING_DIRECTORY
           ${HDF5_TEST_BINARY_DIR}/H5TEST-shared
   )
-  add_test (NAME H5TEST-shared-error_test COMMAND "${CMAKE_COMMAND}"
-      -D "TEST_PROGRAM=$<TARGET_FILE:error_test-shared>"
-      -D "TEST_ARGS:STRING="
-      -D "TEST_EXPECT=0"
-      -D "TEST_MASK_ERROR=true"
-      -D "TEST_OUTPUT=error_test.txt"
-      -D "TEST_REFERENCE=error_test_1"
-      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST-shared"
-      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-  )
-  set_tests_properties (H5TEST-shared-error_test PROPERTIES
-      DEPENDS H5TEST-shared-clear-error_test-objects
-      ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST-shared;HDF5_PLUGIN_PRELOAD=::"
-      WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST-shared
-  )
+  if (HDF5_USE_16_API_DEFAULT)
+    add_test (
+        NAME H5TEST-shared-error_test-SKIPPED
+        COMMAND ${CMAKE_COMMAND} -E echo "SKIP $<TARGET_FILE:error_test-shared>"
+    )
+  else ()
+    add_test (NAME H5TEST-shared-error_test COMMAND "${CMAKE_COMMAND}"
+        -D "TEST_PROGRAM=$<TARGET_FILE:error_test-shared>"
+        -D "TEST_ARGS:STRING="
+        -D "TEST_EXPECT=0"
+        -D "TEST_MASK_ERROR=true"
+        -D "TEST_OUTPUT=error_test.txt"
+        -D "TEST_REFERENCE=error_test_1"
+        -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST-shared"
+        -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+    )
+    set_tests_properties (H5TEST-shared-error_test PROPERTIES
+        DEPENDS H5TEST-shared-clear-error_test-objects
+        ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST-shared;HDF5_PLUGIN_PRELOAD=::"
+        WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST-shared
+    )
+  endif ()
 
   #-- Adding test for links_env
   add_test (NAME H5TEST-shared-clear-links_env-objects
-- 
cgit v0.12


From ef2ac0784508083ac057586feb6ad9bbdd98e5bd Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 21 Dec 2017 14:41:48 -0600
Subject: Update link target commands

---
 CMakeLists.txt                |  2 --
 c++/examples/CMakeTests.cmake |  2 +-
 c++/src/CMakeLists.txt        |  4 ++--
 c++/test/CMakeTests.cmake     |  2 +-
 examples/CMakeTests.cmake     |  2 +-
 fortran/src/CMakeLists.txt    |  2 ++
 hl/c++/src/CMakeLists.txt     | 12 ++----------
 hl/fortran/src/CMakeLists.txt |  8 ++++----
 hl/src/CMakeLists.txt         |  4 ++--
 test/CMakeLists.txt           | 22 ++++++++++++----------
 test/CMakeTests.cmake         |  2 +-
 testpar/CMakeLists.txt        | 10 ++++++++--
 12 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 759530b..1322804 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -765,7 +765,6 @@ if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/for
     include (${HDF_RESOURCES_EXT_DIR}/HDFUseFortran.cmake)
 
     set (LINK_Fortran_LIBS ${LINK_LIBS})
-    set (LINK_Fortran_SHARED_LIBS ${LINK_SHARED_LIBS})
 
     if (HDF5_ENABLE_F2003)
       if (NOT FORTRAN_HAVE_ISO_C_BINDING)
@@ -776,7 +775,6 @@ if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/for
     # Parallel IO usage requires MPI to be Linked and Included
     if (H5_HAVE_PARALLEL)
       set (LINK_Fortran_LIBS ${LINK_Fortran_LIBS} ${MPI_Fortran_LIBRARIES})
-      set (LINK_Fortran_SHARED_LIBS ${LINK_Fortran_SHARED_LIBS} ${MPI_Fortran_LIBRARIES})
       if (MPI_Fortran_LINK_FLAGS)
         set (CMAKE_Fortran_EXE_LINKER_FLAGS "${MPI_Fortran_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
       endif ()
diff --git a/c++/examples/CMakeTests.cmake b/c++/examples/CMakeTests.cmake
index 8043863..264a7e7 100644
--- a/c++/examples/CMakeTests.cmake
+++ b/c++/examples/CMakeTests.cmake
@@ -8,7 +8,7 @@
 # distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
-
+#
 
 ##############################################################################
 ##############################################################################
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 579ef64..82ece33 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -82,7 +82,7 @@ set (CPP_HDRS
 
 add_library (${HDF5_CPP_LIB_TARGET} STATIC ${CPP_SRCS} ${CPP_HDRS})
 TARGET_C_PROPERTIES (${HDF5_CPP_LIB_TARGET} STATIC " " " ")
-target_link_libraries (${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
+target_link_libraries (${HDF5_CPP_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}")
 H5_SET_LIB_OPTIONS (${HDF5_CPP_LIB_TARGET} ${HDF5_CPP_LIB_NAME} STATIC)
 set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES
@@ -94,7 +94,7 @@ set (install_targets ${HDF5_CPP_LIB_TARGET})
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_CPP_LIBSH_TARGET} SHARED ${CPP_SRCS} ${CPP_HDRS})
   TARGET_C_PROPERTIES (${HDF5_CPP_LIBSH_TARGET} SHARED " " " ")
-  target_link_libraries (${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  target_link_libraries (${HDF5_CPP_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIBSH_TARGET}")
   H5_SET_LIB_OPTIONS (${HDF5_CPP_LIBSH_TARGET} ${HDF5_CPP_LIB_NAME} SHARED ${HDF5_CXX_PACKAGE_SOVERSION})
   set_target_properties (${HDF5_CPP_LIBSH_TARGET} PROPERTIES
diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake
index 4f5ba94..11463a0 100644
--- a/c++/test/CMakeTests.cmake
+++ b/c++/test/CMakeTests.cmake
@@ -8,7 +8,7 @@
 # distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
-
+#
 HDFTEST_COPY_FILE("${HDF5_CPP_TEST_SOURCE_DIR}/th5s.h5" "${PROJECT_BINARY_DIR}/th5s.h5" "cpp_testhdf5_files")
 add_custom_target(cpp_testhdf5_files ALL COMMENT "Copying files needed by cpp_testhdf5 tests" DEPENDS ${cpp_testhdf5_files_list})
 
diff --git a/examples/CMakeTests.cmake b/examples/CMakeTests.cmake
index ed7561e..592f762 100644
--- a/examples/CMakeTests.cmake
+++ b/examples/CMakeTests.cmake
@@ -8,7 +8,7 @@
 # distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
-
+#
 
 ##############################################################################
 ##############################################################################
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 89fc1a5..b745f3e 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -293,6 +293,7 @@ set (SHARED_LINK_FLAGS " ")
 TARGET_FORTRAN_PROPERTIES (${HDF5_F90_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_LIB_TARGET} PUBLIC ${HDF5_F90_C_LIB_TARGET})
 target_link_libraries (${HDF5_F90_LIB_TARGET} PRIVATE ${LINK_Fortran_LIBS})
+target_include_directories (${HDF5_F90_LIB_TARGET} PUBLIC ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   target_include_directories (${HDF5_F90_LIB_TARGET} PUBLIC ${MPI_Fortran_INCLUDE_DIRS})
 endif ()
@@ -320,6 +321,7 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   TARGET_FORTRAN_PROPERTIES (${HDF5_F90_LIBSH_TARGET} SHARED " " ${SHARED_LINK_FLAGS})
   target_link_libraries (${HDF5_F90_LIBSH_TARGET} PUBLIC ${HDF5_F90_C_LIBSH_TARGET})
   target_link_libraries (${HDF5_F90_LIBSH_TARGET} PRIVATE ${LINK_Fortran_LIBS})
+  target_include_directories (${HDF5_F90_LIBSH_TARGET} PUBLIC ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
   if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
     target_include_directories (${HDF5_F90_LIBSH_TARGET} PUBLIC ${MPI_Fortran_INCLUDE_DIRS})
   endif ()
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index e872eb1..fca96fb 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -12,11 +12,7 @@ set (HDF5_HL_CPP_HDRS ${HDF5_HL_CPP_SRC_SOURCE_DIR}/H5PacketTable.h)
 
 add_library (${HDF5_HL_CPP_LIB_TARGET} STATIC ${HDF5_HL_CPP_SRCS})
 TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIB_TARGET} STATIC " " " ")
-target_link_libraries (
-    ${HDF5_HL_CPP_LIB_TARGET}
-    ${HDF5_HL_LIB_TARGET}
-    ${HDF5_LIB_TARGET}
-)
+target_link_libraries (${HDF5_HL_CPP_LIB_TARGET} PUBLIC ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_TARGET}")
 H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_HL_CPP_LIB_NAME} STATIC)
 set_target_properties (${HDF5_HL_CPP_LIB_TARGET} PROPERTIES
@@ -28,11 +24,7 @@ set (install_targets ${HDF5_HL_CPP_LIB_TARGET})
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_HL_CPP_LIBSH_TARGET} SHARED ${HDF5_HL_CPP_SRCS})
   TARGET_C_PROPERTIES (${HDF5_HL_CPP_LIBSH_TARGET} SHARED " " " ")
-  target_link_libraries (
-      ${HDF5_HL_CPP_LIBSH_TARGET}
-      ${HDF5_HL_LIBSH_TARGET}
-      ${HDF5_LIBSH_TARGET}
-  )
+  target_link_libraries (${HDF5_HL_CPP_LIBSH_TARGET} PUBLIC ${HDF5_HL_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIBSH_TARGET}")
   H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIBSH_TARGET} ${HDF5_HL_CPP_LIB_NAME} SHARED ${HDF5_HL_CXX_PACKAGE_SOVERSION})
   set_target_properties (${HDF5_HL_CPP_LIBSH_TARGET} PROPERTIES
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index 3c8bc46..b3a0495 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -42,7 +42,7 @@ set (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h)
 
 add_library (${HDF5_HL_F90_C_LIB_TARGET} STATIC ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS})
 TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIB_TARGET} STATIC " " " ")
-target_link_libraries (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_HL_LIB_TARGET})
+target_link_libraries (${HDF5_HL_F90_C_LIB_TARGET} PUBLIC ${HDF5_F90_C_LIB_TARGET} ${HDF5_HL_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIB_TARGET}")
 H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_HL_F90_C_LIB_NAME} STATIC)
 set_target_properties (${HDF5_HL_F90_C_LIB_TARGET} PROPERTIES
@@ -55,7 +55,7 @@ set (install_targets ${HDF5_HL_F90_C_LIB_TARGET})
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_library (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS})
   TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED " " " ")
-  target_link_libraries (${HDF5_HL_F90_C_LIBSH_TARGET} ${HDF5_F90_C_LIBSH_TARGET} ${HDF5_HL_LIBSH_TARGET})
+  target_link_libraries (${HDF5_HL_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_F90_C_LIBSH_TARGET} ${HDF5_HL_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIBSH_TARGET}")
   H5_SET_LIB_OPTIONS (${HDF5_HL_F90_C_LIBSH_TARGET} ${HDF5_HL_F90_C_LIB_NAME} SHARED ${HDF5_HL_F_PACKAGE_SOVERSION})
   set_target_properties (${HDF5_HL_F90_C_LIBSH_TARGET} PROPERTIES
@@ -81,7 +81,7 @@ set_source_files_properties (${HDF5_HL_F90_F_SRCS} PROPERTIES LANGUAGE Fortran)
 
 add_library (${HDF5_HL_F90_LIB_TARGET} STATIC ${HDF5_HL_F90_F_SRCS})
 TARGET_FORTRAN_PROPERTIES (${HDF5_HL_F90_LIB_TARGET} STATIC " " " ")
-target_link_libraries (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
+target_link_libraries (${HDF5_HL_F90_LIB_TARGET} PUBLIC ${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_LIB_TARGET}")
 H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} STATIC)
 set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES
@@ -104,7 +104,7 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
     set (SHARED_LINK_FLAGS "/DLL")
   endif ()
   TARGET_FORTRAN_PROPERTIES (${HDF5_HL_F90_LIBSH_TARGET} SHARED " " ${SHARED_LINK_FLAGS})
-  target_link_libraries (${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_HL_F90_C_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET})
+  target_link_libraries (${HDF5_HL_F90_LIBSH_TARGET} PUBLIC ${HDF5_HL_F90_C_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_LIBSH_TARGET}")
   H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_HL_F90_LIB_NAME} SHARED ${HDF5_HL_F_PACKAGE_SOVERSION})
   set_target_properties (${HDF5_HL_F90_LIBSH_TARGET} PROPERTIES
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index e15bc46..0a48f77 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -28,7 +28,7 @@ set (HL_HEADERS
 
 add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SRCS} ${HL_HEADERS})
 TARGET_C_PROPERTIES (${HDF5_HL_LIB_TARGET} STATIC " " " ")
-target_link_libraries (${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
+target_link_libraries (${HDF5_HL_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
 H5_SET_LIB_OPTIONS (${HDF5_HL_LIB_TARGET} ${HDF5_HL_LIB_NAME} STATIC)
 set_target_properties (${HDF5_HL_LIB_TARGET} PROPERTIES
     FOLDER libraries/hl
@@ -40,7 +40,7 @@ set (install_targets ${HDF5_HL_LIB_TARGET})
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_HL_LIBSH_TARGET} SHARED ${HL_SRCS} ${HL_HEADERS})
   TARGET_C_PROPERTIES (${HDF5_HL_LIBSH_TARGET} SHARED " " " ")
-  target_link_libraries (${HDF5_HL_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  target_link_libraries (${HDF5_HL_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})
   H5_SET_LIB_OPTIONS (${HDF5_HL_LIBSH_TARGET} ${HDF5_HL_LIB_NAME} SHARED ${HDF5_HL_PACKAGE_SOVERSION})
   set_target_properties (${HDF5_HL_LIBSH_TARGET} PROPERTIES
       FOLDER libraries/hl
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4f990cf..afd0197 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -29,12 +29,13 @@ set (TEST_LIB_HEADERS
 add_library (${HDF5_TEST_LIB_TARGET} STATIC ${TEST_LIB_SRCS} ${TEST_LIB_HEADERS})
 TARGET_C_PROPERTIES (${HDF5_TEST_LIB_TARGET} STATIC " " " ")
 if (MSVC)
-  target_link_libraries (${HDF5_TEST_LIB_TARGET} "ws2_32.lib")
+  target_link_libraries (${HDF5_TEST_LIB_TARGET} PRIVATE "ws2_32.lib")
 endif ()
 if (MINGW)
-  target_link_libraries (${HDF5_TEST_LIB_TARGET} "wsock32.lib")
+  target_link_libraries (${HDF5_TEST_LIB_TARGET} PRIVATE "wsock32.lib")
 endif ()
-target_link_libraries (${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_LIBS})
+target_link_libraries (${HDF5_TEST_LIB_TARGET} PUBLIC ${LINK_LIBS})
+target_link_libraries (${HDF5_TEST_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
 H5_SET_LIB_OPTIONS (${HDF5_TEST_LIB_TARGET} ${HDF5_TEST_LIB_NAME} STATIC)
 set_target_properties (${HDF5_TEST_LIB_TARGET} PROPERTIES
     FOLDER libraries/test
@@ -45,12 +46,13 @@ if (BUILD_SHARED_LIBS)
   add_library (${HDF5_TEST_LIBSH_TARGET} SHARED ${TEST_LIB_SRCS} ${TEST_LIB_HEADERS})
   TARGET_C_PROPERTIES (${HDF5_TEST_LIBSH_TARGET} SHARED " " " ")
   if (MSVC)
-    target_link_libraries (${HDF5_TEST_LIBSH_TARGET} "ws2_32.lib")
+    target_link_libraries (${HDF5_TEST_LIBSH_TARGET} PRIVATE "ws2_32.lib")
   endif ()
   if (MINGW)
-    target_link_libraries (${HDF5_TEST_LIBSH_TARGET} "wsock32.lib")
+    target_link_libraries (${HDF5_TEST_LIBSH_TARGET} PRIVATE "wsock32.lib")
   endif ()
-  target_link_libraries (${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ${LINK_LIBS})
+  target_link_libraries (${HDF5_TEST_LIBSH_TARGET} PUBLIC ${LINK_LIBS})
+  target_link_libraries (${HDF5_TEST_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})
   H5_SET_LIB_OPTIONS (${HDF5_TEST_LIBSH_TARGET} ${HDF5_TEST_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
   set_target_properties (${HDF5_TEST_LIBSH_TARGET} PROPERTIES
       FOLDER libraries/test
@@ -170,13 +172,13 @@ set (testhdf5_SRCS
 add_executable (testhdf5 ${testhdf5_SRCS})
 TARGET_NAMING (testhdf5 STATIC)
 TARGET_C_PROPERTIES (testhdf5 STATIC " " " ")
-target_link_libraries (testhdf5 ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
+target_link_libraries (testhdf5 ${HDF5_TEST_LIB_TARGET})
 set_target_properties (testhdf5 PROPERTIES FOLDER test)
 if (BUILD_SHARED_LIBS)
   add_executable (testhdf5-shared ${testhdf5_SRCS})
   TARGET_NAMING (testhdf5-shared SHARED)
   TARGET_C_PROPERTIES (testhdf5-shared SHARED " " " ")
-  target_link_libraries (testhdf5-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  target_link_libraries (testhdf5-shared PUBLIC ${HDF5_TEST_LIBSH_TARGET})
   set_target_properties (testhdf5-shared PROPERTIES FOLDER test)
 endif ()
 
@@ -184,13 +186,13 @@ MACRO (ADD_H5_EXE file)
   add_executable (${file} ${HDF5_TEST_SOURCE_DIR}/${file}.c)
   TARGET_NAMING (${file} STATIC)
   TARGET_C_PROPERTIES (${file} STATIC " " " ")
-  target_link_libraries (${file} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
+  target_link_libraries (${file} PUBLIC ${HDF5_TEST_LIB_TARGET})
   set_target_properties (${file} PROPERTIES FOLDER test)
   if (BUILD_SHARED_LIBS)
     add_executable (${file}-shared ${HDF5_TEST_SOURCE_DIR}/${file}.c)
     TARGET_NAMING (${file}-shared SHARED)
     TARGET_C_PROPERTIES (${file}-shared SHARED " " " ")
-    target_link_libraries (${file}-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+    target_link_libraries (${file}-shared PUBLIC ${HDF5_TEST_LIBSH_TARGET})
     set_target_properties (${file}-shared PROPERTIES FOLDER test)
   endif ()
 ENDMACRO ()
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 4a71f43..786ac0a 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -1,4 +1,4 @@
-#
+
 # Copyright by The HDF Group.
 # All rights reserved.
 #
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt
index 0be5961..1043cd6 100644
--- a/testpar/CMakeLists.txt
+++ b/testpar/CMakeLists.txt
@@ -29,14 +29,20 @@ set (testphdf5_SRCS
 add_executable (testphdf5 ${testphdf5_SRCS})
 TARGET_NAMING (testphdf5 STATIC)
 TARGET_C_PROPERTIES (testphdf5 STATIC " " " ")
-target_link_libraries (testphdf5 ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
+target_link_libraries (testphdf5 ${HDF5_TEST_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
+if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
+  target_link_libraries (testphdf5 PRIVATE ${MPI_C_LIBRARIES})
+endif ()
 set_target_properties (testphdf5 PROPERTIES FOLDER test/par)
 
 MACRO (ADD_H5P_EXE file)
   add_executable (${file} ${HDF5_TEST_PAR_SOURCE_DIR}/${file}.c)
   TARGET_NAMING (${file} STATIC)
   TARGET_C_PROPERTIES (${file} STATIC " " " ")
-  target_link_libraries (${file} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
+  target_link_libraries (${file} ${HDF5_TEST_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
+  if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
+    target_link_libraries (${file} PRIVATE ${MPI_C_LIBRARIES})
+  endif ()
   set_target_properties (${file} PROPERTIES FOLDER test/par)
 ENDMACRO (ADD_H5P_EXE file)
 
-- 
cgit v0.12


From d3acc019dc51b249dd939a5e429f32fa26ace5f1 Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Sun, 31 Dec 2017 21:02:49 -0600
Subject: Snapshot version 1.8 release 21 (snap2)

---
 README.txt                            | 2 +-
 c++/src/cpp_doc_config                | 2 +-
 config/cmake/scripts/HDF5config.cmake | 2 +-
 configure.ac                          | 2 +-
 release_docs/RELEASE.txt              | 2 +-
 src/H5public.h                        | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index 2f71026..4eacab4 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap2 currently under development
+HDF5 version 1.8.21-snap3 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index a44864f..7a4dede 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap2, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap3, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 492a6b7..e875dbe 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
-set (CTEST_SOURCE_VERSEXT "-snap2")
+set (CTEST_SOURCE_VERSEXT "-snap3")
 
 ##############################################################################
 # handle input parameters to script.
diff --git a/configure.ac b/configure.ac
index b236963..b430b7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap2], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap3], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index f430106..478f9fc 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap2 currently under development
+HDF5 version 1.8.21-snap3 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index 9d54967..554d0a3 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap2"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap3"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap2"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap3"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
-- 
cgit v0.12


From 531f4d839d92f3991fed30b1587eddabb949a2b0 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 5 Jan 2018 14:30:23 -0600
Subject: Fix link_libs and static CRT fortran

---
 config/cmake_ext_mod/HDFUseFortran.cmake | 8 ++++++++
 testpar/CMakeLists.txt                   | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/cmake_ext_mod/HDFUseFortran.cmake b/config/cmake_ext_mod/HDFUseFortran.cmake
index 7bf4d81..5be2c49 100644
--- a/config/cmake_ext_mod/HDFUseFortran.cmake
+++ b/config/cmake_ext_mod/HDFUseFortran.cmake
@@ -15,6 +15,14 @@
 #-------------------------------------------------------------------------------
 ENABLE_LANGUAGE (Fortran)
 
+#-------------------------------------------------------------------------------
+#  Fix Fortran flags if we are compiling staticly on Windows using
+#  Windows_MT.cmake from config/cmake/UserMacros
+#-------------------------------------------------------------------------------
+if (BUILD_STATIC_CRT_LIBS)
+  TARGET_STATIC_CRT_FLAGS ()
+endif ()
+
 #-----------------------------------------------------------------------------
 # Detect name mangling convention used between Fortran and C
 #-----------------------------------------------------------------------------
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt
index 1043cd6..629216f 100644
--- a/testpar/CMakeLists.txt
+++ b/testpar/CMakeLists.txt
@@ -29,7 +29,7 @@ set (testphdf5_SRCS
 add_executable (testphdf5 ${testphdf5_SRCS})
 TARGET_NAMING (testphdf5 STATIC)
 TARGET_C_PROPERTIES (testphdf5 STATIC " " " ")
-target_link_libraries (testphdf5 ${HDF5_TEST_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
+target_link_libraries (testphdf5 PUBLIC ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
 if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
   target_link_libraries (testphdf5 PRIVATE ${MPI_C_LIBRARIES})
 endif ()
@@ -39,7 +39,7 @@ MACRO (ADD_H5P_EXE file)
   add_executable (${file} ${HDF5_TEST_PAR_SOURCE_DIR}/${file}.c)
   TARGET_NAMING (${file} STATIC)
   TARGET_C_PROPERTIES (${file} STATIC " " " ")
-  target_link_libraries (${file} ${HDF5_TEST_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
+  target_link_libraries (${file} PUBLIC ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
   if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
     target_link_libraries (${file} PRIVATE ${MPI_C_LIBRARIES})
   endif ()
-- 
cgit v0.12


From c9e0dc95335b07724ae20b5f84c37f1350f3ec5c Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Sun, 7 Jan 2018 21:39:19 -0600
Subject: Snapshot version 1.8 release 21 (snap3)

---
 README.txt                            | 2 +-
 c++/src/cpp_doc_config                | 2 +-
 config/cmake/scripts/HDF5config.cmake | 2 +-
 configure.ac                          | 2 +-
 release_docs/RELEASE.txt              | 2 +-
 src/H5public.h                        | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index 4eacab4..2281894 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap3 currently under development
+HDF5 version 1.8.21-snap4 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index 7a4dede..f3a2180 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap3, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap4, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index e875dbe..724d4f0 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
-set (CTEST_SOURCE_VERSEXT "-snap3")
+set (CTEST_SOURCE_VERSEXT "-snap4")
 
 ##############################################################################
 # handle input parameters to script.
diff --git a/configure.ac b/configure.ac
index b430b7c..6284a02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap3], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap4], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 478f9fc..ad22351 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap3 currently under development
+HDF5 version 1.8.21-snap4 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index 554d0a3..a6001d9 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap3"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap4"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap3"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap4"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
-- 
cgit v0.12


From e994a90cdf664113b443aa93a83b8bed0159d2f3 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 10 Jan 2018 11:27:41 -0600
Subject: HDFFV-10385 fix CMAKE_BUILD_TYPE usage

---
 CMakeLists.txt                         | 11 +++---
 config/cmake/HDFCompilerFlags.cmake    |  6 ++--
 config/cmake/hdf5-config.cmake.in      | 14 ++++----
 config/cmake/libhdf5.settings.cmake.in |  2 +-
 config/cmake_ext_mod/HDFMacros.cmake   | 25 ++++++++++---
 fortran/examples/h5_crtatt.f90         |  4 +++
 fortran/src/CMakeLists.txt             | 66 ++++++++++++++++++----------------
 fortran/test/CMakeLists.txt            | 11 +++++-
 hl/fortran/src/CMakeLists.txt          | 15 +++-----
 release_docs/RELEASE.txt               | 23 +++++++++++-
 test/CMakeTests.cmake                  |  2 +-
 11 files changed, 114 insertions(+), 65 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1322804..e028b55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,7 +210,7 @@ if (NOT HDF5_INSTALL_DATA_DIR)
       set (HDF5_INSTALL_FWRK_DIR ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
     endif ()
     set (HDF5_INSTALL_DATA_DIR share)
-    set (HDF5_INSTALL_CMAKE_DIR share/cmake)
+    set (HDF5_INSTALL_CMAKE_DIR share/cmake/hdf5)
   else ()
     set (HDF5_INSTALL_DATA_DIR ".")
     set (HDF5_INSTALL_CMAKE_DIR cmake)
@@ -328,6 +328,8 @@ include (${HDF_RESOURCES_EXT_DIR}/HDFMacros.cmake)
 include (${HDF_RESOURCES_EXT_DIR}/HDFLibMacros.cmake)
 include (${HDF_RESOURCES_DIR}/HDF5Macros.cmake)
 
+SET_HDF5_BUILD_TYPE()
+
 #-----------------------------------------------------------------------------
 # Setup output Directories
 #-----------------------------------------------------------------------------
@@ -345,12 +347,12 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
       ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all fortran modules."
   )
   if (WIN32)
-    set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE})
+    set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CTEST_CONFIGURATION_TYPE})
     set (CMAKE_PDB_OUTPUT_DIRECTORY
         ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all pdb files."
     )
   else ()
-    set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+    set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CTEST_CONFIGURATION_TYPE})
   endif ()
 else ()
   # if we are externally configured, but the project uses old cmake scripts
@@ -493,7 +495,7 @@ option (HDF5_BUILD_GENERATORS "Build Test Generators" OFF)
 #-----------------------------------------------------------------------------
 option (HDF5_ENABLE_TRACE "Enable API tracing capability" OFF)
 mark_as_advanced (HDF5_ENABLE_TRACE)
-if (CMAKE_BUILD_TYPE MATCHES Debug)
+if (HDF5_BUILD_TYPE MATCHES Debug)
   add_definitions (-DDEBUG)
   # Enable tracing of the API
   if (HDF5_ENABLE_TRACE)
@@ -551,7 +553,6 @@ endif ()
 # Parallel IO usage requires MPI to be Linked and Included
 if (H5_HAVE_PARALLEL)
   set (LINK_LIBS ${LINK_LIBS} ${MPI_C_LIBRARIES})
-  set (LINK_SHARED_LIBS ${LINK_SHARED_LIBS} ${MPI_C_LIBRARIES})
   if (MPI_C_LINK_FLAGS)
     set (CMAKE_EXE_LINKER_FLAGS "${MPI_C_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
   endif ()
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index 5f71f33..eeb4b97 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -13,12 +13,12 @@
 # Compiler specific flags : Shouldn't there be compiler tests for these
 #-----------------------------------------------------------------------------
 if (CMAKE_COMPILER_IS_GNUCC)
-  if (CMAKE_BUILD_TYPE MATCHES Debug)
+  if (HDF5_BUILD_TYPE MATCHES Debug)
     set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99")
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
       set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Og -ftrapv -fno-common")
     endif ()
-  else (CMAKE_BUILD_TYPE MATCHES Debug)
+  else (HDF5_BUILD_TYPE MATCHES Debug)
     set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99")
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
       set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstdarg-opt")
@@ -26,7 +26,7 @@ if (CMAKE_COMPILER_IS_GNUCC)
   endif ()
 endif ()
 if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-  if (CMAKE_BUILD_TYPE MATCHES Debug)
+  if (HDF5_BUILD_TYPE MATCHES Debug)
     set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS}")
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og -ftrapv -fno-common")
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
index 14859c1..4bb5616 100644
--- a/config/cmake/hdf5-config.cmake.in
+++ b/config/cmake/hdf5-config.cmake.in
@@ -49,14 +49,18 @@ set (${HDF5_PACKAGE_NAME}_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
 # Dependencies
 #-----------------------------------------------------------------------------
 if (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL)
-  set (${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH "@MPI_C_INCLUDE_PATH@")
+  set (${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH "@MPI_C_INCLUDE_DIRS@")
   set (${HDF5_PACKAGE_NAME}_MPI_C_LIBRARIES    "@MPI_C_LIBRARIES@")
+  if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
+    set (${HDF5_PACKAGE_NAME}_MPI_Fortran_INCLUDE_PATH "@MPI_Fortran_INCLUDE_DIRS@")
+    set (${HDF5_PACKAGE_NAME}_MPI_Fortran_LIBRARIES    "@MPI_Fortran_LIBRARIES@")
+  endif ()
 endif ()
 
 #-----------------------------------------------------------------------------
 # Directories
 #-----------------------------------------------------------------------------
-set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" "${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH}")
+set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@" "${${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_DIRS}")
 
 set (${HDF5_PACKAGE_NAME}_SHARE_DIR "@PACKAGE_SHARE_INSTALL_DIR@")
 set_and_check (${HDF5_PACKAGE_NAME}_BUILD_DIR "@PACKAGE_CURRENT_BUILD_DIR@")
@@ -90,12 +94,6 @@ set (HDF5_VERSION_MINOR  @HDF5_VERSION_MINOR@)
 # project which has already built hdf5 as a subproject
 #-----------------------------------------------------------------------------
 if (NOT TARGET "@HDF5_PACKAGE@")
-  if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND NOT TARGET "zlib")
-    include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
-  endif ()
-  if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND NOT TARGET "szip")
-    include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
-  endif ()
   include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
 endif ()
 
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index 8ef67a5..e9b1a39 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -15,7 +15,7 @@ General Information:
 
 Compiling Options:
 ------------------
-               Compilation Mode: @CMAKE_BUILD_TYPE@
+               Compilation Mode: @HDF5_BUILD_TYPE@
                      C Compiler: @CMAKE_C_COMPILER@
                          CFLAGS: @CMAKE_C_FLAGS@
                       H5_CFLAGS: @H5_CFLAGS@
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 192a5c8..4c2aeb9 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -9,6 +9,23 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
+
+#-------------------------------------------------------------------------------
+macro (SET_HDF5_BUILD_TYPE)
+  if(CMAKE_CONFIGURATION_TYPES)
+    set(HDF5_BUILD_TYPE ${CMAKE_CFG_INTDIR})
+    set(HDF5_CFG_BUILD_TYPE \${CMAKE_INSTALL_CONFIG_NAME})
+  else()
+    if(CMAKE_BUILD_TYPE)
+      set(HDF5_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+      set(HDF5_CFG_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+    else()
+      set(HDF5_BUILD_TYPE "Release")
+      set(HDF5_CFG_BUILD_TYPE "Release")
+    endif()
+  endif()
+endmacro ()
+
 #-------------------------------------------------------------------------------
 macro (SET_GLOBAL_VARIABLE name value)
   set (${name} ${value} CACHE INTERNAL "Used to pass variables between directories" FORCE)
@@ -145,7 +162,7 @@ macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
   if (${importtype} MATCHES "IMPORT")
     set (importprefix "${CMAKE_STATIC_LIBRARY_PREFIX}")
   endif ()
-  if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+  if (${HDF5_BUILD_TYPE} MATCHES "Debug")
     set (IMPORT_LIB_NAME ${LIB_DEBUG_NAME})
   else ()
     set (IMPORT_LIB_NAME ${LIB_RELEASE_NAME})
@@ -160,8 +177,8 @@ macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
         )
       else ()
         set_target_properties (${libtarget} PROPERTIES
-            IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
-            IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+            IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF5_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+            IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF5_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
         )
       endif ()
     else ()
@@ -181,7 +198,7 @@ macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
   else ()
     if (WIN32 AND NOT MINGW)
       set_target_properties (${libtarget} PROPERTIES
-          IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${IMPORT_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+          IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF5_BUILD_TYPE}/${IMPORT_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
           IMPORTED_LINK_INTERFACE_LANGUAGES "C"
       )
     else ()
diff --git a/fortran/examples/h5_crtatt.f90 b/fortran/examples/h5_crtatt.f90
index 7e287c6..d3df380 100644
--- a/fortran/examples/h5_crtatt.f90
+++ b/fortran/examples/h5_crtatt.f90
@@ -84,6 +84,10 @@ PROGRAM H5_CRTATT
   !
   CALL h5aclose_f(attr_id, error)
   !
+  ! Close the attribute datatype.
+  !
+  CALL h5tclose_f(atype_id, error)
+  !
   ! Terminate access to the data space.
   !
   CALL h5sclose_f(aspace_id, error)
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index b745f3e..e4df0f9 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -117,17 +117,10 @@ add_custom_command (
 
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared")
-  if (WIN32)
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${CMAKE_BUILD_TYPE})
-  else ()
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
-  endif ()
-endif ()
-if (WIN32)
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${CMAKE_BUILD_TYPE})
-else ()
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
+  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF5_CFG_BUILD_TYPE})
 endif ()
+file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/static")
+set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF5_CFG_BUILD_TYPE})
 
 INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY})
 
@@ -138,19 +131,31 @@ add_executable (H5match_types
 )
 set (CMD $<TARGET_FILE:H5match_types>)
 add_custom_command (
-    OUTPUT ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
-           ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90
+    OUTPUT ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
+           ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.f90
     COMMAND ${CMD}
-    WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
+    WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/static
     DEPENDS H5match_types
 )
-set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5f90i_gen.h PROPERTIES GENERATED TRUE)
-set_source_files_properties (${HDF5_F90_BINARY_DIR}/H5fortran_types.F90 PROPERTIES GENERATED TRUE)
+set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h PROPERTIES GENERATED TRUE)
+set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5fortran_types.f90 PROPERTIES GENERATED TRUE)
+if (BUILD_SHARED_LIBS)
+  set (CMDSH $<TARGET_FILE:H5match_types>)
+  add_custom_command (
+      OUTPUT ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
+             ${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.f90
+      COMMAND ${CMDSH}
+      WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/shared
+      DEPENDS H5match_types
+  )
+  set_source_files_properties (${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h PROPERTIES GENERATED TRUE)
+  set_source_files_properties (${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.f90 PROPERTIES GENERATED TRUE)
+endif ()
 
 #-----------------------------------------------------------------------------
 # f90CStub lib
 #-----------------------------------------------------------------------------
-set (f90CStub_C_SRCS
+set (f90CStub_C_SOURCES
     # normal distribution
     ${HDF5_F90_SRC_SOURCE_DIR}/H5f90kit.c
     ${HDF5_F90_SRC_SOURCE_DIR}/H5_f.c
@@ -168,21 +173,19 @@ set (f90CStub_C_SRCS
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Tf.c
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Zf.c
 )
-
-if (H5_HAVE_PARALLEL)
-  set (f90CStub_C_SRCS
-      ${f90CStub_C_SRCS}
-      ${HDF5_F90_SRC_SOURCE_DIR}/H5FDmpiof.c
-  )
-endif ()
-set_source_files_properties (${f90CStub_C_SRCS} PROPERTIES LANGUAGE C)
+set_source_files_properties (${f90CStub_C_SOURCES} PROPERTIES LANGUAGE C)
 
 set (f90CStub_C_HDRS
     # generated files
-    ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
+    ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
+)
+set (f90CStub_C_SHHDRS
+    # generated files
+    ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
 )
 
-add_library (${HDF5_F90_C_LIB_TARGET} STATIC ${f90CStub_C_SRCS} ${f90CStub_C_HDRS})
+add_library (${HDF5_F90_C_LIB_TARGET} STATIC ${f90CStub_C_SOURCES} ${f90CStub_C_HDRS})
+target_include_directories(${HDF5_F90_C_LIB_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/static)
 TARGET_C_PROPERTIES (${HDF5_F90_C_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_C_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}")
@@ -194,8 +197,9 @@ set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES
 )
 set (install_targets ${HDF5_F90_C_LIB_TARGET})
 
-if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
-  add_library (${HDF5_F90_C_LIBSH_TARGET} SHARED ${f90CStub_C_SRCS} ${f90CStub_C_HDRS})
+if (BUILD_SHARED_LIBS)
+  add_library (${HDF5_F90_C_LIBSH_TARGET} SHARED ${f90CStub_C_SOURCES} ${f90CStub_C_SHHDRS})
+  target_include_directories(${HDF5_F90_C_LIBSH_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/shared)
   TARGET_C_PROPERTIES (${HDF5_F90_C_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIBSH_TARGET}")
@@ -237,7 +241,7 @@ endif ()
 #-----------------------------------------------------------------------------
 set (f90_F_SRCS
     # generated files
-    ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90
+    ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.f90
 
     # normal distribution
     ${HDF5_F90_SRC_SOURCE_DIR}/H5f90global.f90
@@ -351,8 +355,8 @@ install (
         ${HDF5_F90_SRC_SOURCE_DIR}/H5f90.h
         ${HDF5_F90_SRC_SOURCE_DIR}/H5f90i.h
         ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h
-        ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
-        ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90
+        ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
+        ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.f90
     DESTINATION
         ${HDF5_INSTALL_INCLUDE_DIR}
     COMPONENT
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index c362564..eefb62f 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -4,13 +4,21 @@ PROJECT (HDF5_FORTRAN_TESTS C CXX Fortran)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
+INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
+
+if (BUILD_SHARED_LIBS)
+  file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared")
+  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF5_CFG_BUILD_TYPE})
+endif ()
+file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/static")
+set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF5_CFG_BUILD_TYPE})
 
 #-----------------------------------------------------------------------------
 # Add Test Lib
 #-----------------------------------------------------------------------------
 add_library (${HDF5_F90_C_TEST_LIB_TARGET} STATIC t.c)
 set_source_files_properties (t.c PROPERTIES LANGUAGE C)
+target_include_directories(${HDF5_F90_C_TEST_LIB_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/static)
 TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_C_TEST_LIB_TARGET}
     ${HDF5_F90_C_LIB_TARGET}
@@ -24,6 +32,7 @@ set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES
 )
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_library (${HDF5_F90_C_TEST_LIBSH_TARGET} SHARED t.c)
+  target_include_directories(${HDF5_F90_C_TEST_LIBSH_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/shared)
   TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_F90_C_TEST_LIBSH_TARGET}
       ${HDF5_F90_C_LIBSH_TARGET}
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index b3a0495..cd3559a 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -3,17 +3,10 @@ PROJECT(HDF5_HL_F90_SRC C CXX Fortran)
 
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   file (MAKE_DIRECTORY "${HDF5_HL_F90_SRC_BINARY_DIR}/shared")
-  if (WIN32)
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${CMAKE_BUILD_TYPE})
-  else ()
-    set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
-  endif ()
-endif ()
-if (WIN32)
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${CMAKE_BUILD_TYPE})
-else ()
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
+  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF5_CFG_BUILD_TYPE})
 endif ()
+file (MAKE_DIRECTORY "${HDF5_HL_F90_SRC_BINARY_DIR}/static")
+set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF5_CFG_BUILD_TYPE})
 
 #-----------------------------------------------------------------------------
 # Setup include Directories
@@ -41,6 +34,7 @@ set_source_files_properties (${HDF5_HL_F90_C_SRCS} PROPERTIES LANGUAGE C)
 set (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h)
 
 add_library (${HDF5_HL_F90_C_LIB_TARGET} STATIC ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS})
+target_include_directories(${HDF5_HL_F90_C_LIB_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/static)
 TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_HL_F90_C_LIB_TARGET} PUBLIC ${HDF5_F90_C_LIB_TARGET} ${HDF5_HL_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIB_TARGET}")
@@ -54,6 +48,7 @@ set (install_targets ${HDF5_HL_F90_C_LIB_TARGET})
 
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_library (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS})
+  target_include_directories(${HDF5_HL_F90_C_LIBSH_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/shared)
   TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_HL_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_F90_C_LIBSH_TARGET} ${HDF5_HL_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIBSH_TARGET}")
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index ad22351..f6f15a1 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -57,6 +57,16 @@ New Features
 
     Configuration
     -------------
+    - CMake
+
+      Refactor use of CMAKE_BUILD_TYPE for new variable, which understands
+      the type of generator in use.
+
+      Added new configuration macros to use new HDF5_BUILD_TYPE variable. This
+      variable is set correctly for the type of generator being used for the build.
+
+      (ADB - 2018/01/08, HDFFV-10385, HDFFV-10296)
+
     - None
 
 
@@ -104,7 +114,18 @@ Bug Fixes since HDF5-1.8.20
 
     Configuration
     -------------
-    - None
+    - CMake
+
+      Correct usuage of CMAKE_BUILD_TYPE variable.
+
+      The use of the CMAKE_BUILD_TYPE is incorrect for multi-config
+      generators (Visual Studio and XCode) and is optional for single
+      config generators. Created a new macro to check
+        GLOBAL PROPERTY -> GENERATOR_IS_MULTI_CONFIG
+      Created two new HDF variable, HDF5_BUILD_TYPE and HDF5_CFG_BUILD_TYPE.
+      Defaults for these variables is "Release".
+
+      (ADB - 2018/01/10, HDFFV-10385)
 
 
     Library
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 786ac0a..6af1606 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -810,7 +810,7 @@ if (HDF5_TEST_VFD)
   macro (CHECK_VFD_TEST vfdtest vfdname resultcode)
     if ("${vfdtest}" STREQUAL "flush1" OR "${vfdtest}" STREQUAL "flush2")
       if ("${vfdname}" STREQUAL "multi" OR "${vfdname}" STREQUAL "split")
-        if (NOT BUILD_SHARED_LIBS AND NOT CMAKE_BUILD_TYPE MATCHES Debug)
+        if (NOT BUILD_SHARED_LIBS AND NOT HDF5_BUILD_TYPE MATCHES Debug)
           add_test (NAME VFD-${vfdname}-${vfdtest}
               COMMAND "${CMAKE_COMMAND}"
                   -D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
-- 
cgit v0.12


From a88e5a95e0608471ff91c6e0d072d5e2014a80f2 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 10 Jan 2018 14:42:11 -0600
Subject: HDFFV-10385 only multi-config builders need a folder

---
 config/cmake_ext_mod/HDFMacros.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 4c2aeb9..96febde 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -16,12 +16,11 @@ macro (SET_HDF5_BUILD_TYPE)
     set(HDF5_BUILD_TYPE ${CMAKE_CFG_INTDIR})
     set(HDF5_CFG_BUILD_TYPE \${CMAKE_INSTALL_CONFIG_NAME})
   else()
+    set(HDF5_CFG_BUILD_TYPE ".")
     if(CMAKE_BUILD_TYPE)
       set(HDF5_BUILD_TYPE ${CMAKE_BUILD_TYPE})
-      set(HDF5_CFG_BUILD_TYPE ${CMAKE_BUILD_TYPE})
     else()
       set(HDF5_BUILD_TYPE "Release")
-      set(HDF5_CFG_BUILD_TYPE "Release")
     endif()
   endif()
 endmacro ()
-- 
cgit v0.12


From f5148618649e96f83578b0c415f69bb9016782df Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 11 Jan 2018 09:13:05 -0600
Subject: HDFFV-8745 merge h5diff attribute fix

---
 MANIFEST                                           |    9 +-
 tools/h5copy/CMakeLists.txt                        |    7 +-
 tools/h5diff/CMakeLists.txt                        |    7 +-
 tools/h5diff/CMakeTests.cmake                      |   13 +-
 tools/h5diff/h5diff_common.c                       |    3 +
 tools/h5diff/h5diffgentest.c                       | 6714 +++++++++++---------
 tools/h5diff/testfiles/h5diff_8625.txt             |   10 +
 tools/h5diff/testfiles/h5diff_8639.txt             |   72 +
 tools/h5diff/testfiles/h5diff_attr1.h5             |  Bin 25616 -> 27480 bytes
 tools/h5diff/testfiles/h5diff_attr2.h5             |  Bin 25616 -> 27480 bytes
 tools/h5diff/testfiles/h5diff_attr3.h5             |  Bin 0 -> 27480 bytes
 tools/h5diff/testfiles/h5diff_tmp1.txt             |    5 -
 tools/h5diff/testfiles/h5diff_tmp2.txt             |   13 -
 .../h5diff/testfiles/tmpSingleSiteBethe.output.h5  |  Bin 124440 -> 0 bytes
 .../testfiles/tmpSingleSiteBethe.reference.h5      |  Bin 119464 -> 0 bytes
 tools/h5diff/testfiles/tmptest.he5                 |  Bin 4740424 -> 0 bytes
 tools/h5diff/testfiles/tmptest2.he5                |  Bin 4734280 -> 0 bytes
 tools/h5diff/testh5diff.sh.in                      |   17 +-
 tools/h5dump/CMakeLists.txt                        |    7 +-
 tools/h5import/CMakeLists.txt                      |    6 +-
 tools/h5jam/CMakeLists.txt                         |    8 +-
 tools/h5jam/h5jam.c                                |    6 +-
 tools/h5ls/CMakeLists.txt                          |    7 +-
 tools/h5repack/CMakeLists.txt                      |    7 +-
 tools/h5repack/h5repack_copy.c                     |    2 +-
 tools/h5repack/h5repack_filters.c                  |    4 +-
 tools/h5stat/CMakeLists.txt                        |    7 +-
 tools/lib/CMakeLists.txt                           |   10 +-
 tools/lib/h5diff_attr.c                            |   22 -
 tools/lib/h5diff_dset.c                            |   50 +-
 tools/lib/io_timer.c                               |    4 -
 tools/lib/ph5diff.h                                |    4 -
 tools/misc/CMakeLists.txt                          |    8 +-
 tools/misc/h5mkgrp.c                               |    2 +
 34 files changed, 3820 insertions(+), 3204 deletions(-)
 create mode 100644 tools/h5diff/testfiles/h5diff_8625.txt
 create mode 100644 tools/h5diff/testfiles/h5diff_8639.txt
 create mode 100644 tools/h5diff/testfiles/h5diff_attr3.h5
 delete mode 100644 tools/h5diff/testfiles/h5diff_tmp1.txt
 delete mode 100644 tools/h5diff/testfiles/h5diff_tmp2.txt
 delete mode 100644 tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5
 delete mode 100644 tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5
 delete mode 100644 tools/h5diff/testfiles/tmptest.he5
 delete mode 100644 tools/h5diff/testfiles/tmptest2.he5

diff --git a/MANIFEST b/MANIFEST
index 83a8f31..ff188d1 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1991,6 +1991,7 @@
 
 ./tools/h5diff/testfiles/h5diff_attr1.h5
 ./tools/h5diff/testfiles/h5diff_attr2.h5
+./tools/h5diff/testfiles/h5diff_attr3.h5
 ./tools/h5diff/testfiles/h5diff_attr_v_level1.h5
 ./tools/h5diff/testfiles/h5diff_attr_v_level2.h5
 ./tools/h5diff/testfiles/h5diff_basic1.h5
@@ -2032,12 +2033,8 @@
 ./tools/h5diff/testfiles/compounds_array_vlen2.h5
 ./tools/h5diff/testfiles/non_comparables1.h5
 ./tools/h5diff/testfiles/non_comparables2.h5
-./tools/h5diff/testfiles/tmptest2.he5
-./tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5
-./tools/h5diff/testfiles/h5diff_tmp1.txt
-./tools/h5diff/testfiles/tmptest.he5
-./tools/h5diff/testfiles/h5diff_tmp2.txt
-./tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5
+./tools/h5diff/testfiles/h5diff_8625.txt
+./tools/h5diff/testfiles/h5diff_8639.txt
 ./tools/h5diff/testfiles/tudfilter.h5
 ./tools/h5diff/testfiles/tudfilter2.h5
 ./tools/h5diff/testfiles/h5diff_ud.txt
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt
index 406ca12..ea7bb48 100644
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@@ -53,10 +53,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5copy-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5copy ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt
index d26c742..1ab7e40 100644
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@@ -105,10 +105,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5diff-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5diff ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/h5diff/CMakeTests.cmake b/tools/h5diff/CMakeTests.cmake
index 14fc534..14fbee7 100644
--- a/tools/h5diff/CMakeTests.cmake
+++ b/tools/h5diff/CMakeTests.cmake
@@ -26,6 +26,7 @@
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dtypes.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr2.h5
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr3.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset1.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset2.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset3.h5
@@ -263,6 +264,8 @@
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_800.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_801.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_90.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8625.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8639.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ud.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_vlstr.txt
@@ -978,6 +981,10 @@
           h5diff_800.out.err
           h5diff_801.out
           h5diff_801.out.err
+          h5diff_8625.out
+          h5diff_8625.out.err
+          h5diff_8639.out
+          h5diff_8639.out.err
           h5diff_90.out
           h5diff_90.out.err
           h5diff_vlstr.out
@@ -1551,7 +1558,11 @@ ADD_H5_TEST (h5diff_487 1 -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5
 # ##############################################################################
 # # diff various multiple vlen and fixed strings in a compound type dataset
 # ##############################################################################
-ADD_H5_TEST (h5diff_530 0 -v  ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group /group_copy)
+ADD_H5_TEST (h5diff_530 0 -v ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group /group_copy)
+# test to verify HDFFV-8625
+ADD_H5_TEST (h5diff_8625 0 -v --enable-error-stack ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group/Compound_dset1 /group_copy/Compound_dset3)
+# test to verify HDFFV-8639
+ADD_H5_TEST (h5diff_8639 0 -v h5diff_attr3.h5 h5diff_attr2.h5 /g1)
 ADD_H5_TEST (h5diff_vlstr 0 -v tvlstr.h5 tvlstr2.h5)
 
 # ##############################################################################
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index 67977e9..f8e02be 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -115,14 +115,17 @@ void parse_command_line(int argc,
         default:
             usage();
             h5diff_exit(EXIT_FAILURE);
+            break;
 
         case 'h':
             usage();
             h5diff_exit(EXIT_SUCCESS);
+            break;
 
         case 'V':
             print_version(h5tools_getprogname());
             h5diff_exit(EXIT_SUCCESS);
+            break;
 
         case 'v':
             opts->m_verbose = 1;
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index 7eeb6d3..2955d2c 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,16 +29,16 @@
 size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
 
 /*-------------------------------------------------------------------------
-* Program: h5diffgentest
-*
-* Purpose: generate files for h5diff testing
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 12, 2003
-*
-*-------------------------------------------------------------------------
-*/
+ * Program: h5diffgentest
+ *
+ * Purpose: generate files for h5diff testing
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: November 12, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
 
 #define FILE1    "h5diff_basic1.h5"
 #define FILE2    "h5diff_basic2.h5"
@@ -46,6 +46,7 @@ size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
 #define FILE4    "h5diff_dtypes.h5"
 #define FILE5    "h5diff_attr1.h5"
 #define FILE6    "h5diff_attr2.h5"
+#define FILE6a   "h5diff_attr3.h5"
 #define FILE7    "h5diff_dset1.h5"
 #define FILE8    "h5diff_dset2.h5"
 #define FILE8A   "h5diff_dset3.h5"
@@ -108,37 +109,36 @@ size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
 #define SPACE1_DIM2 0
 
 /* A UD link traversal function.  Shouldn't actually be called. */
-static hid_t UD_traverse(H5_ATTR_UNUSED const char * link_name, H5_ATTR_UNUSED hid_t cur_group,
-                         H5_ATTR_UNUSED const void * udata, H5_ATTR_UNUSED size_t udata_size, H5_ATTR_UNUSED hid_t lapl_id)
-{
+static hid_t UD_traverse(H5_ATTR_UNUSED const char * link_name,
+        H5_ATTR_UNUSED hid_t cur_group, H5_ATTR_UNUSED const void * udata,
+        H5_ATTR_UNUSED size_t udata_size, H5_ATTR_UNUSED hid_t lapl_id) {
     return -1;
 }
-const H5L_class_t UD_link_class[1] = {{
-    H5L_LINK_CLASS_T_VERS,    /* H5L_class_t version       */
-        (H5L_type_t)MY_LINKCLASS,             /* Link type id number            */
-        "UD link class",          /* name for debugging             */
-        NULL,                     /* Creation callback              */
-        NULL,                     /* Move/rename callback           */
-        NULL,                     /* Copy callback                  */
-        UD_traverse,              /* The actual traversal function  */
-        NULL,                     /* Deletion callback              */
-        NULL                      /* Query callback                 */
-}};
-
+const H5L_class_t UD_link_class[1] = { {
+        H5L_LINK_CLASS_T_VERS, /* H5L_class_t version       */
+        (H5L_type_t) MY_LINKCLASS, /* Link type id number            */
+        "UD link class", /* name for debugging             */
+        NULL, /* Creation callback              */
+        NULL, /* Move/rename callback           */
+        NULL, /* Copy callback                  */
+        UD_traverse, /* The actual traversal function  */
+        NULL, /* Deletion callback              */
+        NULL /* Query callback                 */
+} };
 
 /*-------------------------------------------------------------------------
-* prototypes
-*-------------------------------------------------------------------------
-*/
+ * prototypes
+ *-------------------------------------------------------------------------
+ */
 
 /* tests called in main() */
 static int test_basic(const char *fname1, const char *fname2, const char *fname3);
 static int test_types(const char *fname);
 static int test_datatypes(const char *fname);
-static int test_attributes(const char *fname,int make_diffs);
-static int test_datasets(const char *fname,int make_diffs);
-static int test_special_datasets(const char *fname,int make_diffs);
-static int test_hyperslab(const char *fname,int make_diffs);
+static int test_attributes(const char *fname, int make_diffs);
+static int test_datasets(const char *fname, int make_diffs);
+static int test_special_datasets(const char *fname, int make_diffs);
+static int test_hyperslab(const char *fname, int make_diffs);
 static int test_link_name(const char *fname1);
 static int test_soft_links(const char *fname1);
 static int test_linked_softlinks(const char *fname1);
@@ -153,53 +153,59 @@ static int test_exclude_obj3(const char *fname1, const char *fname2);
 static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new);
 static int test_attributes_verbose_level(const char *fname1, const char *fname2);
 static int test_enums(const char *fname);
-static void test_comps_array (const char *fname, const char *dset, const char *attr,int diff, int is_file_new);
-static void test_comps_vlen (const char *fname, const char *dset,const char *attr, int diff, int is_file_new);
-static void test_comps_array_vlen (const char *fname, const char *dset, const char *attr, int diff, int is_file_new);
-static void test_comps_vlen_arry (const char *fname, const char *dset,const char *attr, int diff, int is_file_new);
-static void test_data_nocomparables (const char *fname, int diff);
-static void test_objs_nocomparables (const char *fname1, const char *fname2);
-static void test_objs_strings (const char *fname, const char *fname2);
+static void test_comps_array(const char *fname, const char *dset,
+        const char *attr, int diff, int is_file_new);
+static void test_comps_vlen(const char *fname, const char *dset,
+        const char *attr, int diff, int is_file_new);
+static void test_comps_array_vlen(const char *fname, const char *dset,
+        const char *attr, int diff, int is_file_new);
+static void test_comps_vlen_arry(const char *fname, const char *dset,
+        const char *attr, int diff, int is_file_new);
+static void test_data_nocomparables(const char *fname, int diff);
+static void test_objs_nocomparables(const char *fname1, const char *fname2);
+static void test_objs_strings(const char *fname, const char *fname2);
 
 /* called by test_attributes() and test_datasets() */
-static void write_attr_in(hid_t loc_id,const char* dset_name,hid_t fid,int make_diffs);
-static void write_dset_in(hid_t loc_id,const char* dset_name,hid_t fid,int make_diffs);
-static void gen_datareg(hid_t fid,int make_diffs);
+static void write_attr_strings(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs);
+static void write_attr_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs);
+static void write_dset_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs);
+static void gen_datareg(hid_t fid, int make_diffs);
 /* utilities */
-static int write_attr(hid_t loc_id,int rank,hsize_t *dims,const char *name,hid_t tid,void *buf);
-static int write_dset(hid_t loc_id,int rank,hsize_t *dims,const char *name,hid_t tid,void *buf);
-
+static int write_attr(hid_t loc_id, int rank, hsize_t *dims, const char *name, hid_t tid, void *buf);
+static int write_dset(hid_t loc_id, int rank, hsize_t *dims, const char *name, hid_t tid, void *buf);
 
 /*-------------------------------------------------------------------------
-* Function: main
-*
-* Purpose: main program
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: main
+ *
+ * Purpose: main program
+ *
+ *-------------------------------------------------------------------------
+ */
 
 int main(void)
 {
     test_basic(FILE1, FILE2, FILE11);
 
-    test_types (FILE3);
+    test_types(FILE3);
     test_datatypes(FILE4);
 
     /* generate 2 files, the second call creates a similar file with differences */
-    test_attributes(FILE5,0);
-    test_attributes(FILE6,1);
+    test_attributes(FILE5, 0);
+    test_attributes(FILE6, 1);
+    /* generate file with string datatypes swapped */
+    test_attributes(FILE6a, 2);
 
     /* test attributes with verbose level */
     test_attributes_verbose_level(ATTR_VERBOSE_LEVEL_FILE1, ATTR_VERBOSE_LEVEL_FILE2);
 
     /* generate 2 files, the second call creates a similar file with differences */
-    test_datasets(FILE7,0);
-    test_datasets(FILE8,1);
-    test_datasets(FILE8A,2);
+    test_datasets(FILE7, 0);
+    test_datasets(FILE8, 1);
+    test_datasets(FILE8A, 2);
 
     /* generate 2 files, the second call creates a similar file with differences */
-    test_hyperslab(FILE9,0);
-    test_hyperslab(FILE10,1);
+    test_hyperslab(FILE9, 0);
+    test_hyperslab(FILE10, 1);
 
     test_link_name(FILE12);
 
@@ -212,8 +218,8 @@ int main(void)
     test_ext2soft_links(FILE17, FILE18);
 
     /* generate 2 files, the second call creates a similar file with differences */
-    test_special_datasets(FILE19,0);
-    test_special_datasets(FILE20,1);
+    test_special_datasets(FILE19, 0);
+    test_special_datasets(FILE20, 1);
 
     test_dangle_links(DANGLE_LINK_FILE1, DANGLE_LINK_FILE2);
 
@@ -229,34 +235,34 @@ int main(void)
     test_comp_vlen_strings(COMP_VL_STRS_FILE, "group_copy", 0);
 
     /* diff when invalid enum values are present.
-     * This will probably grow to involve more extensive testing of
-     * enums so it has been given its own test file and test (apart
-     * from the basic type testing).
-     */
+    * This will probably grow to involve more extensive testing of
+    * enums so it has been given its own test file and test (apart
+    * from the basic type testing).
+    */
     test_enums(ENUM_INVALID_VALUES);
 
     /* -------------------------------------------------
-     * Create test files with dataset and attribute with container types
-     * (array, vlen) with multiple nested compound types.
-     */
+    * Create test files with dataset and attribute with container types
+    * (array, vlen) with multiple nested compound types.
+    */
     /* file1 */
-    test_comps_array(COMPS_COMPLEX1,"dset1", "attr1", 0, 1);
-    test_comps_vlen(COMPS_COMPLEX1,"dset2", "attr2", 0, 0);
-    test_comps_array_vlen(COMPS_COMPLEX1,"dset3", "attr3", 0, 0);
-    test_comps_vlen_arry(COMPS_COMPLEX1,"dset4", "attr4", 0, 0);
+    test_comps_array(COMPS_COMPLEX1, "dset1", "attr1", 0, 1);
+    test_comps_vlen(COMPS_COMPLEX1, "dset2", "attr2", 0, 0);
+    test_comps_array_vlen(COMPS_COMPLEX1, "dset3", "attr3", 0, 0);
+    test_comps_vlen_arry(COMPS_COMPLEX1, "dset4", "attr4", 0, 0);
     /* file2 */
-    test_comps_array(COMPS_COMPLEX2,"dset1", "attr1", 5, 1);
-    test_comps_vlen(COMPS_COMPLEX2,"dset2", "attr2",5, 0);
-    test_comps_array_vlen(COMPS_COMPLEX2,"dset3", "attr3", 5, 0);
-    test_comps_vlen_arry(COMPS_COMPLEX2,"dset4", "attr4", 5, 0);
+    test_comps_array(COMPS_COMPLEX2, "dset1", "attr1", 5, 1);
+    test_comps_vlen(COMPS_COMPLEX2, "dset2", "attr2", 5, 0);
+    test_comps_array_vlen(COMPS_COMPLEX2, "dset3", "attr3", 5, 0);
+    test_comps_vlen_arry(COMPS_COMPLEX2, "dset4", "attr4", 5, 0);
 
     /*-------------------------------------------------
-     * Create test files with non-comparable dataset and attributes with
-     * comparable datasets and attributes.  All the comparables should display
-     * differences.
-     */
-    test_data_nocomparables(NON_COMPARBLES1,0);
-    test_data_nocomparables(NON_COMPARBLES2,5);
+    * Create test files with non-comparable dataset and attributes with
+    * comparable datasets and attributes.  All the comparables should display
+    * differences.
+    */
+    test_data_nocomparables(NON_COMPARBLES1, 0);
+    test_data_nocomparables(NON_COMPARBLES2, 5);
 
     /* common objects (same name) with different object types. HDFFV-7644 */
     test_objs_nocomparables(NON_COMPARBLES1, NON_COMPARBLES2);
@@ -268,28 +274,28 @@ int main(void)
 }
 
 /*-------------------------------------------------------------------------
-* Function: test_basic
-*
-* Purpose: Create basic test files, first two contains different data, the
-* third one is just an empty file.
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_basic
+ *
+ * Purpose: Create basic test files, first two contains different data, the
+ * third one is just an empty file.
+ *
+ *-------------------------------------------------------------------------
+ */
 
 static
 int test_basic(const char *fname1, const char *fname2, const char *fname3)
 {
-    hid_t   fid1, fid2;
-    hid_t   gid1, gid2, gid3;
+    hid_t fid1 = -1, fid2 = -1;
+    hid_t gid1 = -1, gid2 = -1, gid3 = -1;
     hsize_t dims1[1] = { 6 };
-    hsize_t dims2[2] = { 3,2 };
+    hsize_t dims2[2] = { 3, 2 };
 
     /* create the empty file */
-    if ((fid1=H5Fcreate(fname3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0){
+    if ((fid1 = H5Fcreate(fname3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "empty file (%s) creation failed.\n", fname3);
         goto out;
     }
-    if (H5Fclose(fid1) < 0){
+    if (H5Fclose(fid1) < 0) {
         fprintf(stderr, "empty file (%s) close failed.\n", fname3);
         goto out;
     }
@@ -299,9 +305,9 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
 
-    if (( fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0 )
+    if ((fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if (( fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0 )
+    if ((fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
@@ -324,16 +330,20 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     */
 
     {
-        double data1[3][2] = {{  1.0F,   1.0F}, {  1.00F,   1.000F}, {  0.0F,   0.0F}};
-        double data2[3][2] = {{  0.0F,   1.1F}, {  1.01F,   1.001F}, {  0.0F,   1.0F}};
-        double data3[3][2] = {{100.0F, 100.0F}, {100.00F, 100.000F}, {100.0F, 100.0F}};
-        double data4[3][2] = {{105.0F, 120.0F}, {160.00F,  95.000F}, { 80.0F,  40.0F}};
+        double data1[3][2] =
+        { { 1.0F, 1.0F }, { 1.00F, 1.000F }, { 0.0F, 0.0F } };
+        double data2[3][2] =
+        { { 0.0F, 1.1F }, { 1.01F, 1.001F }, { 0.0F, 1.0F } };
+        double data3[3][2] = { { 100.0F, 100.0F }, { 100.00F, 100.000F }, {
+                100.0F, 100.0F } };
+        double data4[3][2] = { { 105.0F, 120.0F }, { 160.00F, 95.000F }, {
+                80.0F, 40.0F } };
 
-        write_dset(gid1,2,dims2,"dset1",H5T_NATIVE_DOUBLE,data1);
-        write_dset(gid2,2,dims2,"dset2",H5T_NATIVE_DOUBLE,data2);
-        write_dset(gid1,2,dims2,"dset3",H5T_NATIVE_DOUBLE,data3);
-        write_dset(gid2,2,dims2,"dset4",H5T_NATIVE_DOUBLE,data4);
-        write_dset(gid2,2,dims2,"dset1",H5T_NATIVE_DOUBLE,data2);
+        write_dset(gid1, 2, dims2, "dset1", H5T_NATIVE_DOUBLE, data1);
+        write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_DOUBLE, data2);
+        write_dset(gid1, 2, dims2, "dset3", H5T_NATIVE_DOUBLE, data3);
+        write_dset(gid2, 2, dims2, "dset4", H5T_NATIVE_DOUBLE, data4);
+        write_dset(gid2, 2, dims2, "dset1", H5T_NATIVE_DOUBLE, data2);
 
     }
     /*-------------------------------------------------------------------------
@@ -342,11 +352,11 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
     {
-        int data5[3][2] = {{100,100},{100,0},{0,100}};
-        int data6[3][2] = {{120,80}, {0,100},{0,50}};
+        int data5[3][2] = { { 100, 100 }, { 100, 0 }, { 0, 100 } };
+        int data6[3][2] = { { 120, 80 }, { 0, 100 }, { 0, 50 } };
 
-        write_dset(gid1,2,dims2,"dset5",H5T_NATIVE_INT,data5);
-        write_dset(gid1,2,dims2,"dset6",H5T_NATIVE_INT,data6);
+        write_dset(gid1, 2, dims2, "dset5", H5T_NATIVE_INT, data5);
+        write_dset(gid1, 2, dims2, "dset6", H5T_NATIVE_INT, data6);
 
     }
 
@@ -356,11 +366,12 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
     {
-        unsigned long long data7[3][2] = {{100,100},{100,0},{0,100}};
-        unsigned long long data8[3][2] = {{120,80}, {0,100},{0,50}};
+        unsigned long long data7[3][2] =
+        { { 100, 100 }, { 100, 0 }, { 0, 100 } };
+        unsigned long long data8[3][2] = { { 120, 80 }, { 0, 100 }, { 0, 50 } };
 
-        write_dset(gid1,2,dims2,"dset7",H5T_NATIVE_ULLONG,data7);
-        write_dset(gid1,2,dims2,"dset8",H5T_NATIVE_ULLONG,data8);
+        write_dset(gid1, 2, dims2, "dset7", H5T_NATIVE_ULLONG, data7);
+        write_dset(gid1, 2, dims2, "dset8", H5T_NATIVE_ULLONG, data8);
 
     }
 
@@ -378,45 +389,47 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
     {
-        double data9[3][2] = {{100.0F, 100.0F}, {100.0F,   0.0F}, {0.0F, 100.0F}};
-        double data10[3][2] ={{120.0F,  80.0F}, {  0.0F, 100.0F}, {0.0F,  50.0F}};
+        double data9[3][2] = { { 100.0F, 100.0F }, { 100.0F, 0.0F }, { 0.0F,
+                100.0F } };
+        double data10[3][2] = { { 120.0F, 80.0F }, { 0.0F, 100.0F }, { 0.0F,
+                50.0F } };
 
-        write_dset(gid1,2,dims2,"dset9",H5T_NATIVE_DOUBLE,data9);
-        write_dset(gid1,2,dims2,"dset10",H5T_NATIVE_DOUBLE,data10);
+        write_dset(gid1, 2, dims2, "dset9", H5T_NATIVE_DOUBLE, data9);
+        write_dset(gid1, 2, dims2, "dset10", H5T_NATIVE_DOUBLE, data10);
 
     }
 
-
     /*-------------------------------------------------------------------------
     * test floating point comparison
     *-------------------------------------------------------------------------
     */
     {
         /* epsilon = 0.0000001 = 1e-7
-         * system epsilon for float : FLT_EPSILON = 1.19209E-07
-         */
-        float  data11[3][2] ={{0.000000f,0.0000001f},{0.0000001f, 0.00000022f},{0.0000001f,0.0000001f}};
-        float  data12[3][2] ={{0.000000f,0.0000002f},{0.0000003f,0.0000001f},{0.000000f,0.0000001f}};
+        * system epsilon for float : FLT_EPSILON = 1.19209E-07
+        */
+        float data11[3][2] = { { 0.000000f, 0.0000001f }, { 0.0000001f,
+                0.00000022f }, { 0.0000001f, 0.0000001f } };
+        float data12[3][2] = { { 0.000000f, 0.0000002f }, { 0.0000003f,
+                0.0000001f }, { 0.000000f, 0.0000001f } };
         /* epsilon = 0.0000000000000001 = 1e-16
-         * system epsilon for double : DBL_EPSILON = 2.22045E-16
-         */
-        double data13[3][2] ={
-            {H5_DOUBLE(0.0000000000000000),  H5_DOUBLE(0.0000000000000001)},
-            {H5_DOUBLE(0.0000000000000001),  H5_DOUBLE(0.0000000000000000)},
-            {H5_DOUBLE(0.00000000000000033), H5_DOUBLE(0.0000000000000001)}};
-        double data14[3][2] ={
-            {H5_DOUBLE(0.0000000000000000), H5_DOUBLE(0.0000000000000004)},
-            {H5_DOUBLE(0.0000000000000002), H5_DOUBLE(0.0000000000000001)},
-            {H5_DOUBLE(0.0000000000000001), H5_DOUBLE(0.00000000000000000)}};
+        * system epsilon for double : DBL_EPSILON = 2.22045E-16
+        */
+        double data13[3][2] = { { H5_DOUBLE(0.0000000000000000), H5_DOUBLE(
+                0.0000000000000001) }, { H5_DOUBLE(0.0000000000000001),
+                        H5_DOUBLE(0.0000000000000000) }, { H5_DOUBLE(
+                                0.00000000000000033), H5_DOUBLE(0.0000000000000001) } };
+        double data14[3][2] = { { H5_DOUBLE(0.0000000000000000), H5_DOUBLE(
+                0.0000000000000004) }, { H5_DOUBLE(0.0000000000000002),
+                        H5_DOUBLE(0.0000000000000001) }, { H5_DOUBLE(
+                                0.0000000000000001), H5_DOUBLE(0.00000000000000000) } };
 
-        write_dset(gid1,2,dims2,"fp1",H5T_NATIVE_FLOAT,data11);
-        write_dset(gid1,2,dims2,"fp2",H5T_NATIVE_FLOAT,data12);
-        write_dset(gid1,2,dims2,"d1",H5T_NATIVE_DOUBLE,data13);
-        write_dset(gid1,2,dims2,"d2",H5T_NATIVE_DOUBLE,data14);
+        write_dset(gid1, 2, dims2, "fp1", H5T_NATIVE_FLOAT, data11);
+        write_dset(gid1, 2, dims2, "fp2", H5T_NATIVE_FLOAT, data12);
+        write_dset(gid1, 2, dims2, "d1", H5T_NATIVE_DOUBLE, data13);
+        write_dset(gid1, 2, dims2, "d2", H5T_NATIVE_DOUBLE, data14);
 
     }
 
-
 #if H5_SIZEOF_LONG_DOUBLE !=0
     {
 
@@ -425,15 +438,13 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
         *-------------------------------------------------------------------------
         */
 
-        long double data15[3][2] ={{1.0L,1.0L},{1.0L,1.0L},{1.0L,1.0L}};
+        long double data15[3][2] = { {1.0L,1.0L}, {1.0L,1.0L}, {1.0L,1.0L}};
 
         write_dset(gid1,2,dims2,"ld",H5T_NATIVE_LDOUBLE,data15);
 
     }
 #endif
 
-
-
     /*-------------------------------------------------------------------------
     * NaNs in H5T_NATIVE_FLOAT
     *-------------------------------------------------------------------------
@@ -443,22 +454,22 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
         float data15[6];
         float data16[6];
 
-        data15[0] = (float)HDsqrt(-1.0F);
+        data15[0] = (float) HDsqrt(-1.0F);
         data15[1] = 1.0F;
-        data15[2] = (float)HDsqrt(-1.0F);
+        data15[2] = (float) HDsqrt(-1.0F);
         data15[3] = 1.0F;
         data15[4] = 1.0F;
         data15[5] = 1.0F;
 
-        data16[0] = (float)HDsqrt(-1.0F);
-        data16[1] = (float)HDsqrt(-1.0F);
+        data16[0] = (float) HDsqrt(-1.0F);
+        data16[1] = (float) HDsqrt(-1.0F);
         data16[2] = 1.0F;
         data16[3] = 1.0F;
         data16[4] = 1.0F;
         data16[5] = 1.0F;
 
-        write_dset(gid1,1,dims1,"fp15",H5T_NATIVE_FLOAT,data15);
-        write_dset(gid1,1,dims1,"fp16",H5T_NATIVE_FLOAT,data16);
+        write_dset(gid1, 1, dims1, "fp15", H5T_NATIVE_FLOAT, data15);
+        write_dset(gid1, 1, dims1, "fp16", H5T_NATIVE_FLOAT, data16);
 
     }
 
@@ -485,29 +496,29 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
         data18[4] = 1.0F;
         data18[5] = 1.0F;
 
-        write_dset(gid1,1,dims1,"fp17",H5T_NATIVE_DOUBLE,data17);
-        write_dset(gid1,1,dims1,"fp18",H5T_NATIVE_DOUBLE,data18);
-        write_dset(gid1,1,dims1,"fp18_COPY",H5T_NATIVE_DOUBLE,data18);
+        write_dset(gid1, 1, dims1, "fp17", H5T_NATIVE_DOUBLE, data17);
+        write_dset(gid1, 1, dims1, "fp18", H5T_NATIVE_DOUBLE, data18);
+        write_dset(gid1, 1, dims1, "fp18_COPY", H5T_NATIVE_DOUBLE, data18);
     }
 
     /*------------------------------------------------------------------------
-     *            INFINITY values
-     *------------------------------------------------------------------------
-     */
+    *            INFINITY values
+    *------------------------------------------------------------------------
+    */
     {
-        float  data19[6];
+        float data19[6];
         double data20[6];
 
-        data19[0] = data19[1] = data19[2] = (float)HDlog(0.0F);
-        data19[3] = data19[4] = data19[5] = (float)-HDlog(0.0F);
+        data19[0] = data19[1] = data19[2] = (float) HDlog(0.0F);
+        data19[3] = data19[4] = data19[5] = (float) -HDlog(0.0F);
 
         data20[0] = data20[1] = data20[2] = HDlog(0.0F);
         data20[3] = data20[4] = data20[5] = -HDlog(0.0F);
 
-        write_dset(gid1,1,dims1,"fp19",H5T_NATIVE_FLOAT,data19);
-        write_dset(gid1,1,dims1,"fp19_COPY",H5T_NATIVE_FLOAT,data19);
-        write_dset(gid1,1,dims1,"fp20",H5T_NATIVE_DOUBLE,data20);
-        write_dset(gid1,1,dims1,"fp20_COPY",H5T_NATIVE_DOUBLE,data20);
+        write_dset(gid1, 1, dims1, "fp19", H5T_NATIVE_FLOAT, data19);
+        write_dset(gid1, 1, dims1, "fp19_COPY", H5T_NATIVE_FLOAT, data19);
+        write_dset(gid1, 1, dims1, "fp20", H5T_NATIVE_DOUBLE, data20);
+        write_dset(gid1, 1, dims1, "fp20_COPY", H5T_NATIVE_DOUBLE, data20);
     }
 
     /*-------------------------------------------------------------------------
@@ -515,105 +526,97 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
     {
-        typedef struct cmp1_t
-        {
+        typedef struct cmp1_t {
             double d;
-            float  f;
+            float f;
         } cmp1_t;
 
-        cmp1_t   buf1[2];
-        cmp1_t   buf2[2];
-        hsize_t  dims[1] = {2};
-        size_t   type_size;
-        hid_t    tid;
+        cmp1_t buf1[2];
+        cmp1_t buf2[2];
+        hsize_t dims[1] = { 2 };
+        size_t type_size;
+        hid_t tid;
 
         buf1[0].d = HDsqrt(-1.0F);
-        buf1[0].f = (float)HDsqrt(-1.0F);
+        buf1[0].f = (float) HDsqrt(-1.0F);
         buf2[0].d = HDsqrt(-1.0F);
-        buf2[0].f = (float)HDsqrt(-1.0F);
+        buf2[0].f = (float) HDsqrt(-1.0F);
 
         buf1[1].d = HDsqrt(-1.0F);
-        buf1[1].f = (float)HDsqrt(-1.0F);
+        buf1[1].f = (float) HDsqrt(-1.0F);
         buf2[1].d = 0.0F;
         buf2[1].f = 0.0F;
 
-        type_size = sizeof( cmp1_t );
-        tid = H5Tcreate (H5T_COMPOUND, type_size );
-        H5Tinsert(tid, "d", HOFFSET( cmp1_t, d ), H5T_NATIVE_DOUBLE );
-        H5Tinsert(tid, "f", HOFFSET( cmp1_t, f ), H5T_NATIVE_FLOAT );
-        write_dset(gid1,1,dims,"dset11",tid,buf1);
-        write_dset(gid1,1,dims,"dset12",tid,buf2);
+        type_size = sizeof(cmp1_t);
+        tid = H5Tcreate(H5T_COMPOUND, type_size);
+        H5Tinsert(tid, "d", HOFFSET(cmp1_t, d), H5T_NATIVE_DOUBLE);
+        H5Tinsert(tid, "f", HOFFSET(cmp1_t, f), H5T_NATIVE_FLOAT);
+        write_dset(gid1, 1, dims, "dset11", tid, buf1);
+        write_dset(gid1, 1, dims, "dset12", tid, buf2);
         H5Tclose(tid);
 
-
     }
 
     /* not comparable objects */
     {
 
-        typedef struct cmp1_t
-        {
+        typedef struct cmp1_t {
             double d;
-            int    i;
+            int i;
         } cmp1_t;
 
-        typedef struct cmp2_t
-        {
-            int    i;
+        typedef struct cmp2_t {
+            int i;
             double d;
         } cmp2_t;
 
-        typedef struct cmp3_t
-        {
+        typedef struct cmp3_t {
             int i;
         } cmp3_t;
 
-        double       data2[6] = {0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F};
-        int          data3[6] = {0,0,0,0,0,0};
-        int          data4[3][2] = {{0,0},{0,0},{0,0}};
-        int          data5[2][2] = {{0,0},{0,0}};
-        unsigned int data6[3][2] = {{0,0},{0,0},{0,0}};
-        cmp1_t       data7[1] = {{1.0f, 2}};
-        cmp2_t       data8[1] = {{1, 2.0f}};
-        hsize_t      dims3[2] = {2, 2};
-        hsize_t      dims4[1] = {1};
-        size_t       type_size;
-        hid_t        tid;
-
-
-
-        write_dset(gid3,1,dims1,"dset1",H5T_NATIVE_DOUBLE,NULL);
-        write_dset(gid3,1,dims1,"dset2",H5T_NATIVE_DOUBLE,data2);
-        write_dset(gid3,1,dims1,"dset3",H5T_NATIVE_INT,data3);
-        write_dset(gid3,2,dims2,"dset4",H5T_NATIVE_INT,data4);
-        write_dset(gid3,2,dims3,"dset5",H5T_NATIVE_INT,data5);
-        write_dset(gid3,2,dims2,"dset6",H5T_NATIVE_UINT,data6);
+        double data2[6] = { 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F };
+        int data3[6] = { 0, 0, 0, 0, 0, 0 };
+        int data4[3][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 } };
+        int data5[2][2] = { { 0, 0 }, { 0, 0 } };
+        unsigned int data6[3][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 } };
+        cmp1_t data7[1] = { { 1.0f, 2 } };
+        cmp2_t data8[1] = { { 1, 2.0f } };
+        hsize_t dims3[2] = { 2, 2 };
+        hsize_t dims4[1] = { 1 };
+        size_t type_size;
+        hid_t tid;
+
+        write_dset(gid3, 1, dims1, "dset1", H5T_NATIVE_DOUBLE, NULL);
+        write_dset(gid3, 1, dims1, "dset2", H5T_NATIVE_DOUBLE, data2);
+        write_dset(gid3, 1, dims1, "dset3", H5T_NATIVE_INT, data3);
+        write_dset(gid3, 2, dims2, "dset4", H5T_NATIVE_INT, data4);
+        write_dset(gid3, 2, dims3, "dset5", H5T_NATIVE_INT, data5);
+        write_dset(gid3, 2, dims2, "dset6", H5T_NATIVE_UINT, data6);
 
         /* case of compound with different type members */
-        type_size = sizeof( cmp1_t );
-        tid = H5Tcreate (H5T_COMPOUND, type_size );
-        H5Tinsert(tid, "d", HOFFSET( cmp1_t, d ), H5T_NATIVE_DOUBLE );
-        H5Tinsert(tid, "i", HOFFSET( cmp1_t, i ), H5T_NATIVE_INT );
-        write_dset(gid3,1,dims4,"dset7",tid,data7);
+        type_size = sizeof(cmp1_t);
+        tid = H5Tcreate(H5T_COMPOUND, type_size);
+        H5Tinsert(tid, "d", HOFFSET(cmp1_t, d), H5T_NATIVE_DOUBLE);
+        H5Tinsert(tid, "i", HOFFSET(cmp1_t, i), H5T_NATIVE_INT);
+        write_dset(gid3, 1, dims4, "dset7", tid, data7);
         H5Tclose(tid);
 
-        type_size = sizeof( cmp2_t );
-        tid = H5Tcreate (H5T_COMPOUND, type_size );
-        H5Tinsert(tid, "i", HOFFSET( cmp2_t, i ), H5T_NATIVE_INT  );
-        H5Tinsert(tid, "d", HOFFSET( cmp2_t, d ), H5T_NATIVE_DOUBLE );
-        write_dset(gid3,1,dims4,"dset8",tid,data8);
+        type_size = sizeof(cmp2_t);
+        tid = H5Tcreate(H5T_COMPOUND, type_size);
+        H5Tinsert(tid, "i", HOFFSET(cmp2_t, i), H5T_NATIVE_INT);
+        H5Tinsert(tid, "d", HOFFSET(cmp2_t, d), H5T_NATIVE_DOUBLE);
+        write_dset(gid3, 1, dims4, "dset8", tid, data8);
         H5Tclose(tid);
 
         /* case of compound with different number of members */
-        type_size = sizeof( cmp3_t );
-        tid = H5Tcreate (H5T_COMPOUND, type_size );
-        H5Tinsert(tid, "i", HOFFSET( cmp2_t, i ), H5T_NATIVE_INT  );
-        write_dset(gid3,1,dims4,"dset9",tid,NULL);
+        type_size = sizeof(cmp3_t);
+        tid = H5Tcreate(H5T_COMPOUND, type_size);
+        H5Tinsert(tid, "i", HOFFSET(cmp2_t, i), H5T_NATIVE_INT);
+        write_dset(gid3, 1, dims4, "dset9", tid, NULL);
         H5Tclose(tid);
 
     }
 
-
     /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
@@ -630,46 +633,43 @@ out:
     return FAIL;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: test_types
-*
-* Purpose: Compare different HDF5 object & link types:
-* H5G_DATASET, H5G_TYPE, H5G_GROUP, H5G_LINK, H5G_UDLINK
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_types
+ *
+ * Purpose: Compare different HDF5 object & link types:
+ * H5G_DATASET, H5G_TYPE, H5G_GROUP, H5G_LINK, H5G_UDLINK
+ *
+ *-------------------------------------------------------------------------
+ */
 static
 int test_types(const char *fname)
 {
-    hid_t   fid1;
-    hid_t   gid1;
-    hid_t   gid2;
-    hid_t   tid1;
-    hid_t   tid2;
-    herr_t  status;
-    hsize_t dims[1]={1};
-    typedef struct s1_t
-    {
-        int    a;
-        float  b;
+    hid_t fid1 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hid_t tid1 = -1;
+    hid_t tid2 = -1;
+    herr_t status;
+    hsize_t dims[1] = { 1 };
+    typedef struct s1_t {
+        int a;
+        float b;
     } s1_t;
-    typedef struct s2_t
-    {
-        int    a;
+    typedef struct s2_t {
+        int a;
     } s2_t;
 
     /*-------------------------------------------------------------------------
     * Create one file
     *-------------------------------------------------------------------------
     */
-    fid1 = H5Fcreate (fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    fid1 = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
     * H5G_DATASET
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,1,dims,"dset",H5T_NATIVE_INT,0);
+    write_dset(fid1, 1, dims, "dset", H5T_NATIVE_INT, 0);
 
     /*-------------------------------------------------------------------------
     * H5G_GROUP
@@ -711,7 +711,7 @@ int test_types(const char *fname)
     */
     H5Lcreate_external("filename", "objname", fid1, "ext_link", H5P_DEFAULT, H5P_DEFAULT);
     H5Lregister(UD_link_class);
-    H5Lcreate_ud(fid1, "ud_link", (H5L_type_t)MY_LINKCLASS, NULL, (size_t)0, H5P_DEFAULT, H5P_DEFAULT);
+    H5Lcreate_ud(fid1, "ud_link", (H5L_type_t) MY_LINKCLASS, NULL, (size_t) 0, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
     * Close
@@ -721,195 +721,192 @@ int test_types(const char *fname)
     return status;
 }
 
-
 /*
 
-# ##############################################################################
-# # not comparable types
-# ##############################################################################
+ # ##############################################################################
+ # # not comparable types
+ # ##############################################################################
 
-# 2.0
-TOOLTEST h5diff_20.txt file3.h5 file3.h5 -v dset g1
+ # 2.0
+ TOOLTEST h5diff_20.txt file3.h5 file3.h5 -v dset g1
 
-# 2.1
-TOOLTEST h5diff_21.txt file3.h5 file3.h5 -v dset l1
+ # 2.1
+ TOOLTEST h5diff_21.txt file3.h5 file3.h5 -v dset l1
 
-# 2.2
-TOOLTEST h5diff_22.txt file3.h5 file3.h5 -v dset t1
+ # 2.2
+ TOOLTEST h5diff_22.txt file3.h5 file3.h5 -v dset t1
 
-# ##############################################################################
-# # compare groups, types, links (no differences and differences)
-# ##############################################################################
+ # ##############################################################################
+ # # compare groups, types, links (no differences and differences)
+ # ##############################################################################
 
-# 2.3
-TOOLTEST h5diff_23.txt file3.h5 file3.h5 -v g1 g1
+ # 2.3
+ TOOLTEST h5diff_23.txt file3.h5 file3.h5 -v g1 g1
 
-# 2.4
-TOOLTEST h5diff_24.txt file3.h5 file3.h5 -v t1 t1
+ # 2.4
+ TOOLTEST h5diff_24.txt file3.h5 file3.h5 -v t1 t1
 
-# 2.5
-TOOLTEST h5diff_25.txt file3.h5 file3.h5 -v l1 l1
+ # 2.5
+ TOOLTEST h5diff_25.txt file3.h5 file3.h5 -v l1 l1
 
-# 2.6
-TOOLTEST h5diff_26.txt file3.h5 file3.h5 -v g1 g2
+ # 2.6
+ TOOLTEST h5diff_26.txt file3.h5 file3.h5 -v g1 g2
 
-# 2.7
-TOOLTEST h5diff_27.txt file3.h5 file3.h5 -v t1 t2
+ # 2.7
+ TOOLTEST h5diff_27.txt file3.h5 file3.h5 -v t1 t2
 
-# 2.8
-TOOLTEST h5diff_28.txt file3.h5 file3.h5 -v l1 l2
-*/
+ # 2.8
+ TOOLTEST h5diff_28.txt file3.h5 file3.h5 -v l1 l2
+ */
 
 /*-------------------------------------------------------------------------
-* Function: test_datatypes
-*
-* Purpose: test dataset datatypes
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_datatypes
+ *
+ * Purpose: test dataset datatypes
+ *
+ *-------------------------------------------------------------------------
+ */
 static
 int test_datatypes(const char *fname)
 {
-
-    hid_t   fid1;
-    hid_t   dset;
-    hsize_t dims[2]={3,2};
-    herr_t  status;
-    char    buf1a[3][2] = {{1,1},{1,1},{1,1}};
-    char    buf1b[3][2] = {{1,1},{3,4},{5,6}};
-    short   buf2a[3][2] = {{1,1},{1,1},{1,1}};
-    short   buf2b[3][2] = {{1,1},{3,4},{5,6}};
-    int     buf3a[3][2] = {{1,1},{1,1},{1,1}};
-    int     buf3b[3][2] = {{1,1},{3,4},{5,6}};
-    long    buf4a[3][2] = {{1,1},{1,1},{1,1}};
-    long    buf4b[3][2] = {{1,1},{3,4},{5,6}};
-    float   buf5a[3][2] = {{1.0F, 1.0F}, {1.0F, 1.0F}, {1.0F, 1.0F}};
-    float   buf5b[3][2] = {{1.0F, 1.0F}, {3.0F, 4.0F}, {5.0F, 6.0F}};
-    double  buf6a[3][2] = {{1.0F, 1.0F}, {1.0F, 1.0F}, {1.0F, 1.0F}};
-    double  buf6b[3][2] = {{1.0F, 1.0F}, {3.0F, 4.0F}, {5.0F, 6.0F}};
+    hid_t fid1 = -1;
+    hid_t dset = -1;
+    hsize_t dims[2] = { 3, 2 };
+    herr_t status;
+    char buf1a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    char buf1b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
+    short buf2a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    short buf2b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
+    int buf3a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    int buf3b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
+    long buf4a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    long buf4b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
+    float buf5a[3][2] = { { 1.0F, 1.0F }, { 1.0F, 1.0F }, { 1.0F, 1.0F } };
+    float buf5b[3][2] = { { 1.0F, 1.0F }, { 3.0F, 4.0F }, { 5.0F, 6.0F } };
+    double buf6a[3][2] = { { 1.0F, 1.0F }, { 1.0F, 1.0F }, { 1.0F, 1.0F } };
+    double buf6b[3][2] = { { 1.0F, 1.0F }, { 3.0F, 4.0F }, { 5.0F, 6.0F } };
 
     /*unsigned/signed test
     signed char -128 to 127
     unsigned char 0 to 255
     */
-    char          buf7a[3][2] = {{-1,-128},{-1,-1},{-1,-1}};
-    unsigned char buf7b[3][2] = {{1,128},{1,1},{1,1}};
+    char buf7a[3][2] = { { -1, -128 }, { -1, -1 }, { -1, -1 } };
+    unsigned char buf7b[3][2] = { { 1, 128 }, { 1, 1 }, { 1, 1 } };
 
     /* long long test */
-    long long            buf8a[3][2] = {{1,1},{1,1},{1,1}};
-    long long            buf8b[3][2] = {{1,1},{3,4},{5,6}};
-    unsigned long long   buf9a[3][2] = {{1,1},{1,1},{1,1}};
-    unsigned long long   buf9b[3][2] = {{1,1},{3,4},{5,6}};
+    long long buf8a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    long long buf8b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
+    unsigned long long buf9a[3][2] = { { 1, 1 }, { 1, 1 }, { 1, 1 } };
+    unsigned long long buf9b[3][2] = { { 1, 1 }, { 3, 4 }, { 5, 6 } };
 
-    unsigned int    buf10a[3][2] = {{UIMAX,1},{1,1},{1,1}};
-    unsigned int    buf10b[3][2] = {{UIMAX-1,1},{3,4},{5,6}};
-
-    unsigned short     buf11a[3][2] = {{204,205},{2,3},{1,1}};
-    unsigned int     buf11b[3][2] = {{204,205},{2,3},{1,1}};
+    unsigned int buf10a[3][2] = { { UIMAX, 1 }, { 1, 1 }, { 1, 1 } };
+    unsigned int buf10b[3][2] = { { UIMAX - 1, 1 }, { 3, 4 }, { 5, 6 } };
 
+    unsigned short buf11a[3][2] = { { 204, 205 }, { 2, 3 }, { 1, 1 } };
+    unsigned int buf11b[3][2] = { { 204, 205 }, { 2, 3 }, { 1, 1 } };
 
     /*-------------------------------------------------------------------------
     * Create a file
     *-------------------------------------------------------------------------
     */
-    fid1 = H5Fcreate (fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    fid1 = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
     * Check for different storage order. Give a warning if they are different
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset0a",H5T_STD_I16LE,buf2a);
-    write_dset(fid1,2,dims,"dset0b",H5T_STD_I32LE,buf3b);
+    write_dset(fid1, 2, dims, "dset0a", H5T_STD_I16LE, buf2a);
+    write_dset(fid1, 2, dims, "dset0b", H5T_STD_I32LE, buf3b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_CHAR
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset1a",H5T_NATIVE_CHAR,buf1a);
-    write_dset(fid1,2,dims,"dset1b",H5T_NATIVE_CHAR,buf1b);
+    write_dset(fid1, 2, dims, "dset1a", H5T_NATIVE_CHAR, buf1a);
+    write_dset(fid1, 2, dims, "dset1b", H5T_NATIVE_CHAR, buf1b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_SHORT
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset2a",H5T_NATIVE_SHORT,buf2a);
-    write_dset(fid1,2,dims,"dset2b",H5T_NATIVE_SHORT,buf2b);
+    write_dset(fid1, 2, dims, "dset2a", H5T_NATIVE_SHORT, buf2a);
+    write_dset(fid1, 2, dims, "dset2b", H5T_NATIVE_SHORT, buf2b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_INT
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset3a",H5T_NATIVE_INT,buf3a);
-    write_dset(fid1,2,dims,"dset3b",H5T_NATIVE_INT,buf3b);
+    write_dset(fid1, 2, dims, "dset3a", H5T_NATIVE_INT, buf3a);
+    write_dset(fid1, 2, dims, "dset3b", H5T_NATIVE_INT, buf3b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_LONG
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset4a",H5T_NATIVE_LONG,buf4a);
-    write_dset(fid1,2,dims,"dset4b",H5T_NATIVE_LONG,buf4b);
+    write_dset(fid1, 2, dims, "dset4a", H5T_NATIVE_LONG, buf4a);
+    write_dset(fid1, 2, dims, "dset4b", H5T_NATIVE_LONG, buf4b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_FLOAT
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset5a",H5T_NATIVE_FLOAT,buf5a);
-    write_dset(fid1,2,dims,"dset5b",H5T_NATIVE_FLOAT,buf5b);
+    write_dset(fid1, 2, dims, "dset5a", H5T_NATIVE_FLOAT, buf5a);
+    write_dset(fid1, 2, dims, "dset5b", H5T_NATIVE_FLOAT, buf5b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_DOUBLE
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset6a",H5T_NATIVE_DOUBLE,buf6a);
-    write_dset(fid1,2,dims,"dset6b",H5T_NATIVE_DOUBLE,buf6b);
+    write_dset(fid1, 2, dims, "dset6a", H5T_NATIVE_DOUBLE, buf6a);
+    write_dset(fid1, 2, dims, "dset6b", H5T_NATIVE_DOUBLE, buf6b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_CHAR and H5T_NATIVE_UCHAR
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset7a",H5T_NATIVE_CHAR,buf7a);
-    write_dset(fid1,2,dims,"dset7b",H5T_NATIVE_UCHAR,buf7b);
+    write_dset(fid1, 2, dims, "dset7a", H5T_NATIVE_CHAR, buf7a);
+    write_dset(fid1, 2, dims, "dset7b", H5T_NATIVE_UCHAR, buf7b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_LLONG
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset8a",H5T_NATIVE_LLONG,buf8a);
-    write_dset(fid1,2,dims,"dset8b",H5T_NATIVE_LLONG,buf8b);
+    write_dset(fid1, 2, dims, "dset8a", H5T_NATIVE_LLONG, buf8a);
+    write_dset(fid1, 2, dims, "dset8b", H5T_NATIVE_LLONG, buf8b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_ULLONG
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset9a",H5T_NATIVE_ULLONG,buf9a);
-    write_dset(fid1,2,dims,"dset9b",H5T_NATIVE_ULLONG,buf9b);
+    write_dset(fid1, 2, dims, "dset9a", H5T_NATIVE_ULLONG, buf9a);
+    write_dset(fid1, 2, dims, "dset9b", H5T_NATIVE_ULLONG, buf9b);
 
     /*-------------------------------------------------------------------------
     * H5T_NATIVE_INT
     *-------------------------------------------------------------------------
     */
 
-    write_dset(fid1,2,dims,"dset10a",H5T_NATIVE_UINT,buf10a);
-    write_dset(fid1,2,dims,"dset10b",H5T_NATIVE_UINT,buf10b);
+    write_dset(fid1, 2, dims, "dset10a", H5T_NATIVE_UINT, buf10a);
+    write_dset(fid1, 2, dims, "dset10b", H5T_NATIVE_UINT, buf10b);
 
     /*-------------------------------------------------------------------------
     * Same type class, different size
     *-------------------------------------------------------------------------
     */
-    write_dset(fid1,2,dims,"dset11a",H5T_STD_U16LE,buf11a);
-    dset=H5Dopen2 (fid1, "dset11a", H5P_DEFAULT);
-    write_attr(dset,2,dims,"attr",H5T_STD_U16LE,buf11a);
-    H5Dclose (dset);
+    write_dset(fid1, 2, dims, "dset11a", H5T_STD_U16LE, buf11a);
+    dset = H5Dopen2(fid1, "dset11a", H5P_DEFAULT);
+    write_attr(dset, 2, dims, "attr", H5T_STD_U16LE, buf11a);
+    H5Dclose(dset);
 
-    write_dset(fid1,2,dims,"dset11b",H5T_STD_U32LE,buf11b);
-    dset=H5Dopen2 (fid1, "dset11b", H5P_DEFAULT);
-    write_attr(dset,2,dims,"attr",H5T_STD_U32LE,buf11b);
-    H5Dclose (dset);
+    write_dset(fid1, 2, dims, "dset11b", H5T_STD_U32LE, buf11b);
+    dset = H5Dopen2(fid1, "dset11b", H5P_DEFAULT);
+    write_attr(dset, 2, dims, "attr", H5T_STD_U32LE, buf11b);
+    H5Dclose(dset);
 
     /*-------------------------------------------------------------------------
     * Close
@@ -920,59 +917,58 @@ int test_datatypes(const char *fname)
 }
 
 /*
-# ##############################################################################
-# # Dataset datatypes
-# ##############################################################################
+ # ##############################################################################
+ # # Dataset datatypes
+ # ##############################################################################
 
-# 5.0
-TOOLTEST h5diff_50.txt file4.h5 file4.h5 -v dset0a dset0b
+ # 5.0
+ TOOLTEST h5diff_50.txt file4.h5 file4.h5 -v dset0a dset0b
 
-# 5.1
-TOOLTEST h5diff_51.txt file4.h5 file4.h5 -v dset1a dset1b
+ # 5.1
+ TOOLTEST h5diff_51.txt file4.h5 file4.h5 -v dset1a dset1b
 
-# 5.2
-TOOLTEST h5diff_52.txt file4.h5 file4.h5 -v dset2a dset2b
+ # 5.2
+ TOOLTEST h5diff_52.txt file4.h5 file4.h5 -v dset2a dset2b
 
-# 5.3
-TOOLTEST h5diff_53.txt file4.h5 file4.h5 -v dset3a dset4b
+ # 5.3
+ TOOLTEST h5diff_53.txt file4.h5 file4.h5 -v dset3a dset4b
 
-# 5.4
-TOOLTEST h5diff_54.txt file4.h5 file4.h5 -v dset4a dset4b
+ # 5.4
+ TOOLTEST h5diff_54.txt file4.h5 file4.h5 -v dset4a dset4b
 
-# 5.5
-TOOLTEST h5diff_55.txt file4.h5 file4.h5 -v dset5a dset5b
+ # 5.5
+ TOOLTEST h5diff_55.txt file4.h5 file4.h5 -v dset5a dset5b
 
-# 5.6
-TOOLTEST h5diff_56.txt file4.h5 file4.h5 -v dset6a dset6b
+ # 5.6
+ TOOLTEST h5diff_56.txt file4.h5 file4.h5 -v dset6a dset6b
 
-# 5.7
-TOOLTEST h5diff_57.txt file4.h5 file4.h5 -v dset7a dset7b
+ # 5.7
+ TOOLTEST h5diff_57.txt file4.h5 file4.h5 -v dset7a dset7b
 
-# 5.8 (region reference)
-TOOLTEST h5diff_58.txt file7.h5 file8.h5 -v refreg
-*/
+ # 5.8 (region reference)
+ TOOLTEST h5diff_58.txt file7.h5 file8.h5 -v refreg
+ */
 
 /*-------------------------------------------------------------------------
-* Function: test_attributes
-*
-* Purpose: test attributes
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_attributes
+ *
+ * Purpose: test attributes
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-int test_attributes(const char *file,
-                    int make_diffs /* flag to modify data buffers */)
+int test_attributes(const char *file, int make_diffs /* flag to modify data buffers */)
 {
-    hid_t   fid;
-    hid_t   did;
-    hid_t   gid;
-    hid_t   root_id;
-    hid_t   sid;
-    hsize_t dims[1]={2};
-    herr_t  status;
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t gid = -1;
+    hid_t root_id = -1;
+    hid_t sid = -1;
+    hsize_t dims[1] = { 2 };
+    herr_t status;
 
     /* Create a file  */
-    if((fid  = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Create a 1D dataset */
@@ -982,18 +978,23 @@ int test_attributes(const char *file,
     assert(status >= 0);
 
     /* Create groups */
-    gid  = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    root_id   = H5Gopen2(fid, "/", H5P_DEFAULT);
+    gid = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    root_id = H5Gopen2(fid, "/", H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
     * write a series of attributes on the dataset, group, and root group
     *-------------------------------------------------------------------------
     */
-
-    write_attr_in(did,"dset",fid,make_diffs);
-    write_attr_in(gid,NULL,(hid_t)0,make_diffs);
-    write_attr_in(root_id,NULL,(hid_t)0,make_diffs);
-
+    if (make_diffs > 1) {
+        write_attr_strings(did, "dset", fid, make_diffs);
+        write_attr_strings(gid, NULL, (hid_t) 0, make_diffs);
+        write_attr_strings(root_id, NULL, (hid_t) 0, make_diffs);
+    }
+    else {
+        write_attr_in(did, "dset", fid, make_diffs);
+        write_attr_in(gid, NULL, (hid_t) 0, make_diffs);
+        write_attr_in(root_id, NULL, (hid_t) 0, make_diffs);
+    }
 
     /* Close */
     status = H5Dclose(did);
@@ -1009,338 +1010,313 @@ int test_attributes(const char *file,
     return status;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: test_attributes_verbose_level
-*
-* Purpose: Cresting test files for testing attributes along with
-* levels of verbos option
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_attributes_verbose_level
+ *
+ * Purpose: Cresting test files for testing attributes along with
+ * levels of verbos option
+ *
+ *-------------------------------------------------------------------------
+ */
 static int test_attributes_verbose_level(const char *fname1, const char *fname2)
 {
-    herr_t  status = SUCCEED;
-    hid_t   fid1    = -1,   fid2 = -1;
-    hid_t   f1_gid  = -1,   f2_gid = -1;
-    hid_t   f1_gid2 = -1,   f2_gid2 = -1;
-    hid_t   f1_gid3 = -1,   f2_gid3 = -1;
-    hid_t   f1_gid4 = -1,   f2_gid4 = -1;
-    hid_t   f1_did  = -1,   f2_did = -1;
-    hid_t   f1_sid  = -1,   f2_sid = -1;
-    hid_t   f1_tid  = -1,   f2_tid = -1;
+    herr_t status = SUCCEED;
+    hid_t fid1 = -1, fid2 = -1;
+    hid_t f1_gid = -1, f2_gid = -1;
+    hid_t f1_gid2 = -1, f2_gid2 = -1;
+    hid_t f1_gid3 = -1, f2_gid3 = -1;
+    hid_t f1_gid4 = -1, f2_gid4 = -1;
+    hid_t f1_did = -1, f2_did = -1;
+    hid_t f1_sid = -1, f2_sid = -1;
+    hid_t f1_tid = -1, f2_tid = -1;
     /* dset */
-    hsize_t dset_dims[1]={3};
-    int dset_data[3] = {0,1,2};
+    hsize_t dset_dims[1] = { 3 };
+    int dset_data[3] = { 0, 1, 2 };
 
     /* common attrs dim */
-    hsize_t attr_dims[1]={2};
+    hsize_t attr_dims[1] = { 2 };
 
     /* file1 attr */
-    int    f1_attr_idata[2]= {1,2};        /* integer */
-    float  f1_attr_fdata[2]= {1.1F,2.2F};    /* float */
+    int f1_attr_idata[2] = { 1, 2 }; /* integer */
+    float f1_attr_fdata[2] = { 1.1F, 2.2F }; /* float */
     /* file2 attr */
-    int    f2_attr_idata[2]= {2,3};        /* integer */
-    float  f2_attr_fdata[2]= {2.1F,3.2F};    /* float */
-
+    int f2_attr_idata[2] = { 2, 3 }; /* integer */
+    float f2_attr_fdata[2] = { 2.1F, 3.2F }; /* float */
 
     /*----------------------------------------------------------------------
     * Create file1
     *-----------------------------------------------------------------------*/
-    if((fid1  = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-    {
+    if ((fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Groups
     */
     f1_gid = H5Gcreate2(fid1, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f1_gid < 0)
-    {
+    if (f1_gid < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid2 = H5Gcreate2(fid1, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f1_gid2 < 0)
-    {
+    if (f1_gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid3 = H5Gcreate2(fid1, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f1_gid3 < 0)
-    {
+    if (f1_gid3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid4 = H5Gcreate2(fid1, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f1_gid4 < 0)
-    {
+    if (f1_gid4 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Datasets
     */
     f1_sid = H5Screate_simple(1, dset_dims, NULL);
     f1_did = H5Dcreate2(fid1, "dset", H5T_NATIVE_INT, f1_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f1_did == FAIL)
-    {
+    if (f1_did == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
     status = H5Dwrite(f1_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Named Datatype
     */
     f1_tid = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(fid1, "ntype", f1_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-
-
-
     /*----------------------------------------------------------------------
     * Create file2
     *-----------------------------------------------------------------------*/
-    if((fid2  = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-    {
+    if ((fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Groups
     */
     f2_gid = H5Gcreate2(fid2, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f2_gid < 0)
-    {
+    if (f2_gid < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid2 = H5Gcreate2(fid2, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f2_gid2 < 0)
-    {
+    if (f2_gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid3 = H5Gcreate2(fid2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f2_gid3 < 0)
-    {
+    if (f2_gid3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid4 = H5Gcreate2(fid2, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f2_gid4 < 0)
-    {
+    if (f2_gid4 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Datasets
     */
     f2_sid = H5Screate_simple(1, dset_dims, NULL);
     f2_did = H5Dcreate2(fid2, "dset", H5T_NATIVE_INT, f2_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (f2_did == FAIL)
-    {
+    if (f2_did == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
     status = H5Dwrite(f2_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * Named Datatype
     */
     f2_tid = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(fid2, "ntype", f2_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-   /*----------------------------------
+    /*----------------------------------
     * CASE1 - Same attr number, all Same attr name
     * add attr to group
     */
-    write_attr(f1_gid,1,attr_dims,"integer1",H5T_NATIVE_INT,f1_attr_idata);
-    write_attr(f1_gid,1,attr_dims,"float1",H5T_NATIVE_FLOAT,f1_attr_fdata);
+    write_attr(f1_gid, 1, attr_dims, "integer1", H5T_NATIVE_INT, f1_attr_idata);
+    write_attr(f1_gid, 1, attr_dims, "float1", H5T_NATIVE_FLOAT, f1_attr_fdata);
 
-    write_attr(f2_gid,1,attr_dims,"integer1",H5T_NATIVE_INT,f2_attr_idata);
-    write_attr(f2_gid,1,attr_dims,"float1",H5T_NATIVE_FLOAT,f2_attr_fdata);
+    write_attr(f2_gid, 1, attr_dims, "integer1", H5T_NATIVE_INT, f2_attr_idata);
+    write_attr(f2_gid, 1, attr_dims, "float1", H5T_NATIVE_FLOAT, f2_attr_fdata);
 
-   /*----------------------------------
+    /*----------------------------------
     * CASE2 - Same attr number, some Same attr name
     * add attr to dset
     */
-    write_attr(f1_did,1,attr_dims,"integer1",H5T_NATIVE_INT,f1_attr_idata);
-    write_attr(f1_did,1,attr_dims,"float2",H5T_NATIVE_FLOAT,f1_attr_fdata);
+    write_attr(f1_did, 1, attr_dims, "integer1", H5T_NATIVE_INT, f1_attr_idata);
+    write_attr(f1_did, 1, attr_dims, "float2", H5T_NATIVE_FLOAT, f1_attr_fdata);
 
-    write_attr(f2_did,1,attr_dims,"integer1",H5T_NATIVE_INT,f2_attr_idata);
-    write_attr(f2_did,1,attr_dims,"float3",H5T_NATIVE_FLOAT,f2_attr_fdata);
+    write_attr(f2_did, 1, attr_dims, "integer1", H5T_NATIVE_INT, f2_attr_idata);
+    write_attr(f2_did, 1, attr_dims, "float3", H5T_NATIVE_FLOAT, f2_attr_fdata);
 
-   /*----------------------------------
+    /*----------------------------------
     * CASE3 - Same attr number, all different attr name
     * add attr to ntype
     */
-    write_attr(f1_tid,1,attr_dims,"integer1",H5T_NATIVE_INT,f1_attr_idata);
-    write_attr(f1_tid,1,attr_dims,"float2",H5T_NATIVE_FLOAT,f1_attr_fdata);
-    write_attr(f1_tid,1,attr_dims,"float3",H5T_NATIVE_FLOAT,f1_attr_fdata);
+    write_attr(f1_tid, 1, attr_dims, "integer1", H5T_NATIVE_INT, f1_attr_idata);
+    write_attr(f1_tid, 1, attr_dims, "float2", H5T_NATIVE_FLOAT, f1_attr_fdata);
+    write_attr(f1_tid, 1, attr_dims, "float3", H5T_NATIVE_FLOAT, f1_attr_fdata);
 
-    write_attr(f2_tid,1,attr_dims,"integer4",H5T_NATIVE_INT,f2_attr_idata);
-    write_attr(f2_tid,1,attr_dims,"float5",H5T_NATIVE_FLOAT,f2_attr_fdata);
-    write_attr(f2_tid,1,attr_dims,"float6",H5T_NATIVE_FLOAT,f2_attr_fdata);
+    write_attr(f2_tid, 1, attr_dims, "integer4", H5T_NATIVE_INT, f2_attr_idata);
+    write_attr(f2_tid, 1, attr_dims, "float5", H5T_NATIVE_FLOAT, f2_attr_fdata);
+    write_attr(f2_tid, 1, attr_dims, "float6", H5T_NATIVE_FLOAT, f2_attr_fdata);
 
-   /*----------------------------------
+    /*----------------------------------
     * CASE4 - Different attr number, some same attr name (vs file2-g2)
     * add attr to g2
     */
-    write_attr(f1_gid2,1,attr_dims,"integer1",H5T_NATIVE_INT,f1_attr_idata);
-    write_attr(f1_gid2,1,attr_dims,"float2",H5T_NATIVE_FLOAT,f1_attr_fdata);
-    write_attr(f1_gid2,1,attr_dims,"float3",H5T_NATIVE_FLOAT,f1_attr_fdata);
-
-    write_attr(f2_gid2,1,attr_dims,"integer1",H5T_NATIVE_INT,f2_attr_idata);
-    write_attr(f2_gid2,1,attr_dims,"float2",H5T_NATIVE_FLOAT,f2_attr_fdata);
+    write_attr(f1_gid2, 1, attr_dims, "integer1", H5T_NATIVE_INT, f1_attr_idata);
+    write_attr(f1_gid2, 1, attr_dims, "float2", H5T_NATIVE_FLOAT, f1_attr_fdata);
+    write_attr(f1_gid2, 1, attr_dims, "float3", H5T_NATIVE_FLOAT, f1_attr_fdata);
 
+    write_attr(f2_gid2, 1, attr_dims, "integer1", H5T_NATIVE_INT, f2_attr_idata);
+    write_attr(f2_gid2, 1, attr_dims, "float2", H5T_NATIVE_FLOAT, f2_attr_fdata);
 
-   /*----------------------------------
+    /*----------------------------------
     * CASE5 - Different attr number, all different attr name
     * add attr to g3
     */
-    write_attr(f1_gid3,1,attr_dims,"integer10",H5T_NATIVE_INT,f1_attr_idata);
-    write_attr(f1_gid3,1,attr_dims,"float11",H5T_NATIVE_FLOAT,f1_attr_fdata);
-    write_attr(f1_gid3,1,attr_dims,"float12",H5T_NATIVE_FLOAT,f1_attr_fdata);
-
-    write_attr(f2_gid3,1,attr_dims,"integer3",H5T_NATIVE_INT,f2_attr_idata);
-    write_attr(f2_gid3,1,attr_dims,"float4",H5T_NATIVE_FLOAT,f2_attr_fdata);
+    write_attr(f1_gid3, 1, attr_dims, "integer10", H5T_NATIVE_INT, f1_attr_idata);
+    write_attr(f1_gid3, 1, attr_dims, "float11", H5T_NATIVE_FLOAT, f1_attr_fdata);
+    write_attr(f1_gid3, 1, attr_dims, "float12", H5T_NATIVE_FLOAT, f1_attr_fdata);
 
+    write_attr(f2_gid3, 1, attr_dims, "integer3", H5T_NATIVE_INT, f2_attr_idata);
+    write_attr(f2_gid3, 1, attr_dims, "float4", H5T_NATIVE_FLOAT, f2_attr_fdata);
 
 out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1 > 0)
+    if (fid1 > 0)
         H5Fclose(fid1);
-    if(fid2 > 0)
+    if (fid2 > 0)
         H5Fclose(fid2);
-    if(f1_gid > 0)
+    if (f1_gid > 0)
         H5Gclose(f1_gid);
-    if(f2_gid > 0)
+    if (f2_gid > 0)
         H5Gclose(f2_gid);
-    if(f1_gid2 > 0)
+    if (f1_gid2 > 0)
         H5Gclose(f1_gid2);
-    if(f2_gid2 > 0)
+    if (f2_gid2 > 0)
         H5Gclose(f2_gid2);
-    if(f1_gid3 > 0)
+    if (f1_gid3 > 0)
         H5Gclose(f1_gid3);
-    if(f2_gid3 > 0)
+    if (f2_gid3 > 0)
         H5Gclose(f2_gid3);
-    if(f1_gid4 > 0)
+    if (f1_gid4 > 0)
         H5Gclose(f1_gid4);
-    if(f2_gid4 > 0)
+    if (f2_gid4 > 0)
         H5Gclose(f2_gid4);
-    if(f1_did > 0)
+    if (f1_did > 0)
         H5Dclose(f1_did);
-    if(f2_did > 0)
+    if (f2_did > 0)
         H5Dclose(f2_did);
-    if(f1_sid > 0)
+    if (f1_sid > 0)
         H5Sclose(f1_sid);
-    if(f2_sid > 0)
+    if (f2_sid > 0)
         H5Sclose(f2_sid);
-    if(f1_tid > 0)
+    if (f1_tid > 0)
         H5Tclose(f1_tid);
-    if(f2_tid > 0)
+    if (f2_tid > 0)
         H5Tclose(f2_tid);
 
     return status;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: test_datasets
-*
-* Purpose: Check all HDF5 classes
-* H5T_INTEGER, H5T_FLOAT
-* H5T_TIME, H5T_STRING, H5T_BITFIELD, H5T_OPAQUE, H5T_COMPOUND, H5T_REFERENCE,
-* H5T_ENUM, H5T_VLEN, H5T_ARRAY
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_datasets
+ *
+ * Purpose: Check all HDF5 classes
+ * H5T_INTEGER, H5T_FLOAT
+ * H5T_TIME, H5T_STRING, H5T_BITFIELD, H5T_OPAQUE, H5T_COMPOUND, H5T_REFERENCE,
+ * H5T_ENUM, H5T_VLEN, H5T_ARRAY
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-int test_datasets(const char *file,
-                  int make_diffs /* flag to modify data buffers */)
+int test_datasets(const char *file, int make_diffs /* flag to modify data buffers */)
 {
-    hid_t   fid;
-    hid_t   did;
-    hid_t   gid;
-    hid_t   sid;
-    hsize_t dims[1]={2};
-    herr_t  status;
-    int     buf[2]={1,2};
-
-    if(make_diffs > 0)
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t gid = -1;
+    hid_t sid = -1;
+    hsize_t dims[1] = { 2 };
+    herr_t status;
+    int buf[2] = { 1, 2 };
+
+    if (make_diffs > 0)
         memset(buf, 0, sizeof buf);
 
     /* Create a file  */
-    if((fid = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Create a 1D dataset */
     sid = H5Screate_simple(1, dims, NULL);
-    did  = H5Dcreate2(fid, "dset", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    did = H5Dcreate2(fid, "dset", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
     status = H5Sclose(sid);
     assert(status >= 0);
 
     /* Create a group */
-    gid  = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    gid = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-------------------------------------------------------------------------
     * write a series of datasets on the group
     *-------------------------------------------------------------------------
     */
 
-    write_dset_in(gid,"/dset",fid,make_diffs);
+    write_dset_in(gid, "/dset", fid, make_diffs);
 
     /* close */
     status = H5Dclose(did);
@@ -1355,29 +1331,29 @@ int test_datasets(const char *file,
 }
 
 /*-------------------------------------------------------------------------
-* Function: test_special_datasets
-*
-* Purpose: Check datasets with datasapce of zero dimension size.
-*-------------------------------------------------------------------------
-*/
+ * Function: test_special_datasets
+ *
+ * Purpose: Check datasets with datasapce of zero dimension size.
+ *-------------------------------------------------------------------------
+ */
 static
-int test_special_datasets(const char *file,
-                  int make_diffs /* flag to modify data buffers */)
+int test_special_datasets(const char *file, int make_diffs /* flag to modify data buffers */)
 {
-    hid_t   fid;
-    hid_t   did;
-    hid_t   sid0, sid;
-    hsize_t dims0[SPACE1_RANK]={SPACE1_DIM1, SPACE1_DIM2};
-    hsize_t dims[SPACE1_RANK]={SPACE1_DIM1, SPACE1_DIM2};
-    herr_t  status;
+    hid_t fid = -1;
+    hid_t did = -1;
+    hid_t sid0 = -1;
+    hid_t sid = -1;
+    hsize_t dims0[SPACE1_RANK] = { SPACE1_DIM1, SPACE1_DIM2 };
+    hsize_t dims[SPACE1_RANK] = { SPACE1_DIM1, SPACE1_DIM2 };
+    herr_t status;
 
     /* Create a file  */
-    if((fid = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(file, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
 
     /* Create a dataset with zero dimension size */
     sid0 = H5Screate_simple(SPACE1_RANK, dims0, NULL);
-    did  = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid0, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid0, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* close dataset */
     status = H5Dclose(did);
@@ -1388,12 +1364,12 @@ int test_special_datasets(const char *file,
     assert(status >= 0);
 
     /* Create a dataset with zero dimension size in one file but the other one
-     * has a dataset with a non-zero dimension size */
-    if(make_diffs)
+    * has a dataset with a non-zero dimension size */
+    if (make_diffs)
         dims[1] = SPACE1_DIM2 + 4;
 
     sid = H5Screate_simple(SPACE1_RANK, dims, NULL);
-    did  = H5Dcreate2(fid, "dset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    did = H5Dcreate2(fid, "dset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* close dataspace */
     status = H5Sclose(sid);
@@ -1410,26 +1386,25 @@ int test_special_datasets(const char *file,
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare links, one has longer name than
-*          the other and short name is subset of long name.
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare links, one has longer name than
+ *          the other and short name is subset of long name.
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_link_name(const char *fname1)
 {
-    hid_t   fid1=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1439,16 +1414,15 @@ static int test_link_name(const char *fname1)
     * Groups
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
-    gid2 = H5Gcreate2(fid1, "group_longname", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    gid2 = H5Gcreate2(fid1, "group_longname", H5P_DEFAULT, H5P_DEFAULT,
+            H5P_DEFAULT);
 
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1458,16 +1432,14 @@ static int test_link_name(const char *fname1)
     * Soft Links
     *------------------------------------------------------------------------*/
     status = H5Lcreate_soft("group", fid1, "link_g1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("group_longname", fid1, "link_g2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1477,38 +1449,37 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *------------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare soft links in various way
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare soft links in various way
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_soft_links(const char *fname1)
 {
-    hid_t   fid1=0;
-    hid_t   gid1=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    int data2[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t gid1 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1518,8 +1489,7 @@ static int test_soft_links(const char *fname1)
     * Groups
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1529,25 +1499,22 @@ static int test_soft_links(const char *fname1)
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"target_dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"target_dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "target_dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"dset",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
@@ -1558,48 +1525,42 @@ static int test_soft_links(const char *fname1)
     *------------------------------------------------------------------------*/
     /* file 1 */
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink_dset1_1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink_dset1_2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset2", fid1, "softlink_dset2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_group", fid1, "softlink_group1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_group", fid1, "softlink_group2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/no_obj", fid1, "softlink_noexist", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1609,38 +1570,37 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare linked soft links in various way
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare linked soft links in various way
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_linked_softlinks(const char *fname1)
 {
-    hid_t   fid1=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    hid_t   gid3=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    int data2[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hid_t gid3 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1650,24 +1610,21 @@ static int test_linked_softlinks(const char *fname1)
     * Groups
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid1, "target_group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid3 = H5Gcreate2(fid1, "target_group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid3 < 0)
-    {
+    if (gid3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1677,24 +1634,21 @@ static int test_linked_softlinks(const char *fname1)
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"target_dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"target_dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "target_dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
-    status = write_dset(gid1,2,dims2,"dset",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
@@ -1704,98 +1658,86 @@ static int test_linked_softlinks(const char *fname1)
     * Soft Links (Linked)
     *------------------------------------------------------------------------*/
     /*---------
-     * file 1 */
+    * file 1 */
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink1_to_dset1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink1_to_dset1", fid1, "softlink1_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink1_to_slink1", fid1, "softlink1_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset2", fid1, "softlink2_to_dset2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink2_to_dset2", fid1, "softlink2_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink2_to_slink1", fid1, "softlink2_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("target_group1", fid1, "softlink3_to_group1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink3_to_group1", fid1, "softlink3_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink3_to_slink1", fid1, "softlink3_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("target_group2", fid1, "softlink4_to_group2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink4_to_group2", fid1, "softlink4_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink4_to_slink1", fid1, "softlink4_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1805,52 +1747,50 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
-    if(gid3)
+    if (gid3)
         H5Gclose(gid3);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare external links in various way
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare external links in various way
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_external_links(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    int data2[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
     /* source file */
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* target file */
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -1860,18 +1800,16 @@ static int test_external_links(const char *fname1, const char *fname2)
     * Groups
     *------------------------------------------------------------------------*/
     /*--------------
-     * target file */
+    * target file */
     gid1 = H5Gcreate2(fid2, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid2, "target_group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -1880,26 +1818,23 @@ static int test_external_links(const char *fname1, const char *fname2)
     * Datasets
     *------------------------------------------------------------------------*/
     /*--------------
-     * target file */
-    status = write_dset(fid2,2,dims2,"target_dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    * target file */
+    status = write_dset(fid2, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"x_dset",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "x_dset", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2,2,dims2,"x_dset",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2, 2, dims2, "x_dset", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
@@ -1911,48 +1846,42 @@ static int test_external_links(const char *fname1, const char *fname2)
     /*--------------*/
     /* source file */
     status = H5Lcreate_external(fname2, "/target_group/x_dset", fid1, "ext_link_dset1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/target_group2/x_dset", fid1, "ext_link_dset2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/target_group", fid1, "/ext_link_grp1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/target_group2", fid1, "/ext_link_grp2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link_noexist1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid1, "ext_link_noexist2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -1962,52 +1891,50 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare external links which point to
-*          soft link in various way
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare external links which point to
+ *          soft link in various way
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_ext2soft_links(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid2=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    int data2[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid2 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
     /* source file */
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* target file */
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2018,8 +1945,7 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* target file */
     gid2 = H5Gcreate2(fid2, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2029,18 +1955,16 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     * Datasets
     *------------------------------------------------------------------------*/
     /*--------------
-     * target file */
-    status = write_dset(fid2,2,dims2,"dset1",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    * target file */
+    status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid2,2,dims2,"dset2",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
@@ -2050,18 +1974,16 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     * Soft Links (Linked)
     *------------------------------------------------------------------------*/
     /*---------------
-     * target file */
+    * target file */
     status = H5Lcreate_soft("/dset1", fid2, "softlink_to_dset1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset2", fid2, "softlink_to_dset2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2071,26 +1993,23 @@ static int test_ext2soft_links(const char *fname1, const char *fname2)
     * External Links
     *------------------------------------------------------------------------*/
     /*---------------
-     * source file */
+    * source file */
     status = H5Lcreate_external(fname2, "/target_group", fid1, "ext_link", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/softlink_to_dset1", fid1, "ext_link_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/softlink_to_dset2", fid1, "ext_link_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2100,46 +2019,44 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files to compare dangling links in various way
-*
-* Programmer: Jonathan Kim (Feb 17, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files to compare dangling links in various way
+ *
+ * Programmer: Jonathan Kim (Feb 17, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_dangle_links(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    int data2[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2149,34 +2066,30 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* file2 */
-    status = write_dset(fid2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid2,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
@@ -2187,32 +2100,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* file 1 */
     status = H5Lcreate_soft("no_obj", fid1, "soft_link1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset1", fid1, "soft_link2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj", fid1, "soft_link3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj1", fid1, "soft_link4", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2220,32 +2129,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
 
     /* file 2 */
     status = H5Lcreate_soft("no_obj", fid2, "soft_link1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj", fid2, "soft_link2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset2", fid2, "soft_link3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj2", fid2, "soft_link4", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2256,32 +2161,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* file1 */
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/dset1", fid1, "ext_link2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid1, "ext_link4", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2289,32 +2190,28 @@ static int test_dangle_links(const char *fname1, const char *fname2)
 
     /* file2 */
     status = H5Lcreate_external(fname1, "no_obj", fid2, "ext_link1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "no_obj", fid2, "ext_link2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/dset2", fid2, "ext_link3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid2, "ext_link4", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2324,47 +2221,45 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: For testing comparing group member objects recursively
-*
-* Programmer: Jonathan Kim (Aug 19, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: For testing comparing group member objects recursively
+ *
+ * Programmer: Jonathan Kim (Aug 19, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_group_recurse(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid1_f1=0, gid2_f1=0, gid3_f1=0, gid10_f1=0;
-    hid_t   gid1_f2=0, gid2_f2=0, gid3_f2=0, gid11_f2=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,1},{0,1},{1,0},{1,0}};
-    int data2[4][2] = {{0,2},{0,2},{2,0},{2,0}};
-    int data3[4][2] = {{0,3},{0,3},{3,0},{3,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid1_f1 = -1, gid2_f1 = -1, gid3_f1 = -1, gid10_f1 = -1;
+    hid_t gid1_f2 = -1, gid2_f2 = -1, gid3_f2 = -1, gid11_f2 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 1 }, { 0, 1 }, { 1, 0 }, { 1, 0 } };
+    int data2[4][2] = { { 0, 2 }, { 0, 2 }, { 2, 0 }, { 2, 0 } };
+    int data3[4][2] = { { 0, 3 }, { 0, 3 }, { 3, 0 }, { 3, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2375,32 +2270,28 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* file1 */
     gid1_f1 = H5Gcreate2(fid1, "/grp1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1_f1 < 0)
-    {
+    if (gid1_f1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid2_f1 = H5Gcreate2(fid1, "/grp1/grp2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2_f1 < 0)
-    {
+    if (gid2_f1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid3_f1 = H5Gcreate2(fid1, "/grp1/grp2/grp3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid3_f1 < 0)
-    {
+    if (gid3_f1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid10_f1 = H5Gcreate2(fid1, "/grp10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid10_f1 < 0)
-    {
+    if (gid10_f1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2408,32 +2299,28 @@ static int test_group_recurse(const char *fname1, const char *fname2)
 
     /* file2 */
     gid1_f2 = H5Gcreate2(fid2, "/grp1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1_f2 < 0)
-    {
+    if (gid1_f2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid2_f2 = H5Gcreate2(fid2, "/grp1/grp2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2_f2 < 0)
-    {
+    if (gid2_f2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid3_f2 = H5Gcreate2(fid2, "/grp1/grp2/grp3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid3_f2 < 0)
-    {
+    if (gid3_f2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid11_f2 = H5Gcreate2(fid2, "/grp11", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid11_f2 < 0)
-    {
+    if (gid11_f2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2443,50 +2330,44 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     * Datasets under root
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"dset3",H5T_NATIVE_INT,data3);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* file2 */
-    status = write_dset(fid2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid2,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid2,2,dims2,"dset3",H5T_NATIVE_INT,data3);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
@@ -2496,163 +2377,142 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     * Datasets under group
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(gid1_f1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2_f1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
-    status = write_dset(gid2_f1,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2_f1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid3_f1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
-    status = write_dset(gid3_f1,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid3_f1,2,dims2,"dset3",H5T_NATIVE_INT,data3);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f1, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid10_f1,2,dims2,"dset4",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid10_f1, 2, dims2, "dset4", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid10_f1,2,dims2,"dset5",H5T_NATIVE_INT,data3);
-    if (status == FAIL)
-    {
+    status = write_dset(gid10_f1, 2, dims2, "dset5", H5T_NATIVE_INT, data3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* file2 */
-    status = write_dset(gid1_f2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2_f2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
-    status = write_dset(gid2_f2,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2_f2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid3_f2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
-    status = write_dset(gid3_f2,2,dims2,"dset2",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid3_f2,2,dims2,"dset3",H5T_NATIVE_INT,data3);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3_f2, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid11_f2,2,dims2,"dset4",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid11_f2, 2, dims2, "dset4", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid11_f2,2,dims2,"dset5",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid11_f2, 2, dims2, "dset5", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
     /*-----------------------------------------------------------------------
     * Soft Links
     *------------------------------------------------------------------------*/
     /* file 1 */
     status = H5Lcreate_soft("/grp1", fid1, "slink_grp1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2", fid1, "slink_grp2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2/grp3", fid1, "slink_grp3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp10", fid1, "slink_grp10", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2660,32 +2520,28 @@ static int test_group_recurse(const char *fname1, const char *fname2)
 
     /* file 2 */
     status = H5Lcreate_soft("/grp1", fid2, "slink_grp1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2", fid2, "slink_grp2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2/grp3", fid2, "slink_grp3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp11", fid2, "slink_grp11", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -2696,24 +2552,21 @@ static int test_group_recurse(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* file1 */
     status = H5Lcreate_external(fname2, "/grp1", fid1, "elink_grp1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/grp1/grp2", fid1, "elink_grp2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/grp1/grp2/grp3", fid1, "elink_grp3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -2721,225 +2574,210 @@ static int test_group_recurse(const char *fname1, const char *fname2)
 
     /* file2 */
     status = H5Lcreate_external(fname1, "/grp1", fid2, "elink_grp1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/grp1/grp2", fid2, "elink_grp2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/grp1/grp2/grp3", fid2, "elink_grp3", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     /*------------------------------
-     * external circle route test
-     * file1/grp11 <-> file2/grp10  via elink_grp_circle link
-     */
+    * external circle route test
+    * file1/grp11 <-> file2/grp10  via elink_grp_circle link
+    */
     /* file1 */
     status = H5Lcreate_external(fname2, "/grp11", gid10_f1, "elink_grp_circle", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
     /* file2 */
     status = H5Lcreate_external(fname1, "/grp10", gid11_f2, "elink_grp_circle", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
 out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid1_f1)
+    if (gid1_f1)
         H5Gclose(gid1_f1);
-    if(gid2_f1)
+    if (gid2_f1)
         H5Gclose(gid2_f1);
-    if(gid3_f1)
+    if (gid3_f1)
         H5Gclose(gid3_f1);
-    if(gid1_f2)
+    if (gid1_f2)
         H5Gclose(gid1_f2);
-    if(gid2_f2)
+    if (gid2_f2)
         H5Gclose(gid2_f2);
-    if(gid3_f2)
+    if (gid3_f2)
         H5Gclose(gid3_f2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose:
-*   For testing comparing group member objects recursively via multiple
-*   linked external links
-*
-* Programmer: Jonathan Kim (Sep 16, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose:
+ *   For testing comparing group member objects recursively via multiple
+ *   linked external links
+ *
+ * Programmer: Jonathan Kim (Sep 16, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 #define GRP_R_DSETNAME1 "dset1"
 #define GRP_R_DSETNAME2 "dset2"
 static int test_group_recurse2(void)
 {
-    hid_t       fileid1     = -1;
-    hid_t       grp1        = -1;
-    hid_t       grp2        = -1;
-    hid_t       grp3        = -1;
-    hid_t       grp4        = -1;
-    hid_t       dset1       = -1;
-    hid_t       dset2       = -1;
-    hid_t       datatype    = -1;
-    hid_t       dataspace   = -1;
-    hid_t       fileid2     = -1;
-    hid_t       fileid3     = -1;
-    hid_t       fileid4     = -1;
-    hsize_t     dimsf[2];              /* dataset dimensions */
-    herr_t      status=0;
-    int data1[4][2] = {{0,0},{1,1},{2,2},{3,3}};
-    int data2[4][2] = {{0,0},{0,1},{0,2},{3,3}};
-
-   /*-----------------------------------------------------------------------
+    hid_t fileid1 = -1;
+    hid_t grp1 = -1;
+    hid_t grp2 = -1;
+    hid_t grp3 = -1;
+    hid_t grp4 = -1;
+    hid_t dset1 = -1;
+    hid_t dset2 = -1;
+    hid_t datatype = -1;
+    hid_t dataspace = -1;
+    hid_t fileid2 = -1;
+    hid_t fileid3 = -1;
+    hid_t fileid4 = -1;
+    hsize_t dimsf[2]; /* dataset dimensions */
+    herr_t status = 0;
+    int data1[4][2] = { { 0, 0 }, { 1, 1 }, { 2, 2 }, { 3, 3 } };
+    int data2[4][2] = { { 0, 0 }, { 0, 1 }, { 0, 2 }, { 3, 3 } };
+
+    /*-----------------------------------------------------------------------
     * FILE 1
     *------------------------------------------------------------------------*/
     /*
-     * Create a new file using H5F_ACC_TRUNC access,
-     * default file creation properties, and default file
-     * access properties.
-     */
+    * Create a new file using H5F_ACC_TRUNC access,
+    * default file creation properties, and default file
+    * access properties.
+    */
     fileid1 = H5Fcreate(GRP_RECURSE1_EXT, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Groups
     *------------------------------------------------------------------------*/
     grp1 = H5Gcreate2(fileid1, "/g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp1 < 0)
-    {
+    if (grp1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp2 = H5Gcreate2(grp1, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp2 < 0)
-    {
+    if (grp2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp3 = H5Gcreate2(grp2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp3 < 0)
-    {
+    if (grp3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp4 = H5Gcreate2(grp3, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp4 < 0)
-    {
+    if (grp4 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Datasets
     *------------------------------------------------------------------------*/
     /*
-     * Describe the size of the array and create the data space for fixed
-     * size dataset.
-     */
+    * Describe the size of the array and create the data space for fixed
+    * size dataset.
+    */
     dimsf[0] = 4;
     dimsf[1] = 2;
     dataspace = H5Screate_simple(2, dimsf, NULL);
 
     /*
-     * Define datatype for the data in the file.
-     * We will store little endian INT numbers.
-     */
+    * Define datatype for the data in the file.
+    * We will store little endian INT numbers.
+    */
     datatype = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tset_order(datatype, H5T_ORDER_LE);
 
     /*---------------
-     * dset1
-     */
+    * dset1
+    */
     /*
-     * Create a new dataset within the file using defined dataspace and
-     * datatype and default dataset creation properties.
-     */
-    dset1 = H5Dcreate2(fileid1, GRP_R_DSETNAME1, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * Create a new dataset within the file using defined dataspace and
+    * datatype and default dataset creation properties.
+    */
+    dset1 = H5Dcreate2(fileid1, GRP_R_DSETNAME1, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1);
     H5Dclose(dset1);
 
     /*---------------
-     * dset1
-     */
+    * dset1
+    */
     /*
-     * Create a new dataset within the file using defined dataspace and
-     * datatype and default dataset creation properties.
-     */
-    dset1 = H5Dcreate2(grp3, GRP_R_DSETNAME1, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * Create a new dataset within the file using defined dataspace and
+    * datatype and default dataset creation properties.
+    */
+    dset1 = H5Dcreate2(grp3, GRP_R_DSETNAME1, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1);
 
     /*---------------
-     * dset2
-     */
+    * dset2
+    */
     /*
-     * Create a new dataset within the fileid1 using defined dataspace and
-     * datatype and default dataset creation properties.
-     */
-    dset2 = H5Dcreate2(grp4, GRP_R_DSETNAME2, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * Create a new dataset within the fileid1 using defined dataspace and
+    * datatype and default dataset creation properties.
+    */
+    dset2 = H5Dcreate2(grp4, GRP_R_DSETNAME2, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2);
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Soft links
     *------------------------------------------------------------------------*/
     /*
-     * under  '/' root
-     */
+    * under  '/' root
+    */
     /* link to dset1 */
     status = H5Lcreate_soft(GRP_R_DSETNAME1, fileid1, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
@@ -2952,90 +2790,83 @@ static int test_group_recurse2(void)
     H5Gclose(grp3);
     H5Gclose(grp4);
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * FILE 2-3
     *------------------------------------------------------------------------*/
 
     /* crate target file */
     fileid4 = H5Fcreate(GRP_RECURSE2_EXT3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-   /*-----------------------------------------------
+    /*-----------------------------------------------
     * Groups
     */
     grp4 = H5Gcreate2(fileid4, "/g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp4 < 0)
-    {
+    if (grp4 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT3);
         status = FAIL;
         goto out;
     }
 
     /*---------------
-     * dset2
-     */
+    * dset2
+    */
     /*
-     * Create a new dataset within the fileid1 using defined dataspace and
-     * datatype and default dataset creation properties.
-     */
-    dset2 = H5Dcreate2(grp4, GRP_R_DSETNAME2, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * Create a new dataset within the fileid1 using defined dataspace and
+    * datatype and default dataset creation properties.
+    */
+    dset2 = H5Dcreate2(grp4, GRP_R_DSETNAME2, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2);
 
     H5Gclose(grp4);
     H5Dclose(dset2);
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * FILE 2-2
     *------------------------------------------------------------------------*/
 
     /* crate target file */
     fileid3 = H5Fcreate(GRP_RECURSE2_EXT2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-   /*-----------------------------------------------
+    /*-----------------------------------------------
     * Groups
     */
     grp2 = H5Gcreate2(fileid3, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp2 < 0)
-    {
+    if (grp2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
     }
 
     grp3 = H5Gcreate2(grp2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp3 < 0)
-    {
+    if (grp3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
     }
 
     /*---------------
-     * dset1
-     */
+    * dset1
+    */
     /*
-     * Create a new dataset within the fileid1 using defined dataspace and
-     * datatype and default dataset creation properties.
-     */
-    dset1 = H5Dcreate2(grp3, GRP_R_DSETNAME1, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * Create a new dataset within the fileid1 using defined dataspace and
+    * datatype and default dataset creation properties.
+    */
+    dset1 = H5Dcreate2(grp3, GRP_R_DSETNAME1, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1);
 
-   /*-----------------------------------------------
+    /*-----------------------------------------------
     * extlink to  $GRP_RECURSE2_EXT3/g4
     */
     status = H5Lcreate_external(GRP_RECURSE2_EXT3, "/g4", fileid3, "/g2/g3/g4", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
@@ -3045,56 +2876,52 @@ static int test_group_recurse2(void)
     H5Gclose(grp2);
     H5Gclose(grp3);
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * FILE 2-1
     *------------------------------------------------------------------------*/
 
     /* crate target file */
     fileid2 = H5Fcreate(GRP_RECURSE2_EXT1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-   /*-----------------------------------------------
+    /*-----------------------------------------------
     * Groups
     */
     grp1 = H5Gcreate2(fileid2, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (grp1 < 0)
-    {
+    if (grp1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     /*---------------
-     * dset1
-     */
-    dset1 = H5Dcreate2(fileid2, GRP_R_DSETNAME1, datatype, dataspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    * dset1
+    */
+    dset1 = H5Dcreate2(fileid2, GRP_R_DSETNAME1, datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
-     * Write the data to the dataset using default transfer properties.
-     */
+    * Write the data to the dataset using default transfer properties.
+    */
     status = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1);
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Soft links
     *------------------------------------------------------------------------*/
     /*
-     * under  '/' root
-     */
+    * under  '/' root
+    */
     /* link to dset1 */
     status = H5Lcreate_soft(GRP_R_DSETNAME1, fileid2, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE2_EXT1);
         status = FAIL;
         goto out;
     }
 
-   /*-----------------------------------------------
+    /*-----------------------------------------------
     * extlink to  $GRP_RECURSE2_EXT2/g2
     */
     status = H5Lcreate_external(GRP_RECURSE2_EXT2, "/g2", fileid2, "/g1/g2", H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT1);
         status = FAIL;
         goto out;
@@ -3105,72 +2932,67 @@ static int test_group_recurse2(void)
 
 out:
     /*
-     * Close/release resources.
-     */
-    if(dataspace > 0)
+    * Close/release resources.
+    */
+    if (dataspace > 0)
         H5Sclose(dataspace);
-    if(datatype > 0)
+    if (datatype > 0)
         H5Tclose(datatype);
-    if(fileid1 > 0)
+    if (fileid1 > 0)
         H5Fclose(fileid1);
-    if(fileid2 > 0)
+    if (fileid2 > 0)
         H5Fclose(fileid2);
-    if(fileid3 > 0)
+    if (fileid3 > 0)
         H5Fclose(fileid3);
-    if(fileid4 > 0)
+    if (fileid4 > 0)
         H5Fclose(fileid4);
 
     return status;
 }
 
-
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files for excluding obj.
-*          Same structure, same obj names
-* Test : exclude obj with different value to verify the rest are same
-*
-* Programmer: Jonathan Kim (July, 21, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files for excluding obj.
+ *          Same structure, same obj names
+ * Test : exclude obj with different value to verify the rest are same
+ *
+ * Programmer: Jonathan Kim (July, 21, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_exclude_obj1(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    int data2[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    int data2[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Group
     *------------------------------------------------------------------------*/
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3179,133 +3001,119 @@ static int test_exclude_obj1(const char *fname1, const char *fname2)
     /* file2 */
     gid2 = H5Gcreate2(fid2, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
     /*-----------------------------------------------------------------------
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"dset2",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"dset3",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset3", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-
     /* file2 */
-    status = write_dset(fid2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2,2,dims2,"dset2",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2,2,dims2,"dset3",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2, 2, dims2, "dset3", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
 out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files for excluding obj.
-*          different structure and name
-* Test : exclude different objs to verify the rest are same
-*
-* Programmer: Jonathan Kim (July, 21, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files for excluding obj.
+ *          different structure and name
+ * Test : exclude different objs to verify the rest are same
+ *
+ * Programmer: Jonathan Kim (July, 21, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_exclude_obj2(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    hid_t   gid3=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    int data2[4][2] = {{0,1},{2,3},{1,2},{3,4}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hid_t gid3 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    int data2[4][2] = { { 0, 1 }, { 2, 3 }, { 1, 2 }, { 3, 4 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Group
     *------------------------------------------------------------------------*/
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3313,9 +3121,7 @@ static int test_exclude_obj2(const char *fname1, const char *fname2)
 
     /* file2 */
     gid2 = H5Gcreate2(fid2, "group10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -3324,133 +3130,118 @@ static int test_exclude_obj2(const char *fname1, const char *fname2)
     /* subset name from group10 */
     gid3 = H5Gcreate2(fid2, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-    if (gid3 < 0)
-    {
+    if (gid3 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
     /*-----------------------------------------------------------------------
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"dset10",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset10", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(fid1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"dset2",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-
     /* file2 */
-    status = write_dset(fid2,2,dims2,"dset10",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset10", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid2,2,dims2,"dset2",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid3,2,dims2,"dset3",H5T_NATIVE_INT,data2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid3, 2, dims2, "dset3", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
 out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
-    if(gid3)
+    if (gid3)
         H5Gclose(gid3);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files for excluding obj.
-*          Only one file contains unique objs. Common objs are same.
-* Test : exclude unique objs to verify the rest are same
-*  - HDFFV-7837
-*
-* Programmer: Jonathan Kim (Mar, 19, 2012)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files for excluding obj.
+ *          Only one file contains unique objs. Common objs are same.
+ * Test : exclude unique objs to verify the rest are same - HDFFV-7837
+ *
+ * Programmer: Jonathan Kim (Mar, 19, 2012)
+ *
+ *-------------------------------------------------------------------------*/
 static int test_exclude_obj3(const char *fname1, const char *fname2)
 {
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   gid1=0;
-    hsize_t dims2[2] = {2,4};
-    int data1[4][2] = {{0,0},{0,0},{0,0},{0,0}};
-    herr_t  status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t gid1 = -1;
+    hsize_t dims2[2] = { 2, 4 };
+    int data1[4][2] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Group
     *------------------------------------------------------------------------*/
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3460,26 +3251,23 @@ static int test_exclude_obj3(const char *fname1, const char *fname2)
     * Datasets
     *------------------------------------------------------------------------*/
     /* file1 */
-    status = write_dset(fid1,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
-    status = write_dset(gid1,2,dims2,"dset",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* file2 */
-    status = write_dset(fid2,2,dims2,"dset1",H5T_NATIVE_INT,data1);
-    if (status == FAIL)
-    {
+    status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
@@ -3489,25 +3277,25 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose: Create test files for multiple variable length string/string array
-*          along with fixed length string/string array types in
-*          a compound type dataset.
-*
-* Programmer: Jonathan Kim (Oct, 26, 2010)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose: Create test files for multiple variable length string/string array
+ *          along with fixed length string/string array types in
+ *          a compound type dataset.
+ *
+ * Programmer: Jonathan Kim (Oct, 26, 2010)
+ *
+ *-------------------------------------------------------------------------*/
 #define STR_RANK 1
 #define VLEN_STR_DIM 1
 #define FIXLEN_STR_SIZE 21
@@ -3520,187 +3308,170 @@ out:
 static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new)
 {
     int i;
-
-    hid_t    fid1   = -1;      /* file id */
-    hid_t    gid    = -1;
+    hid_t fid1 = -1; /* file id */
+    hid_t gid = -1;
 
     /* compound1 datatype */
-    typedef struct comp1_t
-    {
-        char   *str_vlen;  /* vlen string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
+    typedef struct comp1_t {
+        char *str_vlen; /* vlen string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
     } comp1_t;
 
     /* compound2 datatype */
-    typedef struct comp2_t
-    {
-        char   *str_vlen;  /* vlen string */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
+    typedef struct comp2_t {
+        char *str_vlen; /* vlen string */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
     } comp2_t;
 
     /* compound3 datatype */
-    typedef struct comp3_t
-    {
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen;  /* vlen string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
+    typedef struct comp3_t {
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen; /* vlen string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
     } comp3_t;
 
     /* compound4 datatype */
-    typedef struct comp4_t
-    {
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen;  /* vlen string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
+    typedef struct comp4_t {
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen; /* vlen string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
     } comp4_t;
 
     /* compound5 datatype */
-    typedef struct comp5_t
-    {
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen;  /* vlen string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
+    typedef struct comp5_t {
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char *str_vlen; /* vlen string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
     } comp5_t;
 
     /* compound6 datatype */
-    typedef struct comp6_t
-    {
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen;  /* vlen string */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen_repeat;  /* vlen string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
+    typedef struct comp6_t {
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char *str_vlen; /* vlen string */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen_repeat; /* vlen string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
     } comp6_t;
 
     /* compound7 datatype */
-    typedef struct comp7_t
-    {
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen;  /* vlen string */
-        char   *str_vlen_repeat;  /* vlen string */
+    typedef struct comp7_t {
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen; /* vlen string */
+        char *str_vlen_repeat; /* vlen string */
     } comp7_t;
 
     /* compound8 datatype */
-    typedef struct comp8_t
-    {
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen;  /* vlen string */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        char   *str_vlen_repeat;  /* vlen string */
+    typedef struct comp8_t {
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen; /* vlen string */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        char *str_vlen_repeat; /* vlen string */
     } comp8_t;
 
     /* compound9 datatype */
-    typedef struct comp9_t
-    {
-        char   str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE];  /* fixed len string array */
-        char   *str_array_vlen[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   *str_vlen_array_again[VLEN_STR_ARRY_DIM];  /* vlen string array */
-        char   str_fixlen[FIXLEN_STR_SIZE];  /* fixed len string */
-        int    int_data1;
-        hobj_ref_t objref1;                  /* reference */
-        char   str_fixlen_repeat[FIXLEN_STR_SIZE];  /* fixed len string */
-        hobj_ref_t objref2;                  /* reference */
-        char   *str_vlen;  /* vlen string */
-        int    int_data2;
-        char   *str_vlen_repeat;  /* vlen string */
-        hobj_ref_t objref3;                  /* reference */
-        int    int_data3;
+    typedef struct comp9_t {
+        char str_array_fixlen[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        char str_fixlen_array_again[FIXLEN_STR_ARRY_DIM][FIXLEN_STR_ARRY_SIZE]; /* fixed len string array */
+        const char *str_array_vlen[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        const char *str_vlen_array_again[VLEN_STR_ARRY_DIM]; /* vlen string array */
+        char str_fixlen[FIXLEN_STR_SIZE]; /* fixed len string */
+        int int_data1;
+        hobj_ref_t objref1; /* reference */
+        char str_fixlen_repeat[FIXLEN_STR_SIZE]; /* fixed len string */
+        hobj_ref_t objref2; /* reference */
+        char *str_vlen; /* vlen string */
+        int int_data2;
+        char *str_vlen_repeat; /* vlen string */
+        hobj_ref_t objref3; /* reference */
+        int int_data3;
     } comp9_t;
 
     /* vlen string */
-    hid_t    sid_vlen_str=0;      /* dataspace ID */
-    hid_t    tid_vlen_str=0;      /* datatype ID */
-    char vlen_str_buf[]= {
-        "Variable length string"
-        };
-    hsize_t dims_vlen_str[]  = {VLEN_STR_DIM};
+    hid_t sid_vlen_str = -1; /* dataspace ID */
+    hid_t tid_vlen_str = -1; /* datatype ID */
+    char vlen_str_buf[] = { "Variable length string" };
+    hsize_t dims_vlen_str[] = { VLEN_STR_DIM };
 
     /* fixlen string */
-    hid_t    sid_fixlen_str=0;      /* dataspace ID */
-    hid_t    tid_fixlen_str=0;      /* datatype ID */
-    const char fixlen_str_buf[FIXLEN_STR_SIZE]= {
-        "Fixed length string"
-        };
-    hsize_t dims_fixlen_str[]  = {FIXLEN_STR_DIM};
+    hid_t sid_fixlen_str = -1; /* dataspace ID */
+    hid_t tid_fixlen_str = -1; /* datatype ID */
+    const char fixlen_str_buf[FIXLEN_STR_SIZE] = { "Fixed length string" };
+    hsize_t dims_fixlen_str[] = { FIXLEN_STR_DIM };
 
     /* vlen string array */
-    hid_t    sid_vlen_str_array=0;      /* dataspace ID */
-    hid_t    tid_vlen_str_array_pre=0;      /* datatype ID */
-    hid_t    tid_vlen_str_array=0; /* datatype ID */
-    char *vlen_str_array_buf[VLEN_STR_ARRY_DIM]= {
-        "1 - Variable length string Array",
-        "2 - Testing variable length string array in compound type",
-        "3 - Four score and seven\n years ago our forefathers brought forth on this continent a new nation,"
-        };
-    hsize_t dims_vlen_str_array[]  = {VLEN_STR_ARRY_DIM};
+    hid_t sid_vlen_str_array = -1; /* dataspace ID */
+    hid_t tid_vlen_str_array_pre = -1; /* datatype ID */
+    hid_t tid_vlen_str_array = -1; /* datatype ID */
+    const char *vlen_str_array_buf[VLEN_STR_ARRY_DIM] =
+    { "1 - Variable length string Array",
+            "2 - Testing variable length string array in compound type",
+            "3 - Four score and seven\n years ago our forefathers brought forth on this continent a new nation," };
+    hsize_t dims_vlen_str_array[] = { VLEN_STR_ARRY_DIM };
 
     /* fixlen string array  */
-    hid_t    sid_fixlen_str_array=0;      /* dataspace ID */
-    hid_t    tid_fixlen_str_array_pre=0;      /* datatype ID */
-    hid_t    tid_fixlen_str_array=0; /* datatype ID */
-    const char *fixlen_str_array_buf[FIXLEN_STR_ARRY_DIM]= {
-        "1 - Fixed length string Array",
-        "2 - Fixed length string Array",
-        "3 - Fixed length string Array"
-        };
-    hsize_t dims_fixlen_str_array[]  = {FIXLEN_STR_ARRY_DIM};
+    hid_t sid_fixlen_str_array = -1; /* dataspace ID */
+    hid_t tid_fixlen_str_array_pre = -1; /* datatype ID */
+    hid_t tid_fixlen_str_array = -1; /* datatype ID */
+    const char *fixlen_str_array_buf[FIXLEN_STR_ARRY_DIM] = {
+            "1 - Fixed length string Array", "2 - Fixed length string Array",
+            "3 - Fixed length string Array" };
+    hsize_t dims_fixlen_str_array[] = { FIXLEN_STR_ARRY_DIM };
 
     /*------------------------------------------
-     * compound dataset
-     *------------------------------------------*/
-    hid_t    sid_comp=0;      /* dataspace ID */
-    hid_t    tid1_comp=0;      /* datatype ID */
-    hid_t    tid2_comp=0;      /* datatype ID */
-    hid_t    tid3_comp=0;      /* datatype ID */
-    hid_t    tid4_comp=0;      /* datatype ID */
-    hid_t    tid5_comp=0;      /* datatype ID */
-    hid_t    tid6_comp=0;      /* datatype ID */
-    hid_t    tid7_comp=0;      /* datatype ID */
-    hid_t    tid8_comp=0;      /* datatype ID */
-    hid_t    tid9_comp=0;      /* datatype ID */
-    hid_t    did_comp=0;      /* dataset ID */
-    hsize_t dims_comp[]  = {COMP_DIM};
-    herr_t  status = SUCCEED;
+    * compound dataset
+    *------------------------------------------*/
+    hid_t sid_comp = -1; /* dataspace ID */
+    hid_t tid1_comp = -1; /* datatype ID */
+    hid_t tid2_comp = -1; /* datatype ID */
+    hid_t tid3_comp = -1; /* datatype ID */
+    hid_t tid4_comp = -1; /* datatype ID */
+    hid_t tid5_comp = -1; /* datatype ID */
+    hid_t tid6_comp = -1; /* datatype ID */
+    hid_t tid7_comp = -1; /* datatype ID */
+    hid_t tid8_comp = -1; /* datatype ID */
+    hid_t tid9_comp = -1; /* datatype ID */
+    hid_t did_comp = -1; /* dataset ID */
+    hsize_t dims_comp[] = { COMP_DIM };
+    herr_t status = SUCCEED;
 
     /* make compound strings data */
     comp1_t comp1_buf;
@@ -3756,23 +3527,30 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     HDstrcpy(comp9_buf.str_fixlen_repeat, fixlen_str_buf);
 
     /* copy vlen string array data to compound buffers */
-    for (i=0; i < VLEN_STR_ARRY_DIM; i++)
-    {
-        comp1_buf.str_array_vlen[i] = comp1_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp2_buf.str_array_vlen[i] = comp2_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp3_buf.str_array_vlen[i] = comp3_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp4_buf.str_array_vlen[i] = comp4_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp5_buf.str_array_vlen[i] = comp5_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp6_buf.str_array_vlen[i] = comp6_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp7_buf.str_array_vlen[i] = comp7_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp8_buf.str_array_vlen[i] = comp8_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
-        comp9_buf.str_array_vlen[i] = comp9_buf.str_vlen_array_again[i] = vlen_str_array_buf[i];
+    for (i = 0; i < VLEN_STR_ARRY_DIM; i++) {
+        comp1_buf.str_array_vlen[i] = comp1_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp2_buf.str_array_vlen[i] = comp2_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp3_buf.str_array_vlen[i] = comp3_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp4_buf.str_array_vlen[i] = comp4_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp5_buf.str_array_vlen[i] = comp5_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp6_buf.str_array_vlen[i] = comp6_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp7_buf.str_array_vlen[i] = comp7_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp8_buf.str_array_vlen[i] = comp8_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
+        comp9_buf.str_array_vlen[i] = comp9_buf.str_vlen_array_again[i] =
+                vlen_str_array_buf[i];
 
     }
 
     /* copy fixlen string attay data to compound buffers */
-    for (i=0; i < FIXLEN_STR_ARRY_DIM; i++)
-    {
+    for (i = 0; i < FIXLEN_STR_ARRY_DIM; i++) {
         HDstrcpy(comp1_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
         HDstrcpy(comp1_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
 
@@ -3806,25 +3584,20 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     comp9_buf.int_data2 = 20;
     comp9_buf.int_data3 = 30;
 
-
     /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    if (is_file_new == 1)
-    {
-        fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-        if (fid1 < 0)
-        {
+    if (is_file_new == 1) {
+        fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+        if (fid1 < 0) {
             fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
             status = FAIL;
             goto out;
         }
     }
-    else
-    {
-        fid1 = H5Fopen (fname1, H5F_ACC_RDWR, H5P_DEFAULT);
-        if (fid1 < 0)
-        {
+    else {
+        fid1 = H5Fopen(fname1, H5F_ACC_RDWR, H5P_DEFAULT);
+        if (fid1 < 0) {
             fprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1);
             status = FAIL;
             goto out;
@@ -3835,8 +3608,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     * Create group
     *------------------------------------------------------------------------*/
     gid = H5Gcreate2(fid1, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid < 0)
-    {
+    if (gid < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3846,8 +3618,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     * Variable length String1 - Create space and type
     *------------------------------------------------------------------------*/
     sid_vlen_str = H5Screate_simple(STR_RANK, dims_vlen_str, NULL);
-    if (sid_vlen_str < 0)
-    {
+    if (sid_vlen_str < 0) {
         fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3855,8 +3626,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
 
     tid_vlen_str = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_vlen_str, H5T_VARIABLE);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3866,8 +3636,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     * Fixed length String2 - Create space and type
     *------------------------------------------------------------------------*/
     sid_fixlen_str = H5Screate_simple(STR_RANK, dims_fixlen_str, NULL);
-    if (sid_fixlen_str < 0)
-    {
+    if (sid_fixlen_str < 0) {
         fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3875,8 +3644,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
 
     tid_fixlen_str = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_fixlen_str, FIXLEN_STR_SIZE);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3886,8 +3654,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     * Fixed length String3 array - Create space and type
     *------------------------------------------------------------------------*/
     sid_vlen_str_array = H5Screate_simple(STR_RANK, dims_vlen_str_array, NULL);
-    if (sid_vlen_str_array < 0)
-    {
+    if (sid_vlen_str_array < 0) {
         fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3895,17 +3662,15 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
 
     tid_vlen_str_array_pre = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_vlen_str_array_pre, H5T_VARIABLE);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-     /* Create the array data type for the string array                */
+    /* Create the array data type for the string array                */
     tid_vlen_str_array = H5Tarray_create2(tid_vlen_str_array_pre, COMP_RANK, dims_vlen_str_array);
-    if (tid_vlen_str_array < 0)
-    {
+    if (tid_vlen_str_array < 0) {
         fprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3915,8 +3680,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     * Variable length String4 array - Create space and type
     *------------------------------------------------------------------------*/
     sid_fixlen_str_array = H5Screate_simple(STR_RANK, dims_fixlen_str_array, NULL);
-    if (sid_fixlen_str_array < 0)
-    {
+    if (sid_fixlen_str_array < 0) {
         fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -3924,126 +3688,123 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
 
     tid_fixlen_str_array_pre = H5Tcopy(H5T_C_S1);
     status = H5Tset_size(tid_fixlen_str_array_pre, FIXLEN_STR_ARRY_SIZE);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
-     /* Create the array data type for the string array                */
+    /* Create the array data type for the string array                */
     tid_fixlen_str_array = H5Tarray_create2(tid_fixlen_str_array_pre, COMP_RANK, dims_fixlen_str_array);
-    if (tid_fixlen_str_array < 0)
-    {
+    if (tid_fixlen_str_array < 0) {
         fprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-   /*-------------------------------------------------------------------------
+    /*-------------------------------------------------------------------------
     * Compound dataset
     *------------------------------------------------------------------------*/
     sid_comp = H5Screate_simple(COMP_RANK, dims_comp, NULL);
-    if (sid_comp < 0)
-    {
+    if (sid_comp < 0) {
         fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
-    tid1_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp1_t));
-    tid2_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp2_t));
-    tid3_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp3_t));
-    tid4_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp4_t));
-    tid5_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp5_t));
-    tid6_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp6_t));
-    tid7_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp7_t));
-    tid8_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp8_t));
-    tid9_comp = H5Tcreate (H5T_COMPOUND, sizeof(comp9_t));
+    tid1_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp1_t));
+    tid2_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp2_t));
+    tid3_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp3_t));
+    tid4_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp4_t));
+    tid5_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp5_t));
+    tid6_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp6_t));
+    tid7_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp7_t));
+    tid8_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp8_t));
+    tid9_comp = H5Tcreate(H5T_COMPOUND, sizeof(comp9_t));
 
     /* compound 1 */
-    H5Tinsert(tid1_comp, "VLEN_STR1", HOFFSET(comp1_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid1_comp, "VLEN_STR2", HOFFSET(comp1_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid1_comp, "FIXLEN_STR1", HOFFSET(comp1_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid1_comp, "FIXLEN_STR2", HOFFSET(comp1_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid1_comp, "VLEN_STR1", HOFFSET(comp1_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid1_comp, "VLEN_STR2", HOFFSET(comp1_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid1_comp, "FIXLEN_STR1", HOFFSET(comp1_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid1_comp, "FIXLEN_STR2", HOFFSET(comp1_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid1_comp, "VLEN_STR_ARRAY1", HOFFSET(comp1_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid1_comp, "VLEN_STR_ARRAY2", HOFFSET(comp1_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid1_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp1_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid1_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp1_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 2 */
-    H5Tinsert(tid2_comp, "VLEN_STR1", HOFFSET(comp2_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid2_comp, "VLEN_STR2", HOFFSET(comp2_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid2_comp, "FIXLEN_STR1", HOFFSET(comp2_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid2_comp, "FIXLEN_STR2", HOFFSET(comp2_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid2_comp, "VLEN_STR1", HOFFSET(comp2_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid2_comp, "VLEN_STR2", HOFFSET(comp2_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid2_comp, "FIXLEN_STR1", HOFFSET(comp2_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid2_comp, "FIXLEN_STR2", HOFFSET(comp2_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid2_comp, "VLEN_STR_ARRAY1", HOFFSET(comp2_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid2_comp, "VLEN_STR_ARRAY2", HOFFSET(comp2_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid2_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp2_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid2_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp2_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 3 */
-    H5Tinsert(tid3_comp, "VLEN_STR1", HOFFSET(comp3_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid3_comp, "VLEN_STR2", HOFFSET(comp3_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid3_comp, "FIXLEN_STR1", HOFFSET(comp3_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid3_comp, "FIXLEN_STR2", HOFFSET(comp3_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid3_comp, "VLEN_STR1", HOFFSET(comp3_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid3_comp, "VLEN_STR2", HOFFSET(comp3_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid3_comp, "FIXLEN_STR1", HOFFSET(comp3_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid3_comp, "FIXLEN_STR2", HOFFSET(comp3_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid3_comp, "VLEN_STR_ARRAY1", HOFFSET(comp3_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid3_comp, "VLEN_STR_ARRAY2", HOFFSET(comp3_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid3_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp3_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid3_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp3_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 4 */
-    H5Tinsert(tid4_comp, "VLEN_STR1", HOFFSET(comp4_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid4_comp, "VLEN_STR2", HOFFSET(comp4_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid4_comp, "FIXLEN_STR1", HOFFSET(comp4_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid4_comp, "FIXLEN_STR2", HOFFSET(comp4_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid4_comp, "VLEN_STR1", HOFFSET(comp4_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid4_comp, "VLEN_STR2", HOFFSET(comp4_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid4_comp, "FIXLEN_STR1", HOFFSET(comp4_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid4_comp, "FIXLEN_STR2", HOFFSET(comp4_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid4_comp, "VLEN_STR_ARRAY1", HOFFSET(comp4_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid4_comp, "VLEN_STR_ARRAY2", HOFFSET(comp4_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid4_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp4_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid4_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp4_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 5 */
-    H5Tinsert(tid5_comp, "VLEN_STR1", HOFFSET(comp5_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid5_comp, "VLEN_STR2", HOFFSET(comp5_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid5_comp, "FIXLEN_STR1", HOFFSET(comp5_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid5_comp, "FIXLEN_STR2", HOFFSET(comp5_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid5_comp, "VLEN_STR1", HOFFSET(comp5_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid5_comp, "VLEN_STR2", HOFFSET(comp5_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid5_comp, "FIXLEN_STR1", HOFFSET(comp5_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid5_comp, "FIXLEN_STR2", HOFFSET(comp5_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid5_comp, "VLEN_STR_ARRAY1", HOFFSET(comp5_t, str_array_vlen), tid_vlen_str_array);
-    H5Tinsert(tid5_comp, "VLEN_STR_ARRAY2", HOFFSET(comp5_t, str_vlen_array_again), tid_vlen_str_array);
+    H5Tinsert(tid5_comp, "VLEN_STR_ARRAY2",  HOFFSET(comp5_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid5_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp5_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid5_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp5_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 6 */
-    H5Tinsert(tid6_comp, "VLEN_STR1", HOFFSET(comp6_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid6_comp, "VLEN_STR2", HOFFSET(comp6_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid6_comp, "FIXLEN_STR1", HOFFSET(comp6_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid6_comp, "FIXLEN_STR2", HOFFSET(comp6_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid6_comp, "VLEN_STR1", HOFFSET(comp6_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid6_comp, "VLEN_STR2", HOFFSET(comp6_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid6_comp, "FIXLEN_STR1", HOFFSET(comp6_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid6_comp, "FIXLEN_STR2", HOFFSET(comp6_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid6_comp, "VLEN_STR_ARRAY1", HOFFSET(comp6_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid6_comp, "VLEN_STR_ARRAY2", HOFFSET(comp6_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid6_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp6_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid6_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp6_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 7 */
-    H5Tinsert(tid7_comp, "VLEN_STR1", HOFFSET(comp7_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid7_comp, "VLEN_STR2", HOFFSET(comp7_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid7_comp, "FIXLEN_STR1", HOFFSET(comp7_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid7_comp, "FIXLEN_STR2", HOFFSET(comp7_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid7_comp, "VLEN_STR1", HOFFSET(comp7_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid7_comp, "VLEN_STR2", HOFFSET(comp7_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid7_comp, "FIXLEN_STR1", HOFFSET(comp7_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid7_comp, "FIXLEN_STR2", HOFFSET(comp7_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid7_comp, "VLEN_STR_ARRAY1", HOFFSET(comp7_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid7_comp, "VLEN_STR_ARRAY2", HOFFSET(comp7_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid7_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp7_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid7_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp7_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 8 */
-    H5Tinsert(tid8_comp, "VLEN_STR1", HOFFSET(comp8_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid8_comp, "VLEN_STR2", HOFFSET(comp8_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid8_comp, "FIXLEN_STR1", HOFFSET(comp8_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid8_comp, "FIXLEN_STR2", HOFFSET(comp8_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid8_comp, "VLEN_STR1", HOFFSET(comp8_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid8_comp, "VLEN_STR2", HOFFSET(comp8_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid8_comp, "FIXLEN_STR1", HOFFSET(comp8_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid8_comp, "FIXLEN_STR2", HOFFSET(comp8_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid8_comp, "VLEN_STR_ARRAY1", HOFFSET(comp8_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid8_comp, "VLEN_STR_ARRAY2", HOFFSET(comp8_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid8_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp8_t, str_array_fixlen), tid_fixlen_str_array);
     H5Tinsert(tid8_comp, "FIXLEN_STR_ARRAY2", HOFFSET(comp8_t, str_fixlen_array_again), tid_fixlen_str_array);
 
     /* compound 9 */
-    H5Tinsert(tid9_comp, "VLEN_STR1", HOFFSET(comp9_t, str_vlen), tid_vlen_str );
-    H5Tinsert(tid9_comp, "VLEN_STR2", HOFFSET(comp9_t, str_vlen_repeat), tid_vlen_str );
-    H5Tinsert(tid9_comp, "FIXLEN_STR1", HOFFSET(comp9_t, str_fixlen), tid_fixlen_str );
-    H5Tinsert(tid9_comp, "FIXLEN_STR2", HOFFSET(comp9_t, str_fixlen_repeat), tid_fixlen_str );
+    H5Tinsert(tid9_comp, "VLEN_STR1", HOFFSET(comp9_t, str_vlen), tid_vlen_str);
+    H5Tinsert(tid9_comp, "VLEN_STR2", HOFFSET(comp9_t, str_vlen_repeat), tid_vlen_str);
+    H5Tinsert(tid9_comp, "FIXLEN_STR1", HOFFSET(comp9_t, str_fixlen), tid_fixlen_str);
+    H5Tinsert(tid9_comp, "FIXLEN_STR2", HOFFSET(comp9_t, str_fixlen_repeat), tid_fixlen_str);
     H5Tinsert(tid9_comp, "VLEN_STR_ARRAY1", HOFFSET(comp9_t, str_array_vlen), tid_vlen_str_array);
     H5Tinsert(tid9_comp, "VLEN_STR_ARRAY2", HOFFSET(comp9_t, str_vlen_array_again), tid_vlen_str_array);
     H5Tinsert(tid9_comp, "FIXLEN_STR_ARRAY1", HOFFSET(comp9_t, str_array_fixlen), tid_fixlen_str_array);
@@ -4055,12 +3816,10 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     H5Tinsert(tid9_comp, "OBJREF2", HOFFSET(comp9_t, objref2), H5T_STD_REF_OBJ);
     H5Tinsert(tid9_comp, "OBJREF3", HOFFSET(comp9_t, objref3), H5T_STD_REF_OBJ);
 
-
     /* Write data to compound 1 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset1", tid1_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid1_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp1_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4070,8 +3829,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 2 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset2", tid2_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid2_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp2_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4081,8 +3839,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 3 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset3", tid3_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid3_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp3_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4092,8 +3849,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 4 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset4", tid4_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid4_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp4_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4103,8 +3859,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 5 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset5", tid5_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid5_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp5_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4114,8 +3869,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 6 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset6", tid6_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid6_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp6_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4125,8 +3879,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 7 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset7", tid7_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid7_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp7_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4136,8 +3889,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* Write data to compound 8 dataset buffer */
     did_comp = H5Dcreate2(gid, "Compound_dset8", tid8_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did_comp, tid8_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp8_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -4148,166 +3900,158 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     did_comp = H5Dcreate2(gid, "Compound_dset9", tid9_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* obj references */
-    status=H5Rcreate(&(comp9_buf.objref1),gid,"Compound_dset2",H5R_OBJECT,(hid_t)-1);
-    status=H5Rcreate(&(comp9_buf.objref2),gid,"Compound_dset3",H5R_OBJECT,(hid_t)-1);
-    status=H5Rcreate(&(comp9_buf.objref3),gid,"Compound_dset4",H5R_OBJECT,(hid_t)-1);
+    status = H5Rcreate(&(comp9_buf.objref1), gid, "Compound_dset2", H5R_OBJECT, (hid_t) -1);
+    status = H5Rcreate(&(comp9_buf.objref2), gid, "Compound_dset3", H5R_OBJECT, (hid_t) -1);
+    status = H5Rcreate(&(comp9_buf.objref3), gid, "Compound_dset4", H5R_OBJECT, (hid_t) -1);
 
     status = H5Dwrite(did_comp, tid9_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp9_buf);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
-
     H5Dclose(did_comp);
+    did_comp = -1;
 
-    did_comp=0;
 out:
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1 > 0)
+    if (fid1 > 0)
         H5Fclose(fid1);
-    if(gid > 0)
+    if (gid > 0)
         H5Gclose(gid);
     /* vlen string */
-    if(tid_vlen_str > 0)
+    if (tid_vlen_str > 0)
         H5Tclose(tid_vlen_str);
-    if(sid_vlen_str > 0)
+    if (sid_vlen_str > 0)
         H5Sclose(sid_vlen_str);
     /* fixed len string */
-    if(tid_fixlen_str > 0)
+    if (tid_fixlen_str > 0)
         H5Tclose(tid_fixlen_str);
-    if(sid_fixlen_str > 0)
+    if (sid_fixlen_str > 0)
         H5Sclose(sid_fixlen_str);
     /* vlen string array */
-    if(tid_vlen_str_array_pre > 0)
+    if (tid_vlen_str_array_pre > 0)
         H5Tclose(tid_vlen_str_array_pre);
-    if(tid_vlen_str_array > 0)
+    if (tid_vlen_str_array > 0)
         H5Tclose(tid_vlen_str_array);
-    if(sid_vlen_str_array > 0)
+    if (sid_vlen_str_array > 0)
         H5Sclose(sid_vlen_str_array);
     /* fixed len string array */
-    if(tid_fixlen_str_array_pre > 0)
+    if (tid_fixlen_str_array_pre > 0)
         H5Tclose(tid_fixlen_str_array_pre);
-    if(tid_fixlen_str_array > 0)
+    if (tid_fixlen_str_array > 0)
         H5Tclose(tid_fixlen_str_array);
-    if(sid_fixlen_str_array > 0)
+    if (sid_fixlen_str_array > 0)
         H5Sclose(sid_fixlen_str_array);
     /* compound */
-    if(tid1_comp > 0)
+    if (tid1_comp > 0)
         H5Tclose(tid1_comp);
-    if(tid2_comp > 0)
+    if (tid2_comp > 0)
         H5Tclose(tid2_comp);
-    if(tid3_comp > 0)
+    if (tid3_comp > 0)
         H5Tclose(tid3_comp);
-    if(tid4_comp > 0)
+    if (tid4_comp > 0)
         H5Tclose(tid4_comp);
-    if(tid5_comp > 0)
+    if (tid5_comp > 0)
         H5Tclose(tid5_comp);
-    if(tid6_comp > 0)
+    if (tid6_comp > 0)
         H5Tclose(tid6_comp);
-    if(tid7_comp > 0)
+    if (tid7_comp > 0)
         H5Tclose(tid7_comp);
-    if(tid8_comp > 0)
+    if (tid8_comp > 0)
         H5Tclose(tid8_comp);
-    if(tid9_comp > 0)
+    if (tid9_comp > 0)
         H5Tclose(tid9_comp);
-    if(did_comp > 0)
+    if (did_comp > 0)
         H5Dclose(did_comp);
-    if(sid_comp > 0)
+    if (sid_comp > 0)
         H5Sclose(sid_comp);
 
     return status;
 } /* end test_comp_vlen_strings() */
 
-
 /*-------------------------------------------------------------------------
-*
-* Purpose: Test diffs of enum values which may include invalid values.
-*
-* Programmer: Dana Robinson
-*
-*-------------------------------------------------------------------------*/
-
-static int
-test_enums(const char *fname)
+ *
+ * Purpose: Test diffs of enum values which may include invalid values.
+ *
+ * Programmer: Dana Robinson
+ *
+ *-------------------------------------------------------------------------*/
+
+static int test_enums(const char *fname)
 {
-    hid_t       fid  = -1;
+    hid_t fid = -1;
 
-    hid_t       tid       = -1;
-    int         enum_val  = -1;
+    hid_t tid = -1;
+    int enum_val = -1;
 
     /* The data in the two arrays cover the following cases:
-     *
-     *   V = valid enum value, I = invalid enum value
-     *
-     *   0:  I-I (same value)
-     *   1:  V-I
-     *   2:  I-V
-     *   3:  V-V (same value)
-     *   4:  I-I (different values) SKIPPED FOR NOW
-     *   5:  V-V (different values)
-     */
+    *
+    *   V = valid enum value, I = invalid enum value
+    *
+    *   0:  I-I (same value)
+    *   1:  V-I
+    *   2:  I-V
+    *   3:  V-V (same value)
+    *   4:  I-I (different values) SKIPPED FOR NOW
+    *   5:  V-V (different values)
+    */
     /* *** NOTE ***
-     *
-     * There is a bug in H5Dread() where invalid enum values are always
-     * returned as -1 so two different invalid enum values cannot be
-     * properly compared.  Test 4 has been adjusted to pass here
-     * while we fix the issue.
-     */
-    int         data1[6] = {9, 0, 9, 0, 9, 0};
+    *
+    * There is a bug in H5Dread() where invalid enum values are always
+    * returned as -1 so two different invalid enum values cannot be
+    * properly compared.  Test 4 has been adjusted to pass here
+    * while we fix the issue.
+    */
+    int data1[6] = { 9, 0, 9, 0, 9, 0 };
     /*int         data1[6] = {9, 0, 9, 0, 8, 0};  */
-    int         data2[6] = {9, 9, 0, 0, 9, 1};
+    int data2[6] = { 9, 9, 0, 0, 9, 1 };
 
-    hsize_t     dims = 6;
+    hsize_t dims = 6;
 
-    herr_t      status = SUCCEED;
+    herr_t status = SUCCEED;
 
     /*-----------------------------------------------------------------------
-     * Create the file
-     *---------------------------------------------------------------------*/
+    * Create the file
+    *---------------------------------------------------------------------*/
 
     fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*-----------------------------------------------------------------------
-     * Create enum types
-     *---------------------------------------------------------------------*/
+    * Create enum types
+    *---------------------------------------------------------------------*/
 
     tid = H5Tenum_create(H5T_NATIVE_INT);
     enum_val = 0;
     status = H5Tenum_insert(tid, "YIN", &enum_val);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
         status = FAIL;
         goto out;
     }
     enum_val = 1;
     status = H5Tenum_insert(tid, "YANG", &enum_val);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
         status = FAIL;
         goto out;
     }
 
     /*-----------------------------------------------------------------------
-     * Create datasets containing enum data.
-     *---------------------------------------------------------------------*/
+    * Create datasets containing enum data.
+    *---------------------------------------------------------------------*/
 
     status = write_dset(fid, 1, &dims, "dset1", tid, data1);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> write_dset failed.\n", fname);
         status = FAIL;
         goto out;
     }
     status = write_dset(fid, 1, &dims, "dset2", tid, data2);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> write_dset failed.\n", fname);
         status = FAIL;
         goto out;
@@ -4315,41 +4059,41 @@ test_enums(const char *fname)
 
 out:
     /*-----------------------------------------------------------------------
-     * Close
-     *---------------------------------------------------------------------*/
-    if(fid)
+    * Close
+    *---------------------------------------------------------------------*/
+    if (fid)
         H5Fclose(fid);
-    if(tid)
+    if (tid)
         H5Tclose(tid);
 
     return status;
 }
 
 /*-------------------------------------------------------------------------
-*
-* Purpose:
-*   Create test files with dataset and attribute with container types
-*   (array, vlen) with multiple nested compound types.
-*
-* Function: test_comps_array()
-*  - type: compound->array->compound
-*
-* Function: test_comps_vlen()
-*  - type: compound->vlen->compound
-*
-* Function: test_comps_array_vlen()
-*  - type: compound->array->compound->vlen->compound
-*
-* Function: test_comps_vlen_arry()
-*  - type: compound->vlen->compound->array->compound
-*
-* Programmer: Jonathan Kim (Sep, 1, 2011)
-*
-*-------------------------------------------------------------------------*/
+ *
+ * Purpose:
+ *   Create test files with dataset and attribute with container types
+ *   (array, vlen) with multiple nested compound types.
+ *
+ * Function: test_comps_array()
+ *  - type: compound->array->compound
+ *
+ * Function: test_comps_vlen()
+ *  - type: compound->vlen->compound
+ *
+ * Function: test_comps_array_vlen()
+ *  - type: compound->array->compound->vlen->compound
+ *
+ * Function: test_comps_vlen_arry()
+ *  - type: compound->vlen->compound->array->compound
+ *
+ * Programmer: Jonathan Kim (Sep, 1, 2011)
+ *
+ *-------------------------------------------------------------------------*/
 #define SDIM_DSET 2
 #define SDIM_CMPD_ARRAY 2
 
-static void test_comps_array (const char *fname, const char *dset, const char *attr,int diff, int is_file_new)
+static void test_comps_array(const char *fname, const char *dset, const char *attr, int diff, int is_file_new)
 {
     /* sub compound 2 */
     typedef struct {
@@ -4363,42 +4107,39 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
         cmpd2_t cmpd2[SDIM_CMPD_ARRAY];
     } cmpd1_t;
 
-    cmpd1_t wdata[SDIM_DSET];   /* dataset with compound1 */
+    cmpd1_t wdata[SDIM_DSET]; /* dataset with compound1 */
 
-    hid_t  fid;  /* HDF5 File IDs  */
-    hid_t  did_dset; /* Dataset ID   */
-    hid_t  sid_dset;       /* Dataset space ID   */
-    hid_t  tid_cmpd1;       /* Compound1 type ID   */
-    hid_t  tid_arry1;       /* Array type ID in compound1   */
-    hid_t  tid_cmpd2;       /* Compound2 type ID   */
-    hid_t  tid_attr;
-    hsize_t  sdims_dset[] = {SDIM_DSET};
-    hsize_t  sdims_cmpd_arry[] = {SDIM_CMPD_ARRAY};
-    int     i,j;
-    herr_t  ret;  /* Generic return value  */
+    hid_t fid = -1; /* HDF5 File IDs  */
+    hid_t did_dset = -1; /* Dataset ID   */
+    hid_t sid_dset = -1; /* Dataset space ID   */
+    hid_t tid_cmpd1 = -1; /* Compound1 type ID   */
+    hid_t tid_arry1 = -1; /* Array type ID in compound1   */
+    hid_t tid_cmpd2 = -1; /* Compound2 type ID   */
+    hid_t tid_attr = -1;
+    hsize_t sdims_dset[] = { SDIM_DSET };
+    hsize_t sdims_cmpd_arry[] = { SDIM_CMPD_ARRAY };
+    int i, j;
+    herr_t ret; /* Generic return value  */
 
     /* Initialize array data to write */
-    for(i=0; i < SDIM_DSET; i++)
-    {
+    for (i = 0; i < SDIM_DSET; i++) {
         wdata[i].i1 = i;
-        for(j=0; j < SDIM_CMPD_ARRAY; j++)
-        {
+        for (j = 0; j < SDIM_CMPD_ARRAY; j++) {
             wdata[i].cmpd2[j].i2 = i * 10 + diff;
-            wdata[i].cmpd2[j].f2 = (float)i * 10.5F + (float)diff;
+            wdata[i].cmpd2[j].f2 = (float) i * 10.5F + (float) diff;
         } /* end for */
     }
 
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
     if (is_file_new == 1)
         fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     else
-        fid = H5Fopen (fname, H5F_ACC_RDWR, H5P_DEFAULT);
-
+        fid = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 
     /* -------------------------------
-     * Create a sub compound2 datatype  */
+    * Create a sub compound2 datatype  */
     tid_cmpd2 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd2_t));
 
     /* Insert integer field */
@@ -4410,9 +4151,9 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /*-----------------------------------
-     * Create a top compound1.
-     */
-    tid_cmpd1 = H5Tcreate (H5T_COMPOUND, sizeof(cmpd1_t));
+    * Create a top compound1.
+    */
+    tid_cmpd1 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd1_t));
 
     ret = H5Tinsert(tid_cmpd1, "int1", HOFFSET(cmpd1_t, i1), H5T_NATIVE_INT);
     assert(ret >= 0);
@@ -4423,10 +4164,9 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
     ret = H5Tinsert(tid_cmpd1, "array_cmpd1", HOFFSET(cmpd1_t, cmpd2), tid_arry1);
     assert(ret >= 0);
 
-
     /* -------------------
-     * Create a dataset
-     */
+    * Create a dataset
+    */
     /* Create dataspace for datasets */
     sid_dset = H5Screate_simple(1, sdims_dset, NULL);
 
@@ -4437,15 +4177,15 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /*-----------------------------------
-     * Create an attribute in root group
-     */
+    * Create an attribute in root group
+    */
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
     assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
     assert(ret >= 0);
 
     /* ----------------
-     * Close Dataset */
+    * Close Dataset */
     ret = H5Aclose(tid_attr);
     assert(ret >= 0);
     ret = H5Tclose(tid_arry1);
@@ -4462,9 +4202,7 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
     assert(ret >= 0);
 }
 
-
-
-static void test_comps_vlen (const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
+static void test_comps_vlen(const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
 {
     /* sub compound 2 */
     typedef struct {
@@ -4475,44 +4213,46 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     /* top compound 1 */
     typedef struct {
         int i1;
-        hvl_t vl;   /* VL information for compound2 */
+        hvl_t vl; /* VL information for compound2 */
     } cmpd1_t;
 
-    cmpd1_t wdata[SDIM_DSET];   /* Dataset for compound1 */
+    cmpd1_t wdata[SDIM_DSET]; /* Dataset for compound1 */
 
-    hid_t  fid;  /* HDF5 File ID */
-    hid_t  did_dset; /* dataset ID   */
-    hid_t  sid_dset;  /* dataset space ID */
-    hid_t  tid_attr;
-    hid_t  tid_cmpd2; /* compound2 type ID */
-    hid_t  tid_cmpd1; /* compound1 type ID */
-    hid_t  tid_cmpd1_vlen;
-    hsize_t  sdims_dset[] = {SDIM_DSET};
+    hid_t fid = -1; /* HDF5 File ID */
+    hid_t did_dset = -1; /* dataset ID   */
+    hid_t sid_dset = -1; /* dataset space ID */
+    hid_t tid_attr = -1;
+    hid_t tid_cmpd2 = -1; /* compound2 type ID */
+    hid_t tid_cmpd1 = -1; /* compound1 type ID */
+    hid_t tid_cmpd1_vlen = -1;
+    hsize_t sdims_dset[] = { SDIM_DSET };
 
-    unsigned       i,j;        /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    unsigned i, j; /* counting variables */
+    herr_t ret; /* Generic return value  */
 
     /* Allocate and initialize VL data to write */
-    for(i = 0; i < SDIM_DSET; i++) {
-        wdata[i].i1 = (int)i;
+    for (i = 0; i < SDIM_DSET; i++) {
+        wdata[i].i1 = (int) i;
         wdata[i].vl.p = HDmalloc((i + 1) * sizeof(cmpd2_t));
         wdata[i].vl.len = i + 1;
-        for(j = 0; j < (i + 1); j++) {
-            ((cmpd2_t *)wdata[i].vl.p)[j].i2 = (int)(i * 10 + (unsigned)diff);
-            ((cmpd2_t *)wdata[i].vl.p)[j].f2 = (float)i * 10.5F + (float)diff;
+        for (j = 0; j < (i + 1); j++) {
+            ((cmpd2_t *) wdata[i].vl.p)[j].i2 =
+                    (int) (i * 10 + (unsigned) diff);
+            ((cmpd2_t *) wdata[i].vl.p)[j].f2 = (float) i * 10.5F
+                    + (float) diff;
         } /* end for */
     } /* end for */
 
     /*-----------------------------------------------------------------------
-     * Create file(s)
-     *------------------------------------------------------------------------*/
+    * Create file(s)
+    *------------------------------------------------------------------------*/
     if (is_file_new == 1)
         fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     else
-        fid = H5Fopen (fname, H5F_ACC_RDWR, H5P_DEFAULT);
+        fid = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 
     /* -----------------------------
-     * Create sub compound2 type */
+    * Create sub compound2 type */
     tid_cmpd2 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd2_t));
 
     /* Insert fields */
@@ -4522,7 +4262,7 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /* ---------------------------
-     * Create top compound1 type */
+    * Create top compound1 type */
     tid_cmpd1 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd1_t));
     /* Insert fields */
     ret = H5Tinsert(tid_cmpd1, "int1", HOFFSET(cmpd1_t, i1), H5T_NATIVE_INT);
@@ -4534,8 +4274,8 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /* -------------------------------
-     * Create dataset with compound1
-     */
+    * Create dataset with compound1
+    */
     /* Create dataspace for dataset */
     sid_dset = H5Screate_simple(1, sdims_dset, NULL);
 
@@ -4547,8 +4287,8 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /*-----------------------------------
-     * Create an attribute in root group
-     */
+    * Create an attribute in root group
+    */
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
     assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
@@ -4559,7 +4299,7 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /* ----------------
-     * Close IDs */
+    * Close IDs */
     ret = H5Aclose(tid_attr);
     assert(ret >= 0);
     ret = H5Dclose(did_dset);
@@ -4576,17 +4316,16 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     assert(ret >= 0);
 }
 
-
-static void test_comps_array_vlen (const char * fname, const char *dset,const char *attr, int diff, int is_file_new)
+static void test_comps_array_vlen(const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
 {
     typedef struct {
         int i3;
         float f3;
     } cmpd3_t;
 
-    typedef struct {        /* Typedef for compound datatype */
+    typedef struct { /* Typedef for compound datatype */
         int i2;
-        hvl_t vl;   /* VL information to write */
+        hvl_t vl; /* VL information to write */
     } cmpd2_t;
 
     typedef struct {
@@ -4594,53 +4333,53 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
         cmpd2_t cmpd2[SDIM_CMPD_ARRAY];
     } cmpd1_t;
 
-    cmpd1_t wdata[SDIM_DSET];   /* Information to write */
-    hid_t  fid;  /* HDF5 File IDs  */
-    hid_t  did_dset; /* Dataset ID   */
-    hid_t  sid_dset;       /* Dataspace ID   */
-    hid_t  tid_attr;
-    hid_t  tid_cmpd1;       /* Compound1 Datatype ID   */
-    hid_t  tid_arry1;       /* Array Datatype ID   */
-    hid_t  tid_cmpd2;       /* Compound2 Datatype ID   */
-    hid_t  tid_cmpd2_vlen;
-    hid_t  tid_cmpd3;       /* Compound3 Datatype ID   */
-    hsize_t  sdims_dset[] = {SDIM_DSET};
-    hsize_t  sdims_arry[] = {SDIM_CMPD_ARRAY};
-    unsigned i, j, k;   /* counting variables */
-    herr_t  ret;        /* Generic return value  */
-
-
+    cmpd1_t wdata[SDIM_DSET]; /* Information to write */
+    hid_t fid = -1; /* HDF5 File IDs  */
+    hid_t did_dset = -1; /* Dataset ID   */
+    hid_t sid_dset = -1; /* Dataspace ID   */
+    hid_t tid_attr = -1;
+    hid_t tid_cmpd1 = -1; /* Compound1 Datatype ID   */
+    hid_t tid_arry1 = -1; /* Array Datatype ID   */
+    hid_t tid_cmpd2 = -1; /* Compound2 Datatype ID   */
+    hid_t tid_cmpd2_vlen = -1;
+    hid_t tid_cmpd3 = -1; /* Compound3 Datatype ID   */
+    hsize_t sdims_dset[] = { SDIM_DSET };
+    hsize_t sdims_arry[] = { SDIM_CMPD_ARRAY };
+    unsigned i, j, k; /* counting variables */
+    herr_t ret; /* Generic return value  */
 
     /* Initialize array data to write in compound1 */
-    for(i = 0; i < SDIM_DSET; i++) {
-        wdata[i].i1 = (int)i;
+    for (i = 0; i < SDIM_DSET; i++) {
+        wdata[i].i1 = (int) i;
 
         /* Allocate and initialize VL data to write in compound2 */
-        for(j = 0; j < SDIM_CMPD_ARRAY; j++) {
-            wdata[i].cmpd2[j].i2 = (int)(j * 10);
+        for (j = 0; j < SDIM_CMPD_ARRAY; j++) {
+            wdata[i].cmpd2[j].i2 = (int) (j * 10);
             wdata[i].cmpd2[j].vl.p = HDmalloc((j + 1) * sizeof(cmpd3_t));
             wdata[i].cmpd2[j].vl.len = j + 1;
-            for(k = 0; k < (j + 1); k++) {
+            for (k = 0; k < (j + 1); k++) {
                 /* Initialize data of compound3 */
-                ((cmpd3_t *)wdata[i].cmpd2[j].vl.p)[k].i3 = (int)j * 10 + diff;
-                ((cmpd3_t *)wdata[i].cmpd2[j].vl.p)[k].f3 = (float)j * 10.5F + (float)diff;
+                ((cmpd3_t *) wdata[i].cmpd2[j].vl.p)[k].i3 = (int) j * 10
+                        + diff;
+                ((cmpd3_t *) wdata[i].cmpd2[j].vl.p)[k].f3 = (float) j * 10.5F
+                        + (float) diff;
             } /* end for */
         } /* end for */
     }
 
     /*-----------------------------------------------------------------------
-     * Create file(s)
-     *------------------------------------------------------------------------*/
+    * Create file(s)
+    *------------------------------------------------------------------------*/
     if (is_file_new == 1)
         fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     else
-        fid = H5Fopen (fname, H5F_ACC_RDWR, H5P_DEFAULT);
+        fid = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 
     /* Create dataspace for datasets */
     sid_dset = H5Screate_simple(1, sdims_dset, NULL);
 
     /*-------------------------------------
-     * Create a sub compound3 datatype  */
+    * Create a sub compound3 datatype  */
     tid_cmpd3 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd3_t));
 
     /* Insert integer field */
@@ -4651,9 +4390,8 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     ret = H5Tinsert(tid_cmpd3, "float", HOFFSET(cmpd3_t, f3), H5T_NATIVE_FLOAT);
     assert(ret >= 0);
 
-
     /*-------------------------------------
-     * Create a sub compound2 datatype  */
+    * Create a sub compound2 datatype  */
     tid_cmpd2 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd2_t));
 
     /* Insert integer field */
@@ -4664,20 +4402,18 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     ret = H5Tinsert(tid_cmpd2, "vlen", HOFFSET(cmpd2_t, vl), tid_cmpd2_vlen);
     assert(ret >= 0);
 
-
     /*-----------------------------------
-     * Create a top compound1 datatype for dataset.
-     */
-    tid_cmpd1 = H5Tcreate (H5T_COMPOUND, sizeof(cmpd1_t));
+    * Create a top compound1 datatype for dataset.
+    */
+    tid_cmpd1 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd1_t));
 
     /* Create an array datatype */
     tid_arry1 = H5Tarray_create2(tid_cmpd2, 1, sdims_arry);
     /* insert the array */
     H5Tinsert(tid_cmpd1, "array_comp", HOFFSET(cmpd1_t, cmpd2), tid_arry1);
 
-
     /* ----------------------
-     * Create a dataset */
+    * Create a dataset */
     did_dset = H5Dcreate2(fid, dset, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write dataset to disk */
@@ -4685,8 +4421,8 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     assert(ret >= 0);
 
     /*-----------------------------------
-     * Create an attribute in root group
-     */
+    * Create an attribute in root group
+    */
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
     assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
@@ -4697,7 +4433,7 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     assert(ret >= 0);
 
     /*-------------------
-     * Close IDs */
+    * Close IDs */
     ret = H5Aclose(tid_attr);
     assert(ret >= 0);
     ret = H5Tclose(tid_arry1);
@@ -4718,8 +4454,7 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     assert(ret >= 0);
 }
 
-
-static void test_comps_vlen_arry (const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
+static void test_comps_vlen_arry(const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
 {
     /* sub compound 3 */
     typedef struct {
@@ -4736,53 +4471,53 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     /* top compound 1 */
     typedef struct {
         int i1;
-        hvl_t vl;   /* VL information for compound2 */
+        hvl_t vl; /* VL information for compound2 */
     } cmpd1_t;
 
-    cmpd1_t wdata[SDIM_DSET];   /* Dataset for compound1 */
+    cmpd1_t wdata[SDIM_DSET]; /* Dataset for compound1 */
 
-    hid_t  fid;  /* HDF5 File ID */
-    hid_t  did_dset; /* dataset ID   */
-    hid_t  sid_dset;  /* dataset space ID */
-    hid_t  tid_attr;
-    hid_t  tid_cmpd3; /* compound3 type ID */
-    hid_t  tid_cmpd2; /* compound2 type ID */
-    hid_t  tid_cmpd2_arry;
-    hid_t  tid_cmpd1; /* compound1 type ID */
-    hid_t  tid_cmpd1_vlen;
-    hsize_t  sdims_dset[] = {SDIM_DSET};
-    hsize_t  sdims_cmpd_arry[] = {SDIM_CMPD_ARRAY};
+    hid_t fid = -1; /* HDF5 File ID */
+    hid_t did_dset = -1; /* dataset ID   */
+    hid_t sid_dset = -1; /* dataset space ID */
+    hid_t tid_attr = -1;
+    hid_t tid_cmpd3 = -1; /* compound3 type ID */
+    hid_t tid_cmpd2 = -1; /* compound2 type ID */
+    hid_t tid_cmpd2_arry = -1;
+    hid_t tid_cmpd1 = -1; /* compound1 type ID */
+    hid_t tid_cmpd1_vlen = -1;
+    hsize_t sdims_dset[] = { SDIM_DSET };
+    hsize_t sdims_cmpd_arry[] = { SDIM_CMPD_ARRAY };
 
-    unsigned       i,j,k;        /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    unsigned i, j, k; /* counting variables */
+    herr_t ret; /* Generic return value  */
 
     /* Allocate and initialize VL data to write */
-    for(i = 0; i < SDIM_DSET; i++) {
+    for (i = 0; i < SDIM_DSET; i++) {
         /* compound 1 data */
-        wdata[i].i1 = (int)i;
+        wdata[i].i1 = (int) i;
         wdata[i].vl.p = HDmalloc((i + 1) * sizeof(cmpd2_t));
         wdata[i].vl.len = i + 1;
-        for(j = 0; j < (i + 1); j++) {
+        for (j = 0; j < (i + 1); j++) {
             /* compound2 data */
-            ((cmpd2_t *)wdata[i].vl.p)[j].i2 = (int)i * 10 + diff;
-            for(k = 0; k < SDIM_CMPD_ARRAY; k++) {
+            ((cmpd2_t *) wdata[i].vl.p)[j].i2 = (int) i * 10 + diff;
+            for (k = 0; k < SDIM_CMPD_ARRAY; k++) {
                 /* compound 3 data */
-                ((cmpd2_t *)(wdata[i].vl.p))[j].cmpd3[k].i3 = (int)((float)k * 10.5F) + diff;
-                ((cmpd2_t *)(wdata[i].vl.p))[j].cmpd3[k].f3 = (float)k * 10.5F + (float)diff;
+                ((cmpd2_t *) (wdata[i].vl.p))[j].cmpd3[k].i3 = (int) ((float) k * 10.5F) + diff;
+                ((cmpd2_t *) (wdata[i].vl.p))[j].cmpd3[k].f3 = (float) k * 10.5F + (float) diff;
             } /* end for */
         } /* end for */
     } /* end for */
 
     /*-----------------------------------------------------------------------
-     * Create file(s)
-     *------------------------------------------------------------------------*/
+    * Create file(s)
+    *------------------------------------------------------------------------*/
     if (is_file_new == 1)
         fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     else
-        fid = H5Fopen (fname, H5F_ACC_RDWR, H5P_DEFAULT);
+        fid = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT);
 
     /* -----------------------------
-     * Create sub compound3 type */
+    * Create sub compound3 type */
     tid_cmpd3 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd3_t));
 
     /* Insert fields */
@@ -4792,7 +4527,7 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     assert(ret >= 0);
 
     /* -----------------------------
-     * Create sub compound2 type */
+    * Create sub compound2 type */
     tid_cmpd2 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd2_t));
 
     ret = H5Tinsert(tid_cmpd2, "int2", HOFFSET(cmpd2_t, i2), H5T_NATIVE_INT);
@@ -4803,8 +4538,8 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     assert(ret >= 0);
 
     /* ---------------------------
-     * Create top compound1 type
-     */
+    * Create top compound1 type
+    */
     /* Create a VL datatype */
     tid_cmpd1 = H5Tcreate(H5T_COMPOUND, sizeof(cmpd1_t));
     /* Insert fields */
@@ -4815,21 +4550,22 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     assert(ret >= 0);
 
     /* -------------------------------
-     * Create dataset with compound1
-     */
+    * Create dataset with compound1
+    */
     /* Create dataspace for dataset */
     sid_dset = H5Screate_simple(1, sdims_dset, NULL);
 
     /* Create a dataset */
-    did_dset = H5Dcreate2(fid, dset, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    did_dset = H5Dcreate2(fid, dset, tid_cmpd1, sid_dset, H5P_DEFAULT,
+            H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write dataset to disk */
     ret = H5Dwrite(did_dset, tid_cmpd1, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
     assert(ret >= 0);
 
     /*-----------------------------------
-     * Create an attribute in root group
-     */
+    * Create an attribute in root group
+    */
     tid_attr = H5Acreate2(fid, attr, tid_cmpd1, sid_dset, H5P_DEFAULT, H5P_DEFAULT);
     assert(tid_attr > 0);
     ret = H5Awrite(tid_attr, tid_cmpd1, wdata);
@@ -4840,7 +4576,7 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     assert(ret >= 0);
 
     /* ----------------
-     * Close IDs */
+    * Close IDs */
     ret = H5Aclose(tid_attr);
     assert(ret >= 0);
     ret = H5Dclose(did_dset);
@@ -4861,99 +4597,95 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     assert(ret >= 0);
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: test_data_nocomparables
-*
-* Purpose:
-*   Create test files with non-comparable dataset and attributes with
-*   comparable datasets and attributes.  All the comparables should display
-*   differences.
-*
-*-------------------------------------------------------------------------*/
+ * Function: test_data_nocomparables
+ *
+ * Purpose:
+ *   Create test files with non-comparable dataset and attributes with
+ *   comparable datasets and attributes.  All the comparables should display
+ *   differences.
+ *
+ *-------------------------------------------------------------------------*/
 #define DIM_ARRY 3
-static void test_data_nocomparables (const char * fname, int make_diffs)
+static void test_data_nocomparables(const char * fname, int make_diffs)
 {
-    hid_t   fid=0;
-    hid_t   gid1=0;
-    hid_t   gid2=0;
-    hid_t   did1=0;
-    hid_t   did2=0;
-    hid_t   sid1=0;
-    hid_t   tid_dset1=0;
-    hid_t   tid_attr1=0;
-    hsize_t dims1_1[1] = {DIM_ARRY};
-    hsize_t dims1_2[1] = {DIM_ARRY+1};
-    hsize_t dims2[2] = {DIM_ARRY, 1};
-    int data1[DIM_ARRY] = {0,0,0};
-    int data2[DIM_ARRY] = {1,1,1};
-    int data3[DIM_ARRY+1] = {1,1,1,1};
-    int data1_dim2[DIM_ARRY][1] = {{0},{0},{0}};
+    hid_t fid = -1;
+    hid_t gid1 = -1;
+    hid_t gid2 = -1;
+    hid_t did1 = -1;
+    hid_t did2 = -1;
+    hid_t sid1 = -1;
+    hid_t tid_dset1 = -1;
+    hid_t tid_attr1 = -1;
+    hsize_t dims1_1[1] = { DIM_ARRY };
+    hsize_t dims1_2[1] = { DIM_ARRY + 1 };
+    hsize_t dims2[2] = { DIM_ARRY, 1 };
+    int data1[DIM_ARRY] = { 0, 0, 0 };
+    int data2[DIM_ARRY] = { 1, 1, 1 };
+    int data3[DIM_ARRY + 1] = { 1, 1, 1, 1 };
+    int data1_dim2[DIM_ARRY][1] = { { 0 }, { 0 }, { 0 } };
     int rank_attr;
-    char data1_str[DIM_ARRY][STR_SIZE]= {"ab","cd","ef"};
-    herr_t  status = SUCCEED;
-    void *dset_data_ptr1=NULL;
-    void *dset_data_ptr2=NULL;
-    void *dset_data_ptr3=NULL;
-    void *attr_data_ptr1=NULL;
-    void *attr_data_ptr2=NULL;
-    void *attr_data_ptr3=NULL;
-    void *attr_data_ptr4=NULL;
-    void *attr2_dim_ptr=NULL;
-    void *attr3_dim_ptr=NULL;
+    char data1_str[DIM_ARRY][STR_SIZE] = { "ab", "cd", "ef" };
+    herr_t status = SUCCEED;
+    void *dset_data_ptr1 = NULL;
+    void *dset_data_ptr2 = NULL;
+    void *dset_data_ptr3 = NULL;
+    void *attr_data_ptr1 = NULL;
+    void *attr_data_ptr2 = NULL;
+    void *attr_data_ptr3 = NULL;
+    void *attr_data_ptr4 = NULL;
+    void *attr2_dim_ptr = NULL;
+    void *attr3_dim_ptr = NULL;
 
     /* init */
-    tid_dset1=H5Tcopy(H5T_NATIVE_INT);
-    dset_data_ptr1=(int*)&data1;
-    dset_data_ptr2=(int*)&data1;
-    dset_data_ptr3=(int*)&data1;
-    tid_attr1=H5Tcopy(H5T_NATIVE_INT);
-    attr_data_ptr1=(int*)&data1;
-    attr_data_ptr3=(int*)&data1;
-    attr_data_ptr4=(int*)&data1;
-    attr2_dim_ptr=(hsize_t*)&dims1_1;
-    attr3_dim_ptr=(hsize_t*)&dims1_1;
-    rank_attr=1;
-
-    if (make_diffs)
-    {
+    tid_dset1 = H5Tcopy(H5T_NATIVE_INT);
+    dset_data_ptr1 = (int*) &data1;
+    dset_data_ptr2 = (int*) &data1;
+    dset_data_ptr3 = (int*) &data1;
+    tid_attr1 = H5Tcopy(H5T_NATIVE_INT);
+    attr_data_ptr1 = (int*) &data1;
+    attr_data_ptr3 = (int*) &data1;
+    attr_data_ptr4 = (int*) &data1;
+    attr2_dim_ptr = (hsize_t*) &dims1_1;
+    attr3_dim_ptr = (hsize_t*) &dims1_1;
+    rank_attr = 1;
+
+    if (make_diffs) {
         /* ------------
-         * group1 */
-        tid_dset1=H5Tcopy(H5T_C_S1);
-        H5Tset_size(tid_dset1, (size_t)STR_SIZE);
-        dset_data_ptr1=(char*)&data1_str;
-        dset_data_ptr2=(int*)&data2;
-        attr_data_ptr1=(int*)&data2;
+        * group1 */
+        tid_dset1 = H5Tcopy(H5T_C_S1);
+        H5Tset_size(tid_dset1, (size_t) STR_SIZE);
+        dset_data_ptr1 = (char*) &data1_str;
+        dset_data_ptr2 = (int*) &data2;
+        attr_data_ptr1 = (int*) &data2;
 
         /* -----------
-         * group2
-         */
-        dset_data_ptr3=(int*)&data2;
+        * group2
+        */
+        dset_data_ptr3 = (int*) &data2;
         /* dset1/attr1 */
-        tid_attr1=H5Tcopy(H5T_C_S1);
-        H5Tset_size(tid_attr1, (size_t)STR_SIZE);
-        attr_data_ptr2=(char*)&data1_str;
+        tid_attr1 = H5Tcopy(H5T_C_S1);
+        H5Tset_size(tid_attr1, (size_t) STR_SIZE);
+        attr_data_ptr2 = (char*) &data1_str;
 
         /* dset1/attr2 */
-        attr2_dim_ptr=(hsize_t*)&dims1_2;
+        attr2_dim_ptr = (hsize_t*) &dims1_2;
 
         /* dset1/attr3 */
-        attr_data_ptr3=(int*)&data1_dim2;
-        attr3_dim_ptr=(hsize_t*)&dims2;
-        rank_attr=2;
+        attr_data_ptr3 = (int*) &data1_dim2;
+        attr3_dim_ptr = (hsize_t*) &dims2;
+        rank_attr = 2;
 
         /* dset1/attr4 */
-        attr_data_ptr4=(int*)&data2;
+        attr_data_ptr4 = (int*) &data2;
 
     }
 
-
-   /*-----------------------------------------------------------------------
+    /*-----------------------------------------------------------------------
     * Create file(s)
     *------------------------------------------------------------------------*/
-    fid = H5Fcreate (fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if (fid < 0)
-    {
+    fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid < 0) {
         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname);
         status = FAIL;
         goto out;
@@ -4963,16 +4695,14 @@ static void test_data_nocomparables (const char * fname, int make_diffs)
     * Groups
     *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
         status = FAIL;
         goto out;
@@ -4981,29 +4711,26 @@ static void test_data_nocomparables (const char * fname, int make_diffs)
     /*-----------------------------------------------------------------------
     * Datasets in /g1
     *------------------------------------------------------------------------*/
-    if((sid1 = H5Screate_simple(1, dims1_1, NULL)) < 0)
-         goto out;
+    if ((sid1 = H5Screate_simple(1, dims1_1, NULL)) < 0)
+        goto out;
 
     /*  dset1 */
-    if((did1 = H5Dcreate2(gid1, "dset1", tid_dset1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-    {
+    if ((did1 = H5Dcreate2(gid1, "dset1", tid_dset1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
 
-    if(H5Dwrite(did1, tid_dset1, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr1) < 0)
-    {
+    if (H5Dwrite(did1, tid_dset1, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr1) < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
-    write_attr(did1,1,dims1_1,"attr", H5T_NATIVE_INT, attr_data_ptr1);
+    write_attr(did1, 1, dims1_1, "attr", H5T_NATIVE_INT, attr_data_ptr1);
 
     /*  dset2 */
-    status = write_dset(gid1, 1, dims1_1,"dset2", H5T_NATIVE_INT, dset_data_ptr2);
-    if (status == FAIL)
-    {
+    status = write_dset(gid1, 1, dims1_1, "dset2", H5T_NATIVE_INT, dset_data_ptr2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname);
         goto out;
     }
@@ -5012,108 +4739,100 @@ static void test_data_nocomparables (const char * fname, int make_diffs)
     * Datasets in /g2
     *------------------------------------------------------------------------*/
     /* ---------
-     *  dset1 */
-    if((did2 = H5Dcreate2(gid2, "dset1", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-    {
+    *  dset1 */
+    if ((did2 = H5Dcreate2(gid2, "dset1", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
 
-    if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr3) < 0)
-    {
+    if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr3) < 0) {
         fprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
     /* attr1 - non-compatible : different type */
-    write_attr(did2,1,dims1_1,"attr1", tid_attr1, attr_data_ptr2);
-
+    write_attr(did2, 1, dims1_1, "attr1", tid_attr1, attr_data_ptr2);
 
     /* attr2 - non-compatible : same rank, different dimention */
-    write_attr(did2,1, attr2_dim_ptr,"attr2", H5T_NATIVE_INT, data3);
+    write_attr(did2, 1, (hsize_t *) attr2_dim_ptr, "attr2", H5T_NATIVE_INT, data3);
 
     /* attr3 - non-compatible : different rank */
-    write_attr(did2, rank_attr,attr3_dim_ptr,"attr3", H5T_NATIVE_INT, attr_data_ptr3);
+    write_attr(did2, rank_attr, (hsize_t *) attr3_dim_ptr, "attr3", H5T_NATIVE_INT, attr_data_ptr3);
 
     /* attr4 - compatible : different data values */
-    write_attr(did2,1,dims1_1,"attr4", H5T_NATIVE_INT, attr_data_ptr4);
+    write_attr(did2, 1, dims1_1, "attr4", H5T_NATIVE_INT, attr_data_ptr4);
 
     /*----------
-     * dset2 */
-    status = write_dset(gid2, 1, dims1_1,"dset2", H5T_NATIVE_INT, dset_data_ptr3);
-    if (status == FAIL)
-    {
+    * dset2 */
+    status = write_dset(gid2, 1, dims1_1, "dset2", H5T_NATIVE_INT, dset_data_ptr3);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname);
         goto out;
     }
 
-
-
 out:
 
     /*-----------------------------------------------------------------------
     * Close IDs
     *-----------------------------------------------------------------------*/
-    if(fid)
+    if (fid)
         H5Fclose(fid);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
-    if(did1)
+    if (did1)
         H5Dclose(did1);
-    if(did2)
+    if (did2)
         H5Dclose(did2);
-    if(sid1)
+    if (sid1)
         H5Sclose(sid1);
-    if(tid_dset1)
+    if (tid_dset1)
         H5Tclose(tid_dset1);
-    if(tid_attr1)
+    if (tid_attr1)
         H5Tclose(tid_attr1);
 }
 
 /*-------------------------------------------------------------------------
-* Function: test_objs_nocomparables
-*
-* Purpose:
-*   Create test files with common objects (same name) but different object
-*   types.
-*   h5diff should show non-comparable output from these common objects.
-*-------------------------------------------------------------------------*/
+ * Function: test_objs_nocomparables
+ *
+ * Purpose:
+ *   Create test files with common objects (same name) but different object
+ *   types.
+ *   h5diff should show non-comparable output from these common objects.
+ *-------------------------------------------------------------------------*/
 static void test_objs_nocomparables(const char *fname1, const char *fname2)
 {
-    herr_t  status = SUCCEED;
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   topgid1=0;
-    hid_t   topgid2=0;
-    hid_t   gid1=0;
-    hid_t   did1=0;
-    hid_t   tid1=0;
-    hid_t   gid2=0;
-    hid_t   did2=0;
-    hid_t   tid2=0;
-    hsize_t dims[1] = {DIM_ARRY};
-    int data1[DIM_ARRY] = {1,1,1};
-    int data2[DIM_ARRY] = {2,2,2};
-
-   /*-----------------------------------------------------------------------
+    herr_t status = SUCCEED;
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t topgid1 = -1;
+    hid_t topgid2 = -1;
+    hid_t gid1 = -1;
+    hid_t did1 = -1;
+    hid_t tid1 = -1;
+    hid_t gid2 = -1;
+    hid_t did2 = -1;
+    hid_t tid2 = -1;
+    hsize_t dims[1] = { DIM_ARRY };
+    int data1[DIM_ARRY] = { 1, 1, 1 };
+    int data2[DIM_ARRY] = { 2, 2, 2 };
+
+    /*-----------------------------------------------------------------------
     * Open file(s) to add objects
     *------------------------------------------------------------------------*/
     /* file1 */
-    fid1 = H5Fopen (fname1, H5F_ACC_RDWR, H5P_DEFAULT);
-    if (fid1 < 0)
-    {
+    fid1 = H5Fopen(fname1, H5F_ACC_RDWR, H5P_DEFAULT);
+    if (fid1 < 0) {
         fprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* file2 */
-    fid2 = H5Fopen (fname2, H5F_ACC_RDWR, H5P_DEFAULT);
-    if (fid2 < 0)
-    {
+    fid2 = H5Fopen(fname2, H5F_ACC_RDWR, H5P_DEFAULT);
+    if (fid2 < 0) {
         fprintf(stderr, "Error: %s> H5Fopen failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -5124,25 +4843,22 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* parent group */
     topgid1 = H5Gcreate2(fid1, "diffobjtypes", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (topgid1 < 0)
-    {
+    if (topgid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     /* dataset */
-    status = write_dset(topgid1, 1, dims,"obj1", H5T_NATIVE_INT, data1);
-    if (status == FAIL)
-    {
+    status = write_dset(topgid1, 1, dims, "obj1", H5T_NATIVE_INT, data1);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         goto out;
     }
 
     /* group */
     gid1 = H5Gcreate2(topgid1, "obj2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid1 < 0)
-    {
+    if (gid1 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
@@ -5151,8 +4867,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     /* committed type */
     tid1 = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(topgid1, "obj3", tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1);
         goto out;
     }
@@ -5162,8 +4877,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     *------------------------------------------------------------------------*/
     /* parent group */
     topgid2 = H5Gcreate2(fid2, "diffobjtypes", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (topgid2 < 0)
-    {
+    if (topgid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -5171,8 +4885,7 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
 
     /* group */
     gid2 = H5Gcreate2(topgid2, "obj1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (gid2 < 0)
-    {
+    if (gid2 < 0) {
         fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
@@ -5181,16 +4894,14 @@ static void test_objs_nocomparables(const char *fname1, const char *fname2)
     /* committed type */
     tid2 = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(topgid2, "obj2", tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (status < 0)
-    {
+    if (status < 0) {
         fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2);
         goto out;
     }
 
     /* dataset */
-    status = write_dset(topgid2, 1, dims,"obj3", H5T_NATIVE_INT, data2);
-    if (status == FAIL)
-    {
+    status = write_dset(topgid2, 1, dims, "obj3", H5T_NATIVE_INT, data2);
+    if (status == FAIL) {
         fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         goto out;
     }
@@ -5199,116 +4910,109 @@ out:
     /*-----------------------------------------------------------------------
     * Close IDs
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
-    if(topgid1)
+    if (topgid1)
         H5Gclose(topgid1);
-    if(topgid2)
+    if (topgid2)
         H5Gclose(topgid2);
-    if(did1)
+    if (did1)
         H5Dclose(did1);
-    if(did2)
+    if (did2)
         H5Dclose(did2);
-    if(gid1)
+    if (gid1)
         H5Gclose(gid1);
-    if(gid2)
+    if (gid2)
         H5Gclose(gid2);
-    if(tid1)
+    if (tid1)
         H5Tclose(tid1);
-    if(tid2)
+    if (tid2)
         H5Tclose(tid2);
 
 }
 
-static hid_t mkstr(int size, H5T_str_t pad) {
+static hid_t mkstr(int size, H5T_str_t pad)
+{
     hid_t type;
 
-    if((type=H5Tcopy(H5T_C_S1)) < 0) return -1;
-    if(H5Tset_size(type, (size_t)size) < 0) return -1;
-    if(H5Tset_strpad(type, pad) < 0) return -1;
+    if ((type = H5Tcopy(H5T_C_S1)) < 0)
+        return -1;
+    if (H5Tset_size(type, (size_t) size) < 0)
+        return -1;
+    if (H5Tset_strpad(type, pad) < 0)
+        return -1;
 
     return type;
 }
 
 /*-------------------------------------------------------------------------
-* Function: test_objs_strings
-*
-* Purpose:
-*   Create test files with common objects (same name) but different string
-*   types.
-*   h5diff should show differences output from these common objects.
-*-------------------------------------------------------------------------*/
+ * Function: test_objs_strings
+ *
+ * Purpose:
+ *   Create test files with common objects (same name) but different string
+ *   types.
+ *   h5diff should show differences output from these common objects.
+ *-------------------------------------------------------------------------*/
 static void test_objs_strings(const char *fname1, const char *fname2)
 {
-    herr_t  status = SUCCEED;
-    hid_t   fid1=0;
-    hid_t   fid2=0;
-    hid_t   dataset=0;
-    hid_t   space=0;
-    hid_t   f_type=0;
-    hid_t   m_type=0;
-    hsize_t dims1[] = {3, 4};
-    char string1A[12][3] = {"s1","s2","s3","s4","s5","s6","s","s","s9",
-            "s0","s1","s2"};
-    char string1B[12][3] = {"s1","s2","s3","s4","s","s","s7","s8","s9",
-            "s0","s1","s2"};
-
-    hsize_t dims2[]={20};
-    char string2A[20][10] = {"ab cd ef1", "ab cd ef2", "ab cd ef3", "ab cd ef4",
-            "ab cd ef5", "ab cd ef6", "ab cd ef7", "ab cd ef8",
-            "ab cd 9", "ab cd 0", "ab cd 1", "ab cd 2",
-            "ab cd ef3", "ab cd ef4", "ab cd ef5", "ab cd ef6",
-            "ab cd ef7", "ab cd ef8", "ab cd ef9", "ab cd ef0"};
-    char string2B[20][10] = {"ab cd ef1", "ab cd ef2", "ab cd ef3", "ab cd ef4",
-            "ab cd ef5", "ab cd ef6", "ab cd ef7", "ab cd ef8",
-            "ab cd ef9", "ab cd ef0", "ab cd ef1", "ab cd ef2",
-            "ab cd 3", "ab cd 4", "ab cd 5", "ab cd 6",
-            "ab cd ef7", "ab cd ef8", "ab cd ef9", "ab cd ef0"};
-
-    hsize_t dims3[] = {27};
-    char string3A[27][6] = {"abcd0", "abcd1", "abcd2", "abcd3",
-            "abcd4", "abcd5", "abcd6", "abcd7",
-            "abcd8", "abcd9", "abcd0", "abcd1",
-            "abd2", "abc3", "bcd4", "acd5",
-            "abcd6", "abcd7", "abcd8", "abcd9",
-            "abcd0", "abcd1", "abcd2", "abcd3",
-            "abc4", "abc5", "abc6"};
-    char string3B[27][6] = {"abcd0", "abcd1", "abcd2", "abcd3",
-            "abcd4", "abcd5", "abcd6", "abcd7",
-            "abcd8", "abcd9", "abcd0", "abcd1",
-            "abcd2", "abcd3", "abcd4", "abcd5",
-            "abd6", "abc7", "bcd8", "acd9",
-            "abcd0", "abcd1", "abcd2", "abcd3",
-            "abd4", "abd5", "abd6"};
-
-    hsize_t dims4[] = {3};
+    hid_t fid1 = -1;
+    hid_t fid2 = -1;
+    hid_t dataset = -1;
+    hid_t space = -1;
+    hid_t f_type = -1;
+    hid_t m_type = -1;
+    hsize_t dims1[] = { 3, 4 };
+    char string1A[12][3] = { "s1", "s2", "s3", "s4", "s5", "s6", "s", "s", "s9",
+            "s0", "s1", "s2" };
+    char string1B[12][3] = { "s1", "s2", "s3", "s4", "s", "s", "s7", "s8", "s9",
+            "s0", "s1", "s2" };
+
+    hsize_t dims2[] = { 20 };
+    char string2A[20][10] = { "ab cd ef1", "ab cd ef2", "ab cd ef3",
+            "ab cd ef4", "ab cd ef5", "ab cd ef6", "ab cd ef7", "ab cd ef8",
+            "ab cd 9", "ab cd 0", "ab cd 1", "ab cd 2", "ab cd ef3",
+            "ab cd ef4", "ab cd ef5", "ab cd ef6", "ab cd ef7", "ab cd ef8",
+            "ab cd ef9", "ab cd ef0" };
+    char string2B[20][10] = { "ab cd ef1", "ab cd ef2", "ab cd ef3",
+            "ab cd ef4", "ab cd ef5", "ab cd ef6", "ab cd ef7", "ab cd ef8",
+            "ab cd ef9", "ab cd ef0", "ab cd ef1", "ab cd ef2", "ab cd 3",
+            "ab cd 4", "ab cd 5", "ab cd 6", "ab cd ef7", "ab cd ef8",
+            "ab cd ef9", "ab cd ef0" };
+
+    hsize_t dims3[] = { 27 };
+    char string3A[27][6] = { "abcd0", "abcd1", "abcd2", "abcd3", "abcd4",
+            "abcd5", "abcd6", "abcd7", "abcd8", "abcd9", "abcd0", "abcd1",
+            "abd2", "abc3", "bcd4", "acd5", "abcd6", "abcd7", "abcd8", "abcd9",
+            "abcd0", "abcd1", "abcd2", "abcd3", "abc4", "abc5", "abc6" };
+    char string3B[27][6] = { "abcd0", "abcd1", "abcd2", "abcd3", "abcd4",
+            "abcd5", "abcd6", "abcd7", "abcd8", "abcd9", "abcd0", "abcd1",
+            "abcd2", "abcd3", "abcd4", "abcd5", "abd6", "abc7", "bcd8", "acd9",
+            "abcd0", "abcd1", "abcd2", "abcd3", "abd4", "abd5", "abd6" };
+
+    hsize_t dims4[] = { 3 };
     char string4A[3][21] = { "s1234567890123456789", "s1234567890123456789",
-            "s12345678901234567"};
+            "s12345678901234567" };
     char string4B[3][21] = { "s1234567890123456789", "s12345678901234567",
-            "s1234567890123456789"};
+            "s1234567890123456789" };
 
     /*-----------------------------------------------------------------------
-     * Create file(s)
-     *------------------------------------------------------------------------*/
-     /* file1 */
-     fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-     if (fid1 < 0)
-     {
-         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
-         status = FAIL;
-         goto out;
-     }
-
-     /* file2 */
-     fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-     if (fid2 < 0)
-     {
-         fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
-         status = FAIL;
-         goto out;
-     }
+    * Create file(s)
+    *------------------------------------------------------------------------*/
+    /* file1 */
+    fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid1 < 0) {
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        goto out;
+    }
+
+    /* file2 */
+    fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    if (fid2 < 0) {
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        goto out;
+    }
 
     /* string 1 : nullterm string */
     space = H5Screate_simple(2, dims1, NULL);
@@ -5398,88 +5102,82 @@ out:
     /*-----------------------------------------------------------------------
     * Close IDs
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if (fid1)
         H5Fclose(fid1);
-    if(fid2)
+    if (fid2)
         H5Fclose(fid2);
 }
 
 /*-------------------------------------------------------------------------
-* Function: write_attr_in
-*
-* Purpose: write attributes in LOC_ID (dataset, group, named datatype)
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: write_attr_strings
+ *
+ * Purpose: write attributes in LOC_ID (dataset, group, named datatype)
+ *          swap VL strings
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-void write_attr_in(hid_t loc_id,
-                   const char* dset_name, /* for saving reference to dataset*/
-                   hid_t fid,
-                   int make_diffs /* flag to modify data buffers */)
+void write_attr_strings(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs /* flag to modify data buffers */)
 {
     /* Compound datatype */
-    typedef struct s_t
-    {
-        char   a;
+    typedef struct s_t {
+        char a;
         double b;
     } s_t;
 
-    typedef enum
-    {
-        RED,
-        GREEN
+    typedef enum {
+        RED, GREEN
     } e_t;
 
-    hid_t   aid;
-    hid_t   sid;
-    hid_t   tid;
-    herr_t  status;
-    int     val, i, j, k, l, n;
-    float   f;
+    hid_t aid = -1;
+    hid_t sid = -1;
+    hid_t tid = -1;
+    herr_t status;
+    int val, i, j, k, l, n;
+    float f;
 
     /* create 1D attributes with dimension [2], 2 elements */
-    hsize_t    dims[1]={2};
-    char       buf1[2][STR_SIZE]= {"ab","de"};        /* string */
-    char       *buf1a[2];                             /* VL string */
-    char       buf2[2]= {1,2};                 /* bitfield, opaque */
-    s_t        buf3[2]= {{1,2.0F},{3,4.0F}};         /* compound */
-    hobj_ref_t buf4[2];                        /* reference */
-    e_t        buf45[2]= {RED,RED};            /* enum */
-    hvl_t      buf5[2];                        /* vlen */
-    hsize_t    dimarray[1]={3};                /* array dimension */
-    int        buf6[2][3]= {{1,2,3},{4,5,6}};  /* array */
-    int        buf7[2]= {1,2};                 /* integer */
-    float      buf8[2]= {1.0F, 2.0F};                 /* float */
+    hsize_t    dims[1] = { 2 };
+    char       buf1[2][STR_SIZE] = { "ab", "de" }; /* string */
+    char      *buf1a[2]; /* VL string */
+    char       buf2[2] = { 1, 2 }; /* bitfield, opaque */
+    s_t        buf3[2] = { { 1, 2.0F }, { 3, 4.0F } }; /* compound */
+    hobj_ref_t buf4[2]; /* reference */
+    e_t        buf45[2] = { RED, RED }; /* enum */
+    hvl_t      buf5[2]; /* vlen */
+    hsize_t    dimarray[1] = { 3 }; /* array dimension */
+    int        buf6[2][3] = { { 1, 2, 3 }, { 4, 5, 6 } }; /* array */
+    int        buf7[2] = { 1, 2 }; /* integer */
+    float      buf8[2] = { 1.0F, 2.0F }; /* float */
 
     /* create 2D attributes with dimension [3][2], 6 elements */
-    hsize_t    dims2[2]={3,2};
-    char       buf12[3][2][STR_SIZE]= {{"ab","cd"},{"ef","gh"},{"ij","kl"}};            /* string */
-    char       *buf12a[3][2];                                                           /* VL string */
-    char       buf22[3][2]= {{1,2},{3,4},{5,6}};                                        /* bitfield, opaque */
-    s_t        buf32[6]= {{1,2.0F},{3,4.0F},{5,6.0F},{7,8.0F},{9,10.0F},{11,12.0F}};    /* compound */
-    hobj_ref_t buf42[3][2];                                                             /* reference */
-    e_t        buf452[3][2];                                                            /* enum */
-    hvl_t      buf52[3][2];                                                             /* vlen */
-    int        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}}; /* array */
-    int        buf72[3][2]= {{1,2},{3,4},{5,6}};                                        /* integer */
-    float      buf82[3][2]= {{1.0F,2.0F},{3.0F,4.0F},{5.0F,6.0F}};                      /* float */
+    hsize_t    dims2[2] = { 3, 2 };
+    char       buf12[3][2][STR_SIZE] = { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } }; /* string */
+    char      *buf12a[3][2]; /* VL string */
+    char       buf22[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* bitfield, opaque */
+    s_t        buf32[6] = { { 1, 2.0F }, { 3, 4.0F }, { 5, 6.0F }, { 7, 8.0F }, { 9, 10.0F }, { 11, 12.0F } }; /* compound */
+    hobj_ref_t buf42[3][2]; /* reference */
+    e_t        buf452[3][2]; /* enum */
+    hvl_t      buf52[3][2]; /* vlen */
+    int        buf62[6][3] = { { 1, 2, 3 }, { 4, 5, 6 }, { 7, 8, 9 }, { 10, 11, 12 }, { 13, 14, 15 }, { 16, 17, 18 } }; /* array */
+    int        buf72[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* integer */
+    float      buf82[3][2] = { { 1.0F, 2.0F }, { 3.0F, 4.0F }, { 5.0F, 6.0F } }; /* float */
 
     /* create 3D attributes with dimension [4][3][2], 24 elements */
-    hsize_t    dims3[3]={4,3,2};
-    char       buf13[4][3][2][STR_SIZE]= {{{"ab","cd"},{"ef","gh"},{"ij","kl"}},
-    {{"mn","pq"},{"rs","tu"},{"vw","xz"}},
-    {{"AB","CD"},{"EF","GH"},{"IJ","KL"}},
-    {{"MN","PQ"},{"RS","TU"},{"VW","XZ"}}};  /* string */
-    char       *buf13a[4][3][2];   /* VL string */
-    char       buf23[4][3][2];    /* bitfield, opaque */
-    s_t        buf33[4][3][2];    /* compound */
-    hobj_ref_t buf43[4][3][2];    /* reference */
-    e_t        buf453[4][3][2];   /* enum */
-    hvl_t      buf53[4][3][2];    /* vlen */
-    int        buf63[24][3];      /* array */
-    int        buf73[4][3][2];    /* integer */
-    float      buf83[4][3][2];    /* float */
-
+    hsize_t dims3[3] = { 4, 3, 2 };
+    char buf13[4][3][2][STR_SIZE] = { { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } },
+                                    { { "mn", "pq" }, { "rs", "tu" }, { "vw", "xz" } },
+                                    { { "AB", "CD" }, { "EF", "GH" }, { "IJ", "KL" } },
+                                    { { "MN", "PQ" }, { "RS", "TU" }, { "VW", "XZ" } } }; /* string */
+    char      *buf13a[4][3][2]; /* VL string */
+    char       buf23[4][3][2]; /* bitfield, opaque */
+    s_t        buf33[4][3][2]; /* compound */
+    hobj_ref_t buf43[4][3][2]; /* reference */
+    e_t        buf453[4][3][2]; /* enum */
+    hvl_t      buf53[4][3][2]; /* vlen */
+    int        buf63[24][3]; /* array */
+    int        buf73[4][3][2]; /* integer */
+    float      buf83[4][3][2]; /* float */
 
     /*-------------------------------------------------------------------------
     * 1D attributes
@@ -5492,15 +5190,10 @@ void write_attr_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            for (j=0; j<2; j++)
-            {
-                buf1[i][j]='z';
-            }
-        }
-    }
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 2; j++)
+                buf1[i][j] = 'z';
+
     /*
     buf1[2][2]= {"ab","de"};
     $h5diff file7.h5 file6.h5 g1 g1 -v
@@ -5513,16 +5206,17 @@ void write_attr_in(hid_t loc_id,
     [ 1 ]          d                z
     [ 1 ]          e                z
     */
+    for (i = 0; i < 2; i++)
+        buf1a[i] = buf1[i];
+
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, (size_t)STR_SIZE);
-    write_attr(loc_id,1,dims,"string",tid,buf1);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 1, dims, "string", tid, buf1a);
     status = H5Tclose(tid);
 
-    for (i=0; i<2; i++)
-        buf1a[i]=buf1[i];
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_attr(loc_id,1,dims,"VLstring",tid,buf1a);
+    status = H5Tset_size(tid, (size_t)STR_SIZE);
+    write_attr(loc_id, 1, dims, "VLstring", tid, buf1);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5531,10 +5225,8 @@ void write_attr_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            buf2[i]=buf2[1]=0;
-    }
+        for (i = 0; i < 2; i++)
+            buf2[i] = buf2[1] = 0;
     /*
     buf2[2]= {1,2};
     $h5diff file7.h5 file6.h5 g1 g1 -v
@@ -5548,7 +5240,7 @@ void write_attr_in(hid_t loc_id,
     */
 
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_attr(loc_id,1,dims,"bitfield",tid,buf2);
+    write_attr(loc_id, 1, dims, "bitfield", tid, buf2);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5568,9 +5260,9 @@ void write_attr_in(hid_t loc_id,
     [ 1 ]          2               0               2
     */
 
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_attr(loc_id,1,dims,"opaque",tid,buf2);
+    write_attr(loc_id, 1, dims, "opaque", tid, buf2);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5579,12 +5271,10 @@ void write_attr_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf3[i].a=0; buf3[i].b=0;
+        for (i = 0; i < 2; i++) {
+            buf3[i].a = 0;
+            buf3[i].b = 0;
         }
-    }
 
     /*
     buf3[2]= {{1,2},{3,4}};
@@ -5599,10 +5289,10 @@ void write_attr_in(hid_t loc_id,
     [ 1 ]          4               5               1
     */
 
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_attr(loc_id,1,dims,"compound",tid,buf3);
+    write_attr(loc_id, 1, dims, "compound", tid, buf3);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5610,70 +5300,64 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        status=H5Rcreate(&buf4[0],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-        status=H5Rcreate(&buf4[1],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-        write_attr(loc_id,1,dims,"reference",H5T_STD_REF_OBJ,buf4);
+    if (dset_name) {
+        status = H5Rcreate(&buf4[0], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        status = H5Rcreate(&buf4[1], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_attr(loc_id, 1, dims, "reference", H5T_STD_REF_OBJ, buf4);
     }
 
     /*-------------------------------------------------------------------------
-    * H5T_ENUM
-    *-------------------------------------------------------------------------
-    */
+     * H5T_ENUM
+     *-------------------------------------------------------------------------
+     */
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf45[i]=GREEN;
-        }
-    }
+        for (i = 0; i < 2; i++)
+            buf45[i] = GREEN;
     /*
-    buf45[2]= {RED,RED};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Group:       </g1> and </g1>
-    Attribute:   <enum> and <enum>
-    position     enum of </g1>   enum of </g1>   difference
-    ------------------------------------------------------------
-    [ 0 ]          RED              GREEN
-    [ 1 ]          RED              GREEN
-    */
+        buf45[2]= {RED,RED};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <enum> and <enum>
+        position     enum of </g1>   enum of </g1>   difference
+        ------------------------------------------------------------
+        [ 0 ]          RED              GREEN
+        [ 1 ]          RED              GREEN
+     */
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_attr(loc_id,1,dims,"enum",tid,buf45);
+    write_attr(loc_id, 1, dims, "enum", tid, buf45);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
-    * H5T_VLEN
-    *-------------------------------------------------------------------------
-    */
+     * H5T_VLEN
+     *-------------------------------------------------------------------------
+     */
 
     /* Allocate and initialize VL dataset to write */
 
     buf5[0].len = 1;
-    buf5[0].p = HDmalloc( 1 * sizeof(int));
-    ((int *)buf5[0].p)[0]=1;
+    buf5[0].p = HDmalloc(1 * sizeof(int));
+    ((int *) buf5[0].p)[0] = 1;
     buf5[1].len = 2;
-    buf5[1].p = HDmalloc( 2 * sizeof(int));
-    ((int *)buf5[1].p)[0]=2;
-    ((int *)buf5[1].p)[1]=3;
+    buf5[1].p = HDmalloc(2 * sizeof(int));
+    ((int *) buf5[1].p)[0] = 2;
+    ((int *) buf5[1].p)[1] = 3;
 
-    if (make_diffs)
-    {
-        ((int *)buf5[0].p)[0]=0;
-        ((int *)buf5[1].p)[0]=0;
-        ((int *)buf5[1].p)[1]=0;
+    if (make_diffs) {
+        ((int *) buf5[0].p)[0] = 0;
+        ((int *) buf5[1].p)[0] = 0;
+        ((int *) buf5[1].p)[1] = 0;
     }
     /*
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Group:       </g1> and </g1>
-    position        vlen of </g1>   vlen of </g1>   difference
-    ------------------------------------------------------------
-    [ 0 ]          1               0               1
-    [ 1 ]          2               0               2
-    [ 1 ]          3               0               3
-    */
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        position        vlen of </g1>   vlen of </g1>   difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+        [ 1 ]          3               0               3
+     */
 
     sid = H5Screate_simple(1, dims, NULL);
     tid = H5Tvlen_create(H5T_NATIVE_INT);
@@ -5687,66 +5371,1048 @@ void write_attr_in(hid_t loc_id,
     status = H5Sclose(sid);
 
     /*-------------------------------------------------------------------------
-    * H5T_ARRAY
-    *-------------------------------------------------------------------------
-    */
+     * H5T_ARRAY
+     *-------------------------------------------------------------------------
+     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            for (j=0; j<3; j++)
-            {
-                buf6[i][j]=0;
-            }
-    }
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 3; j++)
+                buf6[i][j] = 0;
     /*
-    buf6[2][3]= {{1,2,3},{4,5,6}};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Group:       </g1> and </g1>
-    Attribute:   <array> and <array>
-    position        array of </g1>  array of </g1>  difference
-    ------------------------------------------------------------
-    [ 0 ]          1               0               1
-    [ 0 ]          2               0               2
-    [ 0 ]          3               0               3
-    [ 1 ]          4               0               4
-    [ 1 ]          5               0               5
-    [ 1 ]          6               0               6
-    */
+        buf6[2][3]= {{1,2,3},{4,5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <array> and <array>
+        position        array of </g1>  array of </g1>  difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 0 ]          2               0               2
+        [ 0 ]          3               0               3
+        [ 1 ]          4               0               4
+        [ 1 ]          5               0               5
+        [ 1 ]          6               0               6
+     */
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
     write_attr(loc_id, 1, dims, "array", tid, buf6);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
-    * H5T_INTEGER and H5T_FLOAT
+     * H5T_INTEGER and H5T_FLOAT
+     *-------------------------------------------------------------------------
+     */
+
+    if (make_diffs)
+        for (i = 0; i < 2; i++) {
+            buf7[i] = 0;
+            buf8[i] = 0;
+        }
+    /*
+        buf7[2]= {1,2};
+        buf8[2]= {1,2};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        position        integer of </g1> integer of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+        position        float of </g1>  float of </g1>  difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+     */
+    write_attr(loc_id, 1, dims, "integer", H5T_NATIVE_INT, buf7);
+    write_attr(loc_id, 1, dims, "float", H5T_NATIVE_FLOAT, buf8);
+
+    /*-------------------------------------------------------------------------
+     * 2D attributes
+     *-------------------------------------------------------------------------
+     */
+
+    /*-------------------------------------------------------------------------
+     * H5T_STRING
+     *-------------------------------------------------------------------------
+     */
+    if (make_diffs)
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                for (k = 0; k < 2; k++)
+                    buf12[i][j][k] = 'z';
+
+    /*
+        buf12[6][2]= {"ab","cd","ef","gh","ij","kl"};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <string2D> and <string2D>
+        position        string2D of </g1> string2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          a                z
+        [ 0 0 ]          b                z
+        [ 0 1 ]          c                z
+        [ 0 1 ]          d                z
+        [ 1 0 ]          e                z
+        [ 1 0 ]          f                z
+        [ 1 1 ]          g                z
+        [ 1 1 ]          h                z
+        [ 2 0 ]          i                z
+        [ 2 0 ]          j                z
+        [ 2 1 ]          k                z
+        [ 2 1 ]          l                z
+     */
+
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++)
+            buf12a[i][j] = buf12[i][j];
+
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 2, dims2, "string2D", tid, buf12a);
+    status = H5Tclose(tid);
+
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_attr(loc_id, 2, dims2, "VLstring2D", tid, buf12);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_BITFIELD
+     *-------------------------------------------------------------------------
+     */
+
+    if (make_diffs)
+        memset(buf22, 0, sizeof buf22);
+    /*
+        buf22[3][2]= {{1,2},{3,4},{5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <bitfield2D> and <bitfield2D>
+        position        bitfield2D of </g1> bitfield2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+     */
+
+    tid = H5Tcopy(H5T_STD_B8LE);
+    write_attr(loc_id, 2, dims2, "bitfield2D", tid, buf22);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_OPAQUE
+     *-------------------------------------------------------------------------
+     */
+
+    /*
+        buf22[3][2]= {{1,2},{3,4},{5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <opaque2D> and <opaque2D>
+        position        opaque2D of </g1> opaque2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+     */
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
+    status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
+    write_attr(loc_id, 2, dims2, "opaque2D", tid, buf22);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_COMPOUND
+     *-------------------------------------------------------------------------
+     */
+    if (make_diffs)
+        memset(buf32, 0, sizeof buf32);
+
+    /*
+        buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <opaque2D> and <opaque2D>
+        position        opaque2D of </g1> opaque2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+     */
+
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
+    H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+    H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+    write_attr(loc_id, 2, dims2, "compound2D", tid, buf32);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_REFERENCE (H5R_OBJECT object reference)
+     *-------------------------------------------------------------------------
+     */
+    /* Create references to dataset */
+    if (dset_name) {
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                status = H5Rcreate(&buf42[i][j], fid, dset_name, H5R_OBJECT,
+                        (hid_t) -1);
+        write_attr(loc_id, 2, dims2, "reference2D", H5T_STD_REF_OBJ, buf42);
+    }
+
+    /*-------------------------------------------------------------------------
+     * H5T_ENUM
+     *-------------------------------------------------------------------------
+     */
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++)
+            if (make_diffs)
+                buf452[i][j] = GREEN;
+            else
+                buf452[i][j] = RED;
+
+    /*
+        Attribute:   <enum2D> and <enum2D>
+        position        enum2D of </g1> enum2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          RED              GREEN
+        [ 0 1 ]          RED              GREEN
+        [ 1 0 ]          RED              GREEN
+        [ 1 1 ]          RED              GREEN
+        [ 2 0 ]          RED              GREEN
+        [ 2 1 ]          RED              GREEN
+     */
+
+    tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
+    H5Tenum_insert(tid, "GREEN", (val = 1, &val));
+    write_attr(loc_id, 2, dims2, "enum2D", tid, buf452);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_VLEN
+     *-------------------------------------------------------------------------
+     */
+
+    /* Allocate and initialize VL dataset to write */
+    n = 0;
+    for (i = 0; i < 3; i++) {
+        for (j = 0; j < 2; j++) {
+            buf52[i][j].p = HDmalloc((size_t)(i + 1) * sizeof(int));
+            buf52[i][j].len = (size_t)(i + 1);
+            for (l = 0; l < i + 1; l++)
+                if (make_diffs)
+                    ((int *) buf52[i][j].p)[l] = 0;
+                else
+                    ((int *) buf52[i][j].p)[l] = n++;
+        }
+    }
+
+    /*
+        position        vlen2D of </g1> vlen2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 1 ]          1               0               1
+        [ 1 0 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 1 1 ]          5               0               5
+        [ 2 0 ]          6               0               6
+        [ 2 0 ]          7               0               7
+        [ 2 0 ]          8               0               8
+        [ 2 1 ]          9               0               9
+        [ 2 1 ]          10              0               10
+        [ 2 1 ]          11              0               11
+     */
+
+    sid = H5Screate_simple(2, dims2, NULL);
+    tid = H5Tvlen_create(H5T_NATIVE_INT);
+    aid = H5Acreate2(loc_id, "vlen2D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Awrite(aid, tid, buf52);
+    assert(status >= 0);
+    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf52);
+    assert(status >= 0);
+    status = H5Aclose(aid);
+    status = H5Tclose(tid);
+    status = H5Sclose(sid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_ARRAY
+     *-------------------------------------------------------------------------
+     */
+
+    if (make_diffs)
+        memset(buf62, 0, sizeof buf62);
+    /*
+        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <array2D> and <array2D>
+        position        array2D of </g1> array2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 0 ]          2               0               2
+        [ 0 0 ]          3               0               3
+        [ 0 1 ]          4               0               4
+        [ 0 1 ]          5               0               5
+        [ 0 1 ]          6               0               6
+        [ 1 0 ]          7               0               7
+        [ 1 0 ]          8               0               8
+        [ 1 0 ]          9               0               9
+        [ 1 1 ]          10              0               10
+        [ 1 1 ]          11              0               11
+        [ 1 1 ]          12              0               12
+        [ 2 0 ]          13              0               13
+        [ 2 0 ]          14              0               14
+        [ 2 0 ]          15              0               15
+        [ 2 1 ]          16              0               16
+        [ 2 1 ]          17              0               17
+        [ 2 1 ]          18              0               18
+     */
+    tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
+    write_attr(loc_id, 2, dims2, "array2D", tid, buf62);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_INTEGER and H5T_FLOAT
+     *-------------------------------------------------------------------------
+     */
+
+    if (make_diffs) {
+        memset(buf72, 0, sizeof buf72);
+        memset(buf82, 0, sizeof buf82);
+    }
+    /*
+        Attribute:   <integer2D> and <integer2D>
+        position        integer2D of </g1> integer2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+        6 differences found
+        Attribute:   <float2D> and <float2D>
+        position        float2D of </g1> float2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+     */
+
+    write_attr(loc_id, 2, dims2, "integer2D", H5T_NATIVE_INT, buf72);
+    write_attr(loc_id, 2, dims2, "float2D", H5T_NATIVE_FLOAT, buf82);
+
+    /*-------------------------------------------------------------------------
+     * 3D attributes
+     *-------------------------------------------------------------------------
+     */
+
+    /*-------------------------------------------------------------------------
+     * H5T_STRING
+     *-------------------------------------------------------------------------
+     */
+
+    if (make_diffs)
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
+                for (k = 0; k < 2; k++)
+                    for (l = 0; l < 2; l++)
+                        buf13[i][j][k][l] = 'z';
+
+    /*
+        buf13[24][2]= {"ab","cd","ef","gh","ij","kl","mn","pq",
+        "rs","tu","vw","xz","AB","CD","EF","GH",
+        "IJ","KL","MN","PQ","RS","TU","VW","XZ"};
+
+        Attribute:   <string3D> and <string3D>
+        position        string3D of </g1> string3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          a                z
+        [ 0 0 0 ]          b                z
+        [ 0 0 1 ]          c                z
+        [ 0 0 1 ]          d                z
+        [ 0 1 0 ]          e                z
+        [ 0 1 0 ]          f                z
+        [ 0 1 1 ]          g                z
+        [ 0 1 1 ]          h                z
+        [ 0 2 0 ]          i                z
+        [ 0 2 0 ]          j                z
+        [ 0 2 1 ]          k                z
+        [ 0 2 1 ]          l                z
+        [ 1 0 0 ]          m                z
+        [ 1 0 0 ]          n                z
+        [ 1 0 1 ]          p                z
+        [ 1 0 1 ]          q                z
+        [ 1 1 0 ]          r                z
+        [ 1 1 0 ]          s                z
+        [ 1 1 1 ]          t                z
+        [ 1 1 1 ]          u                z
+        [ 1 2 0 ]          v                z
+        [ 1 2 0 ]          w                z
+        [ 1 2 1 ]          x                z
+        [ 2 0 0 ]          A                z
+        [ 2 0 0 ]          B                z
+        [ 2 0 1 ]          C                z
+        [ 2 0 1 ]          D                z
+        [ 2 1 0 ]          E                z
+        [ 2 1 0 ]          F                z
+        [ 2 1 1 ]          G                z
+        [ 2 1 1 ]          H                z
+        [ 2 2 0 ]          I                z
+        [ 2 2 0 ]          J                z
+        [ 2 2 1 ]          K                z
+        [ 2 2 1 ]          L                z
+        [ 3 0 0 ]          M                z
+        [ 3 0 0 ]          N                z
+        [ 3 0 1 ]          P                z
+        [ 3 0 1 ]          Q                z
+        [ 3 1 0 ]          R                z
+        [ 3 1 0 ]          S                z
+        [ 3 1 1 ]          T                z
+        [ 3 1 1 ]          U                z
+        [ 3 2 0 ]          V                z
+        [ 3 2 0 ]          W                z
+        [ 3 2 1 ]          X                z
+        [ 3 2 1 ]          Z                z
+     */
+
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                buf13a[i][j][k] = buf13[i][j][k];
+
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 3, dims3, "string3D", tid, buf13a);
+    status = H5Tclose(tid);
+
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_attr(loc_id, 3, dims3, "VLstring3D", tid, buf13);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_BITFIELD
+     *-------------------------------------------------------------------------
+     */
+
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                if (make_diffs)
+                    buf23[i][j][k] = 0;
+                else
+                    buf23[i][j][k] = (char) n++;
+
+    /*
+        position        bitfield3D of </g1> bitfield3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 1 ]          2               0               2
+        [ 0 1 0 ]          3               0               3
+        [ 0 1 1 ]          4               0               4
+        [ 0 2 0 ]          5               0               5
+        [ 0 2 1 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 1 0 ]          9               0               9
+        [ 1 1 1 ]          10              0               10
+        [ 1 2 0 ]          11              0               11
+        [ 1 2 1 ]          12              0               12
+        [ 2 0 0 ]          13              0               13
+        [ 2 0 1 ]          14              0               14
+        [ 2 1 0 ]          15              0               15
+        [ 2 1 1 ]          16              0               16
+        [ 2 2 0 ]          17              0               17
+        [ 2 2 1 ]          18              0               18
+        [ 3 0 0 ]          19              0               19
+        [ 3 0 1 ]          20              0               20
+        [ 3 1 0 ]          21              0               21
+        [ 3 1 1 ]          22              0               22
+        [ 3 2 0 ]          23              0               23
+        [ 3 2 1 ]          24              0               24
+     */
+
+    tid = H5Tcopy(H5T_STD_B8LE);
+    write_attr(loc_id, 3, dims3, "bitfield3D", tid, buf23);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_OPAQUE
+     *-------------------------------------------------------------------------
+     */
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
+    status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
+    write_attr(loc_id, 3, dims3, "opaque3D", tid, buf23);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_COMPOUND
+     *-------------------------------------------------------------------------
+     */
+
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                if (make_diffs) {
+                    buf33[i][j][k].a = 0;
+                    buf33[i][j][k].b = 0.0F;
+                } else {
+                    buf33[i][j][k].a = (char) n++;
+                    buf33[i][j][k].b = n++;
+                }
+    /*position        compound3D of </g1> compound3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 0 ]          2               0               2
+        [ 0 0 1 ]          3               0               3
+        [ 0 0 1 ]          4               0               4
+        [ 0 1 0 ]          5               0               5
+        [ 0 1 0 ]          6               0               6
+        [ 0 1 1 ]          7               0               7
+        [ 0 1 1 ]          8               0               8
+        [ 0 2 0 ]          9               0               9
+        [ 0 2 0 ]          10              0               10
+        [ 0 2 1 ]          11              0               11
+        [ 0 2 1 ]          12              0               12
+        [ 1 0 0 ]          13              0               13
+        [ 1 0 0 ]          14              0               14
+        [ 1 0 1 ]          15              0               15
+        [ 1 0 1 ]          16              0               16
+        [ 1 1 0 ]          17              0               17
+        [ 1 1 0 ]          18              0               18
+        [ 1 1 1 ]          19              0               19
+        [ 1 1 1 ]          20              0               20
+        [ 1 2 0 ]          21              0               21
+        [ 1 2 0 ]          22              0               22
+        [ 1 2 1 ]          23              0               23
+        [ 1 2 1 ]          24              0               24
+        [ 2 0 0 ]          25              0               25
+        [ 2 0 0 ]          26              0               26
+        [ 2 0 1 ]          27              0               27
+        [ 2 0 1 ]          28              0               28
+        [ 2 1 0 ]          29              0               29
+        [ 2 1 0 ]          30              0               30
+        [ 2 1 1 ]          31              0               31
+        [ 2 1 1 ]          32              0               32
+        [ 2 2 0 ]          33              0               33
+        [ 2 2 0 ]          34              0               34
+        [ 2 2 1 ]          35              0               35
+        [ 2 2 1 ]          36              0               36
+        [ 3 0 0 ]          37              0               37
+        [ 3 0 0 ]          38              0               38
+        [ 3 0 1 ]          39              0               39
+        [ 3 0 1 ]          40              0               40
+        [ 3 1 0 ]          41              0               41
+        [ 3 1 0 ]          42              0               42
+        [ 3 1 1 ]          43              0               43
+        [ 3 1 1 ]          44              0               44
+        [ 3 2 0 ]          45              0               45
+        [ 3 2 0 ]          46              0               46
+        [ 3 2 1 ]          47              0               47
+        [ 3 2 1 ]          48              0               48
+     */
+
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
+    H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+    H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+    write_attr(loc_id, 3, dims3, "compound3D", tid, buf33);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_REFERENCE (H5R_OBJECT object reference)
+     *-------------------------------------------------------------------------
+     */
+    /* Create references to dataset */
+    if (dset_name) {
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
+                for (k = 0; k < 2; k++)
+                    status = H5Rcreate(&buf43[i][j][k], fid, dset_name,
+                            H5R_OBJECT, (hid_t) -1);
+        write_attr(loc_id, 3, dims3, "reference3D", H5T_STD_REF_OBJ, buf43);
+    }
+
+    /*-------------------------------------------------------------------------
+     * H5T_ENUM
+     *-------------------------------------------------------------------------
+     */
+
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                if (make_diffs)
+                    buf453[i][j][k] = RED;
+                else
+                    buf453[i][j][k] = GREEN;
+
+    /*
+        position        enum3D of </g1> enum3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          GREEN            RED
+        [ 0 0 1 ]          GREEN            RED
+        [ 0 1 0 ]          GREEN            RED
+        [ 0 1 1 ]          GREEN            RED
+        [ 0 2 0 ]          GREEN            RED
+        [ 0 2 1 ]          GREEN            RED
+        [ 1 0 0 ]          GREEN            RED
+        [ 1 0 1 ]          GREEN            RED
+        [ 1 1 0 ]          GREEN            RED
+        [ 1 1 1 ]          GREEN            RED
+        [ 1 2 0 ]          GREEN            RED
+        [ 1 2 1 ]          GREEN            RED
+        [ 2 0 0 ]          GREEN            RED
+        [ 2 0 1 ]          GREEN            RED
+        [ 2 1 0 ]          GREEN            RED
+        [ 2 1 1 ]          GREEN            RED
+        [ 2 2 0 ]          GREEN            RED
+        [ 2 2 1 ]          GREEN            RED
+        [ 3 0 0 ]          GREEN            RED
+        [ 3 0 1 ]          GREEN            RED
+        [ 3 1 0 ]          GREEN            RED
+        [ 3 1 1 ]          GREEN            RED
+        [ 3 2 0 ]          GREEN            RED
+        [ 3 2 1 ]          GREEN            RED
+     */
+
+    tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
+    H5Tenum_insert(tid, "GREEN", (val = 1, &val));
+    write_attr(loc_id, 3, dims3, "enum3D", tid, buf453);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_VLEN
+     *-------------------------------------------------------------------------
+     */
+
+    /* Allocate and initialize VL dataset to write */
+    n = 0;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++) {
+                buf53[i][j][k].p = HDmalloc((size_t)(i + 1) * sizeof(int));
+                buf53[i][j][k].len = (size_t)(i + 1);
+                for (l = 0; l < i + 1; l++)
+                    if (make_diffs)
+                        ((int *) buf53[i][j][k].p)[l] = 0;
+                    else
+                        ((int *) buf53[i][j][k].p)[l] = n++;
+            }
+    /*
+        position        vlen3D of </g1> vlen3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 1 ]          1               0               1
+        [ 0 1 0 ]          2               0               2
+        [ 0 1 1 ]          3               0               3
+        [ 0 2 0 ]          4               0               4
+        [ 0 2 1 ]          5               0               5
+        [ 1 0 0 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 0 1 ]          9               0               9
+        [ 1 1 0 ]          10              0               10
+        etc
+     */
+    sid = H5Screate_simple(3, dims3, NULL);
+    tid = H5Tvlen_create(H5T_NATIVE_INT);
+    aid = H5Acreate2(loc_id, "vlen3D", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Awrite(aid, tid, buf53);
+    assert(status >= 0);
+    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf53);
+    assert(status >= 0);
+    status = H5Aclose(aid);
+    status = H5Tclose(tid);
+    status = H5Sclose(sid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_ARRAY
+     *-------------------------------------------------------------------------
+     */
+    n = 1;
+    for (i = 0; i < 24; i++) {
+        for (j = 0; j < (int) dimarray[0]; j++) {
+            if (make_diffs)
+                buf63[i][j] = 0;
+            else
+                buf63[i][j] = n++;
+        }
+    }
+    /*
+        position        array3D of </g1> array3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 0 ]          2               0               2
+        [ 0 0 0 ]          3               0               3
+        [ 0 0 1 ]          4               0               4
+        [ 0 0 1 ]          5               0               5
+        [ 0 0 1 ]          6               0               6
+        [ 0 1 0 ]          7               0               7
+        etc
+     */
+
+    tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
+    write_attr(loc_id, 3, dims3, "array3D", tid, buf63);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+     * H5T_INTEGER and H5T_FLOAT
+     *-------------------------------------------------------------------------
+     */
+    n = 1;
+    f = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++) {
+                if (make_diffs) {
+                    buf73[i][j][k] = 0;
+                    buf83[i][j][k] = 0.0F;
+                }
+                else {
+                    buf73[i][j][k] = n++;
+                    buf83[i][j][k] = f++;
+                }
+            }
+
+    /*
+        position        integer3D of </g1> integer3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 1 ]          2               0               2
+        [ 0 1 0 ]          3               0               3
+        [ 0 1 1 ]          4               0               4
+        [ 0 2 0 ]          5               0               5
+        [ 0 2 1 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 1 0 ]          9               0               9
+        [ 1 1 1 ]          10              0               10
+        etc
+     */
+    write_attr(loc_id, 3, dims3, "integer3D", H5T_NATIVE_INT, buf73);
+    write_attr(loc_id, 3, dims3, "float3D", H5T_NATIVE_FLOAT, buf83);
+}
+
+/*-------------------------------------------------------------------------
+ * Function: write_attr_in
+ *
+ * Purpose: write attributes in LOC_ID (dataset, group, named datatype)
+ *
+ *-------------------------------------------------------------------------
+ */
+static
+void write_attr_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs /* flag to modify data buffers */)
+{
+    /* Compound datatype */
+    typedef struct s_t {
+        char a;
+        double b;
+    } s_t;
+
+    typedef enum {
+        RED, GREEN
+    } e_t;
+
+    hid_t aid = -1;
+    hid_t sid = -1;
+    hid_t tid = -1;
+    herr_t status;
+    int val, i, j, k, l, n;
+    float f;
+
+    /* create 1D attributes with dimension [2], 2 elements */
+    hsize_t    dims[1] = { 2 };
+    char       buf1[2][STR_SIZE] = { "ab", "de" }; /* string */
+    char      *buf1a[2]; /* VL string */
+    char       buf2[2] = { 1, 2 }; /* bitfield, opaque */
+    s_t        buf3[2] = { { 1, 2.0F }, { 3, 4.0F } }; /* compound */
+    hobj_ref_t buf4[2]; /* reference */
+    e_t        buf45[2] = { RED, RED }; /* enum */
+    hvl_t      buf5[2]; /* vlen */
+    hsize_t    dimarray[1] = { 3 }; /* array dimension */
+    int        buf6[2][3] = { { 1, 2, 3 }, { 4, 5, 6 } }; /* array */
+    int        buf7[2] = { 1, 2 }; /* integer */
+    float      buf8[2] = { 1.0F, 2.0F }; /* float */
+
+    /* create 2D attributes with dimension [3][2], 6 elements */
+    hsize_t    dims2[2] = { 3, 2 };
+    char       buf12[3][2][STR_SIZE] = { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } }; /* string */
+    char      *buf12a[3][2]; /* VL string */
+    char       buf22[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* bitfield, opaque */
+    s_t        buf32[6] = { { 1, 2.0F }, { 3, 4.0F }, { 5, 6.0F }, { 7, 8.0F }, { 9, 10.0F }, { 11, 12.0F } }; /* compound */
+    hobj_ref_t buf42[3][2]; /* reference */
+    e_t        buf452[3][2]; /* enum */
+    hvl_t      buf52[3][2]; /* vlen */
+    int        buf62[6][3] = { { 1, 2, 3 }, { 4, 5, 6 }, { 7, 8, 9 }, { 10, 11, 12 }, { 13, 14, 15 }, { 16, 17, 18 } }; /* array */
+    int        buf72[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* integer */
+    float      buf82[3][2] = { { 1.0F, 2.0F }, { 3.0F, 4.0F }, { 5.0F, 6.0F } }; /* float */
+
+    /* create 3D attributes with dimension [4][3][2], 24 elements */
+    hsize_t dims3[3] = { 4, 3, 2 };
+    char buf13[4][3][2][STR_SIZE] = { { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } },
+                                      { { "mn", "pq" }, { "rs", "tu" }, { "vw", "xz" } },
+                                      { { "AB", "CD" }, { "EF", "GH" }, { "IJ", "KL" } },
+                                      { { "MN", "PQ" }, { "RS", "TU" }, { "VW", "XZ" } } }; /* string */
+    char      *buf13a[4][3][2]; /* VL string */
+    char       buf23[4][3][2]; /* bitfield, opaque */
+    s_t        buf33[4][3][2]; /* compound */
+    hobj_ref_t buf43[4][3][2]; /* reference */
+    e_t        buf453[4][3][2]; /* enum */
+    hvl_t      buf53[4][3][2]; /* vlen */
+    int        buf63[24][3]; /* array */
+    int        buf73[4][3][2]; /* integer */
+    float      buf83[4][3][2]; /* float */
+
+    /*-------------------------------------------------------------------------
+    * 1D attributes
+    *-------------------------------------------------------------------------
+    */
+
+    /*-------------------------------------------------------------------------
+    * H5T_STRING
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 2; j++)
+                buf1[i][j] = 'z';
+    /*
+        buf1[2][2]= {"ab","de"};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <string> and <string>
+        position      string of </g1>  string of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          a                z
+        [ 0 ]          b                z
+        [ 1 ]          d                z
+        [ 1 ]          e                z
+    */
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_attr(loc_id, 1, dims, "string", tid, buf1);
+    status = H5Tclose(tid);
+
+    for (i = 0; i < 2; i++)
+        buf1a[i] = buf1[i];
+    tid = H5Tcopy(H5T_C_S1);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 1, dims, "VLstring", tid, buf1a);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+    * H5T_BITFIELD
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+        for (i = 0; i < 2; i++)
+            buf2[i] = buf2[1] = 0;
+    /*
+        buf2[2]= {1,2};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <bitfield> and <bitfield>
+        position      bitfield of </g1> bitfield of </g1> difference
+        position        opaque of </g1> opaque of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+    */
+
+    tid = H5Tcopy(H5T_STD_B8LE);
+    write_attr(loc_id, 1, dims, "bitfield", tid, buf2);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+    * H5T_OPAQUE
+    *-------------------------------------------------------------------------
+    */
+
+    /*
+        buf2[2]= {1,2};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <opaque> and <opaque>
+        position     opaque of </g1> opaque of </g1> difference
+        position        opaque of </g1> opaque of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+    */
+
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
+    status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
+    write_attr(loc_id, 1, dims, "opaque", tid, buf2);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+    * H5T_COMPOUND
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+        for (i = 0; i < 2; i++) {
+            buf3[i].a = 0;
+            buf3[i].b = 0;
+        }
+    /*
+        buf3[2]= {{1,2},{3,4}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <compound> and <compound>
+        position        compound of </g1> compound of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          1               5               4
+        [ 0 ]          2               5               3
+        [ 1 ]          3               5               2
+        [ 1 ]          4               5               1
+    */
+
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
+    H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
+    H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
+    write_attr(loc_id, 1, dims, "compound", tid, buf3);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+    * H5T_REFERENCE (H5R_OBJECT object reference)
     *-------------------------------------------------------------------------
     */
+    /* Create references to dataset */
+    if (dset_name) {
+        status = H5Rcreate(&buf4[0], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        status = H5Rcreate(&buf4[1], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_attr(loc_id, 1, dims, "reference", H5T_STD_REF_OBJ, buf4);
+    }
 
+    /*-------------------------------------------------------------------------
+    * H5T_ENUM
+    *-------------------------------------------------------------------------
+    */
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf7[i]=0;
-            buf8[i]=0;
-        }
+        for (i = 0; i < 2; i++)
+            buf45[i] = GREEN;
+    /*
+        buf45[2]= {RED,RED};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <enum> and <enum>
+        position     enum of </g1>   enum of </g1>   difference
+        ------------------------------------------------------------
+        [ 0 ]          RED              GREEN
+        [ 1 ]          RED              GREEN
+    */
+    tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
+    H5Tenum_insert(tid, "GREEN", (val = 1, &val));
+    write_attr(loc_id, 1, dims, "enum", tid, buf45);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+    * H5T_VLEN
+    *-------------------------------------------------------------------------
+    */
+
+    /* Allocate and initialize VL dataset to write */
+
+    buf5[0].len = 1;
+    buf5[0].p = HDmalloc(1 * sizeof(int));
+    ((int *) buf5[0].p)[0] = 1;
+    buf5[1].len = 2;
+    buf5[1].p = HDmalloc(2 * sizeof(int));
+    ((int *) buf5[1].p)[0] = 2;
+    ((int *) buf5[1].p)[1] = 3;
+
+    if (make_diffs) {
+        ((int *) buf5[0].p)[0] = 0;
+        ((int *) buf5[1].p)[0] = 0;
+        ((int *) buf5[1].p)[1] = 0;
     }
     /*
-    buf7[2]= {1,2};
-    buf8[2]= {1,2};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Group:       </g1> and </g1>
-    position        integer of </g1> integer of </g1> difference
-    ------------------------------------------------------------
-    [ 0 ]          1               0               1
-    [ 1 ]          2               0               2
-    position        float of </g1>  float of </g1>  difference
-    ------------------------------------------------------------
-    [ 0 ]          1               0               1
-    [ 1 ]          2               0               2
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        position        vlen of </g1>   vlen of </g1>   difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+        [ 1 ]          3               0               3
+    */
+
+    sid = H5Screate_simple(1, dims, NULL);
+    tid = H5Tvlen_create(H5T_NATIVE_INT);
+    aid = H5Acreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Awrite(aid, tid, buf5);
+    assert(status >= 0);
+    status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5);
+    assert(status >= 0);
+    status = H5Aclose(aid);
+    status = H5Tclose(tid);
+    status = H5Sclose(sid);
+
+    /*-------------------------------------------------------------------------
+    * H5T_ARRAY
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs) {
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 3; j++)
+                buf6[i][j] = 0;
+    }
+    /*
+        buf6[2][3]= {{1,2,3},{4,5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <array> and <array>
+        position        array of </g1>  array of </g1>  difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 0 ]          2               0               2
+        [ 0 ]          3               0               3
+        [ 1 ]          4               0               4
+        [ 1 ]          5               0               5
+        [ 1 ]          6               0               6
+    */
+    tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
+    write_attr(loc_id, 1, dims, "array", tid, buf6);
+    status = H5Tclose(tid);
+
+    /*-------------------------------------------------------------------------
+    * H5T_INTEGER and H5T_FLOAT
+    *-------------------------------------------------------------------------
     */
-    write_attr(loc_id,1,dims,"integer",H5T_NATIVE_INT,buf7);
-    write_attr(loc_id,1,dims,"float",H5T_NATIVE_FLOAT,buf8);
 
+    if (make_diffs) {
+        for (i = 0; i < 2; i++) {
+            buf7[i] = 0;
+            buf8[i] = 0;
+        }
+    }
+    /*
+        buf7[2]= {1,2};
+        buf8[2]= {1,2};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        position        integer of </g1> integer of </g1> difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+        position        float of </g1>  float of </g1>  difference
+        ------------------------------------------------------------
+        [ 0 ]          1               0               1
+        [ 1 ]          2               0               2
+    */
+    write_attr(loc_id, 1, dims, "integer", H5T_NATIVE_INT, buf7);
+    write_attr(loc_id, 1, dims, "float", H5T_NATIVE_FLOAT, buf8);
 
     /*-------------------------------------------------------------------------
     * 2D attributes
@@ -5757,50 +6423,45 @@ void write_attr_in(hid_t loc_id,
     * H5T_STRING
     *-------------------------------------------------------------------------
     */
-    if (make_diffs)
-    {
-        for (i=0; i<3; i++)
-            for (j=0; j<2; j++)
-                for (k=0; k<2; k++)
-                    buf12[i][j][k]='z';
+    if (make_diffs) {
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                for (k = 0; k < 2; k++)
+                    buf12[i][j][k] = 'z';
     }
 
     /*
-    buf12[6][2]= {"ab","cd","ef","gh","ij","kl"};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Attribute:   <string2D> and <string2D>
-    position        string2D of </g1> string2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          a                z
-    [ 0 0 ]          b                z
-    [ 0 1 ]          c                z
-    [ 0 1 ]          d                z
-    [ 1 0 ]          e                z
-    [ 1 0 ]          f                z
-    [ 1 1 ]          g                z
-    [ 1 1 ]          h                z
-    [ 2 0 ]          i                z
-    [ 2 0 ]          j                z
-    [ 2 1 ]          k                z
-    [ 2 1 ]          l                z
+        buf12[6][2]= {"ab","cd","ef","gh","ij","kl"};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <string2D> and <string2D>
+        position        string2D of </g1> string2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          a                z
+        [ 0 0 ]          b                z
+        [ 0 1 ]          c                z
+        [ 0 1 ]          d                z
+        [ 1 0 ]          e                z
+        [ 1 0 ]          f                z
+        [ 1 1 ]          g                z
+        [ 1 1 ]          h                z
+        [ 2 0 ]          i                z
+        [ 2 0 ]          j                z
+        [ 2 1 ]          k                z
+        [ 2 1 ]          l                z
     */
 
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, (size_t)STR_SIZE);
-    write_attr(loc_id,2,dims2,"string2D",tid,buf12);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_attr(loc_id, 2, dims2, "string2D", tid, buf12);
     status = H5Tclose(tid);
 
-    for (i=0; i<3; i++)
-    {
-        for (j=0; j<2; j++)
-        {
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++)
+            buf12a[i][j] = buf12[i][j];
 
-            buf12a[i][j]=buf12[i][j];
-        }
-    }
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_attr(loc_id,2,dims2,"VLstring2D",tid,buf12a);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 2, dims2, "VLstring2D", tid, buf12a);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5809,27 +6470,23 @@ void write_attr_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        memset(buf22,0,sizeof buf22);
-    }
-
+        memset(buf22, 0, sizeof buf22);
     /*
-    buf22[3][2]= {{1,2},{3,4},{5,6}};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Attribute:   <bitfield2D> and <bitfield2D>
-    position        bitfield2D of </g1> bitfield2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 1 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 2 0 ]          5               0               5
-    [ 2 1 ]          6               0               6
+        buf22[3][2]= {{1,2},{3,4},{5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <bitfield2D> and <bitfield2D>
+        position        bitfield2D of </g1> bitfield2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
     */
 
-
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_attr(loc_id,2,dims2,"bitfield2D",tid,buf22);
+    write_attr(loc_id, 2, dims2, "bitfield2D", tid, buf22);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5838,21 +6495,21 @@ void write_attr_in(hid_t loc_id,
     */
 
     /*
-    buf22[3][2]= {{1,2},{3,4},{5,6}};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Attribute:   <opaque2D> and <opaque2D>
-    position        opaque2D of </g1> opaque2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 1 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 2 0 ]          5               0               5
-    [ 2 1 ]          6               0               6
-    */
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+        buf22[3][2]= {{1,2},{3,4},{5,6}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <opaque2D> and <opaque2D>
+        position        opaque2D of </g1> opaque2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+    */
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_attr(loc_id,2,dims2,"opaque2D",tid,buf22);
+    write_attr(loc_id, 2, dims2, "opaque2D", tid, buf22);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5860,29 +6517,25 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     if (make_diffs)
-    {
-        memset(buf32,0,sizeof buf32);
-    }
-
+        memset(buf32, 0, sizeof buf32);
     /*
-    buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Attribute:   <opaque2D> and <opaque2D>
-    position        opaque2D of </g1> opaque2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 1 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 2 0 ]          5               0               5
-    [ 2 1 ]          6               0               6
-    */
-
-
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+        buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Attribute:   <opaque2D> and <opaque2D>
+        position        opaque2D of </g1> opaque2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+    */
+
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_attr(loc_id,2,dims2,"compound2D",tid,buf32);
+    write_attr(loc_id, 2, dims2, "compound2D", tid, buf32);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5890,44 +6543,41 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        for (i = 0; i < 3; i++) {
-            for (j = 0; j < 2; j++) {
-                status=H5Rcreate(&buf42[i][j],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-            }
-        }
-        write_attr(loc_id,2,dims2,"reference2D",H5T_STD_REF_OBJ,buf42);
+    if (dset_name) {
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                status = H5Rcreate(&buf42[i][j], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_attr(loc_id, 2, dims2, "reference2D", H5T_STD_REF_OBJ, buf42);
     }
 
     /*-------------------------------------------------------------------------
     * H5T_ENUM
     *-------------------------------------------------------------------------
     */
-    for (i=0; i<3; i++)
-    {
-        for (j=0; j<2; j++)
-        {
-            if (make_diffs) buf452[i][j]=GREEN; else buf452[i][j]=RED;
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++) {
+            if (make_diffs)
+                buf452[i][j] = GREEN;
+            else
+                buf452[i][j] = RED;
         }
-    }
 
     /*
-    Attribute:   <enum2D> and <enum2D>
-    position        enum2D of </g1> enum2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          RED              GREEN
-    [ 0 1 ]          RED              GREEN
-    [ 1 0 ]          RED              GREEN
-    [ 1 1 ]          RED              GREEN
-    [ 2 0 ]          RED              GREEN
-    [ 2 1 ]          RED              GREEN
+        Attribute:   <enum2D> and <enum2D>
+        position        enum2D of </g1> enum2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          RED              GREEN
+        [ 0 1 ]          RED              GREEN
+        [ 1 0 ]          RED              GREEN
+        [ 1 1 ]          RED              GREEN
+        [ 2 0 ]          RED              GREEN
+        [ 2 1 ]          RED              GREEN
     */
 
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_attr(loc_id,2,dims2,"enum2D",tid,buf452);
+    write_attr(loc_id, 2, dims2, "enum2D", tid, buf452);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -5936,33 +6586,33 @@ void write_attr_in(hid_t loc_id,
     */
 
     /* Allocate and initialize VL dataset to write */
-    n=0;
-    for(i = 0; i < 3; i++) {
-        for(j = 0; j < 2; j++) {
+    n = 0;
+    for (i = 0; i < 3; i++) {
+        for (j = 0; j < 2; j++) {
             buf52[i][j].p = HDmalloc((size_t)(i + 1) * sizeof(int));
             buf52[i][j].len = (size_t)(i + 1);
-            for(l = 0; l < i + 1; l++)
-                if(make_diffs)
-                    ((int *)buf52[i][j].p)[l] = 0;
+            for (l = 0; l < i + 1; l++)
+                if (make_diffs)
+                    ((int *) buf52[i][j].p)[l] = 0;
                 else
-                    ((int *)buf52[i][j].p)[l] = n++;
+                    ((int *) buf52[i][j].p)[l] = n++;
         }
     }
 
     /*
-    position        vlen2D of </g1> vlen2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 1 ]          1               0               1
-    [ 1 0 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 1 1 ]          5               0               5
-    [ 2 0 ]          6               0               6
-    [ 2 0 ]          7               0               7
-    [ 2 0 ]          8               0               8
-    [ 2 1 ]          9               0               9
-    [ 2 1 ]          10              0               10
-    [ 2 1 ]          11              0               11
+        position        vlen2D of </g1> vlen2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 1 ]          1               0               1
+        [ 1 0 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 1 1 ]          5               0               5
+        [ 2 0 ]          6               0               6
+        [ 2 0 ]          7               0               7
+        [ 2 0 ]          8               0               8
+        [ 2 1 ]          9               0               9
+        [ 2 1 ]          10              0               10
+        [ 2 1 ]          11              0               11
     */
 
     sid = H5Screate_simple(2, dims2, NULL);
@@ -5982,34 +6632,32 @@ void write_attr_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        memset(buf62,0,sizeof buf62);
-    }
+        memset(buf62, 0, sizeof buf62);
     /*
-    buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};
-    $h5diff file7.h5 file6.h5 g1 g1 -v
-    Group:       </g1> and </g1>
-    Attribute:   <array2D> and <array2D>
-    position        array2D of </g1> array2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 0 ]          2               0               2
-    [ 0 0 ]          3               0               3
-    [ 0 1 ]          4               0               4
-    [ 0 1 ]          5               0               5
-    [ 0 1 ]          6               0               6
-    [ 1 0 ]          7               0               7
-    [ 1 0 ]          8               0               8
-    [ 1 0 ]          9               0               9
-    [ 1 1 ]          10              0               10
-    [ 1 1 ]          11              0               11
-    [ 1 1 ]          12              0               12
-    [ 2 0 ]          13              0               13
-    [ 2 0 ]          14              0               14
-    [ 2 0 ]          15              0               15
-    [ 2 1 ]          16              0               16
-    [ 2 1 ]          17              0               17
-    [ 2 1 ]          18              0               18
+        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};
+        $h5diff file7.h5 file6.h5 g1 g1 -v
+        Group:       </g1> and </g1>
+        Attribute:   <array2D> and <array2D>
+        position        array2D of </g1> array2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 0 ]          2               0               2
+        [ 0 0 ]          3               0               3
+        [ 0 1 ]          4               0               4
+        [ 0 1 ]          5               0               5
+        [ 0 1 ]          6               0               6
+        [ 1 0 ]          7               0               7
+        [ 1 0 ]          8               0               8
+        [ 1 0 ]          9               0               9
+        [ 1 1 ]          10              0               10
+        [ 1 1 ]          11              0               11
+        [ 1 1 ]          12              0               12
+        [ 2 0 ]          13              0               13
+        [ 2 0 ]          14              0               14
+        [ 2 0 ]          15              0               15
+        [ 2 1 ]          16              0               16
+        [ 2 1 ]          17              0               17
+        [ 2 1 ]          18              0               18
     */
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
     write_attr(loc_id, 2, dims2, "array2D", tid, buf62);
@@ -6020,36 +6668,34 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        memset(buf72,0,sizeof buf72);
-        memset(buf82,0,sizeof buf82);
+    if (make_diffs) {
+        memset(buf72, 0, sizeof buf72);
+        memset(buf82, 0, sizeof buf82);
     }
     /*
-    Attribute:   <integer2D> and <integer2D>
-    position        integer2D of </g1> integer2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 1 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 2 0 ]          5               0               5
-    [ 2 1 ]          6               0               6
-    6 differences found
-    Attribute:   <float2D> and <float2D>
-    position        float2D of </g1> float2D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 ]          1               0               1
-    [ 0 1 ]          2               0               2
-    [ 1 0 ]          3               0               3
-    [ 1 1 ]          4               0               4
-    [ 2 0 ]          5               0               5
-    [ 2 1 ]          6               0               6
-    */
-
-    write_attr(loc_id,2,dims2,"integer2D",H5T_NATIVE_INT,buf72);
-    write_attr(loc_id,2,dims2,"float2D",H5T_NATIVE_FLOAT,buf82);
-
+        Attribute:   <integer2D> and <integer2D>
+        position        integer2D of </g1> integer2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+        6 differences found
+        Attribute:   <float2D> and <float2D>
+        position        float2D of </g1> float2D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 ]          1               0               1
+        [ 0 1 ]          2               0               2
+        [ 1 0 ]          3               0               3
+        [ 1 1 ]          4               0               4
+        [ 2 0 ]          5               0               5
+        [ 2 1 ]          6               0               6
+    */
+
+    write_attr(loc_id, 2, dims2, "integer2D", H5T_NATIVE_INT, buf72);
+    write_attr(loc_id, 2, dims2, "float2D", H5T_NATIVE_FLOAT, buf82);
 
     /*-------------------------------------------------------------------------
     * 3D attributes
@@ -6061,90 +6707,83 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<4; i++)
-            for (j=0; j<3; j++)
-                for (k=0; k<2; k++)
-                    for (l=0; l<2; l++)
-                        buf13[i][j][k][l]='z';
+    if (make_diffs) {
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
+                for (k = 0; k < 2; k++)
+                    for (l = 0; l < 2; l++)
+                        buf13[i][j][k][l] = 'z';
     }
 
     /*
-    buf13[24][2]= {"ab","cd","ef","gh","ij","kl","mn","pq",
-    "rs","tu","vw","xz","AB","CD","EF","GH",
-    "IJ","KL","MN","PQ","RS","TU","VW","XZ"};
-
-    Attribute:   <string3D> and <string3D>
-    position        string3D of </g1> string3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          a                z
-    [ 0 0 0 ]          b                z
-    [ 0 0 1 ]          c                z
-    [ 0 0 1 ]          d                z
-    [ 0 1 0 ]          e                z
-    [ 0 1 0 ]          f                z
-    [ 0 1 1 ]          g                z
-    [ 0 1 1 ]          h                z
-    [ 0 2 0 ]          i                z
-    [ 0 2 0 ]          j                z
-    [ 0 2 1 ]          k                z
-    [ 0 2 1 ]          l                z
-    [ 1 0 0 ]          m                z
-    [ 1 0 0 ]          n                z
-    [ 1 0 1 ]          p                z
-    [ 1 0 1 ]          q                z
-    [ 1 1 0 ]          r                z
-    [ 1 1 0 ]          s                z
-    [ 1 1 1 ]          t                z
-    [ 1 1 1 ]          u                z
-    [ 1 2 0 ]          v                z
-    [ 1 2 0 ]          w                z
-    [ 1 2 1 ]          x                z
-    [ 2 0 0 ]          A                z
-    [ 2 0 0 ]          B                z
-    [ 2 0 1 ]          C                z
-    [ 2 0 1 ]          D                z
-    [ 2 1 0 ]          E                z
-    [ 2 1 0 ]          F                z
-    [ 2 1 1 ]          G                z
-    [ 2 1 1 ]          H                z
-    [ 2 2 0 ]          I                z
-    [ 2 2 0 ]          J                z
-    [ 2 2 1 ]          K                z
-    [ 2 2 1 ]          L                z
-    [ 3 0 0 ]          M                z
-    [ 3 0 0 ]          N                z
-    [ 3 0 1 ]          P                z
-    [ 3 0 1 ]          Q                z
-    [ 3 1 0 ]          R                z
-    [ 3 1 0 ]          S                z
-    [ 3 1 1 ]          T                z
-    [ 3 1 1 ]          U                z
-    [ 3 2 0 ]          V                z
-    [ 3 2 0 ]          W                z
-    [ 3 2 1 ]          X                z
-    [ 3 2 1 ]          Z                z
+        buf13[24][2]= {"ab","cd","ef","gh","ij","kl","mn","pq",
+        "rs","tu","vw","xz","AB","CD","EF","GH",
+        "IJ","KL","MN","PQ","RS","TU","VW","XZ"};
+
+        Attribute:   <string3D> and <string3D>
+        position        string3D of </g1> string3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          a                z
+        [ 0 0 0 ]          b                z
+        [ 0 0 1 ]          c                z
+        [ 0 0 1 ]          d                z
+        [ 0 1 0 ]          e                z
+        [ 0 1 0 ]          f                z
+        [ 0 1 1 ]          g                z
+        [ 0 1 1 ]          h                z
+        [ 0 2 0 ]          i                z
+        [ 0 2 0 ]          j                z
+        [ 0 2 1 ]          k                z
+        [ 0 2 1 ]          l                z
+        [ 1 0 0 ]          m                z
+        [ 1 0 0 ]          n                z
+        [ 1 0 1 ]          p                z
+        [ 1 0 1 ]          q                z
+        [ 1 1 0 ]          r                z
+        [ 1 1 0 ]          s                z
+        [ 1 1 1 ]          t                z
+        [ 1 1 1 ]          u                z
+        [ 1 2 0 ]          v                z
+        [ 1 2 0 ]          w                z
+        [ 1 2 1 ]          x                z
+        [ 2 0 0 ]          A                z
+        [ 2 0 0 ]          B                z
+        [ 2 0 1 ]          C                z
+        [ 2 0 1 ]          D                z
+        [ 2 1 0 ]          E                z
+        [ 2 1 0 ]          F                z
+        [ 2 1 1 ]          G                z
+        [ 2 1 1 ]          H                z
+        [ 2 2 0 ]          I                z
+        [ 2 2 0 ]          J                z
+        [ 2 2 1 ]          K                z
+        [ 2 2 1 ]          L                z
+        [ 3 0 0 ]          M                z
+        [ 3 0 0 ]          N                z
+        [ 3 0 1 ]          P                z
+        [ 3 0 1 ]          Q                z
+        [ 3 1 0 ]          R                z
+        [ 3 1 0 ]          S                z
+        [ 3 1 1 ]          T                z
+        [ 3 1 1 ]          U                z
+        [ 3 2 0 ]          V                z
+        [ 3 2 0 ]          W                z
+        [ 3 2 1 ]          X                z
+        [ 3 2 1 ]          Z                z
     */
 
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, (size_t)STR_SIZE);
-    write_attr(loc_id,3,dims3,"string3D",tid,buf13);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_attr(loc_id, 3, dims3, "string3D", tid, buf13);
     status = H5Tclose(tid);
 
-    for (i=0; i<4; i++)
-    {
-        for (j=0; j<3; j++)
-        {
-            for (k=0; k<2; k++)
-            {
-                buf13a[i][j][k]=buf13[i][j][k];
-            }
-        }
-    }
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                buf13a[i][j][k] = buf13[i][j][k];
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_attr(loc_id,3,dims3,"VLstring3D",tid,buf13a);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_attr(loc_id, 3, dims3, "VLstring3D", tid, buf13a);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6152,58 +6791,55 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    n=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
-                if(make_diffs)
+                if (make_diffs)
                     buf23[i][j][k] = 0;
                 else
-                    buf23[i][j][k] = (char)n++;
+                    buf23[i][j][k] = (char) n++;
             }
-        }
-    }
-
     /*
-    position        bitfield3D of </g1> bitfield3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          1               0               1
-    [ 0 0 1 ]          2               0               2
-    [ 0 1 0 ]          3               0               3
-    [ 0 1 1 ]          4               0               4
-    [ 0 2 0 ]          5               0               5
-    [ 0 2 1 ]          6               0               6
-    [ 1 0 0 ]          7               0               7
-    [ 1 0 1 ]          8               0               8
-    [ 1 1 0 ]          9               0               9
-    [ 1 1 1 ]          10              0               10
-    [ 1 2 0 ]          11              0               11
-    [ 1 2 1 ]          12              0               12
-    [ 2 0 0 ]          13              0               13
-    [ 2 0 1 ]          14              0               14
-    [ 2 1 0 ]          15              0               15
-    [ 2 1 1 ]          16              0               16
-    [ 2 2 0 ]          17              0               17
-    [ 2 2 1 ]          18              0               18
-    [ 3 0 0 ]          19              0               19
-    [ 3 0 1 ]          20              0               20
-    [ 3 1 0 ]          21              0               21
-    [ 3 1 1 ]          22              0               22
-    [ 3 2 0 ]          23              0               23
-    [ 3 2 1 ]          24              0               24
+        position        bitfield3D of </g1> bitfield3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 1 ]          2               0               2
+        [ 0 1 0 ]          3               0               3
+        [ 0 1 1 ]          4               0               4
+        [ 0 2 0 ]          5               0               5
+        [ 0 2 1 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 1 0 ]          9               0               9
+        [ 1 1 1 ]          10              0               10
+        [ 1 2 0 ]          11              0               11
+        [ 1 2 1 ]          12              0               12
+        [ 2 0 0 ]          13              0               13
+        [ 2 0 1 ]          14              0               14
+        [ 2 1 0 ]          15              0               15
+        [ 2 1 1 ]          16              0               16
+        [ 2 2 0 ]          17              0               17
+        [ 2 2 1 ]          18              0               18
+        [ 3 0 0 ]          19              0               19
+        [ 3 0 1 ]          20              0               20
+        [ 3 1 0 ]          21              0               21
+        [ 3 1 1 ]          22              0               22
+        [ 3 2 0 ]          23              0               23
+        [ 3 2 1 ]          24              0               24
     */
 
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_attr(loc_id,3,dims3,"bitfield3D",tid,buf23);
+    write_attr(loc_id, 3, dims3, "bitfield3D", tid, buf23);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
     * H5T_OPAQUE
     *-------------------------------------------------------------------------
     */
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_attr(loc_id,3,dims3,"opaque3D",tid,buf23);
+    write_attr(loc_id, 3, dims3, "opaque3D", tid, buf23);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6211,77 +6847,75 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    n=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
                     buf33[i][j][k].a = 0;
                     buf33[i][j][k].b = 0.0F;
                 }
                 else {
-                    buf33[i][j][k].a = (char)n++;
+                    buf33[i][j][k].a = (char) n++;
                     buf33[i][j][k].b = n++;
                 }
             }
-        }
-    }
     /*position        compound3D of </g1> compound3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          1               0               1
-    [ 0 0 0 ]          2               0               2
-    [ 0 0 1 ]          3               0               3
-    [ 0 0 1 ]          4               0               4
-    [ 0 1 0 ]          5               0               5
-    [ 0 1 0 ]          6               0               6
-    [ 0 1 1 ]          7               0               7
-    [ 0 1 1 ]          8               0               8
-    [ 0 2 0 ]          9               0               9
-    [ 0 2 0 ]          10              0               10
-    [ 0 2 1 ]          11              0               11
-    [ 0 2 1 ]          12              0               12
-    [ 1 0 0 ]          13              0               13
-    [ 1 0 0 ]          14              0               14
-    [ 1 0 1 ]          15              0               15
-    [ 1 0 1 ]          16              0               16
-    [ 1 1 0 ]          17              0               17
-    [ 1 1 0 ]          18              0               18
-    [ 1 1 1 ]          19              0               19
-    [ 1 1 1 ]          20              0               20
-    [ 1 2 0 ]          21              0               21
-    [ 1 2 0 ]          22              0               22
-    [ 1 2 1 ]          23              0               23
-    [ 1 2 1 ]          24              0               24
-    [ 2 0 0 ]          25              0               25
-    [ 2 0 0 ]          26              0               26
-    [ 2 0 1 ]          27              0               27
-    [ 2 0 1 ]          28              0               28
-    [ 2 1 0 ]          29              0               29
-    [ 2 1 0 ]          30              0               30
-    [ 2 1 1 ]          31              0               31
-    [ 2 1 1 ]          32              0               32
-    [ 2 2 0 ]          33              0               33
-    [ 2 2 0 ]          34              0               34
-    [ 2 2 1 ]          35              0               35
-    [ 2 2 1 ]          36              0               36
-    [ 3 0 0 ]          37              0               37
-    [ 3 0 0 ]          38              0               38
-    [ 3 0 1 ]          39              0               39
-    [ 3 0 1 ]          40              0               40
-    [ 3 1 0 ]          41              0               41
-    [ 3 1 0 ]          42              0               42
-    [ 3 1 1 ]          43              0               43
-    [ 3 1 1 ]          44              0               44
-    [ 3 2 0 ]          45              0               45
-    [ 3 2 0 ]          46              0               46
-    [ 3 2 1 ]          47              0               47
-    [ 3 2 1 ]          48              0               48
-    */
-
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 0 ]          2               0               2
+        [ 0 0 1 ]          3               0               3
+        [ 0 0 1 ]          4               0               4
+        [ 0 1 0 ]          5               0               5
+        [ 0 1 0 ]          6               0               6
+        [ 0 1 1 ]          7               0               7
+        [ 0 1 1 ]          8               0               8
+        [ 0 2 0 ]          9               0               9
+        [ 0 2 0 ]          10              0               10
+        [ 0 2 1 ]          11              0               11
+        [ 0 2 1 ]          12              0               12
+        [ 1 0 0 ]          13              0               13
+        [ 1 0 0 ]          14              0               14
+        [ 1 0 1 ]          15              0               15
+        [ 1 0 1 ]          16              0               16
+        [ 1 1 0 ]          17              0               17
+        [ 1 1 0 ]          18              0               18
+        [ 1 1 1 ]          19              0               19
+        [ 1 1 1 ]          20              0               20
+        [ 1 2 0 ]          21              0               21
+        [ 1 2 0 ]          22              0               22
+        [ 1 2 1 ]          23              0               23
+        [ 1 2 1 ]          24              0               24
+        [ 2 0 0 ]          25              0               25
+        [ 2 0 0 ]          26              0               26
+        [ 2 0 1 ]          27              0               27
+        [ 2 0 1 ]          28              0               28
+        [ 2 1 0 ]          29              0               29
+        [ 2 1 0 ]          30              0               30
+        [ 2 1 1 ]          31              0               31
+        [ 2 1 1 ]          32              0               32
+        [ 2 2 0 ]          33              0               33
+        [ 2 2 0 ]          34              0               34
+        [ 2 2 1 ]          35              0               35
+        [ 2 2 1 ]          36              0               36
+        [ 3 0 0 ]          37              0               37
+        [ 3 0 0 ]          38              0               38
+        [ 3 0 1 ]          39              0               39
+        [ 3 0 1 ]          40              0               40
+        [ 3 1 0 ]          41              0               41
+        [ 3 1 0 ]          42              0               42
+        [ 3 1 1 ]          43              0               43
+        [ 3 1 1 ]          44              0               44
+        [ 3 2 0 ]          45              0               45
+        [ 3 2 0 ]          46              0               46
+        [ 3 2 1 ]          47              0               47
+        [ 3 2 1 ]          48              0               48
+    */
+
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_attr(loc_id,3,dims3,"compound3D",tid,buf33);
+    write_attr(loc_id, 3, dims3, "compound3D", tid, buf33);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6289,15 +6923,13 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        for (i = 0; i < 4; i++) {
-            for (j = 0; j < 3; j++) {
+    if (dset_name) {
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
                 for (k = 0; k < 2; k++)
-                    status=H5Rcreate(&buf43[i][j][k],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-            }
-        }
-        write_attr(loc_id,3,dims3,"reference3D",H5T_STD_REF_OBJ,buf43);
+                    status = H5Rcreate(&buf43[i][j][k], fid, dset_name,
+                            H5R_OBJECT, (hid_t) -1);
+        write_attr(loc_id, 3, dims3, "reference3D", H5T_STD_REF_OBJ, buf43);
     }
 
     /*-------------------------------------------------------------------------
@@ -6305,48 +6937,47 @@ void write_attr_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
-                if (make_diffs) buf453[i][j][k]=RED; else buf453[i][j][k]=GREEN;
+                if (make_diffs)
+                    buf453[i][j][k] = RED;
+                else
+                    buf453[i][j][k] = GREEN;
             }
-        }
-    }
-
     /*
-    position        enum3D of </g1> enum3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          GREEN            RED
-    [ 0 0 1 ]          GREEN            RED
-    [ 0 1 0 ]          GREEN            RED
-    [ 0 1 1 ]          GREEN            RED
-    [ 0 2 0 ]          GREEN            RED
-    [ 0 2 1 ]          GREEN            RED
-    [ 1 0 0 ]          GREEN            RED
-    [ 1 0 1 ]          GREEN            RED
-    [ 1 1 0 ]          GREEN            RED
-    [ 1 1 1 ]          GREEN            RED
-    [ 1 2 0 ]          GREEN            RED
-    [ 1 2 1 ]          GREEN            RED
-    [ 2 0 0 ]          GREEN            RED
-    [ 2 0 1 ]          GREEN            RED
-    [ 2 1 0 ]          GREEN            RED
-    [ 2 1 1 ]          GREEN            RED
-    [ 2 2 0 ]          GREEN            RED
-    [ 2 2 1 ]          GREEN            RED
-    [ 3 0 0 ]          GREEN            RED
-    [ 3 0 1 ]          GREEN            RED
-    [ 3 1 0 ]          GREEN            RED
-    [ 3 1 1 ]          GREEN            RED
-    [ 3 2 0 ]          GREEN            RED
-    [ 3 2 1 ]          GREEN            RED
+        position        enum3D of </g1> enum3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          GREEN            RED
+        [ 0 0 1 ]          GREEN            RED
+        [ 0 1 0 ]          GREEN            RED
+        [ 0 1 1 ]          GREEN            RED
+        [ 0 2 0 ]          GREEN            RED
+        [ 0 2 1 ]          GREEN            RED
+        [ 1 0 0 ]          GREEN            RED
+        [ 1 0 1 ]          GREEN            RED
+        [ 1 1 0 ]          GREEN            RED
+        [ 1 1 1 ]          GREEN            RED
+        [ 1 2 0 ]          GREEN            RED
+        [ 1 2 1 ]          GREEN            RED
+        [ 2 0 0 ]          GREEN            RED
+        [ 2 0 1 ]          GREEN            RED
+        [ 2 1 0 ]          GREEN            RED
+        [ 2 1 1 ]          GREEN            RED
+        [ 2 2 0 ]          GREEN            RED
+        [ 2 2 1 ]          GREEN            RED
+        [ 3 0 0 ]          GREEN            RED
+        [ 3 0 1 ]          GREEN            RED
+        [ 3 1 0 ]          GREEN            RED
+        [ 3 1 1 ]          GREEN            RED
+        [ 3 2 0 ]          GREEN            RED
+        [ 3 2 1 ]          GREEN            RED
     */
 
-
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_attr(loc_id,3,dims3,"enum3D",tid,buf453);
+    write_attr(loc_id, 3, dims3, "enum3D", tid, buf453);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6355,34 +6986,32 @@ void write_attr_in(hid_t loc_id,
     */
 
     /* Allocate and initialize VL dataset to write */
-    n=0;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 0;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
                 buf53[i][j][k].p = HDmalloc((size_t)(i + 1) * sizeof(int));
                 buf53[i][j][k].len = (size_t)(i + 1);
                 for (l = 0; l < i + 1; l++)
-                    if(make_diffs)
-                        ((int *)buf53[i][j][k].p)[l] = 0;
+                    if (make_diffs)
+                        ((int *) buf53[i][j][k].p)[l] = 0;
                     else
-                        ((int *)buf53[i][j][k].p)[l] = n++;
+                        ((int *) buf53[i][j][k].p)[l] = n++;
             }
-        }
-    }
     /*
-    position        vlen3D of </g1> vlen3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 1 ]          1               0               1
-    [ 0 1 0 ]          2               0               2
-    [ 0 1 1 ]          3               0               3
-    [ 0 2 0 ]          4               0               4
-    [ 0 2 1 ]          5               0               5
-    [ 1 0 0 ]          6               0               6
-    [ 1 0 0 ]          7               0               7
-    [ 1 0 1 ]          8               0               8
-    [ 1 0 1 ]          9               0               9
-    [ 1 1 0 ]          10              0               10
-    etc
+        position        vlen3D of </g1> vlen3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 1 ]          1               0               1
+        [ 0 1 0 ]          2               0               2
+        [ 0 1 1 ]          3               0               3
+        [ 0 2 0 ]          4               0               4
+        [ 0 2 1 ]          5               0               5
+        [ 1 0 0 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 0 1 ]          9               0               9
+        [ 1 1 0 ]          10              0               10
+        etc
     */
     sid = H5Screate_simple(3, dims3, NULL);
     tid = H5Tvlen_create(H5T_NATIVE_INT);
@@ -6399,24 +7028,25 @@ void write_attr_in(hid_t loc_id,
     * H5T_ARRAY
     *-------------------------------------------------------------------------
     */
-    n=1;
-    for (i = 0; i < 24; i++) {
-        for (j = 0; j < (int)dimarray[0]; j++) {
-            if (make_diffs) buf63[i][j]=0;
-            else buf63[i][j]=n++;
+    n = 1;
+    for (i = 0; i < 24; i++)
+        for (j = 0; j < (int) dimarray[0]; j++) {
+            if (make_diffs)
+                buf63[i][j] = 0;
+            else
+                buf63[i][j] = n++;
         }
-    }
     /*
-    position        array3D of </g1> array3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          1               0               1
-    [ 0 0 0 ]          2               0               2
-    [ 0 0 0 ]          3               0               3
-    [ 0 0 1 ]          4               0               4
-    [ 0 0 1 ]          5               0               5
-    [ 0 0 1 ]          6               0               6
-    [ 0 1 0 ]          7               0               7
-    etc
+        position        array3D of </g1> array3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 0 ]          2               0               2
+        [ 0 0 0 ]          3               0               3
+        [ 0 0 1 ]          4               0               4
+        [ 0 0 1 ]          5               0               5
+        [ 0 0 1 ]          6               0               6
+        [ 0 1 0 ]          7               0               7
+        etc
     */
 
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
@@ -6427,132 +7057,120 @@ void write_attr_in(hid_t loc_id,
     * H5T_INTEGER and H5T_FLOAT
     *-------------------------------------------------------------------------
     */
-    n=1; f=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    f = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
-                    buf73[i][j][k]=0;
-                    buf83[i][j][k]=0.0F;
+                    buf73[i][j][k] = 0;
+                    buf83[i][j][k] = 0.0F;
                 }
                 else {
-                    buf73[i][j][k]=n++;
-                    buf83[i][j][k]=f++;
+                    buf73[i][j][k] = n++;
+                    buf83[i][j][k] = f++;
                 }
             }
-        }
-    }
 
     /*
-    position        integer3D of </g1> integer3D of </g1> difference
-    ------------------------------------------------------------
-    [ 0 0 0 ]          1               0               1
-    [ 0 0 1 ]          2               0               2
-    [ 0 1 0 ]          3               0               3
-    [ 0 1 1 ]          4               0               4
-    [ 0 2 0 ]          5               0               5
-    [ 0 2 1 ]          6               0               6
-    [ 1 0 0 ]          7               0               7
-    [ 1 0 1 ]          8               0               8
-    [ 1 1 0 ]          9               0               9
-    [ 1 1 1 ]          10              0               10
-    etc
-    */
-    write_attr(loc_id,3,dims3,"integer3D",H5T_NATIVE_INT,buf73);
-    write_attr(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83);
+        position        integer3D of </g1> integer3D of </g1> difference
+        ------------------------------------------------------------
+        [ 0 0 0 ]          1               0               1
+        [ 0 0 1 ]          2               0               2
+        [ 0 1 0 ]          3               0               3
+        [ 0 1 1 ]          4               0               4
+        [ 0 2 0 ]          5               0               5
+        [ 0 2 1 ]          6               0               6
+        [ 1 0 0 ]          7               0               7
+        [ 1 0 1 ]          8               0               8
+        [ 1 1 0 ]          9               0               9
+        [ 1 1 1 ]          10              0               10
+        etc
+    */
+    write_attr(loc_id, 3, dims3, "integer3D", H5T_NATIVE_INT, buf73);
+    write_attr(loc_id, 3, dims3, "float3D", H5T_NATIVE_FLOAT, buf83);
 }
 
-
-
 /*-------------------------------------------------------------------------
-* Function: write_dset_in
-*
-* Purpose: write datasets in LOC_ID
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: write_dset_in
+ *
+ * Purpose: write datasets in LOC_ID
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-void write_dset_in(hid_t loc_id,
-                   const char* dset_name, /* for saving reference to dataset*/
-                   hid_t fid,
-                   int make_diffs /* flag to modify data buffers */)
+void write_dset_in(hid_t loc_id, const char* dset_name, hid_t fid, int make_diffs /* flag to modify data buffers */)
 {
     /* Compound datatype */
-    typedef struct s_t
-    {
-        char   a;
+    typedef struct s_t {
+        char a;
         double b;
     } s_t;
 
-    typedef enum
-    {
-        RED,
-        GREEN
+    typedef enum {
+        RED, GREEN
     } e_t;
 
-    hid_t   did;
-    hid_t   sid;
-    hid_t   tid;
-    hid_t   dcpl;
-    herr_t  status;
-    int     val, i, j, k, l, n;
-    float   f;
-    int     fillvalue=2;
-    int     scalar_data = 2;
+    hid_t did = -1;
+    hid_t sid = -1;
+    hid_t tid = -1;
+    hid_t dcpl = -1;
+    herr_t status;
+    int val, i, j, k, l, n;
+    float f;
+    int fillvalue = 2;
+    int scalar_data = 2;
 
     /* create 1D attributes with dimension [2], 2 elements */
-    hsize_t    dims[1]={2};
-    char       buf1[2][STR_SIZE]= {"ab","de"}; /* string */
-    char       *buf1a[2];                      /* VL string */
-    char       buf2[2]= {1,2};                 /* bitfield, opaque */
-    s_t        buf3[2]= {{1,2.0F},{3,4.0F}};   /* compound */
-    hobj_ref_t buf4[2];                        /* reference */
-    e_t        buf45[2]= {RED,GREEN};          /* enum */
-    hvl_t      buf5[2];                        /* vlen */
-    hsize_t    dimarray[1]={3};                /* array dimension */
-    int        buf6[2][3]= {{1,2,3},{4,5,6}};  /* array */
-    int        buf7[2]= {1,2};                 /* integer */
-    float      buf8[2]= {1.0F,2.0F};           /* float */
+    hsize_t dims[1] = { 2 };
+    char buf1[2][STR_SIZE] = { "ab", "de" }; /* string */
+    char *buf1a[2]; /* VL string */
+    char buf2[2] = { 1, 2 }; /* bitfield, opaque */
+    s_t buf3[2] = { { 1, 2.0F }, { 3, 4.0F } }; /* compound */
+    hobj_ref_t buf4[2]; /* reference */
+    e_t buf45[2] = { RED, GREEN }; /* enum */
+    hvl_t buf5[2]; /* vlen */
+    hsize_t dimarray[1] = { 3 }; /* array dimension */
+    int buf6[2][3] = { { 1, 2, 3 }, { 4, 5, 6 } }; /* array */
+    int buf7[2] = { 1, 2 }; /* integer */
+    float buf8[2] = { 1.0F, 2.0F }; /* float */
 
     /* create 2D attributes with dimension [3][2], 6 elements */
-    hsize_t    dims2[2]={3,2};
-    char       buf12[3][2][STR_SIZE]= {{"ab","cd"},{"ef","gh"},{"ij","kl"}};     /* string */
-    char       *buf12a[3][2];                                        /* VL string */
-    char       buf22[3][2]= {{1,2},{3,4},{5,6}};                     /* bitfield, opaque */
-    s_t        buf32[6]= {{1,2.0F},{3,4.0F},{5,6.0F},{7,8.0F},{9,10.0F},{11,12.0F}};   /* compound */
-    hobj_ref_t buf42[3][2];                                          /* reference */
-    hvl_t      buf52[3][2];                                          /* vlen */
-    int        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};  /* array */
-    int        buf72[3][2]= {{1,2},{3,4},{5,6}};                     /* integer */
-    float      buf82[3][2]= {{1.0F,2.0F},{3.0F,4.0F},{5.0F,6.0F}};                     /* float */
+    hsize_t dims2[2] = { 3, 2 };
+    char buf12[3][2][STR_SIZE] = { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } }; /* string */
+    char *buf12a[3][2]; /* VL string */
+    char buf22[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* bitfield, opaque */
+    s_t buf32[6] = { { 1, 2.0F }, { 3, 4.0F }, { 5, 6.0F }, { 7, 8.0F }, { 9, 10.0F }, { 11, 12.0F } }; /* compound */
+    hobj_ref_t buf42[3][2]; /* reference */
+    hvl_t buf52[3][2]; /* vlen */
+    int buf62[6][3] = { { 1, 2, 3 }, { 4, 5, 6 }, { 7, 8, 9 }, { 10, 11, 12 }, { 13, 14, 15 }, { 16, 17, 18 } }; /* array */
+    int buf72[3][2] = { { 1, 2 }, { 3, 4 }, { 5, 6 } }; /* integer */
+    float buf82[3][2] = { { 1.0F, 2.0F }, { 3.0F, 4.0F }, { 5.0F, 6.0F } }; /* float */
 
     /* create 3D attributes with dimension [4][3][2], 24 elements */
-    hsize_t    dims3[3]={4,3,2};
-    char       buf13[4][3][2][STR_SIZE]= {{{"ab","cd"},{"ef","gh"},{"ij","kl"}},
-    {{"mn","pq"},{"rs","tu"},{"vw","xz"}},
-    {{"AB","CD"},{"EF","GH"},{"IJ","KL"}},
-    {{"MN","PQ"},{"RS","TU"},{"VW","XZ"}}};  /* string */
-    char       *buf13a[4][3][2];  /* VL string */
-    char       buf23[4][3][2];    /* bitfield, opaque */
-    s_t        buf33[4][3][2];    /* compound */
-    hobj_ref_t buf43[4][3][2];    /* reference */
-    hvl_t      buf53[4][3][2];    /* vlen */
-    int        buf63[24][3];      /* array */
-    int        buf73[4][3][2];    /* integer */
-    float      buf83[4][3][2];    /* float */
-
-    if(make_diffs == 2) {
+    hsize_t dims3[3] = { 4, 3, 2 };
+    char buf13[4][3][2][STR_SIZE] = { { { "ab", "cd" }, { "ef", "gh" }, { "ij", "kl" } },
+                                    { { "mn", "pq" }, { "rs", "tu" }, { "vw", "xz" } },
+                                    { { "AB", "CD" }, { "EF", "GH" }, { "IJ", "KL" } },
+                                    { { "MN", "PQ" }, { "RS", "TU" }, { "VW", "XZ" } } }; /* string */
+    char *buf13a[4][3][2]; /* VL string */
+    char buf23[4][3][2]; /* bitfield, opaque */
+    s_t buf33[4][3][2]; /* compound */
+    hobj_ref_t buf43[4][3][2]; /* reference */
+    hvl_t buf53[4][3][2]; /* vlen */
+    int buf63[24][3]; /* array */
+    int buf73[4][3][2]; /* integer */
+    float buf83[4][3][2]; /* float */
+
+    if (make_diffs == 2)
         dimarray[0] = 4;
-    }
 
     /*-------------------------------------------------------------------------
     * H5S_SCALAR
     *-------------------------------------------------------------------------
     */
 
-
-
-    if(make_diffs)
+    if (make_diffs)
         scalar_data = 1;
 
     /* create a space  */
@@ -6568,7 +7186,6 @@ void write_dset_in(hid_t loc_id,
     H5Dclose(did);
     H5Sclose(sid);
 
-
     /*-------------------------------------------------------------------------
     * 1D
     *-------------------------------------------------------------------------
@@ -6579,27 +7196,22 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            for (j=0; j<2; j++)
-                buf1[i][j]='z';
-    }
-
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 2; j++)
+                buf1[i][j] = 'z';
 
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid,(size_t)STR_SIZE);
-    write_dset(loc_id,1,dims,"string",tid,buf1);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_dset(loc_id, 1, dims, "string", tid, buf1);
     status = H5Tclose(tid);
 
-    for (i=0; i<2; i++)
-    {
-        buf1a[i]=buf1[i];
-    }
+    for (i = 0; i < 2; i++)
+        buf1a[i] = buf1[i];
+
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_dset(loc_id,1,dims,"VLstring",tid,buf1a);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_dset(loc_id, 1, dims, "VLstring", tid, buf1a);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6608,13 +7220,11 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            buf2[i]=buf2[1]=0;
-    }
+        for (i = 0; i < 2; i++)
+            buf2[i] = buf2[1] = 0;
 
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_dset(loc_id,1,dims,"bitfield",tid,buf2);
+    write_dset(loc_id, 1, dims, "bitfield", tid, buf2);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6623,16 +7233,14 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf3[i].a=0; buf3[i].b=0;
+        for (i = 0; i < 2; i++) {
+            buf3[i].a = 0;
+            buf3[i].b = 0;
         }
-    }
 
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_dset(loc_id,1,dims,"opaque",tid,buf2);
+    write_dset(loc_id, 1, dims, "opaque", tid, buf2);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6640,19 +7248,14 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf45[i]=GREEN;
-        }
-    }
+        for (i = 0; i < 2; i++)
+            buf45[i] = GREEN;
 
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_dset(loc_id,1,dims,"compound",tid,buf3);
+    write_dset(loc_id, 1, dims, "compound", tid, buf3);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6660,11 +7263,10 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        status=H5Rcreate(&buf4[0],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-        status=H5Rcreate(&buf4[1],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-        write_dset(loc_id,1,dims,"reference",H5T_STD_REF_OBJ,buf4);
+    if (dset_name) {
+        status = H5Rcreate(&buf4[0], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        status = H5Rcreate(&buf4[1], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_dset(loc_id, 1, dims, "reference", H5T_STD_REF_OBJ, buf4);
     }
 
     /*-------------------------------------------------------------------------
@@ -6672,16 +7274,16 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    gen_datareg(fid,make_diffs);
+    gen_datareg(fid, make_diffs);
 
     /*-------------------------------------------------------------------------
     * H5T_ENUM
     *-------------------------------------------------------------------------
     */
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_dset(loc_id,1,dims,"enum",tid,buf45);
+    write_dset(loc_id, 1, dims, "enum", tid, buf45);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6692,22 +7294,23 @@ void write_dset_in(hid_t loc_id,
     /* Allocate and initialize VL dataset to write */
 
     buf5[0].len = 1;
-    buf5[0].p = HDmalloc( 1 * sizeof(int));
-    ((int *)buf5[0].p)[0]=1;
+    buf5[0].p = HDmalloc(1 * sizeof(int));
+    ((int *) buf5[0].p)[0] = 1;
     buf5[1].len = 2;
-    buf5[1].p = HDmalloc( 2 * sizeof(int));
-    ((int *)buf5[1].p)[0]=2;
-    ((int *)buf5[1].p)[1]=3;
+    buf5[1].p = HDmalloc(2 * sizeof(int));
+    ((int *) buf5[1].p)[0] = 2;
+    ((int *) buf5[1].p)[1] = 3;
 
-    if(make_diffs) {
-        ((int *)buf5[0].p)[0] = 0;
-        ((int *)buf5[1].p)[0] = 0;
-        ((int *)buf5[1].p)[1]=0;
+    if (make_diffs) {
+        ((int *) buf5[0].p)[0] = 0;
+        ((int *) buf5[1].p)[0] = 0;
+        ((int *) buf5[1].p)[1] = 0;
     }
 
     sid = H5Screate_simple(1, dims, NULL);
     tid = H5Tvlen_create(H5T_NATIVE_INT);
-    did = H5Dcreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    did = H5Dcreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT,
+    H5P_DEFAULT);
     status = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf5);
     HDassert(status >= 0);
     status = H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5);
@@ -6722,37 +7325,32 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-            for (j=0; j<3; j++)
-            {
-                buf6[i][j]=0;
-            }
-    }
+        for (i = 0; i < 2; i++)
+            for (j = 0; j < 3; j++)
+                buf6[i][j] = 0;
 
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
     write_dset(loc_id, 1, dims, "array", tid, buf6);
     status = H5Tclose(tid);
 
     {
-        double  *dbuf;                           /* information to write */
-        hid_t   ldid;                            /* dataset ID   */
-        hid_t   lsid;                            /* dataspace ID   */
-        hid_t   ltid;                            /* datatype ID   */
-        size_t  size;
-        hsize_t sdims[] = {1};
-        hsize_t tdims[] = {H5TOOLS_MALLOCSIZE / sizeof(double) + 1};
-        size_t  jj;
+        double *dbuf; /* information to write */
+        hid_t ldid = -1; /* dataset ID   */
+        hid_t lsid = -1; /* dataspace ID   */
+        hid_t ltid = -1; /* datatype ID   */
+        size_t size;
+        hsize_t sdims[] = { 1 };
+        hsize_t tdims[] = { H5TOOLS_MALLOCSIZE / sizeof(double) + 1 };
+        size_t jj;
 
         /* allocate and initialize array data to write */
-        size = ( H5TOOLS_MALLOCSIZE / sizeof(double) + 1 ) * sizeof(double);
-        dbuf = (double *)HDmalloc(size);
+        size = (H5TOOLS_MALLOCSIZE / sizeof(double) + 1) * sizeof(double);
+        dbuf = (double *) HDmalloc(size);
 
-        for(jj = 0; jj < (H5TOOLS_MALLOCSIZE / sizeof(double) + 1); jj++)
-            dbuf[jj] = (double)jj;
+        for (jj = 0; jj < (H5TOOLS_MALLOCSIZE / sizeof(double) + 1); jj++)
+            dbuf[jj] = (double) jj;
 
-        if (make_diffs)
-        {
+        if (make_diffs) {
             dbuf[5] = 0;
             dbuf[6] = 0;
         }
@@ -6779,17 +7377,13 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        for (i=0; i<2; i++)
-        {
-            buf7[i]=0;
-            buf8[i]=0;
+        for (i = 0; i < 2; i++) {
+            buf7[i] = 0;
+            buf8[i] = 0;
         }
-    }
-
-    write_dset(loc_id,1,dims,"integer",H5T_NATIVE_INT,buf7);
-    write_dset(loc_id,1,dims,"float",H5T_NATIVE_FLOAT,buf8);
 
+    write_dset(loc_id, 1, dims, "integer", H5T_NATIVE_INT, buf7);
+    write_dset(loc_id, 1, dims, "float", H5T_NATIVE_FLOAT, buf8);
 
     /*-------------------------------------------------------------------------
     * 2D
@@ -6801,30 +7395,25 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<3; i++)
-            for (j=0; j<2; j++)
-                for (k=0; k<2; k++)
-                    buf12[i][j][k]='z';
+    if (make_diffs) {
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                for (k = 0; k < 2; k++)
+                    buf12[i][j][k] = 'z';
     }
 
-
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid,(size_t)STR_SIZE);
-    write_dset(loc_id,2,dims2,"string2D",tid,buf12);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_dset(loc_id, 2, dims2, "string2D", tid, buf12);
     status = H5Tclose(tid);
 
-    for (i=0; i<3; i++)
-    {
-        for (j=0; j<2; j++)
-        {
-            buf12a[i][j]=buf12[i][j];
-        }
-    }
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++)
+            buf12a[i][j] = buf12[i][j];
+
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_dset(loc_id,2,dims2,"VLstring2D",tid,buf12a);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_dset(loc_id, 2, dims2, "VLstring2D", tid, buf12a);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6832,23 +7421,20 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
     if (make_diffs)
-    {
-        memset(buf22,0,sizeof buf22);
-    }
+        memset(buf22, 0, sizeof buf22);
 
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_dset(loc_id,2,dims2,"bitfield2D",tid,buf22);
+    write_dset(loc_id, 2, dims2, "bitfield2D", tid, buf22);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
     * H5T_OPAQUE
     *-------------------------------------------------------------------------
     */
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_dset(loc_id,2,dims2,"opaque2D",tid,buf22);
+    write_dset(loc_id, 2, dims2, "opaque2D", tid, buf22);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6857,14 +7443,12 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        memset(buf32,0,sizeof buf32);
-    }
+        memset(buf32, 0, sizeof buf32);
 
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_dset(loc_id,2,dims2,"compound2D",tid,buf32);
+    write_dset(loc_id, 2, dims2, "compound2D", tid, buf32);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6872,14 +7456,11 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        for (i = 0; i < 3; i++) {
-            for (j = 0; j < 2; j++) {
-                status=H5Rcreate(&buf42[i][j],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-            }
-        }
-        write_dset(loc_id,2,dims2,"reference2D",H5T_STD_REF_OBJ,buf42);
+    if (dset_name) {
+        for (i = 0; i < 3; i++)
+            for (j = 0; j < 2; j++)
+                status = H5Rcreate(&buf42[i][j], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_dset(loc_id, 2, dims2, "reference2D", H5T_STD_REF_OBJ, buf42);
     }
 
     /*-------------------------------------------------------------------------
@@ -6888,9 +7469,9 @@ void write_dset_in(hid_t loc_id,
     */
 
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_dset(loc_id,2,dims2,"enum2D",tid,0);
+    write_dset(loc_id, 2, dims2, "enum2D", tid, 0);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -6900,18 +7481,17 @@ void write_dset_in(hid_t loc_id,
 
     /* Allocate and initialize VL dataset to write */
     n = 0;
-    for(i = 0; i < 3; i++) {
-        for(j = 0; j < 2; j++) {
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 2; j++) {
             buf52[i][j].p = HDmalloc((size_t)(i + 1) * sizeof(int));
             buf52[i][j].len = (size_t)(i + 1);
-            for(l = 0; l < i + 1; l++) {
-                if(make_diffs)
-                    ((int *)buf52[i][j].p)[l] = 0;
+            for (l = 0; l < i + 1; l++) {
+                if (make_diffs)
+                    ((int *) buf52[i][j].p)[l] = 0;
                 else
-                    ((int *)buf52[i][j].p)[l] = n++;
+                    ((int *) buf52[i][j].p)[l] = n++;
             }
         }
-    }
 
     sid = H5Screate_simple(2, dims2, NULL);
     tid = H5Tvlen_create(H5T_NATIVE_INT);
@@ -6930,10 +7510,7 @@ void write_dset_in(hid_t loc_id,
     */
 
     if (make_diffs)
-    {
-        memset(buf62,0,sizeof buf62);
-    }
-
+        memset(buf62, 0, sizeof buf62);
 
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
     write_dset(loc_id, 2, dims2, "array2D", tid, buf62);
@@ -6944,14 +7521,11 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
-    if (make_diffs)
-    {
+    if (make_diffs) {
         memset(buf72, 0, sizeof buf72);
         memset(buf82, 0, sizeof buf82);
     }
 
-
     dcpl = H5Pcreate(H5P_DATASET_CREATE);
     status = H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillvalue);
     sid = H5Screate_simple(2, dims2, NULL);
@@ -6966,8 +7540,7 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    write_dset(loc_id,2,dims2,"float2D",H5T_NATIVE_FLOAT,buf82);
-
+    write_dset(loc_id, 2, dims2, "float2D", H5T_NATIVE_FLOAT, buf82);
 
     /*-------------------------------------------------------------------------
     * 3D
@@ -6979,33 +7552,27 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    if (make_diffs)
-    {
-        for (i=0; i<4; i++)
-            for (j=0; j<3; j++)
-                for (k=0; k<2; k++)
-                    for (l=0; l<2; l++)
-                        buf13[i][j][k][l]='z';
+    if (make_diffs) {
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
+                for (k = 0; k < 2; k++)
+                    for (l = 0; l < 2; l++)
+                        buf13[i][j][k][l] = 'z';
     }
 
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid,(size_t)STR_SIZE);
-    write_dset(loc_id,3,dims3,"string3D",tid,buf13);
+    status = H5Tset_size(tid, (size_t) STR_SIZE);
+    write_dset(loc_id, 3, dims3, "string3D", tid, buf13);
     status = H5Tclose(tid);
 
-    for (i=0; i<4; i++)
-    {
-        for (j=0; j<3; j++)
-        {
-            for (k=0; k<2; k++)
-            {
-                buf13a[i][j][k]=buf13[i][j][k];
-            }
-        }
-    }
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++)
+                buf13a[i][j][k] = buf13[i][j][k];
+
     tid = H5Tcopy(H5T_C_S1);
-    status  = H5Tset_size(tid, H5T_VARIABLE);
-    write_dset(loc_id,3,dims3,"VLstring3D",tid,buf13a);
+    status = H5Tset_size(tid, H5T_VARIABLE);
+    write_dset(loc_id, 3, dims3, "VLstring3D", tid, buf13a);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -7013,31 +7580,27 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
-    n=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
-                if(make_diffs)
+                if (make_diffs)
                     buf23[i][j][k] = 0;
                 else
-                    buf23[i][j][k] = (char)n++;
+                    buf23[i][j][k] = (char) n++;
             }
-        }
-    }
-
 
     tid = H5Tcopy(H5T_STD_B8LE);
-    write_dset(loc_id,3,dims3,"bitfield3D",tid,buf23);
+    write_dset(loc_id, 3, dims3, "bitfield3D", tid, buf23);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
     * H5T_OPAQUE
     *-------------------------------------------------------------------------
     */
-    tid = H5Tcreate(H5T_OPAQUE, (size_t)1);
+    tid = H5Tcreate(H5T_OPAQUE, (size_t) 1);
     status = H5Tset_tag(tid, "1-byte opaque type"); /* must set this */
-    write_dset(loc_id,3,dims3,"opaque3D",tid,buf23);
+    write_dset(loc_id, 3, dims3, "opaque3D", tid, buf23);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -7045,27 +7608,24 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-    n=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
                     buf33[i][j][k].a = 0;
                     buf33[i][j][k].b = 0.0F;
                 }
                 else {
-                    buf33[i][j][k].a = (char)n++;
+                    buf33[i][j][k].a = (char) n++;
                     buf33[i][j][k].b = n++;
                 }
             }
-        }
-    }
-
 
-    tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
+    tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t));
     H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR);
     H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE);
-    write_dset(loc_id,3,dims3,"compound3D",tid,buf33);
+    write_dset(loc_id, 3, dims3, "compound3D", tid, buf33);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -7073,15 +7633,12 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
     /* Create references to dataset */
-    if (dset_name)
-    {
-        for (i = 0; i < 4; i++) {
-            for (j = 0; j < 3; j++) {
+    if (dset_name) {
+        for (i = 0; i < 4; i++)
+            for (j = 0; j < 3; j++)
                 for (k = 0; k < 2; k++)
-                    status=H5Rcreate(&buf43[i][j][k],fid,dset_name,H5R_OBJECT,(hid_t)-1);
-            }
-        }
-        write_dset(loc_id,3,dims3,"reference3D",H5T_STD_REF_OBJ,buf43);
+                    status = H5Rcreate(&buf43[i][j][k], fid, dset_name, H5R_OBJECT, (hid_t) -1);
+        write_dset(loc_id, 3, dims3, "reference3D", H5T_STD_REF_OBJ, buf43);
     }
 
     /*-------------------------------------------------------------------------
@@ -7090,9 +7647,9 @@ void write_dset_in(hid_t loc_id,
     */
 
     tid = H5Tcreate(H5T_ENUM, sizeof(e_t));
-    H5Tenum_insert(tid, "RED",   (val = 0, &val));
+    H5Tenum_insert(tid, "RED", (val = 0, &val));
     H5Tenum_insert(tid, "GREEN", (val = 1, &val));
-    write_dset(loc_id,3,dims3,"enum3D",tid,0);
+    write_dset(loc_id, 3, dims3, "enum3D", tid, 0);
     status = H5Tclose(tid);
 
     /*-------------------------------------------------------------------------
@@ -7101,21 +7658,19 @@ void write_dset_in(hid_t loc_id,
     */
 
     /* Allocate and initialize VL dataset to write */
-    n=0;
-    for(i = 0; i < 4; i++) {
-        for(j = 0; j < 3; j++) {
-            for(k = 0; k < 2; k++) {
+    n = 0;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
+            for (k = 0; k < 2; k++) {
                 buf53[i][j][k].p = HDmalloc((size_t)(i + 1) * sizeof(int));
                 buf53[i][j][k].len = (size_t)(i + 1);
-                for(l = 0; l < i + 1; l++) {
-                    if(make_diffs)
-                        ((int *)buf53[i][j][k].p)[l] = 0;
+                for (l = 0; l < i + 1; l++) {
+                    if (make_diffs)
+                        ((int *) buf53[i][j][k].p)[l] = 0;
                     else
-                        ((int *)buf53[i][j][k].p)[l] = n++;
+                        ((int *) buf53[i][j][k].p)[l] = n++;
                 }
             }
-        }
-    }
 
     sid = H5Screate_simple(3, dims3, NULL);
     tid = H5Tvlen_create(H5T_NATIVE_INT);
@@ -7133,14 +7688,14 @@ void write_dset_in(hid_t loc_id,
     *-------------------------------------------------------------------------
     */
 
-
-    n=1;
-    for (i = 0; i < 24; i++) {
+    n = 1;
+    for (i = 0; i < 24; i++)
         for (j = 0; j < 3; j++) {
-            if (make_diffs) buf63[i][j]=0;
-            else buf63[i][j]=n++;
+            if (make_diffs)
+                buf63[i][j] = 0;
+            else
+                buf63[i][j] = n++;
         }
-    }
 
     tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray);
     write_dset(loc_id, 3, dims3, "array3D", tid, buf63);
@@ -7150,82 +7705,86 @@ void write_dset_in(hid_t loc_id,
     * H5T_INTEGER and H5T_FLOAT
     *-------------------------------------------------------------------------
     */
-    n=1; f=1;
-    for (i = 0; i < 4; i++) {
-        for (j = 0; j < 3; j++) {
+    n = 1;
+    f = 1;
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 3; j++)
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
-                    buf73[i][j][k]=0;
-                    buf83[i][j][k]=0.0F;
+                    buf73[i][j][k] = 0;
+                    buf83[i][j][k] = 0.0F;
                 }
                 else {
-                    buf73[i][j][k]=n++;
-                    buf83[i][j][k]=f++;
+                    buf73[i][j][k] = n++;
+                    buf83[i][j][k] = f++;
                 }
             }
-        }
-    }
-    write_dset(loc_id,3,dims3,"integer3D",H5T_NATIVE_INT,buf73);
-    write_dset(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83);
+
+    write_dset(loc_id, 3, dims3, "integer3D", H5T_NATIVE_INT, buf73);
+    write_dset(loc_id, 3, dims3, "float3D", H5T_NATIVE_FLOAT, buf83);
 }
 
 /*-------------------------------------------------------------------------
-* Function: gen_datareg
-*
-* Purpose: generate a dataset region and its reference
-*
-* Date: April 19, 2006
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: gen_datareg
+ *
+ * Purpose: generate a dataset region and its reference
+ *
+ * Date: April 19, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
 
 static
-void gen_datareg(hid_t fid,
-                 int make_diffs /* flag to modify data buffers */)
+void gen_datareg(hid_t fid, int make_diffs /* flag to modify data buffers */)
 {
     /* data dataset */
-    hid_t           did1;              /* dataset ID   */
-    hid_t           sid1;              /* dataspace ID  */
-    hsize_t         dims1[2] = {10,10};/* dimensions */
-    int             *buf;              /* dataset buffer */
+    hid_t did1 = -1; /* dataset ID   */
+    hid_t sid1 = -1; /* dataspace ID  */
+    hsize_t dims1[2] = { 10, 10 };/* dimensions */
+    int *buf; /* dataset buffer */
     /* reference dataset */
-    hid_t           did2;              /* dataset ID   */
-    hid_t           sid2;              /* dataspace ID  */
-    hsize_t         dims2[] = {2};     /* 2 references */
-    hdset_reg_ref_t *rbuf;             /* buffer for write the references  */
-    hsize_t         start[10];         /* starting location of hyperslab */
-    hsize_t         count[10];         /* element count of hyperslab */
-    hsize_t         coord[5][2];       /* coordinates for point selection */
-    herr_t          status;
-    int             i;
+    hid_t did2 = -1; /* dataset ID   */
+    hid_t sid2 = -1; /* dataspace ID  */
+    hsize_t dims2[] = { 2 }; /* 2 references */
+    hdset_reg_ref_t *rbuf; /* buffer for write the references  */
+    hsize_t start[10]; /* starting location of hyperslab */
+    hsize_t count[10]; /* element count of hyperslab */
+    hsize_t coord[5][2]; /* coordinates for point selection */
+    herr_t status;
+    int i;
 
     /* allocate the buffer for write the references */
-    rbuf = (hdset_reg_ref_t *)HDcalloc((size_t)2, sizeof(hdset_reg_ref_t));
+    rbuf = (hdset_reg_ref_t *) HDcalloc((size_t )2, sizeof(hdset_reg_ref_t));
 
     /* allocate the buffer for write the data dataset */
-    buf = (int *)HDmalloc(10 * 10 * sizeof(int));
+    buf = (int *) HDmalloc(10 * 10 * sizeof(int));
 
-    for(i = 0; i < 10 * 10; i++)
+    for (i = 0; i < 10 * 10; i++)
         buf[i] = i;
 
     /* create the data dataset */
-    sid1   = H5Screate_simple(2, dims1, NULL);
-    did1   = H5Dcreate2(fid, "dsetref", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    sid1 = H5Screate_simple(2, dims1, NULL);
+    did1 = H5Dcreate2(fid, "dsetref", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
     HDassert(status >= 0);
 
     /* create the reference dataset */
-    sid2   = H5Screate_simple(1, dims2, NULL);
-    did2   = H5Dcreate2(fid, "refreg", H5T_STD_REF_DSETREG, sid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    sid2 = H5Screate_simple(1, dims2, NULL);
+    did2 = H5Dcreate2(fid, "refreg", H5T_STD_REF_DSETREG, sid2, H5P_DEFAULT,
+    H5P_DEFAULT, H5P_DEFAULT);
 
     /* create the references */
     /* select hyperslab for first reference */
 
-    start[0] = 2; start[1] = 2;
-    count[0] = 6; count[1] = 6;
-    if(make_diffs) {
-        start[0] = 0; start[1] = 0;
-        count[0] = 3; count[1] = 3;
+    start[0] = 2;
+    start[1] = 2;
+    count[0] = 6;
+    count[1] = 6;
+    if (make_diffs) {
+        start[0] = 0;
+        start[1] = 0;
+        count[0] = 3;
+        count[1] = 3;
     }
 
     status = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, NULL, count, NULL);
@@ -7237,25 +7796,32 @@ void gen_datareg(hid_t fid,
     HDassert(status >= 0);
 
     /* select sequence of five points for second reference */
-    coord[0][0]=6; coord[0][1]=9;
-    coord[1][0]=2; coord[1][1]=2;
-    coord[2][0]=8; coord[2][1]=4;
-    coord[3][0]=1; coord[3][1]=6;
-    coord[4][0]=2; coord[4][1]=8;
-    if (make_diffs)
-    {
-        coord[1][0]=3; coord[1][1]=3;
-        coord[3][0]=2; coord[3][1]=5;
-        coord[4][0]=1; coord[4][1]=7;
-    }
-    H5Sselect_elements(sid1,H5S_SELECT_SET,(size_t)5,(const hsize_t *)coord);
+    coord[0][0] = 6;
+    coord[0][1] = 9;
+    coord[1][0] = 2;
+    coord[1][1] = 2;
+    coord[2][0] = 8;
+    coord[2][1] = 4;
+    coord[3][0] = 1;
+    coord[3][1] = 6;
+    coord[4][0] = 2;
+    coord[4][1] = 8;
+    if (make_diffs) {
+        coord[1][0] = 3;
+        coord[1][1] = 3;
+        coord[3][0] = 2;
+        coord[3][1] = 5;
+        coord[4][0] = 1;
+        coord[4][1] = 7;
+    }
+    H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t) 5, (const hsize_t *) coord);
     H5Sget_select_npoints(sid1);
 
     /* store second dataset region */
-    H5Rcreate(&rbuf[1],fid,"dsetref",H5R_DATASET_REGION,sid1);
+    H5Rcreate(&rbuf[1], fid, "dsetref", H5R_DATASET_REGION, sid1);
 
     /* write */
-    status = H5Dwrite(did2,H5T_STD_REF_DSETREG,H5S_ALL,H5S_ALL,H5P_DEFAULT,rbuf);
+    status = H5Dwrite(did2, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf);
     HDassert(status >= 0);
 
     /* close, free memory buffers */
@@ -7272,60 +7838,58 @@ void gen_datareg(hid_t fid,
     HDfree(buf);
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: test_hyperslab
-*
-* Purpose: test diff by hyperslabs. create a dataset with 1GB dimensions
-*  by iterating trough 1KB hyperslabs
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: test_hyperslab
+ *
+ * Purpose: test diff by hyperslabs. create a dataset with 1GB dimensions
+ *  by iterating trough 1KB hyperslabs
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-int test_hyperslab(const char *fname,
-                   int make_diffs /* flag to modify data buffers */)
+int test_hyperslab(const char *fname, int make_diffs /* flag to modify data buffers */)
 {
-    hid_t   did=-1;
-    hid_t   fid=-1;
-    hid_t   f_sid=-1;
-    hid_t   m_sid=-1;
-    hid_t   tid=-1;
-    hid_t   dcpl=-1;
-    hsize_t dims[1]={GBLL};                  /* dataset dimensions */
-    hsize_t hs_size[1]={GBLL/(1024*1024)};   /* hyperslab dimensions */
-    hsize_t chunk_dims[1]={GBLL/1024};       /* chunk dimensions */
+    hid_t did = -1;
+    hid_t fid = -1;
+    hid_t f_sid = -1;
+    hid_t m_sid = -1;
+    hid_t tid = -1;
+    hid_t dcpl = -1;
+    hsize_t dims[1] = { GBLL }; /* dataset dimensions */
+    hsize_t hs_size[1] = { GBLL / (1024 * 1024) }; /* hyperslab dimensions */
+    hsize_t chunk_dims[1] = { GBLL / 1024 }; /* chunk dimensions */
     hsize_t hs_start[1];
-    size_t  size;
-    size_t  nelmts=(size_t)GBLL/(1024*1024); /* elements in each hyperslab */
-    char    fillvalue=-1;
-    char    *buf=NULL;
-    int     i, j, s;
-    char    c;
+    size_t size;
+    size_t nelmts = (size_t)GBLL / (1024 * 1024); /* elements in each hyperslab */
+    char fillvalue = -1;
+    char *buf = NULL;
+    int i, j, s;
+    char c;
 
     /* create */
     fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto out;
-    if(H5Pset_fill_value(dcpl, H5T_NATIVE_CHAR, &fillvalue) < 0)
+    if (H5Pset_fill_value(dcpl, H5T_NATIVE_CHAR, &fillvalue) < 0)
         goto out;
-    if(H5Pset_chunk(dcpl, 1, chunk_dims) < 0)
+    if (H5Pset_chunk(dcpl, 1, chunk_dims) < 0)
         goto out;
-    if((f_sid = H5Screate_simple(1, dims, NULL)) < 0)
+    if ((f_sid = H5Screate_simple(1, dims, NULL)) < 0)
         goto out;
-    if((did = H5Dcreate2(fid, "big", H5T_NATIVE_CHAR, f_sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, "big", H5T_NATIVE_CHAR, f_sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto out;
-    if((m_sid = H5Screate_simple(1, hs_size, hs_size)) < 0)
+    if ((m_sid = H5Screate_simple(1, hs_size, hs_size)) < 0)
         goto out;
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         goto out;
-    if((size = H5Tget_size(tid)) <= 0)
+    if ((size = H5Tget_size(tid)) <= 0)
         goto out;
 
     /* create a evenly divided buffer from 0 to 127  */
-    buf = (char *)HDmalloc((size_t)(nelmts * size));
+    buf = (char *) HDmalloc((size_t)(nelmts * size));
     s = 1024 * 1024 / 127;
-    for(i = 0, j = 0, c = 0; i < 1024 * 1024; j++, i++) {
-        if(j == s) {
+    for (i = 0, j = 0, c = 0; i < 1024 * 1024; j++, i++) {
+        if (j == s) {
             c++;
             j = 0;
         }
@@ -7334,32 +7898,30 @@ int test_hyperslab(const char *fname,
         HDmemset(buf, c, nelmts);
 
         /* make a different hyperslab at this position */
-        if(make_diffs && i == 512 * 512)
+        if (make_diffs && i == 512 * 512)
             HDmemset(buf, 0, nelmts);
 
-        hs_start[0] = (unsigned long long)i * GBLL / (1024 * 1024);
-        if (H5Sselect_hyperslab (f_sid,H5S_SELECT_SET,hs_start,NULL,hs_size, NULL) < 0)
+        hs_start[0] = (unsigned long long) i * GBLL / (1024 * 1024);
+        if (H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, hs_start, NULL, hs_size, NULL) < 0)
             goto out;
 
         /* write only one hyperslab */
-        if ( i==512*512)
-        {
-            if (H5Dwrite (did,H5T_NATIVE_CHAR,m_sid,f_sid,H5P_DEFAULT,buf) < 0)
+        if (i == 512 * 512) {
+            if (H5Dwrite(did, H5T_NATIVE_CHAR, m_sid, f_sid, H5P_DEFAULT, buf) < 0)
                 goto out;
         }
-
     }
     HDfree(buf);
-    buf=NULL;
+    buf = NULL;
 
     /* close */
-    if(H5Sclose(f_sid) < 0)
+    if (H5Sclose(f_sid) < 0)
         goto out;
-    if(H5Sclose(m_sid) < 0)
+    if (H5Sclose(m_sid) < 0)
         goto out;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         goto out;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto out;
     H5Fclose(fid);
 
@@ -7374,40 +7936,32 @@ out:
         H5Fclose(fid);
     } H5E_END_TRY;
     return -1;
-
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: write_attr
-*
-* Purpose: utility function to write an attribute in LOC_ID
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: write_attr
+ *
+ * Purpose: utility function to write an attribute in LOC_ID
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-int write_attr(hid_t loc_id,
-               int rank,
-               hsize_t *dims,
-               const char *name,
-               hid_t tid,
-               void *buf)
+int write_attr(hid_t loc_id, int rank, hsize_t *dims, const char *name, hid_t tid, void *buf)
 {
-    hid_t   aid=-1;
-    hid_t   sid=-1;
+    hid_t aid = -1;
+    hid_t sid = -1;
 
     /* create a space  */
-    if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
+    if ((sid = H5Screate_simple(rank, dims, NULL)) < 0)
         goto out;
 
     /* create the attribute */
-    if((aid = H5Acreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((aid = H5Acreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* write */
-    if(buf)
-    {
-        if(H5Awrite(aid, tid, buf) < 0)
+    if (buf) {
+        if (H5Awrite(aid, tid, buf) < 0)
             goto out;
     }
 
@@ -7425,35 +7979,29 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: write_dset
-*
-* Purpose: utility function to create and write a dataset in LOC_ID
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: write_dset
+ *
+ * Purpose: utility function to create and write a dataset in LOC_ID
+ *
+ *-------------------------------------------------------------------------
+ */
 static
-int write_dset( hid_t loc_id,
-               int rank,
-               hsize_t *dims,
-               const char *name,
-               hid_t tid,
-               void *buf )
+int write_dset(hid_t loc_id, int rank, hsize_t *dims, const char *name, hid_t tid, void *buf)
 {
-    hid_t   did=-1;
-    hid_t   sid=-1;
+    hid_t did = -1;
+    hid_t sid = -1;
 
     /* create a space  */
-    if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
+    if ((sid = H5Screate_simple(rank, dims, NULL)) < 0)
         goto out;
 
     /* create the dataset */
-    if((did = H5Dcreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* write */
-    if(buf)
-    {
-        if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (buf) {
+        if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
             goto out;
     }
 
diff --git a/tools/h5diff/testfiles/h5diff_8625.txt b/tools/h5diff/testfiles/h5diff_8625.txt
new file mode 100644
index 0000000..a7ddb86
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_8625.txt
@@ -0,0 +1,10 @@
+dataset: </group/Compound_dset1> and </group_copy/Compound_dset3>
+Warning: different storage datatype
+Warning: different storage datatype
+Not comparable: </group/Compound_dset1> or </group_copy/Compound_dset3> is of mixed string type
+0 differences found
+--------------------------------
+Some objects are not comparable
+--------------------------------
+Use -c for a list of objects without details of differences.
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_8639.txt b/tools/h5diff/testfiles/h5diff_8639.txt
new file mode 100644
index 0000000..4022e06
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_8639.txt
@@ -0,0 +1,72 @@
+
+group1   group2
+---------------------------------------
+    x      x                   
+
+group  : </g1> and </g1>
+0 differences found
+Warning: different storage datatype
+Not comparable: <VLstring> or <VLstring> is of mixed string type
+Warning: different storage datatype
+Not comparable: <VLstring2D> or <VLstring2D> is of mixed string type
+Warning: different storage datatype
+Not comparable: <VLstring3D> or <VLstring3D> is of mixed string type
+attribute: <array of </g1>> and <array of </g1>>
+0 differences found
+attribute: <array2D of </g1>> and <array2D of </g1>>
+0 differences found
+attribute: <array3D of </g1>> and <array3D of </g1>>
+0 differences found
+attribute: <bitfield of </g1>> and <bitfield of </g1>>
+0 differences found
+attribute: <bitfield2D of </g1>> and <bitfield2D of </g1>>
+0 differences found
+attribute: <bitfield3D of </g1>> and <bitfield3D of </g1>>
+0 differences found
+attribute: <compound of </g1>> and <compound of </g1>>
+0 differences found
+attribute: <compound2D of </g1>> and <compound2D of </g1>>
+0 differences found
+attribute: <compound3D of </g1>> and <compound3D of </g1>>
+0 differences found
+attribute: <enum of </g1>> and <enum of </g1>>
+0 differences found
+attribute: <enum2D of </g1>> and <enum2D of </g1>>
+0 differences found
+attribute: <enum3D of </g1>> and <enum3D of </g1>>
+0 differences found
+attribute: <float of </g1>> and <float of </g1>>
+0 differences found
+attribute: <float2D of </g1>> and <float2D of </g1>>
+0 differences found
+attribute: <float3D of </g1>> and <float3D of </g1>>
+0 differences found
+attribute: <integer of </g1>> and <integer of </g1>>
+0 differences found
+attribute: <integer2D of </g1>> and <integer2D of </g1>>
+0 differences found
+attribute: <integer3D of </g1>> and <integer3D of </g1>>
+0 differences found
+attribute: <opaque of </g1>> and <opaque of </g1>>
+0 differences found
+attribute: <opaque2D of </g1>> and <opaque2D of </g1>>
+0 differences found
+attribute: <opaque3D of </g1>> and <opaque3D of </g1>>
+0 differences found
+Warning: different storage datatype
+Not comparable: <string> or <string> is of mixed string type
+Warning: different storage datatype
+Not comparable: <string2D> or <string2D> is of mixed string type
+Warning: different storage datatype
+Not comparable: <string3D> or <string3D> is of mixed string type
+attribute: <vlen of </g1>> and <vlen of </g1>>
+0 differences found
+attribute: <vlen2D of </g1>> and <vlen2D of </g1>>
+0 differences found
+attribute: <vlen3D of </g1>> and <vlen3D of </g1>>
+0 differences found
+--------------------------------
+Some objects are not comparable
+--------------------------------
+Use -c for a list of objects without details of differences.
+EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_attr1.h5 b/tools/h5diff/testfiles/h5diff_attr1.h5
index 5004f13..fc519d4 100644
Binary files a/tools/h5diff/testfiles/h5diff_attr1.h5 and b/tools/h5diff/testfiles/h5diff_attr1.h5 differ
diff --git a/tools/h5diff/testfiles/h5diff_attr2.h5 b/tools/h5diff/testfiles/h5diff_attr2.h5
index 92a91c0..627d432 100644
Binary files a/tools/h5diff/testfiles/h5diff_attr2.h5 and b/tools/h5diff/testfiles/h5diff_attr2.h5 differ
diff --git a/tools/h5diff/testfiles/h5diff_attr3.h5 b/tools/h5diff/testfiles/h5diff_attr3.h5
new file mode 100644
index 0000000..df2c664
Binary files /dev/null and b/tools/h5diff/testfiles/h5diff_attr3.h5 differ
diff --git a/tools/h5diff/testfiles/h5diff_tmp1.txt b/tools/h5diff/testfiles/h5diff_tmp1.txt
deleted file mode 100644
index 40e3fb6..0000000
--- a/tools/h5diff/testfiles/h5diff_tmp1.txt
+++ /dev/null
@@ -1,5 +0,0 @@
---------------------------------
-Some objects are not comparable
---------------------------------
-Use -c for a list of objects.
-EXIT CODE: 0
diff --git a/tools/h5diff/testfiles/h5diff_tmp2.txt b/tools/h5diff/testfiles/h5diff_tmp2.txt
deleted file mode 100644
index a2d6da6..0000000
--- a/tools/h5diff/testfiles/h5diff_tmp2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-dataset: </G/down/Data> and </G/down/Data>
-1599 differences found
-dataset: </G/down/Tail/array> and </G/down/Tail/array>
-8 differences found
-dataset: </G/up/Data> and </G/up/Data>
-1845 differences found
-dataset: </G/up/Tail/array> and </G/up/Tail/array>
-10 differences found
---------------------------------
-Some objects are not comparable
---------------------------------
-Use -c for a list of objects.
-EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5 b/tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5
deleted file mode 100644
index bbcfb63..0000000
Binary files a/tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5 and /dev/null differ
diff --git a/tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5 b/tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5
deleted file mode 100644
index 6b19ed7..0000000
Binary files a/tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5 and /dev/null differ
diff --git a/tools/h5diff/testfiles/tmptest.he5 b/tools/h5diff/testfiles/tmptest.he5
deleted file mode 100644
index edcfcd2..0000000
Binary files a/tools/h5diff/testfiles/tmptest.he5 and /dev/null differ
diff --git a/tools/h5diff/testfiles/tmptest2.he5 b/tools/h5diff/testfiles/tmptest2.he5
deleted file mode 100644
index a6ab02b..0000000
Binary files a/tools/h5diff/testfiles/tmptest2.he5 and /dev/null differ
diff --git a/tools/h5diff/testh5diff.sh.in b/tools/h5diff/testh5diff.sh.in
index ff370a9..4563e39 100644
--- a/tools/h5diff/testh5diff.sh.in
+++ b/tools/h5diff/testh5diff.sh.in
@@ -82,6 +82,7 @@ $SRC_H5DIFF_TESTFILES/h5diff_types.h5
 $SRC_H5DIFF_TESTFILES/h5diff_dtypes.h5
 $SRC_H5DIFF_TESTFILES/h5diff_attr1.h5
 $SRC_H5DIFF_TESTFILES/h5diff_attr2.h5
+$SRC_H5DIFF_TESTFILES/h5diff_attr3.h5
 $SRC_H5DIFF_TESTFILES/h5diff_dset1.h5
 $SRC_H5DIFF_TESTFILES/h5diff_dset2.h5
 $SRC_H5DIFF_TESTFILES/h5diff_hyper1.h5
@@ -307,13 +308,9 @@ $SRC_H5DIFF_TESTFILES/h5diff_709.txt
 $SRC_H5DIFF_TESTFILES/h5diff_710.txt
 $SRC_H5DIFF_TESTFILES/h5diff_80.txt
 $SRC_H5DIFF_TESTFILES/h5diff_90.txt
-$SRC_H5DIFF_TESTFILES/h5diff_tmp1.txt
-$SRC_H5DIFF_TESTFILES/h5diff_tmp2.txt
+$SRC_H5DIFF_TESTFILES/h5diff_8625.txt
+$SRC_H5DIFF_TESTFILES/h5diff_8639.txt
 $SRC_H5DIFF_TESTFILES/h5diff_vlstr.txt
-$SRC_H5DIFF_TESTFILES/tmptest.he5
-$SRC_H5DIFF_TESTFILES/tmptest2.he5
-$SRC_H5DIFF_TESTFILES/tmpSingleSiteBethe.reference.h5
-$SRC_H5DIFF_TESTFILES/tmpSingleSiteBethe.output.h5
 "
 
 #
@@ -776,10 +773,6 @@ TOOLTEST h5diff_631.txt -v --use-system-epsilon h5diff_basic1.h5 h5diff_basic1.h
 # 7.  attributes
 # ##############################################################################
 TOOLTEST h5diff_70.txt -v h5diff_attr1.h5 h5diff_attr2.h5
-# temporary test to verify HDF5-8625
-TOOLTEST h5diff_tmp1.txt tmptest2.he5 tmptest.he5
-# temporary test to verify HDF5-8639
-TOOLTEST h5diff_tmp2.txt tmpSingleSiteBethe.output.h5 tmpSingleSiteBethe.reference.h5
 
 # ##################################################
 #  attrs with verbose option level
@@ -1101,6 +1094,10 @@ TOOLTEST h5diff_487.txt -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5 h5
 # # diff various multiple vlen and fixed strings in a compound type dataset
 # ##############################################################################
 TOOLTEST h5diff_530.txt -v  h5diff_comp_vl_strs.h5 h5diff_comp_vl_strs.h5 /group /group_copy
+# test to verify HDFFV-8625
+TOOLTEST h5diff_8625.txt -v --enable-error-stack h5diff_comp_vl_strs.h5 h5diff_comp_vl_strs.h5 /group/Compound_dset1 /group_copy/Compound_dset3
+# test to verify HDFFV-8639
+TOOLTEST h5diff_8639.txt -v h5diff_attr3.h5 h5diff_attr2.h5 /g1
 TOOLTEST h5diff_vlstr.txt -v  tvlstr.h5 tvlstr2.h5
 
 # ##############################################################################
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index 3a91e54..f301014 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -97,10 +97,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5dump-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5dump ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index 4831d5c..bde8286 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -43,11 +43,13 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  INSTALL_PROGRAM_PDB (h5import ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
-          h5import
+          ${H5_DEP_EXECUTABLES}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt
index 927a64c..632fba8 100644
--- a/tools/h5jam/CMakeLists.txt
+++ b/tools/h5jam/CMakeLists.txt
@@ -37,8 +37,6 @@ set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5unjam")
 
 set (H5_DEP_EXECUTABLES
     h5jam
-    getub
-    tellub
     h5unjam
 )
 
@@ -70,11 +68,13 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  INSTALL_PROGRAM_PDB (h5jam ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
-          h5jam h5unjam
+          ${H5_DEP_EXECUTABLES}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c
index 269ca89..519d6df 100644
--- a/tools/h5jam/h5jam.c
+++ b/tools/h5jam/h5jam.c
@@ -182,9 +182,11 @@ parse_command_line (int argc, const char *argv[])
       case 'h':
           usage (h5tools_getprogname());
           leave (EXIT_SUCCESS);
+          break;
       case 'V':
           print_version (h5tools_getprogname());
           leave (EXIT_SUCCESS);
+          break;
       case '?':
       default:
           usage (h5tools_getprogname());
@@ -201,10 +203,6 @@ parse_command_line (int argc, const char *argv[])
  * Return:      Success:    0
  *              Failure:    1
  *
- * Programmer:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt
index 0e49edb..d9c3977 100644
--- a/tools/h5ls/CMakeLists.txt
+++ b/tools/h5ls/CMakeLists.txt
@@ -73,10 +73,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5ls-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5ls ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index 86611a9..4b15d7c 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -114,10 +114,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5repack-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5repack ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index 63233b8..a4f8f5b 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -882,7 +882,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                         HDfree(buf);
                                         buf = NULL;
                                     }
-                                 }
+                                }
                                 else { /* possibly not enough memory, read/write by hyperslabs */
                                     size_t p_type_nbytes = msize; /*size of memory type */
                                     hsize_t p_nelmts = nelmts; /*total elements */
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 523f81a..1371691 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -42,7 +42,7 @@ static int aux_copy_obj(hid_t dcpl_id, /* dataset creation property list */
     H5D_layout_t layout;
     int          rank;           /* rank of dataset */
     hsize_t      chsize[64];     /* chunk size in elements */
-    unsigned int i, j;
+    unsigned int i;
 
     /* get information about input filters */
     if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
@@ -237,7 +237,7 @@ int apply_filters(const char* name, /* object name from traverse list */
     int         nfilters;      /* number of filters in DCPL */
     hsize_t     chsize[64];    /* chunk size in elements */
     H5D_layout_t layout;
-    int         i, j;
+    int         i;
     pack_info_t obj;
     pack_info_t filtobj;
 
diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt
index 8c9ec64..9499ea8 100644
--- a/tools/h5stat/CMakeLists.txt
+++ b/tools/h5stat/CMakeLists.txt
@@ -56,10 +56,9 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  if (BUILD_SHARED_LIBS)
-    INSTALL_PROGRAM_PDB (h5stat-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  endif ()
-  INSTALL_PROGRAM_PDB (h5stat ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 4c145a4..068a635 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -39,7 +39,10 @@ set (H5_TOOLS_LIB_HDRS
 
 add_library (${HDF5_TOOLS_LIB_TARGET} STATIC ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS})
 TARGET_C_PROPERTIES (${HDF5_TOOLS_LIB_TARGET} STATIC " " " ")
-target_link_libraries (${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+target_link_libraries (${HDF5_TOOLS_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
+if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
+  target_link_libraries (${HDF5_TOOLS_LIB_TARGET} PRIVATE ${MPI_C_LIBRARIES})
+endif ()
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIB_TARGET}")
 H5_SET_LIB_OPTIONS (${HDF5_TOOLS_LIB_TARGET} ${HDF5_TOOLS_LIB_NAME} STATIC)
 set_target_properties (${HDF5_TOOLS_LIB_TARGET} PROPERTIES
@@ -52,7 +55,10 @@ set (install_targets ${HDF5_TOOLS_LIB_TARGET})
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_TOOLS_LIBSH_TARGET} SHARED ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS})
   TARGET_C_PROPERTIES (${HDF5_TOOLS_LIBSH_TARGET} SHARED " " " ")
-  target_link_libraries (${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  target_link_libraries (${HDF5_TOOLS_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})
+  if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
+    target_link_libraries (${HDF5_TOOLS_LIBSH_TARGET} PRIVATE ${MPI_C_LIBRARIES})
+  endif ()
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIBSH_TARGET}")
   H5_SET_LIB_OPTIONS (${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TOOLS_LIB_NAME} SHARED ${HDF5_TOOLS_PACKAGE_SOVERSION})
   set_target_properties (${HDF5_TOOLS_LIBSH_TARGET} PROPERTIES
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index 6019738..7f08cc7 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -325,8 +325,6 @@ hsize_t diff_attr(hid_t loc1_id,
     hid_t      space2_id = -1;    /* space ID */
     hid_t      ftype1_id = -1;    /* file data type ID */
     hid_t      ftype2_id = -1;    /* file data type ID */
-    int        vstrtype1 = 0;     /* ftype1 is a variable string */
-    int        vstrtype2 = 0;     /* ftype2 is a variable string */
     hid_t      mtype1_id = -1;    /* memory data type ID */
     hid_t      mtype2_id = -1;    /* memory data type ID */
     size_t     msize1;            /* memory size of memory type */
@@ -385,28 +383,8 @@ hsize_t diff_attr(hid_t loc1_id,
             /* get the datatypes  */
             if((ftype1_id = H5Aget_type(attr1_id)) < 0)
                 HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type first attribute failed");
-            vstrtype1 = H5Tis_variable_str(ftype1_id);
             if((ftype2_id = H5Aget_type(attr2_id)) < 0)
                 HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type second attribute failed");
-            vstrtype2 = H5Tis_variable_str(ftype2_id);
-
-            /* no compare if either one but not both are variable string type */
-            if (vstrtype1 != vstrtype2) {
-                if((opts->m_verbose || opts->m_list_not_cmp))
-                    parallel_print("Not comparable: one of attribute <%s/%s> or <%s/%s> is of variable length type\n",
-                            path1, name1, path2, name2);
-                opts->not_cmp = 1;
-                if (H5Tclose(ftype1_id) < 0)
-                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose first attribute ftype failed");
-                if (H5Tclose(ftype2_id) < 0)
-                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose second attribute ftype failed");
-                if (H5Aclose(attr1_id) < 0)
-                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aclose first attribute failed");
-                if (H5Aclose(attr2_id) < 0)
-                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aclose second attribute failed");
-
-                continue;
-            }
 
             if((mtype1_id = H5Tget_native_type(ftype1_id, H5T_DIR_DEFAULT)) < 0)
                 HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tget_native_type first attribute ftype failed");
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 9d0462d..af6a171 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -192,7 +192,8 @@ hsize_t diff_datasetid(hid_t did1,
     hid_t      sm_space = -1;           /*stripmine data space */
     size_t     need;                    /* bytes needed for malloc */
     int        i;
-    unsigned int  vl_data = 0;          /*contains VL datatypes */
+    unsigned int  vl_data1 = 0;          /*contains VL datatypes */
+    unsigned int  vl_data2 = 0;          /*contains VL datatypes */
 
     h5difftrace("diff_datasetid start\n");
     /* Get the dataspace handle */
@@ -314,7 +315,9 @@ hsize_t diff_datasetid(hid_t did1,
      * VLEN memory buffer later
      */
     if(TRUE == h5tools_detect_vlen(m_tid1))
-        vl_data = TRUE;
+        vl_data1 = TRUE;
+    if(TRUE == h5tools_detect_vlen(m_tid2))
+        vl_data2 = TRUE;
     h5diffdebug2("h5tools_detect_vlen - errstat:%d\n", opts->err_stat);
 
     /*------------------------------------------------------------------------
@@ -405,11 +408,12 @@ hsize_t diff_datasetid(hid_t did1,
             h5diffdebug2("diff_array nfound:%d\n", nfound);
 
             /* reclaim any VL memory, if necessary */
-            if(vl_data) {
-                h5difftrace("check vl_data\n");
+            h5diffdebug2("check vl_data1:%d\n", vl_data1);
+            if(vl_data1)
                 H5Dvlen_reclaim(m_tid1, sid1, H5P_DEFAULT, buf1);
+            h5diffdebug2("check vl_data2:%d\n", vl_data2);
+            if(vl_data2)
                 H5Dvlen_reclaim(m_tid2, sid2, H5P_DEFAULT, buf2);
-            } /* end if */
             if(buf1 != NULL) {
                 HDfree(buf1);
                 buf1 = NULL;
@@ -499,10 +503,10 @@ hsize_t diff_datasetid(hid_t did1,
                         dadims, opts, name1, name2, dam_tid, did1, did2);
 
                 /* reclaim any VL memory, if necessary */
-                if(vl_data) {
+                if(vl_data1)
                     H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
-                    H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf2);
-                } /* end if */
+                if(vl_data2)
+                    H5Dvlen_reclaim(m_tid2, sm_space, H5P_DEFAULT, sm_buf2);
 
                 /* calculate the next hyperslab offset */
                 for(i = rank1, carry = 1; i > 0 && carry; --i) {
@@ -539,29 +543,29 @@ done:
     /* free */
     if(buf1 != NULL) {
         /* reclaim any VL memory, if necessary */
-        if(vl_data)
+        if(vl_data1)
             H5Dvlen_reclaim(m_tid1, sid1, H5P_DEFAULT, buf1);
         HDfree(buf1);
         buf1 = NULL;
     }
     if(buf2 != NULL) {
         /* reclaim any VL memory, if necessary */
-        if(vl_data)
+        if(vl_data2)
             H5Dvlen_reclaim(m_tid2, sid2, H5P_DEFAULT, buf2);
         HDfree(buf2);
         buf2 = NULL;
     }
     if(sm_buf1 != NULL) {
         /* reclaim any VL memory, if necessary */
-        if(vl_data)
+        if(vl_data1)
             H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
         HDfree(sm_buf1);
         sm_buf1 = NULL;
     }
     if(sm_buf2 != NULL) {
         /* reclaim any VL memory, if necessary */
-        if(vl_data)
-            H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf2);
+        if(vl_data2)
+            H5Dvlen_reclaim(m_tid2, sm_space, H5P_DEFAULT, sm_buf2);
         HDfree(sm_buf2);
         sm_buf2 = NULL;
     }
@@ -570,6 +574,7 @@ done:
     H5E_BEGIN_TRY {
         H5Sclose(sid1);
         H5Sclose(sid2);
+        H5Sclose(sm_space);
         H5Tclose(f_tid1);
         H5Tclose(f_tid2);
         H5Tclose(m_tid1);
@@ -761,12 +766,31 @@ int diff_can_type(hid_t       f_tid1, /* file data type */
         }
     }
 
+    if(tclass1 == H5T_STRING) {
+        htri_t vstrtype1 = -1;
+        htri_t vstrtype2 = -1;
+        h5difftrace("diff_can_type end - H5T_STRING\n");
+
+        vstrtype1 = H5Tis_variable_str(f_tid1);
+        vstrtype2 = H5Tis_variable_str(f_tid2);
+
+        /* no compare if either one but not both are variable string type */
+        if (vstrtype1 != vstrtype2) {
+            if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name)
+                parallel_print("Not comparable: <%s> or <%s> is of mixed string type\n",
+                        obj1_name, obj2_name);
+            opts->not_cmp = 1;
+            HGOTO_DONE(0);
+        }
+    }
+
     if(tclass1 == H5T_COMPOUND) {
         int   nmembs1;
         int   nmembs2;
         int   j;
         hid_t memb_type1 = -1;
         hid_t memb_type2 = -1;
+        h5difftrace("diff_can_type end - H5T_COMPOUND\n");
 
         nmembs1 = H5Tget_nmembers(f_tid1);
         nmembs2 = H5Tget_nmembers(f_tid2);
diff --git a/tools/lib/io_timer.c b/tools/lib/io_timer.c
index c894598..ab184d3 100644
--- a/tools/lib/io_timer.c
+++ b/tools/lib/io_timer.c
@@ -25,10 +25,6 @@
 #include "H5private.h"
 #include "hdf5.h"
 
-#ifdef H5_HAVE_PARALLEL
-#include <mpi.h>
-#endif
-
 #include "io_timer.h"
 
 /*
diff --git a/tools/lib/ph5diff.h b/tools/lib/ph5diff.h
index 21d7d00..2189e31 100644
--- a/tools/lib/ph5diff.h
+++ b/tools/lib/ph5diff.h
@@ -42,9 +42,5 @@ struct diffs_found
     int      not_cmp;
 };
 
-#ifdef H5_HAVE_PARALLEL
-#include <mpi.h>
-#endif
-
 #endif  /* _PH5DIFF_H__ */
 
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
index da1af42..1c22235 100644
--- a/tools/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
@@ -76,13 +76,13 @@ endif ()
 # Rules for Installation of tools using make Install target
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
-  INSTALL_PROGRAM_PDB (h5debug ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  INSTALL_PROGRAM_PDB (h5repart ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-  INSTALL_PROGRAM_PDB (h5mkgrp ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  foreach (exec ${H5_DEP_EXECUTABLES})
+    INSTALL_PROGRAM_PDB (${exec} ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  endforeach ()
 
   install (
       TARGETS
-          h5debug h5repart h5mkgrp
+          ${H5_DEP_EXECUTABLES}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c
index 43d6bfe..b7ff73c 100644
--- a/tools/misc/h5mkgrp.c
+++ b/tools/misc/h5mkgrp.c
@@ -129,6 +129,7 @@ parse_command_line(int argc, const char *argv[], param_t *parms)
             case 'h':
                 usage();
                 leave(EXIT_SUCCESS);
+                break;
 
             /* Create objects with the latest version of the format */
             case 'l':
@@ -149,6 +150,7 @@ parse_command_line(int argc, const char *argv[], param_t *parms)
             case 'V':
                 print_version(h5tools_getprogname());
                 leave(EXIT_SUCCESS);
+                break;
 
             /* Bad command line argument */
             default:
-- 
cgit v0.12


From ef4aa562dd3af4b104cc3551d12fd5583f09ca1a Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 22 Jan 2018 11:56:54 -0600
Subject: HDFFV-10392,10393,01385 merge from develop

---
 CMakeLists.txt                         | 12 ++----
 c++/examples/CMakeLists.txt            |  2 -
 c++/test/CMakeLists.txt                |  1 -
 config/cmake/HDFCompilerFlags.cmake    |  6 +--
 config/cmake/libhdf5.settings.cmake.in |  2 +-
 config/cmake/scripts/HDF5config.cmake  |  2 +-
 config/cmake_ext_mod/HDFMacros.cmake   | 69 ++++++++++++++++++----------------
 examples/CMakeLists.txt                |  4 --
 fortran/examples/CMakeLists.txt        |  6 ---
 fortran/src/CMakeLists.txt             | 10 ++---
 fortran/test/CMakeLists.txt            | 29 +++++---------
 fortran/testpar/CMakeLists.txt         |  1 -
 hl/c++/examples/CMakeLists.txt         |  1 -
 hl/c++/test/CMakeLists.txt             |  1 -
 hl/examples/CMakeLists.txt             |  1 -
 hl/fortran/examples/CMakeLists.txt     |  1 -
 hl/fortran/src/CMakeLists.txt          |  9 +++--
 hl/fortran/test/CMakeLists.txt         | 16 ++------
 hl/test/CMakeLists.txt                 |  6 +--
 hl/tools/gif2h5/CMakeLists.txt         |  3 --
 release_docs/USING_HDF5_CMake.txt      |  9 ++---
 test/CMakeLists.txt                    | 22 +----------
 test/CMakeTests.cmake                  |  7 ++--
 testpar/CMakeLists.txt                 |  2 -
 tools/h5copy/CMakeLists.txt            |  3 --
 tools/h5diff/CMakeLists.txt            |  4 --
 tools/h5dump/CMakeLists.txt            |  3 --
 tools/h5import/CMakeLists.txt          |  2 -
 tools/h5jam/CMakeLists.txt             |  5 ---
 tools/h5ls/CMakeLists.txt              |  2 -
 tools/h5repack/CMakeLists.txt          |  4 --
 tools/h5repack/h5repack_filters.c      | 12 +++---
 tools/h5repack/h5repack_parse.c        | 10 ++---
 tools/h5stat/CMakeLists.txt            |  3 --
 tools/misc/CMakeLists.txt              |  5 ---
 tools/perform/CMakeLists.txt           |  9 -----
 36 files changed, 93 insertions(+), 191 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e028b55..f6837fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -328,7 +328,7 @@ include (${HDF_RESOURCES_EXT_DIR}/HDFMacros.cmake)
 include (${HDF_RESOURCES_EXT_DIR}/HDFLibMacros.cmake)
 include (${HDF_RESOURCES_DIR}/HDF5Macros.cmake)
 
-SET_HDF5_BUILD_TYPE()
+SET_HDF_BUILD_TYPE()
 
 #-----------------------------------------------------------------------------
 # Setup output Directories
@@ -464,11 +464,9 @@ endif ()
 set (EXE_EXT "")
 if (WIN32)
   set (EXE_EXT ".exe")
-  if (NOT CYGWIN)
-    add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1)
-    add_definitions (-D_CRT_SECURE_NO_WARNINGS)
-    add_definitions (-D_CONSOLE)
-  endif ()
+  add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1)
+  add_definitions (-D_CRT_SECURE_NO_WARNINGS)
+  add_definitions (-D_CONSOLE)
 endif ()
 
 if (MSVC)
@@ -577,8 +575,6 @@ include (UserMacros.cmake)
 #-----------------------------------------------------------------------------
 # Include filter (zlib, szip, etc.) macros
 #-----------------------------------------------------------------------------
-set (LINK_COMP_LIBS)
-set (LINK_COMP_SHARED_LIBS)
 include (CMakeFilters.cmake)
 
 #-----------------------------------------------------------------------------
diff --git a/c++/examples/CMakeLists.txt b/c++/examples/CMakeLists.txt
index e5b0b4a..300f6bc 100644
--- a/c++/examples/CMakeLists.txt
+++ b/c++/examples/CMakeLists.txt
@@ -34,7 +34,6 @@ set (tutr_examples
 
 foreach (example ${examples})
   add_executable (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp)
-  TARGET_NAMING (cpp_ex_${example} STATIC)
   TARGET_C_PROPERTIES (cpp_ex_${example} STATIC " " " ")
   target_link_libraries (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
   set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
@@ -42,7 +41,6 @@ endforeach ()
 
 foreach (example ${tutr_examples})
   add_executable (cpp_ex_${example} ${HDF5_CPP_EXAMPLES_SOURCE_DIR}/${example}.cpp)
-  TARGET_NAMING (cpp_ex_${example} STATIC)
   TARGET_C_PROPERTIES (cpp_ex_${example} STATIC " " " ")
   target_link_libraries (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
   set_target_properties (cpp_ex_${example} PROPERTIES FOLDER examples/cpp)
diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
index c6f76c9..9bf983d 100644
--- a/c++/test/CMakeLists.txt
+++ b/c++/test/CMakeLists.txt
@@ -36,7 +36,6 @@ set (srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 configure_file (${HDF5_CPP_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h  @ONLY)
 
 add_executable (cpp_testhdf5 ${CPP_TEST_SRCS} )
-TARGET_NAMING (cpp_testhdf5 STATIC)
 TARGET_C_PROPERTIES (cpp_testhdf5 STATIC " " " ")
 target_link_libraries (cpp_testhdf5
     ${HDF5_CPP_LIB_TARGET}
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index eeb4b97..a414cea 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -13,12 +13,12 @@
 # Compiler specific flags : Shouldn't there be compiler tests for these
 #-----------------------------------------------------------------------------
 if (CMAKE_COMPILER_IS_GNUCC)
-  if (HDF5_BUILD_TYPE MATCHES Debug)
+  if (${HDF_CFG_NAME} MATCHES "Debug")
     set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99")
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
       set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Og -ftrapv -fno-common")
     endif ()
-  else (HDF5_BUILD_TYPE MATCHES Debug)
+  else ()
     set (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99")
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
       set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstdarg-opt")
@@ -26,7 +26,7 @@ if (CMAKE_COMPILER_IS_GNUCC)
   endif ()
 endif ()
 if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
-  if (HDF5_BUILD_TYPE MATCHES Debug)
+  if (${HDF_CFG_NAME} MATCHES "Debug")
     set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS}")
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og -ftrapv -fno-common")
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index e9b1a39..5d97172 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -15,7 +15,7 @@ General Information:
 
 Compiling Options:
 ------------------
-               Compilation Mode: @HDF5_BUILD_TYPE@
+               Compilation Mode: @HDF_BUILD_TYPE@
                      C Compiler: @CMAKE_C_COMPILER@
                          CFLAGS: @CMAKE_C_FLAGS@
                       H5_CFLAGS: @H5_CFLAGS@
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 724d4f0..e6e0936 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -8,7 +8,7 @@
 # distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
-
+#
 #############################################################################################
 ### ${CTEST_SCRIPT_ARG} is of the form OPTION=VALUE                                       ###
 ### BUILD_GENERATOR required [Unix, VS2017, VS201764, VS2015, VS201564, VS2013, VS201364] ###
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 96febde..1326420 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -11,18 +11,25 @@
 #
 
 #-------------------------------------------------------------------------------
-macro (SET_HDF5_BUILD_TYPE)
-  if(CMAKE_CONFIGURATION_TYPES)
-    set(HDF5_BUILD_TYPE ${CMAKE_CFG_INTDIR})
-    set(HDF5_CFG_BUILD_TYPE \${CMAKE_INSTALL_CONFIG_NAME})
+macro (SET_HDF_BUILD_TYPE)
+  get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+  if(_isMultiConfig)
+    set(HDF_CFG_NAME ${CTEST_CONFIGURATION_TYPE})
+    set(HDF_BUILD_TYPE ${CMAKE_CFG_INTDIR})
+    set(HDF_CFG_BUILD_TYPE \${CMAKE_INSTALL_CONFIG_NAME})
   else()
-    set(HDF5_CFG_BUILD_TYPE ".")
+    set(HDF_CFG_BUILD_TYPE ".")
     if(CMAKE_BUILD_TYPE)
-      set(HDF5_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+      set(HDF_CFG_NAME ${CMAKE_BUILD_TYPE})
+      set(HDF_BUILD_TYPE ${CMAKE_BUILD_TYPE})
     else()
-      set(HDF5_BUILD_TYPE "Release")
+      set(HDF_CFG_NAME "Release")
+      set(HDF_BUILD_TYPE "Release")
     endif()
   endif()
+  if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Release")
+  endif()
 endmacro ()
 
 #-------------------------------------------------------------------------------
@@ -61,13 +68,6 @@ macro (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES)
 endmacro ()
 
 #-------------------------------------------------------------------------------
-macro (TARGET_NAMING libtarget libtype)
-  if (${libtype} MATCHES "SHARED")
-    set_target_properties (${libtarget} PROPERTIES OUTPUT_NAME "${libtarget}${ARGN}")
-  endif ()
-endmacro ()
-
-#-------------------------------------------------------------------------------
 macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
   if (WIN32 AND MSVC)
     get_target_property (target_type ${libtarget} TYPE)
@@ -104,31 +104,36 @@ endmacro ()
 
 #-------------------------------------------------------------------------------
 macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
+  if (WIN32)
+    set (LIB_DEBUG_SUFFIX "_D")
+  else ()
+    set (LIB_DEBUG_SUFFIX "_debug")
+  endif ()
   if (${libtype} MATCHES "SHARED")
-    if (WIN32)
-      set (LIB_RELEASE_NAME "${libname}")
-      set (LIB_DEBUG_NAME "${libname}_D")
-    else ()
-      set (LIB_RELEASE_NAME "${libname}")
-      set (LIB_DEBUG_NAME "${libname}_debug")
-    endif ()
+    set (LIB_RELEASE_NAME "${libname}")
+    set (LIB_DEBUG_NAME "${libname}${LIB_DEBUG_SUFFIX}")
   else ()
     if (WIN32)
       set (LIB_RELEASE_NAME "lib${libname}")
-      set (LIB_DEBUG_NAME "lib${libname}_D")
+      set (LIB_DEBUG_NAME "lib${libname}${LIB_DEBUG_SUFFIX}")
     else ()
       set (LIB_RELEASE_NAME "${libname}")
-      set (LIB_DEBUG_NAME "${libname}_debug")
+      set (LIB_DEBUG_NAME "${libname}${LIB_DEBUG_SUFFIX}")
     endif ()
   endif ()
 
   set_target_properties (${libtarget}
       PROPERTIES
-      OUTPUT_NAME                ${LIB_RELEASE_NAME}
-      OUTPUT_NAME_DEBUG          ${LIB_DEBUG_NAME}
-      OUTPUT_NAME_RELEASE        ${LIB_RELEASE_NAME}
-      OUTPUT_NAME_MINSIZEREL     ${LIB_RELEASE_NAME}
-      OUTPUT_NAME_RELWITHDEBINFO ${LIB_RELEASE_NAME}
+         OUTPUT_NAME
+               ${LIB_RELEASE_NAME}
+         OUTPUT_NAME_DEBUG
+               ${LIB_DEBUG_NAME}
+         OUTPUT_NAME_RELEASE
+               ${LIB_RELEASE_NAME}
+         OUTPUT_NAME_MINSIZEREL
+               ${LIB_RELEASE_NAME}
+         OUTPUT_NAME_RELWITHDEBINFO
+               ${LIB_RELEASE_NAME}
   )
   if (${libtype} MATCHES "STATIC")
     if (WIN32)
@@ -161,7 +166,7 @@ macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
   if (${importtype} MATCHES "IMPORT")
     set (importprefix "${CMAKE_STATIC_LIBRARY_PREFIX}")
   endif ()
-  if (${HDF5_BUILD_TYPE} MATCHES "Debug")
+  if (${HDF_CFG_NAME} MATCHES "Debug")
     set (IMPORT_LIB_NAME ${LIB_DEBUG_NAME})
   else ()
     set (IMPORT_LIB_NAME ${LIB_RELEASE_NAME})
@@ -176,8 +181,8 @@ macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
         )
       else ()
         set_target_properties (${libtarget} PROPERTIES
-            IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF5_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
-            IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF5_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+            IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+            IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
         )
       endif ()
     else ()
@@ -197,7 +202,7 @@ macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
   else ()
     if (WIN32 AND NOT MINGW)
       set_target_properties (${libtarget} PROPERTIES
-          IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF5_BUILD_TYPE}/${IMPORT_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+          IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${HDF_BUILD_TYPE}/${IMPORT_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
           IMPORTED_LINK_INTERFACE_LANGUAGES "C"
       )
     else ()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index e310026..174c787 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -38,13 +38,11 @@ set (examples
 
 foreach (example ${examples})
   add_executable (${example} ${HDF5_EXAMPLES_SOURCE_DIR}/${example}.c)
-  TARGET_NAMING (${example} STATIC)
   TARGET_C_PROPERTIES (${example} STATIC " " " ")
   target_link_libraries (${example} ${HDF5_LIB_TARGET})
   set_target_properties (${example} PROPERTIES FOLDER examples)
   if (BUILD_SHARED_LIBS)
     add_executable (${example}-shared ${HDF5_EXAMPLES_SOURCE_DIR}/${example}.c)
-    TARGET_NAMING (${example}-shared SHARED)
     TARGET_C_PROPERTIES (${example}-shared SHARED " " " ")
     target_link_libraries (${example}-shared ${HDF5_LIBSH_TARGET})
     set_target_properties (${example}-shared PROPERTIES FOLDER examples)
@@ -53,13 +51,11 @@ endforeach ()
 
 if (H5_HAVE_PARALLEL)
   add_executable (ph5example ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c)
-  TARGET_NAMING (ph5example STATIC)
   TARGET_C_PROPERTIES (ph5example STATIC " " " ")
   target_link_libraries (ph5example ${HDF5_LIB_TARGET} ${MPI_C_LIBRARIES})
   set_target_properties (ph5example PROPERTIES FOLDER examples)
   if (BUILD_SHARED_LIBS)
     add_executable (ph5example-shared ${HDF5_EXAMPLES_SOURCE_DIR}/ph5example.c)
-    TARGET_NAMING (ph5example-shared SHARED)
     TARGET_C_PROPERTIES (ph5example-shared SHARED " " " ")
     target_link_libraries (ph5example-shared ${HDF5_LIBSH_TARGET} ${MPI_C_LIBRARIES})
     set_target_properties (ph5example-shared PROPERTIES FOLDER examples)
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index cd5da0e..e5b277d 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -40,7 +40,6 @@ set (F2003_examples
 
 foreach (example ${examples})
   add_executable (f90_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-  TARGET_NAMING (f90_ex_${example} STATIC)
   TARGET_FORTRAN_PROPERTIES (f90_ex_${example} STATIC " " " ")
   target_link_libraries (f90_ex_${example}
       ${HDF5_F90_LIB_TARGET}
@@ -54,7 +53,6 @@ foreach (example ${examples})
   )
   if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
     add_executable (f90_ex_${example}-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-    TARGET_NAMING (f90_ex_${example}-shared SHARED)
     TARGET_FORTRAN_PROPERTIES (f90_ex_${example}-shared SHARED " " " ")
     target_link_libraries (f90_ex_${example}-shared
         ${HDF5_F90_LIBSH_TARGET}
@@ -72,7 +70,6 @@ endforeach ()
 if (HDF5_ENABLE_F2003)
   foreach (example ${F2003_examples})
     add_executable (f03_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-    TARGET_NAMING (f03_ex_${example} STATIC)
     TARGET_FORTRAN_PROPERTIES (f03_ex_${example} STATIC " " " ")
     target_link_libraries (f03_ex_${example}
         ${HDF5_F90_LIB_TARGET}
@@ -86,7 +83,6 @@ if (HDF5_ENABLE_F2003)
     )
     if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
       add_executable (f03_ex_${example}-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-      TARGET_NAMING (f03_ex_${example}-shared SHARED)
       TARGET_FORTRAN_PROPERTIES (f03_ex_${example}-shared SHARED " " " ")
       target_link_libraries (f03_ex_${example}-shared
           ${HDF5_F90_LIBSH_TARGET}
@@ -104,7 +100,6 @@ endif ()
 
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   add_executable (f90_ex_ph5example ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
-  TARGET_NAMING (f90_ex_ph5example STATIC)
   TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example STATIC " " " ")
   target_link_libraries (f90_ex_ph5example
       ${HDF5_F90_LIB_TARGET}
@@ -118,7 +113,6 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   )
   if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
     add_executable (f90_ex_ph5example-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
-    TARGET_NAMING (f90_ex_ph5example-shared SHARED)
     TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example-shared SHARED " " " ")
     target_link_libraries (f90_ex_ph5example-shared
         ${HDF5_F90_LIBSH_TARGET}
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index e4df0f9..4d98b81 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -117,12 +117,12 @@ add_custom_command (
 
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared")
-  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF5_CFG_BUILD_TYPE})
+  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF_CFG_BUILD_TYPE})
 endif ()
 file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/static")
-set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF5_CFG_BUILD_TYPE})
+set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF_CFG_BUILD_TYPE})
 
-INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY})
+INCLUDE_DIRECTORIES (${HDF5_F90_SOURCE_DIR} ${HDF5_F90_BINARY_DIR} ${CMAKE_Fortran_MODULE_DIRECTORY})
 
 #-----------------------------------------------------------------------------
 add_executable (H5match_types
@@ -185,7 +185,7 @@ set (f90CStub_C_SHHDRS
 )
 
 add_library (${HDF5_F90_C_LIB_TARGET} STATIC ${f90CStub_C_SOURCES} ${f90CStub_C_HDRS})
-target_include_directories(${HDF5_F90_C_LIB_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/static)
+target_include_directories(${HDF5_F90_C_LIB_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/static)
 TARGET_C_PROPERTIES (${HDF5_F90_C_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_C_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}")
@@ -199,7 +199,7 @@ set (install_targets ${HDF5_F90_C_LIB_TARGET})
 
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_F90_C_LIBSH_TARGET} SHARED ${f90CStub_C_SOURCES} ${f90CStub_C_SHHDRS})
-  target_include_directories(${HDF5_F90_C_LIBSH_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/shared)
+  target_include_directories(${HDF5_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/shared)
   TARGET_C_PROPERTIES (${HDF5_F90_C_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIBSH_TARGET}")
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index eefb62f..0c1f616 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -4,21 +4,21 @@ PROJECT (HDF5_FORTRAN_TESTS C CXX Fortran)
 #-----------------------------------------------------------------------------
 # Setup include Directories
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
+INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_FORTRAN_TESTS_SOURCE_DIR} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
 
 if (BUILD_SHARED_LIBS)
-  file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/shared")
-  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF5_CFG_BUILD_TYPE})
+  file (MAKE_DIRECTORY "${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared")
+  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF_CFG_BUILD_TYPE})
 endif ()
-file (MAKE_DIRECTORY "${HDF5_F90_BINARY_DIR}/static")
-set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF5_CFG_BUILD_TYPE})
+file (MAKE_DIRECTORY "${HDF5_FORTRAN_TESTS_BINARY_DIR}/static")
+set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF_CFG_BUILD_TYPE})
 
 #-----------------------------------------------------------------------------
 # Add Test Lib
 #-----------------------------------------------------------------------------
 add_library (${HDF5_F90_C_TEST_LIB_TARGET} STATIC t.c)
 set_source_files_properties (t.c PROPERTIES LANGUAGE C)
-target_include_directories(${HDF5_F90_C_TEST_LIB_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/static)
+target_include_directories(${HDF5_F90_C_TEST_LIB_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/static)
 TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_C_TEST_LIB_TARGET}
     ${HDF5_F90_C_LIB_TARGET}
@@ -32,7 +32,7 @@ set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES
 )
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_library (${HDF5_F90_C_TEST_LIBSH_TARGET} SHARED t.c)
-  target_include_directories(${HDF5_F90_C_TEST_LIBSH_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/shared)
+  target_include_directories(${HDF5_F90_C_TEST_LIBSH_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/shared)
   TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_F90_C_TEST_LIBSH_TARGET}
       ${HDF5_F90_C_LIBSH_TARGET}
@@ -138,7 +138,6 @@ add_executable (testhdf5_fortran
     tH5Z.f90
     tHDF5.f90
 )
-TARGET_NAMING (testhdf5_fortran STATIC)
 TARGET_FORTRAN_PROPERTIES (testhdf5_fortran STATIC " " " ")
 target_link_libraries (testhdf5_fortran
     ${HDF5_F90_TEST_LIB_TARGET}
@@ -172,7 +171,6 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
       tH5Z.f90
       tHDF5.f90
   )
-  TARGET_NAMING (testhdf5_fortran-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (testhdf5_fortran-shared SHARED " " " ")
   target_link_libraries (testhdf5_fortran-shared
       ${HDF5_F90_TEST_LIBSH_TARGET}
@@ -199,7 +197,6 @@ add_executable (testhdf5_fortran_1_8
     tH5MISC_1_8.f90
     tHDF5_1_8.f90
 )
-TARGET_NAMING (testhdf5_fortran_1_8 STATIC)
 TARGET_FORTRAN_PROPERTIES (testhdf5_fortran_1_8 STATIC " " " ")
 target_link_libraries (testhdf5_fortran_1_8
     ${HDF5_F90_TEST_LIB_TARGET}
@@ -224,7 +221,6 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
       tH5MISC_1_8.f90
       tHDF5_1_8.f90
   )
-  TARGET_NAMING (testhdf5_fortran_1_8-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (testhdf5_fortran_1_8-shared SHARED " " " ")
   target_link_libraries (testhdf5_fortran_1_8-shared
       ${HDF5_F90_TEST_LIBSH_TARGET}
@@ -254,7 +250,6 @@ if (HDF5_ENABLE_F2003)
       tH5T_F03.f90
       tHDF5_F03.f90
   )
-  TARGET_NAMING (fortranlib_test_F03 STATIC)
   TARGET_FORTRAN_PROPERTIES (fortranlib_test_F03 STATIC " " " ")
   target_link_libraries (fortranlib_test_F03
       ${HDF5_F90_TEST_LIB_TARGET}
@@ -264,6 +259,7 @@ if (HDF5_ENABLE_F2003)
   if (WIN32 AND MSVC)
     target_link_libraries (fortranlib_test_F03 "ws2_32.lib")
   endif ()
+  
   target_include_directories (fortranlib_test_F03 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
   set_target_properties (fortranlib_test_F03 PROPERTIES
       LINKER_LANGUAGE Fortran
@@ -281,7 +277,6 @@ if (HDF5_ENABLE_F2003)
         tH5T_F03.f90
         tHDF5_F03.f90
     )
-    TARGET_NAMING (fortranlib_test_F03-shared SHARED)
     TARGET_FORTRAN_PROPERTIES (fortranlib_test_F03-shared SHARED " " " ")
     target_link_libraries (fortranlib_test_F03-shared
         ${HDF5_F90_TEST_LIBSH_TARGET}
@@ -301,8 +296,7 @@ if (HDF5_ENABLE_F2003)
 endif ()
 
 #-- Adding test for fflush1
-add_executable (fflush1 fflush1.f90)
-TARGET_NAMING (fflush1 STATIC)
+add_executable (fflush1 fflush1.F90)
 TARGET_FORTRAN_PROPERTIES (fflush1 STATIC " " " ")
 target_link_libraries (fflush1
     ${HDF5_F90_LIB_TARGET}
@@ -320,7 +314,6 @@ set_target_properties (fflush1 PROPERTIES
 )
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_executable (fflush1-shared fflush1.f90)
-  TARGET_NAMING (fflush1-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (fflush1-shared SHARED " " " ")
   target_link_libraries (fflush1-shared
       ${HDF5_F90_LIBSH_TARGET}
@@ -339,8 +332,7 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
 endif ()
 
 #-- Adding test for fflush2
-add_executable (fflush2 fflush2.f90)
-TARGET_NAMING (fflush2 STATIC)
+add_executable (fflush2 fflush2.F90)
 TARGET_FORTRAN_PROPERTIES (fflush2 STATIC " " " ")
 target_link_libraries (fflush2
     ${HDF5_F90_TEST_LIB_TARGET}
@@ -358,7 +350,6 @@ set_target_properties (fflush2 PROPERTIES
 )
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_executable (fflush2-shared fflush2.f90)
-  TARGET_NAMING (fflush2-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (fflush2-shared SHARED " " " ")
   target_link_libraries (fflush2-shared
       ${HDF5_F90_TEST_LIBSH_TARGET}
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index 4aa7f43..ed9d28c 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -16,7 +16,6 @@ add_executable (parallel_test
     hyper.f90
     mdset.f90
 )
-TARGET_NAMING (parallel_test STATIC)
 TARGET_FORTRAN_PROPERTIES (parallel_test STATIC " " " ")
 target_link_libraries (parallel_test
     ${HDF5_F90_TEST_LIB_TARGET}
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index 33ad1e5..8c48795 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -11,7 +11,6 @@ INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_DIR}/src)
 #  Add in the examples for the Packet Table codes
 # --------------------------------------------------------------------
 add_executable (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp)
-TARGET_NAMING (ptExampleFL STATIC)
 TARGET_C_PROPERTIES (ptExampleFL STATIC " " " ")
 target_link_libraries (
     ptExampleFL
diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt
index a2f9429..54afd7c 100644
--- a/hl/c++/test/CMakeLists.txt
+++ b/hl/c++/test/CMakeLists.txt
@@ -17,7 +17,6 @@ INCLUDE_DIRECTORIES (${HDF5_CPP_SRC_DIR}/src)
 
 add_executable (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp)
 TARGET_C_PROPERTIES (hl_ptableTest STATIC " " " ")
-TARGET_NAMING (hl_ptableTest STATIC)
 target_link_libraries (
     hl_ptableTest
     ${HDF5_LIB_TARGET}
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index 1144e0f..68f0128 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -28,7 +28,6 @@ set (examples
 
 foreach (example ${examples})
   add_executable (hl_ex_${example} ${HDF5_HL_EXAMPLES_SOURCE_DIR}/${example}.c)
-  TARGET_NAMING (hl_ex_${example} STATIC)
   TARGET_C_PROPERTIES (hl_ex_${example} STATIC " " " ")
   target_link_libraries (hl_ex_${example} ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
   set_target_properties (hl_ex_${example} PROPERTIES FOLDER examples/hl)
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt
index dfe6102..d920d64 100644
--- a/hl/fortran/examples/CMakeLists.txt
+++ b/hl/fortran/examples/CMakeLists.txt
@@ -16,7 +16,6 @@ set (examples
 
 foreach (example ${examples})
   add_executable (hl_f90_ex_${example} ${HDF5_HL_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-  TARGET_NAMING (hl_f90_ex_${example} STATIC)
   TARGET_FORTRAN_PROPERTIES (hl_f90_ex_${example} STATIC " " " ")
   target_link_libraries (hl_f90_ex_${example}
       ${HDF5_HL_F90_LIB_TARGET}
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index cd3559a..93ba5ed 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -3,10 +3,10 @@ PROJECT(HDF5_HL_F90_SRC C CXX Fortran)
 
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   file (MAKE_DIRECTORY "${HDF5_HL_F90_SRC_BINARY_DIR}/shared")
-  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF5_CFG_BUILD_TYPE})
+  set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF_CFG_BUILD_TYPE})
 endif ()
 file (MAKE_DIRECTORY "${HDF5_HL_F90_SRC_BINARY_DIR}/static")
-set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF5_CFG_BUILD_TYPE})
+set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF_CFG_BUILD_TYPE})
 
 #-----------------------------------------------------------------------------
 # Setup include Directories
@@ -14,6 +14,7 @@ set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF5_CFG_BUILD_TYP
 INCLUDE_DIRECTORIES (
     ${HDF5_HL_SRC_DIR}/src
     ${HDF5_F90_SRC_DIR}/src
+    ${HDF5_HL_F90_SRC_SOURCE_DIR}
     ${HDF5_F90_BINARY_DIR}
     ${CMAKE_Fortran_MODULE_DIRECTORY}
     ${MOD_BUILD_DIR}
@@ -34,7 +35,7 @@ set_source_files_properties (${HDF5_HL_F90_C_SRCS} PROPERTIES LANGUAGE C)
 set (HDF5_HL_F90_HEADERS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTf90proto.h)
 
 add_library (${HDF5_HL_F90_C_LIB_TARGET} STATIC ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS})
-target_include_directories(${HDF5_HL_F90_C_LIB_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/static)
+target_include_directories(${HDF5_HL_F90_C_LIB_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/static)
 TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_HL_F90_C_LIB_TARGET} PUBLIC ${HDF5_F90_C_LIB_TARGET} ${HDF5_HL_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIB_TARGET}")
@@ -48,7 +49,7 @@ set (install_targets ${HDF5_HL_F90_C_LIB_TARGET})
 
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_library (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED ${HDF5_HL_F90_C_SRCS} ${HDF5_HL_F90_HEADERS})
-  target_include_directories(${HDF5_HL_F90_C_LIBSH_TARGET} PRIVATE ${HDF5_F90_BINARY_DIR}/shared)
+  target_include_directories(${HDF5_HL_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/shared)
   TARGET_C_PROPERTIES (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_HL_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_F90_C_LIBSH_TARGET} ${HDF5_HL_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_F90_C_LIBSH_TARGET}")
diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt
index e2baa69..25fe40d 100644
--- a/hl/fortran/test/CMakeLists.txt
+++ b/hl/fortran/test/CMakeLists.txt
@@ -8,7 +8,6 @@ INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${
 
 #-- Adding test for hl_f90_tstds
 add_executable (hl_f90_tstds tstds.f90)
-TARGET_NAMING (hl_f90_tstds STATIC)
 TARGET_FORTRAN_PROPERTIES (hl_f90_tstds STATIC " " " ")
 target_link_libraries (hl_f90_tstds ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
 target_include_directories (hl_f90_tstds PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
@@ -16,7 +15,6 @@ set_target_properties (hl_f90_tstds PROPERTIES LINKER_LANGUAGE Fortran)
 set_target_properties (hl_f90_tstds PROPERTIES FOLDER test/hl/fortran)
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_executable (hl_f90_tstds-shared tstds.f90)
-  TARGET_NAMING (hl_f90_tstds-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (hl_f90_tstds-shared SHARED " " " ")
   target_link_libraries (hl_f90_tstds-shared ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET})
   target_include_directories (hl_f90_tstds-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
@@ -29,17 +27,15 @@ endif ()
 
 #-- Adding test for hl_f90_tstlite
 add_executable (hl_f90_tstlite tstlite.f90)
-TARGET_NAMING (hl_f90_tstlite STATIC)
 TARGET_FORTRAN_PROPERTIES (hl_f90_tstlite STATIC " " " ")
-target_link_libraries (hl_f90_tstlite ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
+target_link_libraries (hl_f90_tstlite ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_F90_TEST_LIB_TARGET})
 target_include_directories (hl_f90_tstlite PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
 set_target_properties (hl_f90_tstlite PROPERTIES LINKER_LANGUAGE Fortran)
 set_target_properties (hl_f90_tstlite PROPERTIES FOLDER test/hl/fortran)
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_executable (hl_f90_tstlite-shared tstlite.f90)
-  TARGET_NAMING (hl_f90_tstlite-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (hl_f90_tstlite-shared SHARED " " " ")
-  target_link_libraries (hl_f90_tstlite-shared ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET})
+  target_link_libraries (hl_f90_tstlite-shared ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_F90_TEST_LIBSH_TARGET})
   target_include_directories (hl_f90_tstlite-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
   set_target_properties (hl_f90_tstlite-shared PROPERTIES
         LINKER_LANGUAGE Fortran
@@ -50,7 +46,6 @@ endif ()
 
 #-- Adding test for hl_f90_tstimage
 add_executable (hl_f90_tstimage tstimage.f90)
-TARGET_NAMING (hl_f90_tstimage STATIC)
 TARGET_FORTRAN_PROPERTIES (hl_f90_tstimage STATIC " " " ")
 target_link_libraries (hl_f90_tstimage  ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
 target_include_directories (hl_f90_tstimage PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
@@ -58,7 +53,6 @@ set_target_properties (hl_f90_tstimage PROPERTIES LINKER_LANGUAGE Fortran)
 set_target_properties (hl_f90_tstimage PROPERTIES FOLDER test/hl/fortran)
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_executable (hl_f90_tstimage-shared tstimage.f90)
-  TARGET_NAMING (hl_f90_tstimage-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (hl_f90_tstimage-shared SHARED " " " ")
   target_link_libraries (hl_f90_tstimage-shared  ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET})
   target_include_directories (hl_f90_tstimage-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
@@ -71,17 +65,15 @@ endif ()
 
 #-- Adding test for hl_f90_tsttable
 add_executable (hl_f90_tsttable tsttable.f90)
-TARGET_NAMING (hl_f90_tsttable STATIC)
 TARGET_FORTRAN_PROPERTIES (hl_f90_tsttable STATIC " " " ")
-target_link_libraries (hl_f90_tsttable ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET})
+target_link_libraries (hl_f90_tsttable ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_F90_TEST_LIB_TARGET})
 target_include_directories (hl_f90_tsttable PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
 set_target_properties (hl_f90_tsttable PROPERTIES LINKER_LANGUAGE Fortran)
 set_target_properties (hl_f90_tsttable PROPERTIES FOLDER test/hl/fortran)
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_executable (hl_f90_tsttable-shared tsttable.f90)
-  TARGET_NAMING (hl_f90_tsttable-shared SHARED)
   TARGET_FORTRAN_PROPERTIES (hl_f90_tsttable-shared SHARED " " " ")
-  target_link_libraries (hl_f90_tsttable-shared ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET})
+  target_link_libraries (hl_f90_tsttable-shared ${HDF5_HL_F90_LIBSH_TARGET} ${HDF5_F90_LIBSH_TARGET} ${HDF5_F90_TEST_LIBSH_TARGET})
   target_include_directories (hl_f90_tsttable-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
   set_target_properties (hl_f90_tsttable-shared PROPERTIES
         LINKER_LANGUAGE Fortran
diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt
index a9f54ec..52194a8 100644
--- a/hl/test/CMakeLists.txt
+++ b/hl/test/CMakeLists.txt
@@ -22,19 +22,17 @@ include_directories (${HDF5_TEST_SRC_DIR})
 # --------------------------------------------------------------------
 MACRO (HL_ADD_EXE hl_name)
   add_executable (hl_${hl_name} ${hl_name}.c)
-  TARGET_NAMING (hl_${hl_name} STATIC)
   TARGET_C_PROPERTIES (hl_${hl_name} STATIC " " " ")
   target_link_libraries (hl_${hl_name}
       ${HDF5_HL_LIB_TARGET}
-      ${HDF5_LIB_TARGET}
       ${HDF5_TEST_LIB_TARGET}
+      ${HDF5_LIB_TARGET}
   )
   set_target_properties (hl_${hl_name} PROPERTIES FOLDER test/hl)
 ENDMACRO ()
 
 MACRO (HL_ADD_SHEXE hl_name)
   add_executable (hl_${hl_name} ${hl_name}.c)
-  TARGET_NAMING (hl_${hl_name} SHARED)
   TARGET_C_PROPERTIES (hl_${hl_name} SHARED " " " ")
   target_link_libraries (hl_${hl_name}
       ${HDF5_HL_LIBSH_TARGET}
@@ -52,7 +50,6 @@ HL_ADD_EXE (test_table)
 
 # test_packet has two source files
 add_executable (hl_test_packet test_packet.c test_packet_vlen.c)
-TARGET_NAMING (hl_test_packet STATIC)
 TARGET_C_PROPERTIES (hl_test_packet STATIC " " " ")
 target_link_libraries (hl_test_packet
     ${HDF5_HL_LIB_TARGET}
@@ -67,7 +64,6 @@ set_target_properties (hl_test_packet PROPERTIES FOLDER test/hl)
 # --------------------------------------------------------------------
 if (HDF5_BUILD_GENERATORS)
   add_executable (hl_gen_test_ds gen_test_ds.c)
-  TARGET_NAMING (hl_gen_test_ds STATIC)
   TARGET_C_PROPERTIES (hl_gen_test_ds STATIC " " " ")
   target_link_libraries (hl_gen_test_ds
       ${HDF5_HL_LIB_TARGET}
diff --git a/hl/tools/gif2h5/CMakeLists.txt b/hl/tools/gif2h5/CMakeLists.txt
index 9d7a406..34d7074 100644
--- a/hl/tools/gif2h5/CMakeLists.txt
+++ b/hl/tools/gif2h5/CMakeLists.txt
@@ -18,7 +18,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
 INCLUDE_DIRECTORIES (${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR})
 
 add_executable (gif2h5 ${GIF2H5_SOURCES})
-TARGET_NAMING (gif2h5 STATIC)
 TARGET_C_PROPERTIES (gif2h5 STATIC " " " ")
 target_link_libraries (gif2h5 ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (gif2h5 PROPERTIES FOLDER tools/hl)
@@ -30,7 +29,6 @@ set (hdf2gif_SOURCES
     ${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/hdfgifwr.c
 )
 add_executable (h52gif ${hdf2gif_SOURCES})
-TARGET_NAMING (h52gif STATIC)
 TARGET_C_PROPERTIES (h52gif STATIC " " " ")
 target_link_libraries (h52gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (h52gif PROPERTIES FOLDER tools/hl)
@@ -44,7 +42,6 @@ if (BUILD_TESTING)
   # --------------------------------------------------------------------
   if (HDF5_BUILD_GENERATORS)
       add_executable (hl_h52gifgentest ${HDF5_HL_TOOLS_GIF2H5_SOURCE_DIR}/h52gifgentst.c)
-      TARGET_NAMING (hl_h52gifgentest STATIC)
       TARGET_C_PROPERTIES (hl_h52gifgentest STATIC " " " ")
       target_link_libraries (hl_h52gifgentest ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
       set_target_properties (hl_h52gifgentest PROPERTIES FOLDER generator/tools/hl)
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index 589ef03..ce12528 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -37,7 +37,7 @@ I. Preconditions
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
       web site. The HDF5 1.8.x product requires a minimum CMake version
-      of 3.2.2.
+      of 3.10.1.
 
    2. You have installed the HDF5 library built with CMake, by executing
       the HDF Install Utility (the *.msi file in the binary package for
@@ -101,10 +101,10 @@ These steps are described in more detail below.
             * Unix Makefiles
             * Visual Studio 12 2013
             * Visual Studio 12 2013 Win64
-            * Visual Studio 11 2012
-            * Visual Studio 11 2012 Win64
             * Visual Studio 14 2015
             * Visual Studio 14 2015 Win64
+            * Visual Studio 15 2017
+            * Visual Studio 15 2017 Win64
 
         <options> is:
             * BUILD_TESTING:BOOL=ON
@@ -180,7 +180,7 @@ Given the preconditions in section I, create a CMakeLists.txt file at the
 source root. Include the following text in the file:
 
 ##########################################################
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10.1)
 project (HDF5MyApp C CXX)
 
 set (LIB_TYPE STATIC) # or SHARED
@@ -194,7 +194,6 @@ set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_${LIB_TYPE}_LIBRARY})
 set (example hdf_example)
 
 add_executable (${example} ${PROJECT_SOURCE_DIR}/${example}.c)
-TARGET_NAMING (${example} ${LIB_TYPE})
 TARGET_C_PROPERTIES (${example} ${LIB_TYPE} " " " ")
 target_link_libraries (${example} ${LINK_LIBS})
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index afd0197..fc2bd36 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -96,7 +96,7 @@ endif ()
 
     add_library (${HDF5_TEST_PLUGIN_LIB_TARGET} SHARED ${HDF5_TEST_SOURCE_DIR}/${test_lib}.c)
     TARGET_C_PROPERTIES (${HDF5_TEST_PLUGIN_LIB_TARGET} SHARED " " " ")
-    target_link_libraries (${HDF5_TEST_PLUGIN_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+    target_link_libraries (${HDF5_TEST_PLUGIN_LIB_TARGET} PUBLIC ${HDF5_TEST_LIB_TARGET})
     H5_SET_LIB_OPTIONS (${HDF5_TEST_PLUGIN_LIB_TARGET} ${HDF5_TEST_PLUGIN_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
     set_target_properties (${HDF5_TEST_PLUGIN_LIB_TARGET} PROPERTIES FOLDER libraries/TEST_PLUGIN)
 
@@ -122,7 +122,7 @@ endif ()
 
     add_library (${HDF5_TEST_PLUGIN_LIB_TARGET} SHARED ${HDF5_TEST_SOURCE_DIR}/${test_lib}.c)
     TARGET_C_PROPERTIES (${HDF5_TEST_PLUGIN_LIB_TARGET} SHARED " " " ")
-    target_link_libraries (${HDF5_TEST_PLUGIN_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+    target_link_libraries (${HDF5_TEST_PLUGIN_LIB_TARGET} PUBLIC ${HDF5_TEST_LIB_TARGET})
     H5_SET_LIB_OPTIONS (${HDF5_TEST_PLUGIN_LIB_TARGET} ${HDF5_TEST_PLUGIN_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
     set_target_properties (${HDF5_TEST_PLUGIN_LIB_TARGET} PROPERTIES FOLDER libraries/TEST_PLUGIN)
 
@@ -170,13 +170,11 @@ set (testhdf5_SRCS
 
 #-- Adding test for testhdf5
 add_executable (testhdf5 ${testhdf5_SRCS})
-TARGET_NAMING (testhdf5 STATIC)
 TARGET_C_PROPERTIES (testhdf5 STATIC " " " ")
 target_link_libraries (testhdf5 ${HDF5_TEST_LIB_TARGET})
 set_target_properties (testhdf5 PROPERTIES FOLDER test)
 if (BUILD_SHARED_LIBS)
   add_executable (testhdf5-shared ${testhdf5_SRCS})
-  TARGET_NAMING (testhdf5-shared SHARED)
   TARGET_C_PROPERTIES (testhdf5-shared SHARED " " " ")
   target_link_libraries (testhdf5-shared PUBLIC ${HDF5_TEST_LIBSH_TARGET})
   set_target_properties (testhdf5-shared PROPERTIES FOLDER test)
@@ -184,13 +182,11 @@ endif ()
 
 MACRO (ADD_H5_EXE file)
   add_executable (${file} ${HDF5_TEST_SOURCE_DIR}/${file}.c)
-  TARGET_NAMING (${file} STATIC)
   TARGET_C_PROPERTIES (${file} STATIC " " " ")
   target_link_libraries (${file} PUBLIC ${HDF5_TEST_LIB_TARGET})
   set_target_properties (${file} PROPERTIES FOLDER test)
   if (BUILD_SHARED_LIBS)
     add_executable (${file}-shared ${HDF5_TEST_SOURCE_DIR}/${file}.c)
-    TARGET_NAMING (${file}-shared SHARED)
     TARGET_C_PROPERTIES (${file}-shared SHARED " " " ")
     target_link_libraries (${file}-shared PUBLIC ${HDF5_TEST_LIBSH_TARGET})
     set_target_properties (${file}-shared PROPERTIES FOLDER test)
@@ -262,13 +258,11 @@ endforeach ()
 
 #-- Adding test for cache
 add_executable (cache ${HDF5_TEST_SOURCE_DIR}/cache.c ${HDF5_TEST_SOURCE_DIR}/cache_common.c)
-TARGET_NAMING (cache STATIC)
 TARGET_C_PROPERTIES (cache STATIC " " " ")
 target_link_libraries (cache ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 set_target_properties (cache PROPERTIES FOLDER test)
 if (BUILD_SHARED_LIBS)
   add_executable (cache-shared ${HDF5_TEST_SOURCE_DIR}/cache.c ${HDF5_TEST_SOURCE_DIR}/cache_common.c)
-  TARGET_NAMING (cache-shared SHARED)
   TARGET_C_PROPERTIES (cache-shared SHARED " " " ")
   target_link_libraries (cache-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (cache-shared PROPERTIES FOLDER test)
@@ -276,13 +270,11 @@ endif ()
 
 #-- Adding test for cache_api
 add_executable (cache_api ${HDF5_TEST_SOURCE_DIR}/cache_api.c ${HDF5_TEST_SOURCE_DIR}/cache_common.c)
-TARGET_NAMING (cache_api STATIC)
 TARGET_C_PROPERTIES (cache_api STATIC " " " ")
 target_link_libraries (cache_api ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 set_target_properties (cache_api PROPERTIES FOLDER test)
 if (BUILD_SHARED_LIBS)
   add_executable (cache_api-shared ${HDF5_TEST_SOURCE_DIR}/cache_api.c ${HDF5_TEST_SOURCE_DIR}/cache_common.c)
-  TARGET_NAMING (cache_api-shared SHARED)
   TARGET_C_PROPERTIES (cache_api-shared SHARED " " " ")
   target_link_libraries (cache_api-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (cache_api-shared PROPERTIES FOLDER test)
@@ -290,13 +282,11 @@ endif ()
 
 #-- Adding test for hyperslab
 add_executable (hyperslab ${HDF5_TEST_SOURCE_DIR}/hyperslab.c)
-TARGET_NAMING (hyperslab STATIC)
 TARGET_C_PROPERTIES (hyperslab STATIC " " " ")
 target_link_libraries (hyperslab ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 set_target_properties (hyperslab PROPERTIES FOLDER test)
 if (BUILD_SHARED_LIBS)
   add_executable (hyperslab-shared ${HDF5_TEST_SOURCE_DIR}/hyperslab.c)
-  TARGET_NAMING (hyperslab-shared SHARED)
   TARGET_C_PROPERTIES (hyperslab-shared SHARED " " " ")
   target_link_libraries (hyperslab-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (hyperslab-shared PROPERTIES FOLDER test)
@@ -316,7 +306,6 @@ add_executable (ttsafe
     ${HDF5_TEST_SOURCE_DIR}/ttsafe_cancel.c
     ${HDF5_TEST_SOURCE_DIR}/ttsafe_acreate.c
 )
-TARGET_NAMING (ttsafe STATIC)
 TARGET_C_PROPERTIES (ttsafe STATIC " " " ")
 target_link_libraries (ttsafe ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 set_target_properties (ttsafe PROPERTIES FOLDER test)
@@ -328,7 +317,6 @@ if (BUILD_SHARED_LIBS)
       ${HDF5_TEST_SOURCE_DIR}/ttsafe_cancel.c
       ${HDF5_TEST_SOURCE_DIR}/ttsafe_acreate.c
   )
-  TARGET_NAMING (ttsafe-shared SHARED)
   TARGET_C_PROPERTIES (ttsafe-shared SHARED " " " ")
   target_link_libraries (ttsafe-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (ttsafe-shared PROPERTIES FOLDER test)
@@ -343,7 +331,6 @@ endif ()
 #-- Adding test for err_compat
 if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
   add_executable (err_compat ${HDF5_TEST_SOURCE_DIR}/err_compat.c)
-  TARGET_NAMING (err_compat STATIC)
   TARGET_C_PROPERTIES (err_compat STATIC " " " ")
   target_link_libraries (err_compat ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
   set_target_properties (err_compat PROPERTIES FOLDER test)
@@ -358,7 +345,6 @@ endif ()
 
 #-- Adding test for error_test
 add_executable (error_test ${HDF5_TEST_SOURCE_DIR}/error_test.c)
-TARGET_NAMING (error_test STATIC)
 TARGET_C_PROPERTIES (error_test STATIC " " " ")
 target_link_libraries (error_test ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 set_target_properties (error_test PROPERTIES FOLDER test)
@@ -372,13 +358,11 @@ endif ()
 
 #-- Adding test for links_env
 add_executable (links_env ${HDF5_TEST_SOURCE_DIR}/links_env.c)
-TARGET_NAMING (links_env STATIC)
 TARGET_C_PROPERTIES (links_env STATIC " " " ")
 target_link_libraries (links_env ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 set_target_properties (links_env PROPERTIES FOLDER test)
 if (BUILD_SHARED_LIBS)
   add_executable (links_env-shared ${HDF5_TEST_SOURCE_DIR}/links_env.c)
-  TARGET_NAMING (links_env-shared SHARED)
   TARGET_C_PROPERTIES (links_env-shared SHARED " " " ")
   target_link_libraries (links_env-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (links_env-shared PROPERTIES FOLDER test)
@@ -401,13 +385,11 @@ endif ()
 ##############################################################################
 if (BUILD_SHARED_LIBS)
   add_executable (plugin ${HDF5_TEST_SOURCE_DIR}/plugin.c)
-  TARGET_NAMING (plugin SHARED)
   TARGET_C_PROPERTIES (plugin SHARED " " " ")
   target_link_libraries (plugin ${HDF5_TEST_LIB_TARGET})
   set_target_properties (plugin PROPERTIES FOLDER test)
 else ()
   add_executable (plugin ${HDF5_TEST_SOURCE_DIR}/plugin.c)
-  TARGET_NAMING (plugin STATIC)
   TARGET_C_PROPERTIES (plugin STATIC " " " ")
   target_link_libraries (plugin ${HDF5_TEST_LIB_TARGET})
   set_target_properties (plugin PROPERTIES FOLDER test)
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 6af1606..e7904e4 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -728,12 +728,14 @@ if (BUILD_SHARED_LIBS AND TEST_SHARED_PROGRAMS)
 endif ()
 
 ##############################################################################
-###    P L U G I N  T E S T S
+###    F I L T E R  P L U G I N  T E S T S
 ##############################################################################
 if (WIN32)
   set (CMAKE_SEP "\;")
+  set (BIN_REL_PATH "../../")
 else ()
   set (CMAKE_SEP ":")
+  set (BIN_REL_PATH "../")
 endif ()
 
 add_test (NAME H5PLUGIN-plugin COMMAND $<TARGET_FILE:plugin>)
@@ -810,7 +812,7 @@ if (HDF5_TEST_VFD)
   macro (CHECK_VFD_TEST vfdtest vfdname resultcode)
     if ("${vfdtest}" STREQUAL "flush1" OR "${vfdtest}" STREQUAL "flush2")
       if ("${vfdname}" STREQUAL "multi" OR "${vfdname}" STREQUAL "split")
-        if (NOT BUILD_SHARED_LIBS AND NOT HDF5_BUILD_TYPE MATCHES Debug)
+        if (NOT BUILD_SHARED_LIBS AND NOT ${HDF_CFG_NAME} MATCHES "Debug")
           add_test (NAME VFD-${vfdname}-${vfdtest}
               COMMAND "${CMAKE_COMMAND}"
                   -D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
@@ -1028,7 +1030,6 @@ endif ()
 if (HDF5_BUILD_GENERATORS)
   macro (ADD_H5_GENERATOR genfile)
     add_executable (${genfile} ${HDF5_TEST_SOURCE_DIR}/${genfile}.c)
-    TARGET_NAMING (${genfile} STATIC)
     TARGET_C_PROPERTIES (${genfile} STATIC " " " ")
     target_link_libraries (${genfile} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
     set_target_properties (${genfile} PROPERTIES FOLDER generator/test)
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt
index 629216f..891645c 100644
--- a/testpar/CMakeLists.txt
+++ b/testpar/CMakeLists.txt
@@ -27,7 +27,6 @@ set (testphdf5_SRCS
 
 #-- Adding test for testhdf5
 add_executable (testphdf5 ${testphdf5_SRCS})
-TARGET_NAMING (testphdf5 STATIC)
 TARGET_C_PROPERTIES (testphdf5 STATIC " " " ")
 target_link_libraries (testphdf5 PUBLIC ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
 if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
@@ -37,7 +36,6 @@ set_target_properties (testphdf5 PROPERTIES FOLDER test/par)
 
 MACRO (ADD_H5P_EXE file)
   add_executable (${file} ${HDF5_TEST_PAR_SOURCE_DIR}/${file}.c)
-  TARGET_NAMING (${file} STATIC)
   TARGET_C_PROPERTIES (${file} STATIC " " " ")
   target_link_libraries (${file} PUBLIC ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
   if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt
index ea7bb48..d40656b 100644
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@@ -10,7 +10,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
 # Add the h5copy and test executables
 # --------------------------------------------------------------------
 add_executable (h5copy ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/h5copy.c)
-TARGET_NAMING (h5copy STATIC)
 TARGET_C_PROPERTIES (h5copy STATIC " " " ")
 target_link_libraries (h5copy  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (h5copy PROPERTIES FOLDER tools)
@@ -20,7 +19,6 @@ set (H5_DEP_EXECUTABLES h5copy)
 
 if (BUILD_SHARED_LIBS)
   add_executable (h5copy-shared ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/h5copy.c)
-  TARGET_NAMING (h5copy-shared SHARED)
   TARGET_C_PROPERTIES (h5copy-shared SHARED " " " ")
   target_link_libraries (h5copy-shared  ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5copy-shared PROPERTIES FOLDER tools)
@@ -32,7 +30,6 @@ endif ()
 if (BUILD_TESTING)
   if (HDF5_BUILD_GENERATORS)
     add_executable (h5copygentest ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/h5copygentest.c)
-    TARGET_NAMING (h5copygentest STATIC)
     TARGET_C_PROPERTIES (h5copygentest STATIC " " " ")
     target_link_libraries (h5copygentest ${HDF5_LIB_TARGET})
     set_target_properties (h5copygentest PROPERTIES FOLDER generator/tools)
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt
index 1ab7e40..3a900f5 100644
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@@ -13,7 +13,6 @@ add_executable (h5diff
     ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/h5diff_common.c
     ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/h5diff_main.c
 )
-TARGET_NAMING (h5diff STATIC)
 TARGET_C_PROPERTIES (h5diff STATIC " " " ")
 target_link_libraries (h5diff  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (h5diff PROPERTIES FOLDER tools)
@@ -26,7 +25,6 @@ if (BUILD_SHARED_LIBS)
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/h5diff_common.c
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/h5diff_main.c
   )
-  TARGET_NAMING (h5diff-shared SHARED)
   TARGET_C_PROPERTIES (h5diff-shared SHARED " " " ")
   target_link_libraries (h5diff-shared  ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5diff-shared PROPERTIES FOLDER tools)
@@ -40,7 +38,6 @@ if (H5_HAVE_PARALLEL)
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/h5diff_common.c
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/ph5diff_main.c
   )
-  TARGET_NAMING (ph5diff STATIC)
   TARGET_C_PROPERTIES (ph5diff STATIC " " " ")
   target_link_libraries (ph5diff  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
   set_target_properties (ph5diff PROPERTIES FOLDER tools)
@@ -53,7 +50,6 @@ if (BUILD_TESTING)
   # --------------------------------------------------------------------
   if (HDF5_BUILD_GENERATORS)
     add_executable (h5diffgentest ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/h5diffgentest.c)
-    TARGET_NAMING (h5diffgentest STATIC)
     TARGET_C_PROPERTIES (h5diffgentest STATIC " " " ")
     target_link_libraries (h5diffgentest ${HDF5_LIB_TARGET})
     set_target_properties (h5diffgentest PROPERTIES FOLDER generator/tools)
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index f301014..e40c6f5 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -14,7 +14,6 @@ add_executable (h5dump
     ${HDF5_TOOLS_H5DUMP_SOURCE_DIR}/h5dump_ddl.c
     ${HDF5_TOOLS_H5DUMP_SOURCE_DIR}/h5dump_xml.c
 )
-TARGET_NAMING (h5dump STATIC)
 TARGET_C_PROPERTIES (h5dump STATIC " " " ")
 target_link_libraries (h5dump  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (h5dump PROPERTIES FOLDER tools)
@@ -28,7 +27,6 @@ if (BUILD_SHARED_LIBS)
       ${HDF5_TOOLS_H5DUMP_SOURCE_DIR}/h5dump_ddl.c
       ${HDF5_TOOLS_H5DUMP_SOURCE_DIR}/h5dump_xml.c
   )
-  TARGET_NAMING (h5dump-shared SHARED)
   TARGET_C_PROPERTIES (h5dump-shared SHARED " " " ")
   target_link_libraries (h5dump-shared  ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5dump-shared PROPERTIES FOLDER tools)
@@ -72,7 +70,6 @@ if (BUILD_TESTING)
   # --------------------------------------------------------------------
   if (HDF5_BUILD_GENERATORS)
     add_executable (h5dumpgentest ${HDF5_TOOLS_H5DUMP_SOURCE_DIR}/h5dumpgentest.c)
-    TARGET_NAMING (h5dumpgentest STATIC)
     TARGET_C_PROPERTIES (h5dumpgentest STATIC " " " ")
     target_link_libraries (h5dumpgentest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
     set_target_properties (h5dumpgentest PROPERTIES FOLDER generator/tools)
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index bde8286..6e0ac7e 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -10,7 +10,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
 # Add the h5import executables
 # --------------------------------------------------------------------
 add_executable (h5import ${HDF5_TOOLS_H5IMPORT_SOURCE_DIR}/h5import.c)
-TARGET_NAMING (h5import STATIC)
 TARGET_C_PROPERTIES (h5import STATIC " " " ")
 target_link_libraries (h5import  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 #set_target_properties (h5import PROPERTIES COMPILE_DEFINITIONS H5DEBUGIMPORT)
@@ -24,7 +23,6 @@ if (BUILD_TESTING)
   # Add the h5import executables
   # --------------------------------------------------------------------
   add_executable (h5importtest ${HDF5_TOOLS_H5IMPORT_SOURCE_DIR}/h5importtest.c)
-  TARGET_NAMING (h5importtest STATIC)
   TARGET_C_PROPERTIES (h5importtest STATIC " " " ")
   target_link_libraries (h5importtest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
   set_target_properties (h5importtest PROPERTIES FOLDER tools)
diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt
index 632fba8..58ad777 100644
--- a/tools/h5jam/CMakeLists.txt
+++ b/tools/h5jam/CMakeLists.txt
@@ -10,26 +10,22 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
 # Add the h5jam executables
 # --------------------------------------------------------------------
 add_executable (h5jam ${HDF5_TOOLS_H5JAM_SOURCE_DIR}/h5jam.c)
-TARGET_NAMING (h5jam STATIC)
 TARGET_C_PROPERTIES (h5jam STATIC " " " ")
 target_link_libraries (h5jam  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (h5jam PROPERTIES FOLDER tools)
 set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5jam")
 
 add_executable (getub ${HDF5_TOOLS_H5JAM_SOURCE_DIR}/getub.c)
-TARGET_NAMING (getub STATIC)
 TARGET_C_PROPERTIES (getub STATIC " " " ")
 target_link_libraries (getub  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (getub PROPERTIES FOLDER tools)
 
 add_executable (tellub ${HDF5_TOOLS_H5JAM_SOURCE_DIR}/tellub.c)
-TARGET_NAMING (tellub STATIC)
 TARGET_C_PROPERTIES (tellub STATIC " " " ")
 target_link_libraries (tellub  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (tellub PROPERTIES FOLDER tools)
 
 add_executable (h5unjam ${HDF5_TOOLS_H5JAM_SOURCE_DIR}/h5unjam.c)
-TARGET_NAMING (h5unjam STATIC)
 TARGET_C_PROPERTIES (h5unjam STATIC " " " ")
 target_link_libraries (h5unjam  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (h5unjam PROPERTIES FOLDER tools)
@@ -46,7 +42,6 @@ if (BUILD_TESTING)
   # --------------------------------------------------------------------
   if (HDF5_BUILD_GENERATORS)
     add_executable (h5jamgentest ${HDF5_TOOLS_H5JAM_SOURCE_DIR}/h5jamgentest.c)
-    TARGET_NAMING (h5jamgentest STATIC)
     TARGET_C_PROPERTIES (testhdf5 STATIC " " " ")
     target_link_libraries (h5jamgentest ${HDF5_LIB_TARGET})
     set_target_properties (h5jamgentest PROPERTIES FOLDER generator/tools)
diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt
index d9c3977..6cf6fc0 100644
--- a/tools/h5ls/CMakeLists.txt
+++ b/tools/h5ls/CMakeLists.txt
@@ -10,7 +10,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
 # Add the h5ls executable
 #-----------------------------------------------------------------------------
 add_executable (h5ls ${HDF5_TOOLS_H5LS_SOURCE_DIR}/h5ls.c)
-TARGET_NAMING (h5ls STATIC)
 TARGET_C_PROPERTIES (h5ls STATIC " " " ")
 target_link_libraries (h5ls  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (h5ls PROPERTIES FOLDER tools)
@@ -20,7 +19,6 @@ set (H5_DEP_EXECUTABLES h5ls)
 
 if (BUILD_SHARED_LIBS)
   add_executable (h5ls-shared ${HDF5_TOOLS_H5LS_SOURCE_DIR}/h5ls.c)
-  TARGET_NAMING (h5ls-shared SHARED)
   TARGET_C_PROPERTIES (h5ls-shared SHARED " " " ")
   target_link_libraries (h5ls-shared  ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5ls-shared PROPERTIES FOLDER tools)
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index 4b15d7c..fd1ad3e 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -21,7 +21,6 @@ set (REPACK_COMMON_SRCS
 )
 
 add_executable (h5repack ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_main.c)
-TARGET_NAMING (h5repack STATIC)
 TARGET_C_PROPERTIES (h5repack STATIC " " " ")
 target_link_libraries (h5repack  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (h5repack PROPERTIES FOLDER tools)
@@ -31,7 +30,6 @@ set (H5_DEP_EXECUTABLES h5repack)
 
 if (BUILD_SHARED_LIBS)
   add_executable (h5repack-shared ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_main.c)
-  TARGET_NAMING (h5repack-shared SHARED)
   TARGET_C_PROPERTIES (h5repack-shared SHARED " " " ")
   target_link_libraries (h5repack-shared  ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5repack-shared PROPERTIES FOLDER tools)
@@ -45,13 +43,11 @@ if (BUILD_TESTING)
   # Add h5Repack test executables
   # --------------------------------------------------------------------
   add_executable (testh5repack_detect_szip ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testh5repack_detect_szip.c)
-  TARGET_NAMING (testh5repack_detect_szip STATIC)
   TARGET_C_PROPERTIES (testh5repack_detect_szip STATIC " " " ")
   target_link_libraries (testh5repack_detect_szip ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
   set_target_properties (testh5repack_detect_szip PROPERTIES FOLDER tools)
 
   add_executable (h5repacktest ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repacktst.c)
-  TARGET_NAMING (h5repacktest STATIC)
   TARGET_C_PROPERTIES (h5repacktest STATIC " " " ")
   target_link_libraries (h5repacktest  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
   set_target_properties (h5repacktest PROPERTIES FOLDER tools)
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 1371691..eb8d724 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -84,7 +84,8 @@ static int aux_find_obj(const char* name, /* object name from traverse list */
         pack_opt_t *options,              /* repack options */
         pack_info_t *obj                  /*OUT*/) /* info about object to filter */
 {
-    char         *pdest;
+    char         *pdest = NULL;
+    char         *pname = NULL;
     int          result;
     unsigned int i;
 
@@ -94,11 +95,12 @@ static int aux_find_obj(const char* name, /* object name from traverse list */
             return (int) i;
         }
 
-        pdest = HDstrstr(name, options->op_tbl->objs[i].path);
-        result = (int) (pdest - name);
+        pdest = options->op_tbl->objs[i].path;
+        if (pdest[0] == '/') pdest++;
+        pname = name;
+        if (pname[0] == '/') pname++;
 
-        /* found at position 1, meaning without '/' */
-        if (pdest != NULL && result == 1) {
+        if (HDstrcmp(pdest, pname) == 0) {
             *obj = options->op_tbl->objs[i];
             return (int) i;
         }
diff --git a/tools/h5repack/h5repack_parse.c b/tools/h5repack/h5repack_parse.c
index 05af197..f646ee7 100644
--- a/tools/h5repack/h5repack_parse.c
+++ b/tools/h5repack/h5repack_parse.c
@@ -45,9 +45,9 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
     int         f, k, l, p, q, end_obj = -1, no_param = 0;
     unsigned    j, n;
     char        sobj[MAX_NC_NAME];
-    char        scomp[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-    char        stype[6] = {0, 0, 0, 0, 0, 0};
-    char        smask[3] = {0, 0, 0};
+    char        scomp[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    char        stype[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    char        smask[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     obj_list_t* obj_list = NULL;
     unsigned    pixels_per_block;
 
@@ -116,7 +116,6 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
         if (c == '=' || i == len - 1) {
             if (c == '=') { /*one more parameter */
                 scomp[k] = '\0'; /*cut space */
-
                 /*-------------------------------------------------------------------------
                 * H5Z_FILTER_SZIP
                 * szip has the format SZIP=<pixels per block,coding>
@@ -236,8 +235,9 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
                                 filt->cd_nelmts = HDstrtoull(stype, NULL, 0);
                                 p = 0;
                             }
-                            else
+                            else {
                                 filt->cd_values[j++] = (unsigned)HDstrtoul(stype, NULL, 0);
+                            }
                             q = 0;
                             u++; /* skip ',' */
                         }
diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt
index 9499ea8..6b3c06b 100644
--- a/tools/h5stat/CMakeLists.txt
+++ b/tools/h5stat/CMakeLists.txt
@@ -10,7 +10,6 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
 # Add the h5stat executables
 # --------------------------------------------------------------------
 add_executable (h5stat ${HDF5_TOOLS_H5STAT_SOURCE_DIR}/h5stat.c)
-TARGET_NAMING (h5stat STATIC)
 TARGET_C_PROPERTIES (h5stat STATIC " " " ")
 target_link_libraries (h5stat  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (h5stat PROPERTIES FOLDER tools)
@@ -20,7 +19,6 @@ set (H5_DEP_EXECUTABLES h5stat)
 
 if (BUILD_SHARED_LIBS)
   add_executable (h5stat-shared ${HDF5_TOOLS_H5STAT_SOURCE_DIR}/h5stat.c)
-  TARGET_NAMING (h5stat-shared SHARED)
   TARGET_C_PROPERTIES (h5stat-shared SHARED " " " ")
   target_link_libraries (h5stat-shared  ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5stat-shared PROPERTIES FOLDER tools)
@@ -35,7 +33,6 @@ if (BUILD_TESTING)
   # --------------------------------------------------------------------
   if (HDF5_BUILD_GENERATORS)
     add_executable (h5stat_gentest ${HDF5_TOOLS_H5STAT_SOURCE_DIR}/h5stat_gentest.c)
-    TARGET_NAMING (h5stat_gentest STATIC)
     TARGET_C_PROPERTIES (h5stat_gentest STATIC " " " ")
     target_link_libraries (h5stat_gentest ${HDF5_LIB_TARGET})
     set_target_properties (h5stat_gentest PROPERTIES FOLDER generator/tools)
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
index 1c22235..919535f 100644
--- a/tools/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
@@ -11,21 +11,18 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
 # --------------------------------------------------------------------
 #-- Misc Executables
 add_executable (h5debug ${HDF5_TOOLS_MISC_SOURCE_DIR}/h5debug.c)
-TARGET_NAMING (h5debug STATIC)
 TARGET_C_PROPERTIES (h5debug STATIC " " " ")
 target_link_libraries (h5debug ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (h5debug PROPERTIES FOLDER tools)
 set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5debug")
 
 add_executable (h5repart ${HDF5_TOOLS_MISC_SOURCE_DIR}/h5repart.c)
-TARGET_NAMING (h5repart STATIC)
 TARGET_C_PROPERTIES (h5repart STATIC " " " ")
 target_link_libraries (h5repart ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (h5repart PROPERTIES FOLDER tools)
 set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repart")
 
 add_executable (h5mkgrp ${HDF5_TOOLS_MISC_SOURCE_DIR}/h5mkgrp.c)
-TARGET_NAMING (h5mkgrp STATIC)
 TARGET_C_PROPERTIES (h5mkgrp STATIC " " " ")
 target_link_libraries (h5mkgrp  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (h5mkgrp PROPERTIES FOLDER tools)
@@ -50,7 +47,6 @@ if (BUILD_TESTING)
   # --------------------------------------------------------------------
   if (HDF5_BUILD_GENERATORS)
     add_executable (h5repart_gentest ${HDF5_TOOLS_MISC_SOURCE_DIR}/h5repart_gentest.c)
-    TARGET_NAMING (h5repart_gentest STATIC)
     TARGET_C_PROPERTIES (h5repart_gentest STATIC " " " ")
     target_link_libraries (h5repart_gentest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
     set_target_properties (h5repart_gentest PROPERTIES FOLDER generator/tools)
@@ -58,7 +54,6 @@ if (BUILD_TESTING)
   endif ()
 
   add_executable (h5repart_test ${HDF5_TOOLS_MISC_SOURCE_DIR}/repart_test.c)
-  TARGET_NAMING (h5repart_test STATIC)
   TARGET_C_PROPERTIES (h5repart_test STATIC " " " ")
   target_link_libraries (h5repart_test ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
   set_target_properties (h5repart_test PROPERTIES FOLDER tools)
diff --git a/tools/perform/CMakeLists.txt b/tools/perform/CMakeLists.txt
index a52b22b..647f846 100644
--- a/tools/perform/CMakeLists.txt
+++ b/tools/perform/CMakeLists.txt
@@ -21,7 +21,6 @@ set (h5perf_serial_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c
 )
 add_executable (h5perf_serial ${h5perf_serial_SRCS})
-TARGET_NAMING (h5perf_serial STATIC)
 TARGET_C_PROPERTIES (h5perf_serial STATIC " " " ")
 target_link_libraries (h5perf_serial ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (h5perf_serial PROPERTIES FOLDER perform)
@@ -33,7 +32,6 @@ if (HDF5_BUILD_PERFORM_STANDALONE)
       ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c
   )
   add_executable (h5perf_serial_alone ${h5perf_serial_alone_SRCS})
-  TARGET_NAMING (h5perf_serial_alone STATIC)
   TARGET_C_PROPERTIES (h5perf_serial_alone STATIC " " " ")
   target_link_libraries (h5perf_serial_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
   set_target_properties (h5perf_serial_alone PROPERTIES FOLDER perform)
@@ -47,7 +45,6 @@ set (chunk_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/chunk.c
 )
 ADD_EXECUTABLE(chunk ${chunk_SRCS})
-TARGET_NAMING (chunk STATIC)
 TARGET_C_PROPERTIES (chunk STATIC " " " ")
 TARGET_LINK_LIBRARIES(chunk ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (chunk PROPERTIES FOLDER perform)
@@ -57,7 +54,6 @@ set (iopipe_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/iopipe.c
 )
 add_executable (iopipe ${iopipe_SRCS})
-TARGET_NAMING (iopipe STATIC)
 TARGET_C_PROPERTIES (iopipe STATIC " " " ")
 target_link_libraries (iopipe ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (iopipe PROPERTIES FOLDER perform)
@@ -67,7 +63,6 @@ set (overhead_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/overhead.c
 )
 add_executable (overhead ${overhead_SRCS})
-TARGET_NAMING (overhead STATIC)
 TARGET_C_PROPERTIES (overhead STATIC " " " ")
 target_link_libraries (overhead ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (overhead PROPERTIES FOLDER perform)
@@ -78,7 +73,6 @@ if (BUILD_TESTING)
       ${HDF5_PERFORM_SOURCE_DIR}/perf_meta.c
   )
   add_executable (perf_meta ${perf_meta_SRCS})
-  TARGET_NAMING (perf_meta STATIC)
   TARGET_C_PROPERTIES (perf_meta STATIC " " " ")
   target_link_libraries (perf_meta ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
   set_target_properties (perf_meta PROPERTIES FOLDER perform)
@@ -89,7 +83,6 @@ set (zip_perf_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/zip_perf.c
 )
 add_executable (zip_perf ${zip_perf_SRCS})
-TARGET_NAMING (zip_perf STATIC)
 TARGET_C_PROPERTIES (zip_perf STATIC " " " ")
 target_link_libraries (zip_perf ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_target_properties (zip_perf PROPERTIES FOLDER perform)
@@ -101,7 +94,6 @@ if (H5_HAVE_PARALLEL AND BUILD_TESTING)
       ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c
   )
   add_executable (h5perf ${h5perf_SRCS})
-  TARGET_NAMING (h5perf STATIC)
   TARGET_C_PROPERTIES (h5perf STATIC " " " ")
   target_link_libraries (h5perf ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
   set_target_properties (h5perf PROPERTIES FOLDER perform)
@@ -113,7 +105,6 @@ if (H5_HAVE_PARALLEL AND BUILD_TESTING)
         ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c
     )
     add_executable (h5perf_alone ${h5perf_alone_SRCS})
-    TARGET_NAMING (h5perf_alone STATIC)
     TARGET_C_PROPERTIES (h5perf_alone STATIC " " " ")
     target_link_libraries (h5perf_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
     set_target_properties (h5perf_alone PROPERTIES FOLDER perform)
-- 
cgit v0.12


From 4bf3d192bbc8f453d9a3b4312e4b56d4bd2bcf0f Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 22 Jan 2018 12:13:02 -0600
Subject: HDFFV-10385 merge typo

---
 test/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fc2bd36..40db60f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -336,7 +336,6 @@ if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
   set_target_properties (err_compat PROPERTIES FOLDER test)
   if (BUILD_SHARED_LIBS)
     add_executable (err_compat-shared ${HDF5_TEST_SOURCE_DIR}/err_compat.c)
-    TARGET_NAMING (err_compat-shared SHARED)
     TARGET_C_PROPERTIES (err_compat-shared SHARED " " " ")
     target_link_libraries (err_compat-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
     set_target_properties (err_compat-shared PROPERTIES FOLDER test)
@@ -350,7 +349,6 @@ target_link_libraries (error_test ${HDF5_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
 set_target_properties (error_test PROPERTIES FOLDER test)
 if (BUILD_SHARED_LIBS)
   add_executable (error_test-shared ${HDF5_TEST_SOURCE_DIR}/error_test.c)
-  TARGET_NAMING (error_test-shared SHARED)
   TARGET_C_PROPERTIES (error_test-shared SHARED " " " ")
   target_link_libraries (error_test-shared ${HDF5_TEST_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (error_test-shared PROPERTIES FOLDER test)
-- 
cgit v0.12


From 393851823fb954c75126627fa7701cd051eda162 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 22 Jan 2018 12:50:51 -0600
Subject: Fix cmake typo

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6837fe..3db4a83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -493,7 +493,7 @@ option (HDF5_BUILD_GENERATORS "Build Test Generators" OFF)
 #-----------------------------------------------------------------------------
 option (HDF5_ENABLE_TRACE "Enable API tracing capability" OFF)
 mark_as_advanced (HDF5_ENABLE_TRACE)
-if (HDF5_BUILD_TYPE MATCHES Debug)
+if (${HDF_CFG_NAME} MATCHES "Debug")
   add_definitions (-DDEBUG)
   # Enable tracing of the API
   if (HDF5_ENABLE_TRACE)
-- 
cgit v0.12


From fe772268d9c8ae7ab5a54c74db6241920c69c253 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 25 Jan 2018 11:13:39 -0600
Subject: Merge notes from develop

---
 release_docs/RELEASE.txt | 72 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 68 insertions(+), 4 deletions(-)

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index f6f15a1..a2a9d14 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -62,7 +62,7 @@ New Features
       Refactor use of CMAKE_BUILD_TYPE for new variable, which understands
       the type of generator in use.
 
-      Added new configuration macros to use new HDF5_BUILD_TYPE variable. This
+      Added new configuration macros to use new HDF_BUILD_TYPE variable. This
       variable is set correctly for the type of generator being used for the build.
 
       (ADB - 2018/01/08, HDFFV-10385, HDFFV-10296)
@@ -122,15 +122,29 @@ Bug Fixes since HDF5-1.8.20
       generators (Visual Studio and XCode) and is optional for single
       config generators. Created a new macro to check
         GLOBAL PROPERTY -> GENERATOR_IS_MULTI_CONFIG
-      Created two new HDF variable, HDF5_BUILD_TYPE and HDF5_CFG_BUILD_TYPE.
+      Created two new HDF variable, HDF_BUILD_TYPE and HDF_CFG_BUILD_TYPE.
       Defaults for these variables is "Release".
 
       (ADB - 2018/01/10, HDFFV-10385)
 
+    - CMake
+
+      Add replacement of fortran flags if using static CRT.
+
+      Added TARGET_STATIC_CRT_FLAGS call to HDFUseFortran.cmake file in
+      config/cmake_ext_mod folder.
+
+      (ADB - 2018/01/08, HDFFV-10334)
+
 
     Library
     -------
-    - None
+    - Utility function can not handle lowercase Windows drive letters
+
+      Added call to toupper function for drive letter.
+
+      (ADB - 2017/12/18, HDFFV-10307)
+
 
 
     Parallel Library
@@ -145,7 +159,57 @@ Bug Fixes since HDF5-1.8.20
 
     Tools
     -----
-    - None
+    - h5dump
+
+      h5dump would output an indented blank line in the filters section.
+
+      h5dump over used the h5tools_simple_prefix function, which is a
+      function intended to account for the data index (x,y,z) option.
+      Removed the function call for header information.
+
+      (ADB - 2018/01/25, HDFFV-10396)
+
+    - h5repack
+
+      h5repack incorrectly searched internal object table for name.
+
+      h5repack would search the table of objects for a name, if the
+      name did not match it tried to determine if the name without a
+      leading slash would match. The logic was flawed! The table
+      stored names(paths) without a leading slash and did a strstr
+      of the table path to the name.
+      The assumption was that if there was a difference of one then
+      it was a match, however "pressure" would match "/pressure" as
+      well as "/pressure1", "/pressure2", etc. Changed logic to remove
+      any leading slash and then do a full compare of the name.
+
+      (ADB - 2018/01/18, HDFFV-10393)
+
+    - h5repack
+
+      h5repack failed to handle more then 9 chars for int conversion.
+
+      User defined filter parameter conversions would fail for integers
+      larger then 9 characters. Increased local variable array for storing
+      the current command line parameter to prevent buffer overflows.
+
+      (ADB - 2018/01/17, HDFFV-10392)
+
+    - h5diff
+
+      h5diff seg faulted if comparing VL strings against fixed strings.
+
+      Reworked solution for HDFFV-8625 and HDFFV-8639. Implemented the check
+      for string objects of same type in the diff_can_type function by
+      adding an if(tclass1 == H5T_STRING) block. This if block moves the
+      same check that was added for attributes to this function, which is
+      used by all object types. This function also handles complex type
+      structures.
+      Also added a new test file in h5diffgenttest for testing this issue
+      and removed the temporary files used in the test scripts.
+
+      (ADB - 2018/01/04, HDFFV-8745)
+
 
 
     Fortran API
-- 
cgit v0.12


From e98f1054c3830d0786eaccc48300e63cda0e57e7 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 25 Jan 2018 11:20:45 -0600
Subject: Fix typos

---
 release_docs/RELEASE.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index a2a9d14..3f30ef2 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -82,7 +82,7 @@ New Features
 
     Tools
     -----
-    - None 
+    - None
 
 
     High-Level APIs
@@ -116,7 +116,7 @@ Bug Fixes since HDF5-1.8.20
     -------------
     - CMake
 
-      Correct usuage of CMAKE_BUILD_TYPE variable.
+      Correct usage of CMAKE_BUILD_TYPE variable.
 
       The use of the CMAKE_BUILD_TYPE is incorrect for multi-config
       generators (Visual Studio and XCode) and is optional for single
@@ -163,7 +163,7 @@ Bug Fixes since HDF5-1.8.20
 
       h5dump would output an indented blank line in the filters section.
 
-      h5dump over used the h5tools_simple_prefix function, which is a
+      h5dump overused the h5tools_simple_prefix function, which is a
       function intended to account for the data index (x,y,z) option.
       Removed the function call for header information.
 
@@ -197,7 +197,7 @@ Bug Fixes since HDF5-1.8.20
 
     - h5diff
 
-      h5diff seg faulted if comparing VL strings against fixed strings.
+      h5diff seg-faulted if comparing VL strings against fixed strings.
 
       Reworked solution for HDFFV-8625 and HDFFV-8639. Implemented the check
       for string objects of same type in the diff_can_type function by
-- 
cgit v0.12


From bc6134ee2da45a1ea902432c65d898e09d6d91a3 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 25 Jan 2018 17:04:00 -0600
Subject: Fix extlib references and fortran name typo

---
 CMakeInstallation.cmake           | 10 +++++-----
 CMakeLists.txt                    |  2 +-
 config/cmake/hdf5-config.cmake.in |  8 +++++++-
 fortran/test/CMakeLists.txt       |  6 +++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 96e4f0d..5d3daff 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -41,7 +41,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
   if (HDF5_EXPORTED_TARGETS)
     install (
         EXPORT ${HDF5_EXPORTED_TARGETS}
-        DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
+        DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/hdf5
         FILE ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-targets.cmake
         NAMESPACE ${HDF5_PACKAGE}::
         COMPONENT configinstall
@@ -84,7 +84,7 @@ set (CURRENT_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}" )
 configure_package_config_file (
     ${HDF_RESOURCES_DIR}/hdf5-config.cmake.in
     "${HDF5_BINARY_DIR}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake"
-    INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}"
+    INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}/hdf5"
     PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR
     INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}"
 )
@@ -98,14 +98,14 @@ set (CURRENT_BUILD_DIR "${CMAKE_INSTALL_PREFIX}" )
 configure_package_config_file (
     ${HDF_RESOURCES_DIR}/hdf5-config.cmake.in
     "${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake"
-    INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}"
+    INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}/hdf5"
     PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR
 )
 
 if (NOT HDF5_EXTERNALLY_CONFIGURED)
   install (
       FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake
-      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
+      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/hdf5
       COMPONENT configinstall
   )
 endif ()
@@ -120,7 +120,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
   )
   install (
       FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake
-      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
+      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/hdf5
       COMPONENT configinstall
   )
 endif ()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3db4a83..564c091 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,7 +210,7 @@ if (NOT HDF5_INSTALL_DATA_DIR)
       set (HDF5_INSTALL_FWRK_DIR ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
     endif ()
     set (HDF5_INSTALL_DATA_DIR share)
-    set (HDF5_INSTALL_CMAKE_DIR share/cmake/hdf5)
+    set (HDF5_INSTALL_CMAKE_DIR share/cmake)
   else ()
     set (HDF5_INSTALL_DATA_DIR ".")
     set (HDF5_INSTALL_CMAKE_DIR cmake)
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
index 4bb5616..c4823c7 100644
--- a/config/cmake/hdf5-config.cmake.in
+++ b/config/cmake/hdf5-config.cmake.in
@@ -94,7 +94,13 @@ set (HDF5_VERSION_MINOR  @HDF5_VERSION_MINOR@)
 # project which has already built hdf5 as a subproject
 #-----------------------------------------------------------------------------
 if (NOT TARGET "@HDF5_PACKAGE@")
-  include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
+  if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND NOT TARGET "zlib")
+    include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
+  endif ()
+  if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS AND NOT TARGET "szip")
+    include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
+  endif ()
+  include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
 endif ()
 
 # Handle default component(static) :
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 0c1f616..c7416df 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -259,7 +259,7 @@ if (HDF5_ENABLE_F2003)
   if (WIN32 AND MSVC)
     target_link_libraries (fortranlib_test_F03 "ws2_32.lib")
   endif ()
-  
+
   target_include_directories (fortranlib_test_F03 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
   set_target_properties (fortranlib_test_F03 PROPERTIES
       LINKER_LANGUAGE Fortran
@@ -296,7 +296,7 @@ if (HDF5_ENABLE_F2003)
 endif ()
 
 #-- Adding test for fflush1
-add_executable (fflush1 fflush1.F90)
+add_executable (fflush1 fflush1.f90)
 TARGET_FORTRAN_PROPERTIES (fflush1 STATIC " " " ")
 target_link_libraries (fflush1
     ${HDF5_F90_LIB_TARGET}
@@ -332,7 +332,7 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
 endif ()
 
 #-- Adding test for fflush2
-add_executable (fflush2 fflush2.F90)
+add_executable (fflush2 fflush2.f90)
 TARGET_FORTRAN_PROPERTIES (fflush2 STATIC " " " ")
 target_link_libraries (fflush2
     ${HDF5_F90_TEST_LIB_TARGET}
-- 
cgit v0.12


From 84d523eb00641dba2bfb97baa7623b138fe2ce68 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 26 Jan 2018 13:24:57 -0600
Subject: HDFFVC-10396 merge from develop

---
 tools/h5dump/h5dump_ddl.c |  16 ----
 tools/h5dump/h5dump_xml.c | 189 ----------------------------------------------
 tools/lib/h5tools_dump.c  |  53 -------------
 3 files changed, 258 deletions(-)

diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c
index 8dc96ce..7c0a05b 100644
--- a/tools/h5dump/h5dump_ddl.c
+++ b/tools/h5dump/h5dump_ddl.c
@@ -277,7 +277,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                         ctx.indent_level++;
 
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -289,7 +288,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                         error_msg("internal error (file %s:line %d)\n", __FILE__, __LINE__);
 
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -311,7 +309,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                     }
                     else if(found_obj->displayed) {
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -332,7 +329,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                         ctx.indent_level--;
 
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -414,7 +410,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                     /* print the value of a soft link */
                     /* Standard DDL: no modification */
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -425,7 +420,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -450,7 +444,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
             }
             else {
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -479,7 +472,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                         ctx.indent_level++;
 
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -487,7 +479,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -500,7 +491,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                     } /* end else */
                 } /* end else */
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -522,7 +512,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
         case H5L_TYPE_HARD:
         default:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -534,7 +523,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
             ctx.indent_level++;
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
             /* Render the element */
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "LINKCLASS %d", linfo->type);
@@ -543,7 +531,6 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
             ctx.indent_level--;
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
             /* Render the element */
             h5tools_str_reset(&buffer);
             if(HDstrlen(h5tools_dump_header_format->udlinkblockend)) {
@@ -904,7 +891,6 @@ dump_group(hid_t gid, const char *name)
     ctx.indent_level--;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -1571,7 +1557,6 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H
         HDmemset(&buffer, 0, sizeof(h5tools_str_t));
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -1583,7 +1568,6 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H
         error_msg("unable to open object \"%s\"\n", obj_name);
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
         /* Render the element */
         h5tools_str_reset(&buffer);
         if(HDstrlen(h5tools_dump_header_format->attributeblockend)) {
diff --git a/tools/h5dump/h5dump_xml.c b/tools/h5dump/h5dump_xml.c
index 76819f0..6e72b56 100644
--- a/tools/h5dump/h5dump_xml.c
+++ b/tools/h5dump/h5dump_xml.c
@@ -230,7 +230,6 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                         ctx.indent_level++;
 
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -242,7 +241,6 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                         error_msg("internal error (file %s:line %d)\n", __FILE__, __LINE__);
 
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -277,7 +275,6 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                         xml_name_to_XID(prefix, parentxid, (int)sizeof(parentxid), 1);
 
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -297,7 +294,6 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                         ctx.indent_level++;
 
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -309,7 +305,6 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                         ctx.indent_level--;
 
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -404,7 +399,6 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                     if (res == 0) {
                         /* target obj found */
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -426,7 +420,6 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                     else {
                         /* dangling link -- omit from xml attributes */
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -491,7 +484,6 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                         xml_name_to_XID(prefix, parentxid, (int)sizeof(parentxid), 1);
 
                         ctx.need_prefix = TRUE;
-                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -538,7 +530,6 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                 xml_name_to_XID(prefix, parentxid, (int)sizeof(parentxid), 1);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -904,7 +895,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                    as it's name.  */
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -917,7 +907,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 char *t_objname = xml_escape_the_name(found_obj->objname);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -930,7 +919,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
         }
         else {
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -943,7 +931,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
         switch (H5Tget_class(type)) {
             case H5T_INTEGER:
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -956,7 +943,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 sgn = H5Tget_sign(type);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1001,7 +987,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1017,7 +1002,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ord = H5Tget_order(type);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1026,7 +1010,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level++;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1060,7 +1043,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1070,7 +1052,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
 
             case H5T_TIME:
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1079,7 +1060,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level++;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1089,7 +1069,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1105,7 +1084,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 is_vlstr = H5Tis_variable_str(type);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1115,7 +1093,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level++;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1143,7 +1120,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1156,7 +1132,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ord = H5Tget_order(type);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1165,7 +1140,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level++;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1192,7 +1166,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1204,7 +1177,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 /* <hdf5:OpaqueType Tag="tag" Size="bytes" /> */
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1214,7 +1186,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 mname = H5Tget_tag(type);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1226,7 +1197,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1241,7 +1211,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 nmembers = (unsigned)H5Tget_nmembers(type);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1261,7 +1230,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                     t_fname = xml_escape_the_name(mname);
 
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1274,7 +1242,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                     ctx.indent_level++;
 
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1287,7 +1254,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                     ctx.indent_level--;
 
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1297,7 +1263,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                     ctx.indent_level--;
 
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1308,7 +1273,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1318,7 +1282,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
 
             case H5T_REFERENCE:
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1328,7 +1291,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 /*  Only Object references supported at this time */
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1337,7 +1299,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level++;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1346,7 +1307,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1355,7 +1315,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1368,7 +1327,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 nmembs = H5Tget_nmembers(type);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1378,7 +1336,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level++;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1387,7 +1344,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 xml_print_enum(type);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1397,7 +1353,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1407,7 +1362,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
 
             case H5T_VLEN:
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1418,7 +1372,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level++;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1431,7 +1384,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1441,7 +1393,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1473,7 +1424,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level++;
                 for (i = 0; i < ndims; i++) {
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1486,7 +1436,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level++;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1499,7 +1448,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1509,7 +1457,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1523,7 +1470,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
             case H5T_NCLASSES:
             default:
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1605,7 +1551,6 @@ xml_dump_datatype(hid_t type)
                  */
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1618,7 +1563,6 @@ xml_dump_datatype(hid_t type)
                 char *t_objname = xml_escape_the_name(found_obj->objname);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1631,7 +1575,6 @@ xml_dump_datatype(hid_t type)
         }
         else {
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -1641,7 +1584,6 @@ xml_dump_datatype(hid_t type)
     }
     else {
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -1654,7 +1596,6 @@ xml_dump_datatype(hid_t type)
         dump_indent -= COL;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -1719,7 +1660,6 @@ xml_dump_dataspace(hid_t space)
     ctx.indent_level++;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -1732,7 +1672,6 @@ xml_dump_dataspace(hid_t space)
         /* scalar dataspace (just a tag, no XML attrs. defined */
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -1745,7 +1684,6 @@ xml_dump_dataspace(hid_t space)
         /* <hdf5:SimpleDataspace Ndims="nd"> */
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -1757,7 +1695,6 @@ xml_dump_dataspace(hid_t space)
         for (i = 0; i < ndims; i++) {
             if (maxsize[i] == H5S_UNLIMITED) {
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1767,7 +1704,6 @@ xml_dump_dataspace(hid_t space)
             }
             else if (maxsize[i] == (hsize_t) 0) {
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1777,7 +1713,6 @@ xml_dump_dataspace(hid_t space)
             }
             else {
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1789,7 +1724,6 @@ xml_dump_dataspace(hid_t space)
         ctx.indent_level--;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -1804,7 +1738,6 @@ xml_dump_dataspace(hid_t space)
 
         ctx.need_prefix = TRUE;
         h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-
         /* Render the element */
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "<%sNullDataspace />",xmlnsprefix);
@@ -1816,7 +1749,6 @@ xml_dump_dataspace(hid_t space)
     case H5S_NO_CLASS:
     default:
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -1827,7 +1759,6 @@ xml_dump_dataspace(hid_t space)
     ctx.indent_level--;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -1898,7 +1829,6 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
     outputformat = &string_dataformat;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -1908,7 +1838,6 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
     ctx.indent_level++;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2004,7 +1933,6 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
         ctx.indent_level++;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2030,7 +1958,6 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
     ctx.indent_level--;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2091,7 +2018,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
     outputformat = &string_dataformat;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2127,7 +2053,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 dump_indent += COL;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2135,7 +2060,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2143,7 +2067,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2151,7 +2074,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2159,7 +2081,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2172,7 +2093,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
             case H5T_COMPOUND:
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2183,7 +2103,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
             case H5T_REFERENCE:
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2191,7 +2110,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 if (!H5Tequal(type, H5T_STD_REF_OBJ)) {
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2199,7 +2117,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2208,7 +2125,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 }
                 else {
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2218,7 +2134,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     xml_print_refs(attr_id, ATTRIBUTE_DATA);
 
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2227,7 +2142,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 }
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2237,7 +2151,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
             case H5T_VLEN:
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2250,7 +2163,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
             case H5T_NCLASSES:
             default:
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2258,7 +2170,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2266,7 +2177,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2274,7 +2184,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2287,7 +2196,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
             /* The case of an attribute never yet written ??
              * Or dataspace is H5S_NULL. */
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -2297,7 +2205,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
             ctx.indent_level++;
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -2307,7 +2214,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
             ctx.indent_level--;
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -2322,7 +2228,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
         H5Aclose(attr_id);
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2337,7 +2242,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
         ctx.indent_level++;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2347,7 +2251,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
         ctx.indent_level--;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2434,7 +2337,6 @@ xml_dump_named_datatype(hid_t type, const char *name)
          */
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2449,7 +2351,6 @@ xml_dump_named_datatype(hid_t type, const char *name)
         H5O_info_t  oinfo;          /* Object info */
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2486,7 +2387,6 @@ xml_dump_named_datatype(hid_t type, const char *name)
                 xml_name_to_XID(found_obj->objname, pointerxid, (int)sizeof(pointerxid), 1);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2496,7 +2396,6 @@ xml_dump_named_datatype(hid_t type, const char *name)
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2514,7 +2413,6 @@ xml_dump_named_datatype(hid_t type, const char *name)
     dump_indent += COL;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2528,7 +2426,6 @@ xml_dump_named_datatype(hid_t type, const char *name)
     dump_indent -= COL;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2539,7 +2436,6 @@ xml_dump_named_datatype(hid_t type, const char *name)
     dump_indent -= COL;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2679,7 +2575,6 @@ xml_dump_group(hid_t gid, const char *name)
                     xml_name_to_XID("/", grpxid, 100, 1);
 
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2694,7 +2589,6 @@ xml_dump_group(hid_t gid, const char *name)
                     xml_name_to_XID(par, parentxid, 100, 1);
 
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2714,7 +2608,6 @@ xml_dump_group(hid_t gid, const char *name)
                     xml_name_to_XID(par, parentxid, 100, 1);
 
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2738,7 +2631,6 @@ xml_dump_group(hid_t gid, const char *name)
                     xml_name_to_XID("/", grpxid, 100, 1);
 
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2754,7 +2646,6 @@ xml_dump_group(hid_t gid, const char *name)
                     xml_name_to_XID(par, parentxid, 100, 1);
 
                     ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2824,7 +2715,6 @@ xml_dump_group(hid_t gid, const char *name)
         char *parentxid = (char *)HDmalloc((size_t)100);
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2897,7 +2787,6 @@ xml_dump_group(hid_t gid, const char *name)
     }
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -3024,7 +2913,6 @@ xml_print_refs(hid_t did, int source)
 
         if (!path) {
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3035,7 +2923,6 @@ xml_print_refs(hid_t did, int source)
             char *t_path = xml_escape_the_string(path, -1);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3181,7 +3068,6 @@ xml_print_strs(hid_t did, int source)
 
         if (!onestring) {
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3289,7 +3175,6 @@ check_filters(hid_t dcpl)
         if (filter == H5Z_FILTER_DEFLATE) {
             ctx.indent_level++;
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3308,7 +3193,6 @@ check_filters(hid_t dcpl)
         else if (filter == H5Z_FILTER_FLETCHER32) {
             ctx.indent_level++;
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3319,7 +3203,6 @@ check_filters(hid_t dcpl)
         else if (filter == H5Z_FILTER_SHUFFLE) {
             ctx.indent_level++;
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3331,7 +3214,6 @@ check_filters(hid_t dcpl)
             ctx.indent_level++;
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3425,7 +3307,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
     dump_indent += COL;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -3443,7 +3324,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         const char * path = lookup_ref_path(*(hobj_ref_t *) buf);
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3451,7 +3331,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         if (!path) {
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3462,7 +3341,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             char *t_path = xml_escape_the_string(path, -1);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3472,7 +3350,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         }
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3482,7 +3359,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
     else if (H5Tget_class(type) == H5T_STRING) {
         /* ????? */
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3490,7 +3366,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3502,7 +3377,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         switch (H5Tget_class(type)) {
         case H5T_INTEGER:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3518,7 +3392,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3527,7 +3400,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             break;
         case H5T_FLOAT:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3543,7 +3415,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3553,7 +3424,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         case H5T_BITFIELD:
         case H5T_OPAQUE:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3575,7 +3445,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3584,7 +3453,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             break;
         case H5T_ENUM:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3602,7 +3470,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             if(name)
                 H5free_memory(name);
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3611,7 +3478,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             break;
         case H5T_ARRAY:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3619,7 +3485,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3628,7 +3493,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             break;
         case H5T_TIME:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3636,7 +3500,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3645,7 +3508,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             break;
         case H5T_COMPOUND:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3653,7 +3515,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3662,7 +3523,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             break;
         case H5T_VLEN:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3670,7 +3530,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3683,7 +3542,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         case H5T_REFERENCE:
         default:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3691,7 +3549,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3705,7 +3562,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
     dump_indent -= COL;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -3792,7 +3648,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
     xml_name_to_XID(prefix, pstr, 100, 1);
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -3827,7 +3682,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             dump_indent += COL;
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3837,7 +3691,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             dump_indent += COL;
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3852,7 +3705,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             for (i = 0; i < ndims; i++) {
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3861,7 +3713,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             }
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3875,7 +3726,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             dump_indent -= COL;
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3886,7 +3736,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             dump_indent -= COL;
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3896,7 +3745,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             dump_indent -= COL;
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3911,7 +3759,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
         ctx.indent_level++;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3920,7 +3767,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
         ctx.indent_level++;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3929,7 +3775,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
         ctx.indent_level--;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3941,7 +3786,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
         ctx.indent_level++;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3950,7 +3794,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
         ctx.indent_level++;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3959,7 +3802,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
         ctx.indent_level--;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3975,7 +3817,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
     dump_indent += COL;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4024,7 +3865,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
     dump_indent += COL;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4036,7 +3876,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
         ctx.indent_level++;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4049,7 +3888,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
     }
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4060,7 +3898,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
     dump_indent -= COL;
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4113,7 +3950,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             ctx.indent_level++;
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4121,7 +3957,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4129,7 +3964,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4137,7 +3971,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4149,7 +3982,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
 
         case H5T_COMPOUND:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4165,7 +3997,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
 
         case H5T_REFERENCE:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4173,7 +4004,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
             if (!H5Tequal(type, H5T_STD_REF_OBJ)) {
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4181,7 +4011,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4190,7 +4019,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             }
             else {
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4200,7 +4028,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
                 xml_print_refs(did, DATASET_DATA);
 
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4209,7 +4036,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             }
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4221,7 +4047,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             ctx.indent_level--;
             dump_indent -= COL;
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4240,7 +4065,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
         case H5T_NCLASSES:
         default:
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4248,7 +4072,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4256,7 +4079,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4264,7 +4086,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
             ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -4278,7 +4099,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
         ctx.indent_level++;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4287,7 +4107,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
         ctx.indent_level++;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4296,7 +4115,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
         ctx.indent_level--;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4310,7 +4128,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
     H5Pclose(dcpl);
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4376,7 +4193,6 @@ xml_print_enum(hid_t type)
     super = H5Tget_super(type);
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4386,7 +4202,6 @@ xml_print_enum(hid_t type)
     xml_print_datatype(super,0);
 
     ctx.need_prefix = TRUE;
-    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4437,7 +4252,6 @@ xml_print_enum(hid_t type)
         char *t_name = xml_escape_the_name(name[i]);
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4455,7 +4269,6 @@ xml_print_enum(hid_t type)
         ctx.indent_level--;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4463,7 +4276,6 @@ xml_print_enum(hid_t type)
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4493,7 +4305,6 @@ xml_print_enum(hid_t type)
         ctx.indent_level--;
 
         ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
         h5tools_str_reset(&buffer);
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 31c54d3..7ec5da8 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -2060,7 +2060,6 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         ctx->indent_level++;
 
         ctx->need_prefix = TRUE;
-        h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
         h5tools_str_reset(buffer);
 
@@ -2071,7 +2070,6 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
         ctx->need_prefix = TRUE;
-        h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
         h5tools_str_reset(buffer);
 
@@ -2111,7 +2109,6 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
         ctx->need_prefix = TRUE;
-        h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
         h5tools_str_reset(buffer);
 
@@ -2150,7 +2147,6 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
         ctx->need_prefix = TRUE;
-        h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
         h5tools_str_reset(buffer);
 
@@ -2225,7 +2221,6 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         ctx->indent_level--;
 
         ctx->need_prefix = TRUE;
-        h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
         h5tools_str_reset(buffer);
         if(H5Tclose(str_type) < 0)
@@ -2268,7 +2263,6 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
               H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Tget_tag failed");
 
            ctx->need_prefix = TRUE;
-           h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
            h5tools_str_reset(buffer);
            h5tools_str_append(buffer, "OPAQUE_TAG \"%s\";", ttag);
@@ -2279,7 +2273,6 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         ctx->indent_level--;
 
         ctx->need_prefix = TRUE;
-        h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
         h5tools_str_reset(buffer);
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->structblockend);
@@ -2298,7 +2291,6 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
             mname = H5Tget_member_name(type, i);
             if((mtype = H5Tget_member_type(type, i)) >= 0) {
                 ctx->need_prefix = TRUE;
-                h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
                 h5tools_str_reset(buffer);
                 h5tools_print_datatype(stream, buffer, info, ctx, mtype, TRUE);
@@ -2315,7 +2307,6 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         ctx->indent_level--;
 
         ctx->need_prefix = TRUE;
-        h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
         h5tools_str_reset(buffer);
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->structblockend);
@@ -2340,7 +2331,6 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         ctx->indent_level++;
 
         ctx->need_prefix = TRUE;
-        h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
         h5tools_str_reset(buffer);
         h5tools_print_datatype(stream, buffer, info, ctx, super, TRUE);
@@ -2356,7 +2346,6 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         ctx->indent_level--;
 
         ctx->need_prefix = TRUE;
-        h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
         h5tools_str_reset(buffer);
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->enumblockend);
@@ -2772,7 +2761,6 @@ h5tools_dump_oid(FILE *stream, const h5tool_format_t *info,
         ncols = info->line_ncols;
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s %d %s", OBJID, BEGIN, oid, END);
@@ -2862,7 +2850,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     *-------------------------------------------------------------------------
     */
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", STORAGE_LAYOUT, BEGIN);
@@ -2873,7 +2860,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
         case H5D_CHUNKED:
             ctx->indent_level++;
             ctx->need_prefix = TRUE;
-            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "%s ", CHUNKED);
@@ -2886,7 +2872,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
             h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0);
 
             ctx->need_prefix = TRUE;
-            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
             h5tools_str_reset(&buffer);
 
@@ -2942,14 +2927,12 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
         case H5D_COMPACT:
             ctx->indent_level++;
             ctx->need_prefix = TRUE;
-            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "%s", COMPACT);
             h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0);
 
             ctx->need_prefix = TRUE;
-            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "SIZE " HSIZE_T_FORMAT, storage_size);
@@ -2969,14 +2952,12 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                 ctx->indent_level++;
                 if (next) {
                     ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s", CONTIGUOUS);
                     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0);
 
                     ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s %s", EXTERNAL, BEGIN);
@@ -2987,7 +2968,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                         H5Pget_external(dcpl_id, j, sizeof(name), name, &offset, &size);
 
                         ctx->need_prefix = TRUE;
-                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "FILENAME %s SIZE " HSIZE_T_FORMAT, name, size);
@@ -2997,7 +2977,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                     ctx->indent_level--;
 
                     ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s", END);
@@ -3007,21 +2986,18 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                     haddr_t ioffset;
 
                     ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s", CONTIGUOUS);
                     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0);
 
                     ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer,"SIZE " HSIZE_T_FORMAT, storage_size);
                     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0);
 
                     ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                     h5tools_str_reset(&buffer);
                     ioffset = H5Dget_offset(obj_id);
@@ -3041,7 +3017,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     }/*switch*/
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s", END);
@@ -3053,7 +3028,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     */
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", FILTERS, BEGIN);
@@ -3071,7 +3045,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                 continue; /* nothing to print for invalid filter */
 
             ctx->need_prefix = TRUE;
-            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
             h5tools_str_reset(&buffer);
             switch(filtn) {
@@ -3097,14 +3070,12 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                         ctx->indent_level++;
 
                         ctx->need_prefix = TRUE;
-                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "PIXELS_PER_BLOCK %d", szip_pixels_per_block);
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
                         ctx->need_prefix = TRUE;
-                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                         h5tools_str_reset(&buffer);
                         if(szip_options_mask & H5_SZIP_CHIP_OPTION_MASK)
@@ -3114,7 +3085,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
                         ctx->need_prefix = TRUE;
-                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                         h5tools_str_reset(&buffer);
                         if(szip_options_mask & H5_SZIP_EC_OPTION_MASK)
@@ -3124,7 +3094,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
                         ctx->need_prefix = TRUE;
-                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                         h5tools_str_reset(&buffer);
                         if(szip_options_mask & H5_SZIP_LSB_OPTION_MASK)
@@ -3135,7 +3104,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
                         if(szip_options_mask & H5_SZIP_RAW_OPTION_MASK) {
                             ctx->need_prefix = TRUE;
-                            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                             h5tools_str_reset(&buffer);
                             h5tools_str_append(&buffer, "HEADER %s", "RAW");
@@ -3145,7 +3113,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                         ctx->indent_level--;
 
                         ctx->need_prefix = TRUE;
-                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "%s", END);
@@ -3166,7 +3133,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                     ctx->indent_level++;
 
                     ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "FILTER_ID %d", filtn);
@@ -3174,7 +3140,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
                     if(f_name[0] != '\0') {
                         ctx->need_prefix = TRUE;
-                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "COMMENT %s", f_name);
@@ -3182,7 +3147,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                     }
                     if (cd_nelmts) {
                         ctx->need_prefix = TRUE;
-                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "%s %s ","PARAMS", BEGIN);
@@ -3194,7 +3158,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                     ctx->indent_level--;
 
                     ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s", END);
@@ -3206,7 +3169,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     else {
 
         ctx->need_prefix = TRUE;
-        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "NONE");
@@ -3215,7 +3177,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     ctx->indent_level--;
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s", END);
@@ -3226,7 +3187,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     *-------------------------------------------------------------------------
     */
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", FILLVALUE, BEGIN);
@@ -3235,7 +3195,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     ctx->indent_level++;
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "FILL_TIME ");
@@ -3259,7 +3218,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s ", "VALUE ");
@@ -3285,7 +3243,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     ctx->indent_level--;
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s", END);
@@ -3296,7 +3253,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     *-------------------------------------------------------------------------
     */
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "ALLOCATION_TIME %s", BEGIN);
@@ -3305,7 +3261,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     ctx->indent_level++;
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     H5Pget_alloc_time(dcpl_id, &at);
@@ -3330,7 +3285,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     ctx->indent_level--;
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s", END);
@@ -3423,7 +3377,6 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
         ncols = info->line_ncols;
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s \"%s\" %s",
@@ -3460,7 +3413,6 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
     }
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
     h5tools_str_reset(&buffer);
 
@@ -3579,7 +3531,6 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info,
         ncols = info->line_ncols;
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", h5tools_dump_header_format->subsettingbegin, h5tools_dump_header_format->subsettingblockbegin);
@@ -3588,7 +3539,6 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info,
     ctx->indent_level++;
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->startbegin, h5tools_dump_header_format->startblockbegin);
@@ -3597,7 +3547,6 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info,
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->stridebegin, h5tools_dump_header_format->strideblockbegin);
@@ -3606,7 +3555,6 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info,
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->countbegin, h5tools_dump_header_format->countblockbegin);
@@ -3620,7 +3568,6 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info,
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->blockbegin, h5tools_dump_header_format->blockblockbegin);
-- 
cgit v0.12


From b0cb6af193c76935b91f1b14ed03bbd748c9b212 Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Sun, 28 Jan 2018 21:39:57 -0600
Subject: Snapshot version 1.8 release 21 (snap4)

---
 README.txt                            | 2 +-
 c++/src/cpp_doc_config                | 2 +-
 config/cmake/scripts/HDF5config.cmake | 2 +-
 configure.ac                          | 2 +-
 release_docs/RELEASE.txt              | 2 +-
 src/H5public.h                        | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index 2281894..9af5df4 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap4 currently under development
+HDF5 version 1.8.21-snap5 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index f3a2180..60a61b8 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap4, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap5, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index e6e0936..492d883 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
-set (CTEST_SOURCE_VERSEXT "-snap4")
+set (CTEST_SOURCE_VERSEXT "-snap5")
 
 ##############################################################################
 # handle input parameters to script.
diff --git a/configure.ac b/configure.ac
index 6284a02..ceb7f0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap4], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap5], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 3f30ef2..ff16bb6 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap4 currently under development
+HDF5 version 1.8.21-snap5 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index a6001d9..acca700 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap4"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap5"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap4"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap5"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
-- 
cgit v0.12


From 9e311657771d7aaa59bf941d6d6494369f4181ff Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 29 Jan 2018 11:33:11 -0600
Subject: Fix windows and mac compile issues

---
 CMakeLists.txt                         | 81 +++-----------------------------
 config/cmake/libhdf5.settings.cmake.in |  2 +-
 config/cmake_ext_mod/HDFMacros.cmake   | 84 +++++++++++++++++++++++++++++++++-
 fortran/src/CMakeLists.txt             | 10 ++--
 4 files changed, 95 insertions(+), 82 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 564c091..11bd2e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,44 +183,6 @@ set (HDF5_TOOLS_SRC_DIR      ${HDF5_SOURCE_DIR}/tools)
 set (HDF5_PERFORM_SRC_DIR    ${HDF5_SOURCE_DIR}/tools/perform)
 set (HDF5_F90_SRC_DIR        ${HDF5_SOURCE_DIR}/fortran)
 
-if (APPLE)
-  option (HDF5_BUILD_FRAMEWORKS "TRUE to build as frameworks libraries, FALSE to build according to BUILD_SHARED_LIBS" FALSE)
-endif ()
-
-if (NOT HDF5_INSTALL_BIN_DIR)
-  set (HDF5_INSTALL_BIN_DIR bin)
-endif ()
-if (NOT HDF5_INSTALL_LIB_DIR)
-  if (APPLE)
-    set (HDF5_INSTALL_FMWK_DIR ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
-  endif ()
-  set (HDF5_INSTALL_LIB_DIR lib)
-endif ()
-if (NOT HDF5_INSTALL_INCLUDE_DIR)
-  set (HDF5_INSTALL_INCLUDE_DIR include)
-endif ()
-if (NOT HDF5_INSTALL_DATA_DIR)
-  if (NOT WIN32)
-    if (APPLE)
-      if (HDF5_BUILD_FRAMEWORKS)
-        set (HDF5_INSTALL_EXTRA_DIR ../SharedSupport)
-      else ()
-        set (HDF5_INSTALL_EXTRA_DIR share)
-      endif ()
-      set (HDF5_INSTALL_FWRK_DIR ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
-    endif ()
-    set (HDF5_INSTALL_DATA_DIR share)
-    set (HDF5_INSTALL_CMAKE_DIR share/cmake)
-  else ()
-    set (HDF5_INSTALL_DATA_DIR ".")
-    set (HDF5_INSTALL_CMAKE_DIR cmake)
-  endif ()
-endif ()
-
-if (DEFINED ADDITIONAL_CMAKE_PREFIX_PATH AND EXISTS "${ADDITIONAL_CMAKE_PREFIX_PATH}")
-  set (CMAKE_PREFIX_PATH ${ADDITIONAL_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH})
-endif ()
-
 #-----------------------------------------------------------------------------
 # parse the full version number from H5public.h and include in H5_VERS_INFO
 #-----------------------------------------------------------------------------
@@ -325,46 +287,15 @@ set (HDF5_PACKAGE_BUGREPORT "help@hdfgroup.org")
 # Include some macros for reusable code
 #-----------------------------------------------------------------------------
 include (${HDF_RESOURCES_EXT_DIR}/HDFMacros.cmake)
-include (${HDF_RESOURCES_EXT_DIR}/HDFLibMacros.cmake)
-include (${HDF_RESOURCES_DIR}/HDF5Macros.cmake)
 
-SET_HDF_BUILD_TYPE()
+HDF_DIR_PATHS(${HDF5_PACKAGE_NAME})
 
-#-----------------------------------------------------------------------------
-# Setup output Directories
-#-----------------------------------------------------------------------------
-if (NOT HDF5_EXTERNALLY_CONFIGURED)
-  set (CMAKE_RUNTIME_OUTPUT_DIRECTORY
-      ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables."
-  )
-  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY
-      ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries"
-  )
-  set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY
-      ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries."
-  )
-  set (CMAKE_Fortran_MODULE_DIRECTORY
-      ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all fortran modules."
-  )
-  if (WIN32)
-    set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CTEST_CONFIGURATION_TYPE})
-    set (CMAKE_PDB_OUTPUT_DIRECTORY
-        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all pdb files."
-    )
-  else ()
-    set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CTEST_CONFIGURATION_TYPE})
-  endif ()
-else ()
-  # if we are externally configured, but the project uses old cmake scripts
-  # this may not be set and utilities like H5detect will fail
-  if (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-    set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
-  endif ()
-endif ()
+include (${HDF_RESOURCES_EXT_DIR}/HDFLibMacros.cmake)
+include (${HDF_RESOURCES_DIR}/HDF5Macros.cmake)
 
 #-----------------------------------------------------------------------------
 # Targets built within this project are exported at Install time for use
-# by other projects using FindHDF5.
+# by other projects.
 #-----------------------------------------------------------------------------
 if (NOT HDF5_EXPORTED_TARGETS)
   set (HDF5_EXPORTED_TARGETS "hdf5-targets")
@@ -651,13 +582,13 @@ add_subdirectory (${HDF5_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src)
 
 if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
   if (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
-    ADD_DEPENDENCIES (${HDF5_LIB_TARGET} ZLIB)
+    add_dependencies (${HDF5_LIB_TARGET} ZLIB)
     if (BUILD_SHARED_LIBS)
       add_dependencies (${HDF5_LIBSH_TARGET} ZLIB)
     endif ()
   endif ()
   if (SZIP_FOUND AND SZIP_USE_EXTERNAL)
-    ADD_DEPENDENCIES (${HDF5_LIB_TARGET} SZIP)
+    add_dependencies (${HDF5_LIB_TARGET} SZIP)
     if (BUILD_SHARED_LIBS)
       add_dependencies (${HDF5_LIBSH_TARGET} SZIP)
     endif ()
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index 5d97172..8ef67a5 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -15,7 +15,7 @@ General Information:
 
 Compiling Options:
 ------------------
-               Compilation Mode: @HDF_BUILD_TYPE@
+               Compilation Mode: @CMAKE_BUILD_TYPE@
                      C Compiler: @CMAKE_C_COMPILER@
                          CFLAGS: @CMAKE_C_FLAGS@
                       H5_CFLAGS: @H5_CFLAGS@
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 1326420..4097ca9 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -166,7 +166,7 @@ macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
   if (${importtype} MATCHES "IMPORT")
     set (importprefix "${CMAKE_STATIC_LIBRARY_PREFIX}")
   endif ()
-  if (${HDF_CFG_NAME} MATCHES "Debug")
+  if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
     set (IMPORT_LIB_NAME ${LIB_DEBUG_NAME})
   else ()
     set (IMPORT_LIB_NAME ${LIB_RELEASE_NAME})
@@ -331,3 +331,85 @@ macro (HDFTEST_COPY_FILE src dest target)
     )
     list (APPEND ${target}_list "${dest}")
 endmacro ()
+
+macro (HDF_DIR_PATHS package_prefix)
+  if (APPLE)
+    option (${package_prefix}_BUILD_FRAMEWORKS "TRUE to build as frameworks libraries, FALSE to build according to BUILD_SHARED_LIBS" FALSE)
+  endif ()
+
+  if (NOT ${package_prefix}_INSTALL_BIN_DIR)
+    set (${package_prefix}_INSTALL_BIN_DIR bin)
+  endif ()
+  if (NOT ${package_prefix}_INSTALL_LIB_DIR)
+    if (APPLE)
+      if (${package_prefix}_BUILD_FRAMEWORKS)
+        set (${package_prefix}_INSTALL_JAR_DIR ../Java)
+      else ()
+        set (${package_prefix}_INSTALL_JAR_DIR lib)
+      endif ()
+      set (${package_prefix}_INSTALL_FMWK_DIR ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
+    else ()
+      set (${package_prefix}_INSTALL_JAR_DIR lib)
+    endif ()
+    set (${package_prefix}_INSTALL_LIB_DIR lib)
+  endif ()
+  if (NOT ${package_prefix}_INSTALL_INCLUDE_DIR)
+    set (${package_prefix}_INSTALL_INCLUDE_DIR include)
+  endif ()
+  if (NOT ${package_prefix}_INSTALL_DATA_DIR)
+    if (NOT WIN32)
+      if (APPLE)
+        if (${package_prefix}_BUILD_FRAMEWORKS)
+          set (${package_prefix}_INSTALL_EXTRA_DIR ../SharedSupport)
+        else ()
+          set (${package_prefix}_INSTALL_EXTRA_DIR share)
+        endif ()
+        set (${package_prefix}_INSTALL_FWRK_DIR ${CMAKE_INSTALL_FRAMEWORK_PREFIX})
+      endif ()
+      set (${package_prefix}_INSTALL_DATA_DIR share)
+      set (${package_prefix}_INSTALL_CMAKE_DIR share/cmake)
+    else ()
+      set (${package_prefix}_INSTALL_DATA_DIR ".")
+      set (${package_prefix}_INSTALL_CMAKE_DIR cmake)
+    endif ()
+  endif ()
+
+  if (DEFINED ADDITIONAL_CMAKE_PREFIX_PATH AND EXISTS "${ADDITIONAL_CMAKE_PREFIX_PATH}")
+    set (CMAKE_PREFIX_PATH ${ADDITIONAL_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH})
+  endif ()
+
+  SET_HDF_BUILD_TYPE()
+
+#-----------------------------------------------------------------------------
+# Setup output Directories
+#-----------------------------------------------------------------------------
+  if (NOT ${package_prefix}_EXTERNALLY_CONFIGURED)
+    set (CMAKE_RUNTIME_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Executables."
+    )
+    set (CMAKE_LIBRARY_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all Libraries"
+    )
+    set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all static libraries."
+    )
+    set (CMAKE_Fortran_MODULE_DIRECTORY
+        ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all fortran modules."
+    )
+    if (WIN32)
+      set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CTEST_CONFIGURATION_TYPE})
+      set (CMAKE_PDB_OUTPUT_DIRECTORY
+          ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single Directory for all pdb files."
+      )
+    else ()
+      set (CMAKE_TEST_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CTEST_CONFIGURATION_TYPE})
+    endif ()
+  else ()
+    # if we are externally configured, but the project uses old cmake scripts
+    # this may not be set and utilities like H5detect will fail
+    if (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+      set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+    endif ()
+  endif ()
+endmacro ()
+
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 4d98b81..59acaf0 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT (HDF5_F90_SRC C CXX Fortran)
 #-----------------------------------------------------------------------------
 # configure def file for shared libs on windows
 if (WIN32)
-  if (BUILD_SHARED_LIBS)
+  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
     if (MSVC)
       if (NOT H5_HAVE_PARALLEL)
         set (H5_NOPAREXP ";")
@@ -58,7 +58,7 @@ else ()
     endif ()
 endif ()
 if (WIN32 AND MSVC)
-  if (BUILD_SHARED_LIBS)
+  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
     set_target_properties (H5test_FortranHavekind-shared
         PROPERTIES
             COMPILE_FLAGS "/MT"
@@ -93,7 +93,7 @@ add_executable (H5fortran_detect
     ${HDF5_F90_BINARY_DIR}/H5fortran_detect.f90
 )
 if (WIN32 AND MSVC)
-  if (BUILD_SHARED_LIBS)
+  if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
     set_target_properties (H5fortran_detect
         PROPERTIES
             COMPILE_FLAGS "/MT"
@@ -139,7 +139,7 @@ add_custom_command (
 )
 set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h PROPERTIES GENERATED TRUE)
 set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5fortran_types.f90 PROPERTIES GENERATED TRUE)
-if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   set (CMDSH $<TARGET_FILE:H5match_types>)
   add_custom_command (
       OUTPUT ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
@@ -197,7 +197,7 @@ set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES
 )
 set (install_targets ${HDF5_F90_C_LIB_TARGET})
 
-if (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   add_library (${HDF5_F90_C_LIBSH_TARGET} SHARED ${f90CStub_C_SOURCES} ${f90CStub_C_SHHDRS})
   target_include_directories(${HDF5_F90_C_LIBSH_TARGET} PUBLIC ${HDF5_F90_BINARY_DIR}/shared)
   TARGET_C_PROPERTIES (${HDF5_F90_C_LIBSH_TARGET} SHARED " " " ")
-- 
cgit v0.12


From c382cdc13679d5350b93f61d94cbcf819a857f4d Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 29 Jan 2018 12:55:20 -0600
Subject: Update CMake usage

---
 config/cmake/CTestScript.cmake         |   7 --
 config/cmake/HDF518_Examples.cmake.in  |   6 +-
 config/cmake/scripts/CTestScript.cmake |   7 --
 config/cmake/scripts/HDF5config.cmake  |  39 +-----
 config/cmake/scripts/HDF5options.cmake |  20 +++
 release_docs/USING_HDF5_CMake.txt      | 215 +++++++++++++++++++--------------
 6 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake
index c59b10c..a8b7bbc 100644
--- a/config/cmake/CTestScript.cmake
+++ b/config/cmake/CTestScript.cmake
@@ -63,13 +63,6 @@ if (APPLE)
   set (ENV{CC} "${XCODE_CC}")
   set (ENV{CXX} "${XCODE_CXX}")
 
-  if (NOT NO_MAC_FORTRAN)
-    # Shared fortran is not supported, build static
-    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
-  else ()
-    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
-  endif ()
-
   set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
 endif ()
 
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
index a239ded..1aedda3 100644
--- a/config/cmake/HDF518_Examples.cmake.in
+++ b/config/cmake/HDF518_Examples.cmake.in
@@ -66,7 +66,7 @@ endif()
 if(NOT DEFINED CTEST_BUILD_NAME)
   set(CTEST_BUILD_NAME "examples")
 endif()
-set(BUILD_OPTIONS "${BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
 
 #TAR_SOURCE - name of tarfile
 #if(NOT DEFINED TAR_SOURCE)
@@ -88,9 +88,9 @@ else()
   set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
 endif()
 if(${CDASH_LOCAL})
-  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
 endif()
-set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 3cb9a5e..f826e31 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -64,13 +64,6 @@ if (APPLE)
   set (ENV{CC} "${XCODE_CC}")
   set (ENV{CXX} "${XCODE_CXX}")
 
-  if (NOT NO_MAC_FORTRAN)
-    # Shared fortran is not supported, build static
-    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
-  else ()
-    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
-  endif ()
-
   set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
 endif ()
 
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 492d883..a19ad3d 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -32,9 +32,6 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 #     INSTALLDIR  -  root folder where hdf5 is installed
 #     CTEST_CONFIGURATION_TYPE  - Release, Debug, etc
 #     CTEST_SOURCE_NAME  -  source folder
-#     STATIC_ONLY  -  Build/use static libraries
-#     FORTRAN_LIBRARIES -  Build/use fortran libraries
-#     NO_MAC_FORTRAN  - Yes to be SHARED on a Mac
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
@@ -46,9 +43,6 @@ set (CTEST_SOURCE_VERSEXT "-snap5")
 #INSTALLDIR - HDF5-1.8 root folder
 #CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
 #CTEST_SOURCE_NAME - name of source folder; HDF5-1.8.20
-#STATIC_ONLY - Default is YES
-#FORTRAN_LIBRARIES - Default is NO
-#NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac
 if (DEFINED CTEST_SCRIPT_ARG)
     # transform ctest script arguments of the form
     # script.ctest,var1=value1,var2=value2
@@ -68,6 +62,7 @@ endif ()
 
 ###################################################################
 ### Following Line is one of [Release, RelWithDebInfo, Debug] #####
+###        (default use command line -C value)
 set (CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
 ###################################################################
 
@@ -84,16 +79,6 @@ endif ()
 if (NOT DEFINED CTEST_SOURCE_NAME)
   set (CTEST_SOURCE_NAME "hdf5-${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
 endif ()
-if (NOT DEFINED STATIC_ONLY)
-  set (STATICONLYLIBRARIES "YES")
-else ()
-  set (STATICONLYLIBRARIES "NO")
-endif ()
-if (NOT DEFINED FORTRAN_LIBRARIES)
-  set (FORTRANLIBRARIES "NO")
-else ()
-  set(FORTRANLIBRARIES "YES")
-endif ()
 
 set (CTEST_BINARY_NAME "build")
 set (CTEST_DASHBOARD_ROOT "${CTEST_SCRIPT_DIRECTORY}")
@@ -205,28 +190,6 @@ set (REPOSITORY_BRANCH "hdf5_1_8_20")
 #set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")
 ###################################################################
 
-###################################################################
-if (${STATICONLYLIBRARIES})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
-  #########       Following describes computer           ############
-  ## following is optional to describe build                       ##
-  set (SITE_BUILDNAME_SUFFIX "STATIC")
-endif ()
-###################################################################
-####      fortran       ####
-if (${FORTRANLIBRARIES})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
-  ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=ON")
-else ()
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
-  ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=OFF")
-endif ()
-
-### change install prefix
-set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")
-set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$ENV{CMAKE_CONFIG_TYPE}")
 
 ###################################################################
 
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
index b090434..23477ff 100644
--- a/config/cmake/scripts/HDF5options.cmake
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -21,6 +21,26 @@
 #set(CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 17.0")
 
 #############################################################################################
+####      Only build static libraries       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
+####      Add PICC option on linux/mac       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
+
+#############################################################################################
+####      fortran enabled      ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+    ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=ON")
+####      fortran disabled      ####
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
+    ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=OFF")
+
+#############################################################################################
+### change install prefix (default use INSTALLDIR value)
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")
+
+#############################################################################################
 ####      ext libraries       ####
 
 ### ext libs from tgz
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index ce12528..dbd2ddc 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -219,68 +219,74 @@ NOTE: this file is available at the HDF web site:
     http://www.hdfgroup.org/HDF5/release/cmakebuild.html
 
     HDF518_Examples.cmake
+    HDF5_Examples_options.cmake
 
 Also available at the HDF web site is a CMake application framework template.
 You can quickly add files to the framework and execute the script to compile
 your application with an installed HDF5 binary.
 
 ========================================================================
-ctest
+ctest use of HDF518_Examples.cmake and HDF5_Examples_options.cmake
 ========================================================================
 
 cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)
 ###############################################################################################################
 # This script will build and run the examples from a folder
 # Execute from a command line:
-#     ctest -S HDF5_Examples.cmake,OPTION=VALUE -C Release -V -O test.log
+#     ctest -S HDF518_Examples.cmake,OPTION=VALUE -C Release -V -O test.log
 ###############################################################################################################
 
-set (CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
-set (CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
+set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
+if("@CMAKE_GENERATOR_TOOLSET@")
+  set(CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
+endif()
+set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
 
 # handle input parameters to script.
 #INSTALLDIR - HDF5 root folder
 #CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
-#CTEST_SOURCE_NAME - name of source folder; HDF4Examples
-#STATIC_ONLY - Default is YES
-#FORTRAN_LIBRARIES - Default is NO
-#JAVA_LIBRARIES - Default is NO
-##NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac)
-if (DEFINED CTEST_SCRIPT_ARG)
-    # transform ctest script arguments of the form
-    # script.ctest,var1=value1,var2=value2
-    # to variables with the respective names set to the respective values
-    string (REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}")
-    foreach (current_var ${script_args})
-        if ("${current_var}" MATCHES "^([^=]+)=(.+)$")
-            set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
-        endif ()
-    endforeach ()
-endif ()
-if (NOT DEFINED INSTALLDIR)
-    set (INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
-endif ()
-if (NOT DEFINED CTEST_CONFIGURATION_TYPE)
-    set (CTEST_CONFIGURATION_TYPE "Release")
-endif ()
-if (NOT DEFINED CTEST_SOURCE_NAME)
-    set (CTEST_SOURCE_NAME "HDF5Examples")
-endif ()
-if (NOT DEFINED STATIC_ONLY)
-    set (STATICONLYLIBRARIES "YES")
-else ()
-    set (STATICONLYLIBRARIES "NO")
-endif ()
-if (NOT DEFINED FORTRAN_LIBRARIES)
-    set (FORTRANLIBRARIES "NO")
-else ()
-    set (FORTRANLIBRARIES "YES")
-endif ()
-if (NOT DEFINED JAVA_LIBRARIES)
-    set (JAVALIBRARIES "NO")
-else ()
-    set (JAVALIBRARIES "YES")
-endif ()
+#CTEST_SOURCE_NAME - name of source folder; HDF5Examples
+if(DEFINED CTEST_SCRIPT_ARG)
+  # transform ctest script arguments of the form
+  # script.ctest,var1=value1,var2=value2
+  # to variables with the respective names set to the respective values
+  string(REPLACE "," ";" script_args "${CTEST_SCRIPT_ARG}")
+  foreach(current_var ${script_args})
+    if("${current_var}" MATCHES "^([^=]+)=(.+)$")
+      set("${CMAKE_MATCH_1}" "${CMAKE_MATCH_2}")
+    endif()
+  endforeach()
+endif()
+
+###################################################################
+### Following Line is one of [Release, RelWithDebInfo, Debug] #####
+set(CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}")
+if(NOT DEFINED CTEST_CONFIGURATION_TYPE)
+  set(CTEST_CONFIGURATION_TYPE "Release")
+endif()
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=${CTEST_CONFIGURATION_TYPE}")
+##################################################################
+
+if(NOT DEFINED INSTALLDIR)
+  set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
+endif()
+
+if(NOT DEFINED CTEST_SOURCE_NAME)
+  set(CTEST_SOURCE_NAME "HDF5Examples")
+endif()
+
+if(NOT DEFINED HDF_LOCAL)
+  set(CDASH_LOCAL "NO")
+else()
+  set(CDASH_LOCAL "YES")
+endif()
+if(NOT DEFINED CTEST_SITE)
+  set(CTEST_SITE "local")
+endif()
+if(NOT DEFINED CTEST_BUILD_NAME)
+  set(CTEST_BUILD_NAME "examples")
+endif()
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
 
 #TAR_SOURCE - name of tarfile
 #if (NOT DEFINED TAR_SOURCE)
@@ -288,60 +294,38 @@ endif ()
 #endif ()
 
 ###############################################################################################################
-#     Adjust the following SET Commands as needed
-###############################################################################################################
-if (WIN32)
-  if (${STATICONLYLIBRARIES})
-    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
-  endif ()
-  set (ENV{HDF5_DIR} "${INSTALLDIR}/cmake")
-  set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
-  set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
-  set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
-else (WIN32)
-  if (${STATICONLYLIBRARIES})
-    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
-  endif ()
-  set (ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake")
-  set (ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib")
-  set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
-  set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
-  set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
-endif(WIN32)
-if (${FORTRANLIBRARIES})
-  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
-else ()
-  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF")
-endif ()
-if (${JAVALIBRARIES})
-  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_JAVA:BOOL=ON")
-else ()
-  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_JAVA:BOOL=OFF")
-endif ()
-set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
+if(WIN32)
+  set(SITE_OS_NAME "Windows")
+  set(ENV{HDF5_DIR} "${INSTALLDIR}/cmake")
+  set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
+  set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
+  set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
+else()
+  set(ENV{HDF5_DIR} "${INSTALLDIR}/share/cmake")
+  set(ENV{LD_LIBRARY_PATH} "${INSTALLDIR}/lib")
+  set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
+  set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")
+  set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
+endif()
+if(${CDASH_LOCAL})
+  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
+endif()
+set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
 #
 ###############################################################################################################
 
-#-----------------------------------------------------------------------------
-# MAC machines need special option
-#-----------------------------------------------------------------------------
-if (APPLE)
-  # Compiler choice
-  execute_process (COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)
-  execute_process (COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set (ENV{CC} "${XCODE_CC}")
-  set (ENV{CXX} "${XCODE_CXX}")
-  if (NOT NO_MAC_FORTRAN)
-    # Shared fortran is not supported, build static
-    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
-  else ()
-    set (BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF")
-  endif ()
-  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
-endif ()
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format for file: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")        ###
+#############################################################################################
+if(WIN32)
+  include(${CTEST_SCRIPT_DIRECTORY}\\HDF5_Examples_options.cmake)
+else()
+  include(${CTEST_SCRIPT_DIRECTORY}/HDF5_Examples_options.cmake)
+endif()
 
 #-----------------------------------------------------------------------------
 set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
@@ -415,6 +399,53 @@ endif ()
 #-----------------------------------------------------------------------------
 ##############################################################################################################
 
+##############################################################################################################
+####  HDF5_Examples_options.cmake                                                                          ###
+####          Change default configuration of options in config/cmake/cacheinit.cmake file                 ###
+##############################################################################################################
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+####  DEFAULT:                                                                            ###
+####         BUILD_SHARED_LIBS:BOOL=OFF                                                   ###
+####         HDF_BUILD_C:BOOL=ON                                                          ###
+####         HDF_BUILD_CXX:BOOL=OFF                                                       ###
+####         HDF_BUILD_FORTRAN:BOOL=OFF                                                   ###
+####         BUILD_TESTING:BOOL=OFF                                                       ###
+####         HDF_ENABLE_PARALLEL:BOOL=OFF                                                 ###
+####         HDF_ENABLE_THREADSAFE:BOOL=OFF                                               ###
+#############################################################################################
+
+### uncomment/comment and change the following lines for other configuration options
+### build with shared libraries
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=ON")
+
+#############################################################################################
+####      languages       ####
+### disable C builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_C:BOOL=OFF")
+
+### enable C++ builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_CXX:BOOL=ON")
+
+### enable Fortran builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
+
+#############################################################################################
+### enable parallel program builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_ENABLE_PARALLEL:BOOL=ON")
+
+#############################################################################################
+### enable threadsafe program builds
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_ENABLE_THREADSAFE:BOOL=ON")
+
+#############################################################################################
+### enable test program builds, requires reference files in testfiles subdirectory
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=ON")
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCOMPARE_TESTING:BOOL=ON")
+
+#############################################################################################
+
 
 
 ========================================================================
-- 
cgit v0.12


From 74cef485ae8026403a660308495fc364523c5f93 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 1 Feb 2018 11:05:59 -0600
Subject: HDFFV-10398 Merge from develop

---
 CMakeLists.txt                             |  32 +++---
 MANIFEST                                   |   1 -
 c++/CMakeLists.txt                         |   6 +-
 config/cmake/ConfigureChecks.cmake         |  17 +--
 config/cmake/ConversionTests.c             | 167 +++++++++++++++--------------
 config/cmake/HDFCompilerFlags.cmake        |   4 +-
 config/cmake_ext_mod/CheckTypeSize.cmake   |  61 -----------
 config/cmake_ext_mod/ConfigureChecks.cmake |  28 ++---
 config/cmake_ext_mod/HDFTests.c            |  14 +++
 fortran/CMakeLists.txt                     |   8 +-
 fortran/src/CMakeLists.txt                 |  12 +--
 hl/CMakeLists.txt                          |   8 +-
 hl/c++/CMakeLists.txt                      |   6 +-
 hl/fortran/CMakeLists.txt                  |   6 +-
 hl/tools/CMakeLists.txt                    |   2 +-
 release_docs/RELEASE.txt                   |  10 ++
 src/CMakeLists.txt                         |  12 ++-
 tools/CMakeLists.txt                       |  22 ++--
 18 files changed, 189 insertions(+), 227 deletions(-)
 delete mode 100644 config/cmake_ext_mod/CheckTypeSize.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11bd2e8..e44b90f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -446,9 +446,13 @@ endif ()
 #-----------------------------------------------------------------------------
 # Option to embed library info into executables
 #-----------------------------------------------------------------------------
-option (HDF5_ENABLE_EMBEDDED_LIBINFO "embed library info into executables" ON)
-if (HDF5_ENABLE_EMBEDDED_LIBINFO)
-  set (H5_HAVE_EMBEDDED_LIBINFO 1)
+if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+  set (H5_HAVE_EMBEDDED_LIBINFO 0)
+else ()
+  option (HDF5_ENABLE_EMBEDDED_LIBINFO "embed library info into executables" ON)
+  if (HDF5_ENABLE_EMBEDDED_LIBINFO)
+    set (H5_HAVE_EMBEDDED_LIBINFO 1)
+  endif ()
 endif ()
 
 include (${HDF_RESOURCES_DIR}/HDFCompilerFlags.cmake)
@@ -578,7 +582,7 @@ endif ()
 #-----------------------------------------------------------------------------
 # Add the HDF5 Library Target to the build
 #-----------------------------------------------------------------------------
-add_subdirectory (${HDF5_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src)
+add_subdirectory (src)
 
 if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
   if (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
@@ -626,12 +630,12 @@ if (BUILD_TESTING)
 
   if (NOT HDF5_EXTERNALLY_CONFIGURED)
     if (EXISTS "${HDF5_SOURCE_DIR}/test" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/test")
-      add_subdirectory (${HDF5_SOURCE_DIR}/tools/lib ${PROJECT_BINARY_DIR}/tools/lib)
-      add_subdirectory (${HDF5_SOURCE_DIR}/test      ${PROJECT_BINARY_DIR}/test)
+      add_subdirectory (tools/lib)
+      add_subdirectory (test)
     endif ()
     if (H5_HAVE_PARALLEL)
       if (EXISTS "${HDF5_SOURCE_DIR}/testpar" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/testpar")
-        add_subdirectory (${HDF5_SOURCE_DIR}/testpar ${PROJECT_BINARY_DIR}/testpar)
+        add_subdirectory (testpar)
       endif ()
     endif ()
   endif ()
@@ -643,7 +647,7 @@ endif ()
 if (EXISTS "${HDF5_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/tools")
   option (HDF5_BUILD_TOOLS  "Build HDF5 Tools" ON)
   if (HDF5_BUILD_TOOLS)
-    add_subdirectory (${HDF5_SOURCE_DIR}/tools ${PROJECT_BINARY_DIR}/tools)
+    add_subdirectory (tools)
   endif ()
 endif ()
 
@@ -653,7 +657,7 @@ endif ()
 if (EXISTS "${HDF5_SOURCE_DIR}/examples" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/examples")
   option (HDF5_BUILD_EXAMPLES  "Build HDF5 Library Examples" ON)
   if (HDF5_BUILD_EXAMPLES)
-    add_subdirectory (${HDF5_SOURCE_DIR}/examples ${PROJECT_BINARY_DIR}/examples)
+    add_subdirectory (examples)
   endif ()
 endif ()
 
@@ -664,7 +668,7 @@ if (EXISTS "${HDF5_SOURCE_DIR}/hl" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl")
   option (HDF5_BUILD_HL_LIB  "Build HIGH Level HDF5 Library" ON)
   if (HDF5_BUILD_HL_LIB)
     set (H5_INCLUDE_HL 1)
-    add_subdirectory (${HDF5_SOURCE_DIR}/hl ${PROJECT_BINARY_DIR}/hl)
+    add_subdirectory (hl)
   endif ()
 endif ()
 
@@ -708,11 +712,11 @@ if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/for
       endif ()
     endif ()
 
-    add_subdirectory (${HDF5_SOURCE_DIR}/fortran ${PROJECT_BINARY_DIR}/fortran)
+    add_subdirectory (fortran)
     if (HDF5_BUILD_HL_LIB)
       if (EXISTS "${HDF5_SOURCE_DIR}/hl/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl/fortran")
         #-- Build the High Level Fortran source codes
-        add_subdirectory (${HDF5_SOURCE_DIR}/hl/fortran ${PROJECT_BINARY_DIR}/hl/fortran)
+        add_subdirectory (hl/fortran)
       endif ()
     endif ()
   endif ()
@@ -735,11 +739,11 @@ if (EXISTS "${HDF5_SOURCE_DIR}/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/c++")
     if (CMAKE_NO_STD_NAMESPACE)
       set (H5_NO_STD 1)
     endif ()
-    add_subdirectory (${HDF5_SOURCE_DIR}/c++ ${PROJECT_BINARY_DIR}/c++)
+    add_subdirectory (c++)
     if (HDF5_BUILD_HL_LIB)
       if (EXISTS "${HDF5_SOURCE_DIR}/hl/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/hl/c++")
         #-- Build the High Level Fortran source codes
-        add_subdirectory (${HDF5_SOURCE_DIR}/hl/c++ ${PROJECT_BINARY_DIR}/hl/c++)
+        add_subdirectory (hl/c++)
       endif ()
     endif ()
   endif ()
diff --git a/MANIFEST b/MANIFEST
index ff188d1..d1a0f7f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2339,7 +2339,6 @@
 ./config/cmake/userblockTest.cmake
 ./config/cmake/vfdTest.cmake
 
-./config/cmake_ext_mod/CheckTypeSize.cmake
 ./config/cmake_ext_mod/ConfigureChecks.cmake
 ./config/cmake_ext_mod/CTestCustom.cmake
 ./config/cmake_ext_mod/FindMPI.cmake
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
index c9c4815..adbf1a4 100644
--- a/c++/CMakeLists.txt
+++ b/c++/CMakeLists.txt
@@ -27,18 +27,18 @@ if (H5_HAVE_PARALLEL)
   add_definitions ("-DMPICH_IGNORE_CXX_SEEK")
 endif ()
 
-add_subdirectory (${HDF5_CPP_SOURCE_DIR}/src ${HDF5_CPP_BINARY_DIR}/src)
+add_subdirectory (src)
 
 #-----------------------------------------------------------------------------
 # Build the CPP Examples
 #-----------------------------------------------------------------------------
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_CPP_SOURCE_DIR}/examples ${HDF5_CPP_BINARY_DIR}/examples)
+  add_subdirectory (examples)
 endif ()
 
 #-----------------------------------------------------------------------------
 # Build the CPP unit tests
 #-----------------------------------------------------------------------------
 if (BUILD_TESTING)
-  add_subdirectory (${HDF5_CPP_SOURCE_DIR}/test ${HDF5_CPP_BINARY_DIR}/test)
+  add_subdirectory (test)
 endif ()
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 77918a4..85e0492 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -173,7 +173,7 @@ endif ()
 # Macro to determine the various conversion capabilities
 #-----------------------------------------------------------------------------
 macro (H5ConversionTests TEST msg)
-  if ("${TEST}" MATCHES "^${TEST}$")
+  if (NOT DEFINED ${TEST})
    # message (STATUS "===> ${TEST}")
     TRY_RUN (${TEST}_RUN   ${TEST}_COMPILE
         ${CMAKE_BINARY_DIR}
@@ -204,21 +204,6 @@ macro (H5ConversionTests TEST msg)
 endmacro ()
 
 #-----------------------------------------------------------------------------
-# Macro to make some of the conversion tests easier to write/read
-#-----------------------------------------------------------------------------
-macro (H5MiscConversionTest VAR TEST msg)
-  if ("${TEST}" MATCHES "^${TEST}$")
-    if (${VAR})
-      set (${TEST} 1 CACHE INTERNAL ${msg})
-      message (STATUS "${msg}... yes")
-    else ()
-      set (${TEST} "" CACHE INTERNAL ${msg})
-      message (STATUS "${msg}... no")
-    endif ()
-  endif ()
-endmacro ()
-
-#-----------------------------------------------------------------------------
 # Check various conversion capabilities
 #-----------------------------------------------------------------------------
 
diff --git a/config/cmake/ConversionTests.c b/config/cmake/ConversionTests.c
index 082dbd4..002bc88 100644
--- a/config/cmake/ConversionTests.c
+++ b/config/cmake/ConversionTests.c
@@ -9,12 +9,23 @@
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
++
+#if defined(__has_attribute)
+#if __has_attribute(no_sanitize)
+#define HDF_NO_UBSAN __attribute__((no_sanitize("undefined")))
+#else
+#define HDF_NO_UBSAN
+#endif
+#else
+#define HDF_NO_UBSAN
+#endif
+
 #ifdef H5_LDOUBLE_TO_LONG_SPECIAL_TEST
 
 #include <string.h>
 #include <stdlib.h>
 
-int main(void)
+int main(void) HDF_NO_UBSAN
 {
     long double         ld = 20041683600089727.779961L;
     long                ll;
@@ -24,44 +35,44 @@ int main(void)
     int                 ret = 1;
 
     if(sizeof(long double) == 16 && sizeof(long) == 8) {
-	/*make sure the long double type has 16 bytes in size and
-	 * 11 bits of exponent.  If it is,
-	 *the bit sequence should be like below.  It's not
-	 *a decent way to check but this info isn't available. */
-	memcpy(s, &ld, 16);
-	if(s[0]==0x43 && s[1]==0x51 && s[2]==0xcc && s[3]==0xf3 &&
-		s[4]==0x85 && s[5]==0xeb && s[6]==0xc8 && s[7]==0xa0 &&
-		s[8]==0xbf && s[9]==0xcc && s[10]==0x2a && s[11]==0x3c) {
-
-	    /* Assign the hexadecimal value of long double type. */
-	    s[0]=0x43; s[1]=0x51; s[2]=0xcc; s[3]=0xf3;
-	    s[4]=0x85; s[5]=0xeb; s[6]=0xc8; s[7]=0xa0;
-	    s[8]=0xbf; s[9]=0xcc; s[10]=0x2a; s[11]=0x3c;
-	    s[12]=0x3d; s[13]=0x85; s[14]=0x56; s[15]=0x20;
-
-	    memcpy(&ld, s, 16);
-
-	    ll = (long)ld;
-	    memcpy(s2, &ll, 8);
-
-	    /* The library's algorithm converts it to 0x 00 47 33 ce 17 af 22 82
-	     * and gets wrong value 20041683600089730 on the IBM Power6 Linux.
-	     * But the IBM Power6 Linux converts it to 0x00 47 33 ce 17 af 22 7f
-	     * and gets the correct value 20041683600089727.  It uses some special
-	     * algorithm.  We're going to define the macro and skip the test until
-	     * we can figure out how they do it. */
-	    if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
-		    s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
-		ret = 0;
-
-	    ull = (unsigned long)ld;
-	    memcpy(s2, &ull, 8);
-
-	    /* The unsigned long is the same as signed long. */
-	    if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
-		    s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
-		ret = 0;
-	}
+    /*make sure the long double type has 16 bytes in size and
+    * 11 bits of exponent.  If it is,
+    *the bit sequence should be like below.  It's not
+    *a decent way to check but this info isn't available. */
+    memcpy(s, &ld, 16);
+    if(s[0]==0x43 && s[1]==0x51 && s[2]==0xcc && s[3]==0xf3 &&
+        s[4]==0x85 && s[5]==0xeb && s[6]==0xc8 && s[7]==0xa0 &&
+        s[8]==0xbf && s[9]==0xcc && s[10]==0x2a && s[11]==0x3c) {
+
+        /* Assign the hexadecimal value of long double type. */
+        s[0]=0x43; s[1]=0x51; s[2]=0xcc; s[3]=0xf3;
+        s[4]=0x85; s[5]=0xeb; s[6]=0xc8; s[7]=0xa0;
+        s[8]=0xbf; s[9]=0xcc; s[10]=0x2a; s[11]=0x3c;
+        s[12]=0x3d; s[13]=0x85; s[14]=0x56; s[15]=0x20;
+
+        memcpy(&ld, s, 16);
+
+        ll = (long)ld;
+        memcpy(s2, &ll, 8);
+
+        /* The library's algorithm converts it to 0x 00 47 33 ce 17 af 22 82
+        * and gets wrong value 20041683600089730 on the IBM Power6 Linux.
+        * But the IBM Power6 Linux converts it to 0x00 47 33 ce 17 af 22 7f
+        * and gets the correct value 20041683600089727.  It uses some special
+        * algorithm.  We're going to define the macro and skip the test until
+        * we can figure out how they do it. */
+        if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
+            s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
+        ret = 0;
+
+        ull = (unsigned long)ld;
+        memcpy(s2, &ull, 8);
+
+        /* The unsigned long is the same as signed long. */
+        if(s2[0]==0x00 && s2[1]==0x47 && s2[2]==0x33 && s2[3]==0xce &&
+            s2[4]==0x17 && s2[5]==0xaf && s2[6]==0x22 && s2[7]==0x7f)
+        ret = 0;
+    }
     }
 
 done:
@@ -75,7 +86,7 @@ done:
 #include <string.h>
 #include <stdlib.h>
 
-int main(void)
+int main(void) HDF_NO_UBSAN
 {
     long double         ld;
     long                ll;
@@ -86,46 +97,46 @@ int main(void)
     /*Determine if long double has 16 byte in size, 11 bit exponent, and
      *the bias is 0x3ff */
     if(sizeof(long double) == 16) {
-	ld = 1.0L;
-	memcpy(s, &ld, 16);
-	if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-		s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00)
-	    flag = 1;
+    ld = 1.0L;
+    memcpy(s, &ld, 16);
+    if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
+        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00)
+        flag = 1;
     }
 
     if(flag==1 && sizeof(long)==8) {
-	ll = 0x003fffffffffffffL;
-	ld = (long double)ll;
-	memcpy(s, &ld, 16);
-	/* The library converts the value to 0x434fffffffffffff8000000000000000.
-	 * In decimal it is 18014398509481982.000000, one value short of the original.
-	 * The IBM Power6 Linux converts it to 0x4350000000000000bff0000000000000.
-	 * The value is correct in decimal. It uses some special
-	 * algorithm.  We're going to define the macro and skip the test until
-	 * we can figure out how they do it. */
-	if(s[0]==0x43 && s[1]==0x50 && s[2]==0x00 && s[3]==0x00 &&
-		s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
-		s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
-		s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
-	    ret = 0;
+    ll = 0x003fffffffffffffL;
+    ld = (long double)ll;
+    memcpy(s, &ld, 16);
+    /* The library converts the value to 0x434fffffffffffff8000000000000000.
+    * In decimal it is 18014398509481982.000000, one value short of the original.
+    * The IBM Power6 Linux converts it to 0x4350000000000000bff0000000000000.
+    * The value is correct in decimal. It uses some special
+    * algorithm.  We're going to define the macro and skip the test until
+    * we can figure out how they do it. */
+    if(s[0]==0x43 && s[1]==0x50 && s[2]==0x00 && s[3]==0x00 &&
+        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
+        s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
+        s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
+        ret = 0;
     }
     if(flag==1 && sizeof(unsigned long)==8) {
-	ull = 0xffffffffffffffffUL;
-	ld = (long double)ull;
-	memcpy(s, &ld, 16);
-	/* Use a different value from signed long to test. The problem is the same
-	 * for both long and unsigned long. The value is 18446744073709551615.
-	 * The library converts the value to 0x43effffffffffffffe000000000000000.
-	 * In decimal it's 18446744073709548544.000000, very different from the original.
-	 * The IBM Power6 Linux converts it to 0x43f0000000000000bff0000000000000.
-	 * The value is correct in decimal. It uses some special
-	 * algorithm.  We're going to define the macro and skip the test until
-	 * we can figure out how they do it. */
-	if(s[0]==0x43 && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-		s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
-		s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
-		s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
-	    ret = 0;
+    ull = 0xffffffffffffffffUL;
+    ld = (long double)ull;
+    memcpy(s, &ld, 16);
+    /* Use a different value from signed long to test. The problem is the same
+    * for both long and unsigned long. The value is 18446744073709551615.
+    * The library converts the value to 0x43effffffffffffffe000000000000000.
+    * In decimal it's 18446744073709548544.000000, very different from the original.
+    * The IBM Power6 Linux converts it to 0x43f0000000000000bff0000000000000.
+    * The value is correct in decimal. It uses some special
+    * algorithm.  We're going to define the macro and skip the test until
+    * we can figure out how they do it. */
+    if(s[0]==0x43 && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
+        s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
+        s[8]==0xbf && s[9]==0xf0 && s[10]==0x00 && s[11]==0x00 &&
+        s[12]==0x00 && s[13]==0x00 && s[14]==0x00 && s[15]==0x00)
+        ret = 0;
     }
 done:
     exit(ret);
@@ -138,7 +149,7 @@ done:
 #include <string.h>
 #include <stdlib.h>
 
-int main(void)
+int main(void) HDF_NO_UBSAN
 {
     long double         ld = 20041683600089727.779961L;
     long long           ll;
@@ -181,7 +192,7 @@ done:
 #include <string.h>
 #include <stdlib.h>
 
-int main(void)
+int main(void) HDF_NO_UBSAN
 {
     long double         ld;
     long long           ll;
@@ -243,7 +254,7 @@ int FC_DUMMY_MAIN()
 #endif
 #endif
 int
-main ()
+main () HDF_NO_UBSAN
 {
 
     char *chp = "beefs";
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
index a414cea..56277fa 100644
--- a/config/cmake/HDFCompilerFlags.cmake
+++ b/config/cmake/HDFCompilerFlags.cmake
@@ -49,9 +49,9 @@ if (HDF5_DISABLE_COMPILER_WARNINGS)
   if (MSVC)
     set (HDF5_WARNINGS_BLOCKED 1)
     string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W0")
     string (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0")
   endif ()
   if (WIN32)
     add_definitions (-D_CRT_SECURE_NO_WARNINGS)
diff --git a/config/cmake_ext_mod/CheckTypeSize.cmake b/config/cmake_ext_mod/CheckTypeSize.cmake
deleted file mode 100644
index c14c2f2..0000000
--- a/config/cmake_ext_mod/CheckTypeSize.cmake
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright by The HDF Group.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
-# If you do not have access to either file, you may request a copy from
-# help@hdfgroup.org.
-#
-#
-# Check if the type exists and determine size of type.  if the type
-# exists, the size will be stored to the variable.
-#
-# CHECK_TYPE_SIZE - macro which checks the size of type
-# VARIABLE - variable to store size if the type exists.
-# HAVE_${VARIABLE} - does the variable exists or not
-#
-
-macro (HDF_CHECK_TYPE_SIZE TYPE VARIABLE)
-  set (CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS 1)
-  if ("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
-    set (MACRO_CHECK_TYPE_SIZE_FLAGS
-        "-DCHECK_TYPE_SIZE_TYPE=\"${TYPE}\" ${CMAKE_REQUIRED_FLAGS}"
-    )
-    foreach (def HAVE_SYS_TYPES_H HAVE_STDINT_H HAVE_STDDEF_H HAVE_INTTYPES_H)
-      if ("${def}")
-        set (MACRO_CHECK_TYPE_SIZE_FLAGS "${MACRO_CHECK_TYPE_SIZE_FLAGS} -D${def}")
-      endif ()
-    endforeach ()
-
-    message (STATUS "Check size of ${TYPE}")
-    if (CMAKE_REQUIRED_LIBRARIES)
-      set (CHECK_TYPE_SIZE_ADD_LIBRARIES
-          "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-      )
-    endif ()
-    try_run (${VARIABLE} HAVE_${VARIABLE}
-        ${CMAKE_BINARY_DIR}
-        ${HDF_RESOURCES_EXT_DIR}/CheckTypeSize.c
-        CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}
-        "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
-        OUTPUT_VARIABLE OUTPUT
-    )
-    if (HAVE_${VARIABLE})
-      message (STATUS "Check size of ${TYPE} - done")
-      file (APPEND
-          ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
-          "Determining size of ${TYPE} passed with the following output:\n${OUTPUT}\n\n"
-      )
-    else ()
-      message (STATUS "Check size of ${TYPE} - failed")
-      file (APPEND
-          ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
-          "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n\n"
-      )
-    endif ()
-  endif ()
-  set (CMAKE_ALLOW_UNKNOWN_VARIABLE_READ_ACCESS)
-endmacro ()
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index 56d45f9..3797768 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -12,18 +12,18 @@
 #-----------------------------------------------------------------------------
 # Include all the necessary files for macros
 #-----------------------------------------------------------------------------
-include (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
-include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
-include (${CMAKE_ROOT}/Modules/CheckIncludeFileCXX.cmake)
-include (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
-include (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
-include (${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
-include (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
-include (${CMAKE_ROOT}/Modules/CheckVariableExists.cmake)
-include (${CMAKE_ROOT}/Modules/CheckFortranFunctionExists.cmake)
-include (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
+include (CheckFunctionExists)
+include (CheckIncludeFile)
+include (CheckIncludeFileCXX)
+include (CheckIncludeFiles)
+include (CheckLibraryExists)
+include (CheckSymbolExists)
+include (CheckTypeSize)
+include (CheckVariableExists)
+include (CheckFortranFunctionExists)
+include (TestBigEndian)
 if (CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER_LOADED)
-  include (${CMAKE_ROOT}/Modules/TestForSTDNamespace.cmake)
+  include (TestForSTDNamespace)
 endif ()
 
 #-----------------------------------------------------------------------------
@@ -145,7 +145,7 @@ endif ()
 
 # For other specific tests, use this MACRO.
 macro (HDF_FUNCTION_TEST OTHER_TEST)
-  if ("${HDF_PREFIX}_${OTHER_TEST}" MATCHES "^${HDF_PREFIX}_${OTHER_TEST}$")
+  if (NOT DEFINED ${HDF_PREFIX}_${OTHER_TEST})
     set (MACRO_CHECK_FUNCTION_DEFINITIONS "-D${OTHER_TEST} ${CMAKE_REQUIRED_FLAGS}")
     set (OTHER_TEST_ADD_LIBRARIES)
     if (CMAKE_REQUIRED_LIBRARIES)
@@ -587,7 +587,7 @@ endif ()
 
 # For other CXX specific tests, use this MACRO.
 macro (HDF_CXX_FUNCTION_TEST OTHER_TEST)
-  if ("${OTHER_TEST}" MATCHES "^${OTHER_TEST}$")
+  if (NOT DEFINED ${OTHER_TEST})
     set (MACRO_CHECK_FUNCTION_DEFINITIONS "-D${OTHER_TEST} ${CMAKE_REQUIRED_FLAGS}")
     set (OTHER_TEST_ADD_LIBRARIES)
     if (CMAKE_REQUIRED_LIBRARIES)
@@ -656,7 +656,7 @@ endif ()
 if (WINDOWS)
   if (NOT HDF_NO_IOEO_TEST)
   message (STATUS "Checking for InitOnceExecuteOnce:")
-  if ("${${HDF_PREFIX}_HAVE_IOEO}" MATCHES "^${${HDF_PREFIX}_HAVE_IOEO}$")
+  if (NOT DEFINED ${${HDF_PREFIX}_HAVE_IOEO})
     if (LARGEFILE)
       set (CMAKE_REQUIRED_DEFINITIONS
           "${CURRENT_TEST_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE"
diff --git a/config/cmake_ext_mod/HDFTests.c b/config/cmake_ext_mod/HDFTests.c
index 60ac744..320fd5b 100644
--- a/config/cmake_ext_mod/HDFTests.c
+++ b/config/cmake_ext_mod/HDFTests.c
@@ -222,12 +222,26 @@ SIMPLE_TEST(struct stat sb; sb.st_blocks=0);
 #include <stdlib.h>
 #include <string.h>
 
+#if defined(_MSC_VER) && defined(_DEBUG)
+# include <crtdbg.h>
+int DebugReport(int reportType, char* message, int* returnValue)
+{
+  (void)reportType;
+  (void)message;
+  (void)returnValue;
+  return 1; /* no further handling required */
+}
+#endif
+
 int main(void)
 {
   char *llwidthArgs[] = { "I64", "l64", "l", "L", "q", "ll", NULL };
   char *s = malloc(128);
   char **currentArg = NULL;
   LL_TYPE x = (LL_TYPE)1048576 * (LL_TYPE)1048576;
+  #if defined(_MSC_VER) && defined(_DEBUG)
+    _CrtSetReportHook(DebugReport);
+  #endif
   for (currentArg = llwidthArgs; *currentArg != NULL; currentArg++)
     {
     char formatString[64];
diff --git a/fortran/CMakeLists.txt b/fortran/CMakeLists.txt
index 075e1da..a0f92d3 100644
--- a/fortran/CMakeLists.txt
+++ b/fortran/CMakeLists.txt
@@ -10,21 +10,21 @@ endif ()
 #-----------------------------------------------------------------------------
 # Traverse source subdirectory
 #-----------------------------------------------------------------------------
-add_subdirectory (${HDF5_F90_SOURCE_DIR}/src ${HDF5_F90_BINARY_DIR}/src)
+add_subdirectory (src)
 
 #-----------------------------------------------------------------------------
 # Build the Fortran Examples
 #-----------------------------------------------------------------------------
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_F90_SOURCE_DIR}/examples ${HDF5_F90_BINARY_DIR}/examples)
+  add_subdirectory (examples)
 endif ()
 
 #-----------------------------------------------------------------------------
 # Testing
 #-----------------------------------------------------------------------------
 if (BUILD_TESTING)
-  add_subdirectory (${HDF5_F90_SOURCE_DIR}/test ${HDF5_F90_BINARY_DIR}/test)
+  add_subdirectory (test)
   if (MPI_Fortran_FOUND)
-    add_subdirectory (${HDF5_F90_SOURCE_DIR}/testpar ${HDF5_F90_BINARY_DIR}/testpar)
+    add_subdirectory (testpar)
   endif ()
 endif ()
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 59acaf0..f094b47 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -80,10 +80,9 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   )
 endif ()
 
-set (CMD $<TARGET_FILE:H5test_FortranHavekind>)
 add_custom_command (
     OUTPUT ${HDF5_F90_BINARY_DIR}/H5fortran_detect.f90
-    COMMAND ${CMD}
+    COMMAND $<TARGET_FILE:H5test_FortranHavekind>
     ARGS > ${HDF5_F90_BINARY_DIR}/H5fortran_detect.f90
     WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
     DEPENDS H5test_FortranHavekind
@@ -106,10 +105,9 @@ if (WIN32 AND MSVC)
 endif ()
 set_target_properties (H5fortran_detect PROPERTIES LINKER_LANGUAGE Fortran)
 
-set (CMD $<TARGET_FILE:H5fortran_detect>)
 add_custom_command (
     OUTPUT ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h
-    COMMAND ${CMD}
+    COMMAND $<TARGET_FILE:H5fortran_detect>
     ARGS > ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h
     WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}
     DEPENDS H5fortran_detect
@@ -129,22 +127,20 @@ add_executable (H5match_types
     ${HDF5_F90_BINARY_DIR}/H5fort_type_defines.h
     ${HDF5_F90_SRC_SOURCE_DIR}/H5match_types.c
 )
-set (CMD $<TARGET_FILE:H5match_types>)
 add_custom_command (
     OUTPUT ${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h
            ${HDF5_F90_BINARY_DIR}/static/H5fortran_types.f90
-    COMMAND ${CMD}
+    COMMAND $<TARGET_FILE:H5match_types>
     WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/static
     DEPENDS H5match_types
 )
 set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5f90i_gen.h PROPERTIES GENERATED TRUE)
 set_source_files_properties (${HDF5_F90_BINARY_DIR}/static/H5fortran_types.f90 PROPERTIES GENERATED TRUE)
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
-  set (CMDSH $<TARGET_FILE:H5match_types>)
   add_custom_command (
       OUTPUT ${HDF5_F90_BINARY_DIR}/shared/H5f90i_gen.h
              ${HDF5_F90_BINARY_DIR}/shared/H5fortran_types.f90
-      COMMAND ${CMDSH}
+      COMMAND $<TARGET_FILE:H5match_types>
       WORKING_DIRECTORY ${HDF5_F90_BINARY_DIR}/shared
       DEPENDS H5match_types
   )
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index a47e023..d80b4f9 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -12,21 +12,21 @@ add_definitions (${HDF_EXTRA_C_FLAGS})
 #-----------------------------------------------------------------------------
 INCLUDE_DIRECTORIES (${HDF5_HL_SOURCE_DIR}/src )
 
-add_subdirectory (${HDF5_HL_SOURCE_DIR}/src ${HDF5_HL_BINARY_DIR}/src)
+add_subdirectory (src)
 
 #-- Build the High level Tools
 if (HDF5_BUILD_TOOLS)
-  add_subdirectory (${HDF5_HL_SOURCE_DIR}/tools ${HDF5_HL_BINARY_DIR}/tools)
+  add_subdirectory (tools)
 endif ()
 
 #-- Add High Level Examples
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_HL_SOURCE_DIR}/examples ${HDF5_HL_BINARY_DIR}/examples)
+  add_subdirectory (examples)
 endif ()
 
 #-- Build the Unit testing if requested
 if (NOT HDF5_EXTERNALLY_CONFIGURED)
   if (BUILD_TESTING)
-    add_subdirectory (${HDF5_HL_SOURCE_DIR}/test ${HDF5_HL_BINARY_DIR}/test)
+    add_subdirectory (test)
   endif ()
 endif ()
diff --git a/hl/c++/CMakeLists.txt b/hl/c++/CMakeLists.txt
index 91bfa14..9a1d059 100644
--- a/hl/c++/CMakeLists.txt
+++ b/hl/c++/CMakeLists.txt
@@ -4,13 +4,13 @@ PROJECT (HDF5_HL_CPP)
 #-----------------------------------------------------------------------------
 # Main HL lib is in /src
 #-----------------------------------------------------------------------------
-add_subdirectory (${HDF5_HL_CPP_SOURCE_DIR}/src ${HDF5_HL_CPP_BINARY_DIR}/src)
+add_subdirectory (src)
 
 # --------------------------------------------------------------------
 #  Add in the examples for the Packet Table codes
 # --------------------------------------------------------------------
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_HL_CPP_SOURCE_DIR}/examples ${HDF5_HL_CPP_BINARY_DIR}/examples)
+  add_subdirectory (examples)
 endif ()
 
 # --------------------------------------------------------------------
@@ -18,5 +18,5 @@ endif ()
 # --------------------------------------------------------------------
 
 if (BUILD_TESTING)
-  add_subdirectory (${HDF5_HL_CPP_SOURCE_DIR}/test ${HDF5_HL_CPP_BINARY_DIR}/test)
+  add_subdirectory (test)
 endif ()
diff --git a/hl/fortran/CMakeLists.txt b/hl/fortran/CMakeLists.txt
index c651ce9..00d7517 100644
--- a/hl/fortran/CMakeLists.txt
+++ b/hl/fortran/CMakeLists.txt
@@ -4,18 +4,18 @@ PROJECT (HDF5_HL_F90 C CXX Fortran)
 #-----------------------------------------------------------------------------
 # List Source files
 #-----------------------------------------------------------------------------
-add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/src ${HDF5_HL_F90_BINARY_DIR}/src)
+add_subdirectory (src)
 
 #-----------------------------------------------------------------------------
 # Build the HL Fortran Examples
 #-----------------------------------------------------------------------------
 if (HDF5_BUILD_EXAMPLES)
-  add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/examples ${HDF5_HL_F90_BINARY_DIR}/examples)
+  add_subdirectory (examples)
 endif ()
 
 #-----------------------------------------------------------------------------
 # Testing
 #-----------------------------------------------------------------------------
 if (BUILD_TESTING)
-  add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/test ${HDF5_HL_F90_BINARY_DIR}/test)
+  add_subdirectory (test)
 endif ()
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt
index 482bf91..5503f41 100644
--- a/hl/tools/CMakeLists.txt
+++ b/hl/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
 cmake_minimum_required (VERSION 3.2.2)
 PROJECT (HDF5_HL_TOOLS C CXX)
 
-add_subdirectory (${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5 ${HDF5_HL_TOOLS_BINARY_DIR}/gif2h5)
+add_subdirectory (gif2h5)
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index ff16bb6..3e20248 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -116,6 +116,16 @@ Bug Fixes since HDF5-1.8.20
     -------------
     - CMake
 
+      Update CMake commands configuration.
+
+      A number of improvements were made to the CMake commands. Most
+      changes simplify usage or eliminate unused constructs. Also,
+      some changes support better cross-platform support.
+
+      (ADB - 2018/02/01, HDFFV-10398)
+
+    - CMake
+
       Correct usage of CMAKE_BUILD_TYPE variable.
 
       The use of the CMAKE_BUILD_TYPE is incorrect for multi-config
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dc180c3..1593466 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -616,11 +616,13 @@ TARGET_C_PROPERTIES (H5detect STATIC " " " ")
 if (MSVC OR MINGW)
   target_link_libraries (H5detect "ws2_32.lib")
 endif ()
+if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+  set_property(TARGET H5detect PROPERTY LINK_FLAGS "-O0")
+endif ()
 
-set (CMD $<TARGET_FILE:H5detect>)
 add_custom_command (
     OUTPUT ${HDF5_BINARY_DIR}/H5Tinit.c
-    COMMAND ${CMD}
+    COMMAND $<TARGET_FILE:H5detect>
     ARGS > ${HDF5_BINARY_DIR}/H5Tinit.c
     DEPENDS H5detect
 )
@@ -630,11 +632,13 @@ TARGET_C_PROPERTIES (H5make_libsettings STATIC " " " ")
 if (MSVC OR MINGW)
   target_link_libraries (H5make_libsettings "ws2_32.lib")
 endif ()
+if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+  set_property(TARGET H5make_libsettings PROPERTY LINK_FLAGS "-O0")
+endif ()
 
-set (CMD $<TARGET_FILE:H5make_libsettings>)
 add_custom_command (
     OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c
-    COMMAND ${CMD}
+    COMMAND $<TARGET_FILE:H5make_libsettings>
     ARGS > ${HDF5_BINARY_DIR}/H5lib_settings.c
     DEPENDS H5make_libsettings
     WORKING_DIRECTORY ${HDF5_BINARY_DIR}
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index c9cc21b..8f4372a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -15,35 +15,35 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SOURCE_DIR}/lib)
 # If testing was NOT enabled, then we need to build the tools library
 # --------------------------------------------------------------------
 if (NOT BUILD_TESTING)
-  add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/lib)
+  add_subdirectory (lib)
 endif ()
 
 #-- Add the h5diff and test executables
-add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5diff)
+add_subdirectory (h5diff)
 
 #-- Add the h5ls executable
-add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5ls)
+add_subdirectory (h5ls)
 
 #-- Misc Executables
-add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/misc)
+add_subdirectory (misc)
 
 #-- Add the h5import and test executables
-add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5import)
+add_subdirectory (h5import)
 
 #-- h5Repack executables
-add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5repack)
+add_subdirectory (h5repack)
 
 #-- Add the h5dump and test executables
-add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5jam)
+add_subdirectory (h5jam)
 
 #-- Add the h5copy and test executables
-add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5copy)
+add_subdirectory (h5copy)
 
 #-- Add the h5stat and test executables
-add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5stat)
+add_subdirectory (h5stat)
 
 #-- Add the h5dump and test executables
-add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5dump)
+add_subdirectory (h5dump)
 
 #-- Add the perform and test executables
-add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/perform)
+add_subdirectory (perform)
-- 
cgit v0.12


From 957d1b85d8e7551c975a8378b9753a628068748c Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Sun, 4 Feb 2018 21:40:52 -0600
Subject: Snapshot version 1.8 release 21 (snap5)

---
 README.txt                            | 2 +-
 c++/src/cpp_doc_config                | 2 +-
 config/cmake/scripts/HDF5config.cmake | 2 +-
 configure.ac                          | 2 +-
 release_docs/RELEASE.txt              | 2 +-
 src/H5public.h                        | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index 9af5df4..2a847a5 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap5 currently under development
+HDF5 version 1.8.21-snap6 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index 60a61b8..ef95fd3 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap5, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap6, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index a19ad3d..1dc875b 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -35,7 +35,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
-set (CTEST_SOURCE_VERSEXT "-snap5")
+set (CTEST_SOURCE_VERSEXT "-snap6")
 
 ##############################################################################
 # handle input parameters to script.
diff --git a/configure.ac b/configure.ac
index ceb7f0b..cbc0c53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap5], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap6], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 3e20248..919dd2f 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap5 currently under development
+HDF5 version 1.8.21-snap6 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index acca700..ce1915a 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap5"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap6"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap5"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap6"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
-- 
cgit v0.12


From 7f831740f03b2687042c6e5ab951b9ad417d76e2 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 5 Feb 2018 13:01:55 -0600
Subject: HDFFV-10398 patch for UBSAN

---
 src/H5detect.c | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/H5detect.c b/src/H5detect.c
index 2dae228..33eba81 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -36,8 +36,8 @@ static const char *FileHeader = "\n\
  *		Livermore National Laboratory.
  *
  *		Detects machine byte order and floating point
- *		format and generates a C source file (native.c)
- *		to describe those paramters.
+ *        format and generates a C source file (H5Tinit.c)
+ *        to describe those parameters.
  *
  * Assumptions: We have an ANSI compiler.  We're on a Unix like
  *		system or configure has detected those Unix
@@ -54,6 +54,16 @@ static const char *FileHeader = "\n\
 #include "H5Tpublic.h"
 #include "H5Rpublic.h"
 
+#if defined(__has_attribute)
+#if __has_attribute(no_sanitize)
+#define HDF_NO_UBSAN __attribute__((no_sanitize("undefined")))
+#else
+#define HDF_NO_UBSAN
+#endif
+#else
+#define HDF_NO_UBSAN
+#endif
+
 #define MAXDETECT 64
 
 /* The ALIGNMENT test code may generate the SIGBUS, SIGSEGV, or SIGILL signals. 
@@ -65,7 +75,7 @@ static const char *FileHeader = "\n\
 /* Define H5SETJMP/H5LONGJMP depending on if sigsetjmp/siglongjmp are */
 /* supported. */
 #if defined(H5_HAVE_SIGSETJMP) && defined(H5_HAVE_SIGLONGJMP)
-/* Always save blocked signals to be restore by siglongjmp. */
+/* Always save blocked signals to be restored by siglongjmp. */
 #define H5JMP_BUF	sigjmp_buf
 #define H5SETJMP(buf)	HDsigsetjmp(buf, 1)
 #define H5LONGJMP(buf, val)	HDsiglongjmp(buf, val)
@@ -1348,7 +1358,7 @@ bit.\n";
  *-------------------------------------------------------------------------
  */
 static void
-detect_C89_integers(void)
+detect_C89_integers(void) HDF_NO_UBSAN
 {
     DETECT_BYTE(signed char,	  SCHAR,        d_g[nd_g]); nd_g++;
     DETECT_BYTE(unsigned char,	  UCHAR,        d_g[nd_g]); nd_g++;
@@ -1376,7 +1386,7 @@ detect_C89_integers(void)
  *-------------------------------------------------------------------------
  */
 static void
-detect_C89_floats(void)
+detect_C89_floats(void) HDF_NO_UBSAN
 {
     DETECT_F(float,     FLOAT,      d_g[nd_g]); nd_g++;
     DETECT_F(double,    DOUBLE,     d_g[nd_g]); nd_g++;
@@ -1398,7 +1408,7 @@ detect_C89_floats(void)
  *-------------------------------------------------------------------------
  */
 static void
-detect_C99_integers8(void)
+detect_C99_integers8(void) HDF_NO_UBSAN
 {
 #if H5_SIZEOF_INT8_T>0
   #if H5_SIZEOF_INT8_T==1
@@ -1460,7 +1470,7 @@ detect_C99_integers8(void)
  *-------------------------------------------------------------------------
  */
 static void
-detect_C99_integers16(void)
+detect_C99_integers16(void) HDF_NO_UBSAN
 {
 #if H5_SIZEOF_INT16_T>0
     DETECT_I(int16_t, 		  INT16,        d_g[nd_g]); nd_g++;
@@ -1498,7 +1508,7 @@ detect_C99_integers16(void)
  *-------------------------------------------------------------------------
  */
 static void
-detect_C99_integers32(void)
+detect_C99_integers32(void) HDF_NO_UBSAN
 {
 #if H5_SIZEOF_INT32_T>0
     DETECT_I(int32_t, 		  INT32,        d_g[nd_g]); nd_g++;
@@ -1536,7 +1546,7 @@ detect_C99_integers32(void)
  *-------------------------------------------------------------------------
  */
 static void
-detect_C99_integers64(void)
+detect_C99_integers64(void) HDF_NO_UBSAN
 {
 #if H5_SIZEOF_INT64_T>0
     DETECT_I(int64_t, 		  INT64,        d_g[nd_g]); nd_g++;
@@ -1587,7 +1597,7 @@ detect_C99_integers64(void)
  *-------------------------------------------------------------------------
  */
 static void
-detect_C99_integers(void)
+detect_C99_integers(void) HDF_NO_UBSAN
 {
     /* break it down to more subroutines so that each module subroutine */
     /* is smaller and takes less time to compile with optimization on.  */
@@ -1613,7 +1623,7 @@ detect_C99_integers(void)
  *-------------------------------------------------------------------------
  */
 static void
-detect_C99_floats(void)
+detect_C99_floats(void) HDF_NO_UBSAN
 {
 #if H5_SIZEOF_DOUBLE == H5_SIZEOF_LONG_DOUBLE
     /*
@@ -1644,7 +1654,7 @@ detect_C99_floats(void)
  *-------------------------------------------------------------------------
  */
 static void
-detect_alignments(void)
+detect_alignments(void) HDF_NO_UBSAN
 {
     /* Detect structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */
     DETECT_M(void *,              POINTER,      m_g[na_g]); na_g++;
@@ -1662,6 +1672,12 @@ detect_alignments(void)
  */
 static int verify_signal_handlers(int signum, void (*handler)(int))
 {						      
+#if defined(__has_feature)
+#if __has_feature(address_sanitizer) || __has_feature(thread_sanitizer)
+    /* Under the address and thread sanitizers, don't raise any signals. */
+    return 0;
+#endif
+#endif
     void	(*save_handler)(int) = HDsignal(signum, handler);    
     int i, val;
     int ntries=5;
@@ -1726,7 +1742,7 @@ static int verify_signal_handlers(int signum, void (*handler)(int))
  *-------------------------------------------------------------------------
  */
 int
-main(void)
+main(void) HDF_NO_UBSAN
 {
 
 #if defined(H5_HAVE_SETSYSINFO) && defined(SSI_NVPAIRS)
-- 
cgit v0.12


From 77aba5e8802e5fc10522e2cca8c2879d9bb1338e Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 5 Feb 2018 16:10:33 -0600
Subject: Remove old dependency construct

---
 CMakeLists.txt       | 1 -
 tools/CMakeLists.txt | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e44b90f..cd40b2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -630,7 +630,6 @@ if (BUILD_TESTING)
 
   if (NOT HDF5_EXTERNALLY_CONFIGURED)
     if (EXISTS "${HDF5_SOURCE_DIR}/test" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/test")
-      add_subdirectory (tools/lib)
       add_subdirectory (test)
     endif ()
     if (H5_HAVE_PARALLEL)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 8f4372a..0b812bf 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -14,9 +14,7 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SOURCE_DIR}/lib)
 # --------------------------------------------------------------------
 # If testing was NOT enabled, then we need to build the tools library
 # --------------------------------------------------------------------
-if (NOT BUILD_TESTING)
-  add_subdirectory (lib)
-endif ()
+add_subdirectory (lib)
 
 #-- Add the h5diff and test executables
 add_subdirectory (h5diff)
-- 
cgit v0.12


From 953f1e432fabec937665acec5a5ea73754f246b4 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 8 Feb 2018 15:50:50 -0600
Subject: HDFFV-10403 fix soname

---
 config/cmake/HDF5Macros.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index f08349e..c3dea9a 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -17,12 +17,12 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype)
     if (ARGN)
       set (PACKAGE_SOVERSION ${ARGN})
     else ()
-      set (PACKAGE_SOVERSION ${HDF5_PACKAGE_SOVERSION})
+      set (PACKAGE_SOVERSION ${H5_SOVERS_MAJOR})
     endif ()
     if (WIN32)
       set (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION_MAJOR})
     else ()
-      set (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION})
+      set (LIBHDF_VERSION ${HDF5_PACKAGE_SOVERSION})
     endif ()
     set_target_properties (${libtarget} PROPERTIES VERSION ${LIBHDF_VERSION})
     if (WIN32)
-- 
cgit v0.12


From 9b693a7b99ae192d5cccfb712ac55fd85fbb1cf7 Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Sun, 11 Feb 2018 22:25:00 -0600
Subject: Snapshot version 1.8 release 21 (snap6)

---
 README.txt                            | 2 +-
 c++/src/cpp_doc_config                | 2 +-
 config/cmake/scripts/HDF5config.cmake | 2 +-
 configure.ac                          | 2 +-
 release_docs/RELEASE.txt              | 2 +-
 src/H5public.h                        | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index 2a847a5..3668574 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap6 currently under development
+HDF5 version 1.8.21-snap7 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index ef95fd3..751c934 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap6, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap7, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 1dc875b..ab9df52 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -35,7 +35,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
-set (CTEST_SOURCE_VERSEXT "-snap6")
+set (CTEST_SOURCE_VERSEXT "-snap7")
 
 ##############################################################################
 # handle input parameters to script.
diff --git a/configure.ac b/configure.ac
index cbc0c53..ce90a34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap6], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap7], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 919dd2f..8b96379 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap6 currently under development
+HDF5 version 1.8.21-snap7 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index ce1915a..fdb5ed2 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap6"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap7"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap6"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap7"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
-- 
cgit v0.12


From f7d2fbe58db16922e6ff360f46e4334bbcd88831 Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Mon, 19 Feb 2018 06:49:27 -0600
Subject: Snapshot version 1.8 release 21 (snap7)

---
 README.txt                            |  2 +-
 c++/src/cpp_doc_config                |  2 +-
 config/cmake/scripts/HDF5config.cmake |  2 +-
 configure                             | 22 +++++++++++-----------
 configure.ac                          |  2 +-
 release_docs/RELEASE.txt              |  2 +-
 src/H5public.h                        |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.txt b/README.txt
index 3668574..757294f 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap7 currently under development
+HDF5 version 1.8.21-snap8 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index 751c934..a10a675 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap7, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap8, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index ab9df52..9530638 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -35,7 +35,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
-set (CTEST_SOURCE_VERSEXT "-snap7")
+set (CTEST_SOURCE_VERSEXT "-snap8")
 
 ##############################################################################
 # handle input parameters to script.
diff --git a/configure b/configure
index 1671c32..815f71f 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap2.
+# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap8.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.8.21-snap2'
-PACKAGE_STRING='HDF5 1.8.21-snap2'
+PACKAGE_VERSION='1.8.21-snap8'
+PACKAGE_STRING='HDF5 1.8.21-snap8'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.8.21-snap2 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.8.21-snap8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.8.21-snap2:";;
+     short | recursive ) echo "Configuration of HDF5 1.8.21-snap8:";;
    esac
   cat <<\_ACEOF
 
@@ -1745,7 +1745,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.8.21-snap2
+HDF5 configure 1.8.21-snap8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2682,7 +2682,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.8.21-snap2, which was
+It was created by HDF5 $as_me 1.8.21-snap8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3553,7 +3553,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.8.21-snap2'
+ VERSION='1.8.21-snap8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -29313,7 +29313,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-HDF5 config.lt 1.8.21-snap2
+HDF5 config.lt 1.8.21-snap8
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -31373,7 +31373,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.8.21-snap2, which was
+This file was extended by HDF5 $as_me 1.8.21-snap8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31439,7 +31439,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.8.21-snap2
+HDF5 config.status 1.8.21-snap8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index ce90a34..a7703c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap7], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap8], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 8b96379..571afe4 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap7 currently under development
+HDF5 version 1.8.21-snap8 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index fdb5ed2..54f89d6 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap7"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap8"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap7"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap8"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
-- 
cgit v0.12


From 905b1456abfc65ee370c64aea672442f5f3a7ecd Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 19 Feb 2018 13:22:19 -0600
Subject: HDFFV-10384 merge from develop

---
 tools/h5copy/h5copy.c          |  4 ++--
 tools/h5diff/h5diff_common.c   |  2 +-
 tools/h5diff/h5diff_main.c     |  2 +-
 tools/h5dump/h5dump.c          | 33 ++++++++++++++++++---------------
 tools/h5import/h5import.c      |  4 ++--
 tools/h5ls/h5ls.c              |  2 ++
 tools/h5repack/h5repack_main.c |  6 +++---
 tools/lib/h5tools.c            | 22 +++++++++++++++++-----
 tools/lib/h5tools.h            |  2 +-
 9 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c
index 1d15d12..1800810 100644
--- a/tools/h5copy/h5copy.c
+++ b/tools/h5copy/h5copy.c
@@ -293,7 +293,7 @@ main (int argc, const char *argv[])
             break;
 
         case 'E':
-            enable_error_stack = TRUE;
+            enable_error_stack = 1;
             break;
 
         default:
@@ -330,7 +330,7 @@ main (int argc, const char *argv[])
         leave(EXIT_FAILURE);
     }
 
-    if (enable_error_stack) {
+    if (enable_error_stack > 0) {
         H5Eset_auto2(H5E_DEFAULT, func, edata);
         H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
     }
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index f8e02be..6221843 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -178,7 +178,7 @@ void parse_command_line(int argc,
             break;
 
         case 'S':
-            enable_error_stack = TRUE;
+            enable_error_stack = 1;
             break;
 
         case 'E':
diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index ad488a4..c5a0cbf 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -100,7 +100,7 @@ int main(int argc, const char *argv[])
     */
     parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &opts);
 
-    if (enable_error_stack) {
+    if (enable_error_stack > 0) {
         H5Eset_auto2(H5E_DEFAULT, func, edata);
         H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
     }
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 80e653a..fa67548 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -67,7 +67,7 @@ struct handler_t {
  */
 /* The following initialization makes use of C language cancatenating */
 /* "xxx" "yyy" into "xxxyyy". */
-static const char *s_opts = "hn*peyBHirVa:c:d:f:g:k:l:t:w:xD:uX:o*b*F:s:S:A*q:z:m:RECM:O*N:";
+static const char *s_opts = "hn*peyBHirVa:c:d:f:g:k:l:t:w:xD:uX:o*b*F:s:S:A*q:z:m:RE*CM:O*N:";
 static struct long_options l_opts[] = {
     { "help", no_arg, 'h' },
     { "hel", no_arg, 'h' },
@@ -181,7 +181,7 @@ static struct long_options l_opts[] = {
     { "sort_order", require_arg, 'z' },
     { "format", require_arg, 'm' },
     { "region", no_arg, 'R' },
-    { "enable-error-stack", no_arg, 'E' },
+    { "enable-error-stack", optional_arg, 'E' },
     { "packed-bits", require_arg, 'M' },
     { "no-compact-subset", no_arg, 'C' },
     { "ddl", optional_arg, 'O' },
@@ -269,8 +269,8 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "     -m T, --format=T     Set the floating point output format\n");
     PRINTVALSTREAM(rawoutstream, "     -q Q, --sort_by=Q    Sort groups and attributes by index Q\n");
     PRINTVALSTREAM(rawoutstream, "     -z Z, --sort_order=Z Sort groups and attributes by order Z\n");
-    PRINTVALSTREAM(rawoutstream, "     --enable-error-stack Prints messages from the HDF5 error stack as they\n");
-    PRINTVALSTREAM(rawoutstream, "                          occur.\n");
+    PRINTVALSTREAM(rawoutstream, "     --enable-error-stack Prints messages from the HDF5 error stack as they occur.\n");
+    PRINTVALSTREAM(rawoutstream, "                          Optional value 2 also prints file open errors.\n");
     PRINTVALSTREAM(rawoutstream, "     --no-compact-subset  Disable compact form of subsetting and allow the use\n");
     PRINTVALSTREAM(rawoutstream, "                          of \"[\" in dataset names.\n");
     PRINTVALSTREAM(rawoutstream, "     -w N, --width=N      Set the number of columns of output. A value of 0 (zero)\n");
@@ -916,9 +916,8 @@ parse_start:
         case 'n':
             display_fi = TRUE;
             last_was_dset = FALSE;
-            if ( opt_arg != NULL) {
+            if (opt_arg != NULL)
                 h5trav_set_verbose(HDatoi(opt_arg));
-            }
             break;
         case 'p':
             display_dcpl = TRUE;
@@ -935,8 +934,9 @@ parse_start:
             last_was_dset = FALSE;
             break;
         case 'A':
-            if ( opt_arg != NULL) {
-                if(0 == HDatoi(opt_arg)) include_attrs = FALSE;
+            if (opt_arg != NULL) {
+                if(0 == HDatoi(opt_arg))
+                    include_attrs = FALSE;
             }
             else {
                 display_data = FALSE;
@@ -1055,7 +1055,7 @@ parse_start:
             break;
 
         case 'o':
-            if ( bin_output ) {
+            if (bin_output) {
                 if (h5tools_set_data_output_file(opt_arg, 1) < 0) {
                     usage(h5tools_getprogname());
                     goto error;
@@ -1082,8 +1082,8 @@ parse_start:
             break;
 
         case 'b':
-            if ( opt_arg != NULL) {
-                if ( ( bin_form = set_binary_form(opt_arg)) < 0) {
+            if (opt_arg != NULL) {
+                if ((bin_form = set_binary_form(opt_arg)) < 0) {
                     /* failed to set binary form */
                     usage(h5tools_getprogname());
                     goto error;
@@ -1102,7 +1102,7 @@ parse_start:
             break;
 
         case 'q':
-            if ( ( sort_by = set_sort_by(opt_arg)) < 0) {
+            if ((sort_by = set_sort_by(opt_arg)) < 0) {
                 /* failed to set "sort by" form */
                 usage(h5tools_getprogname());
                 goto error;
@@ -1110,7 +1110,7 @@ parse_start:
             break;
 
         case 'z':
-            if ( ( sort_order = set_sort_order(opt_arg)) < 0) {
+            if ((sort_order = set_sort_order(opt_arg)) < 0) {
                 /* failed to set "sort order" form */
                 usage(h5tools_getprogname());
                 goto error;
@@ -1254,7 +1254,10 @@ end_collect:
         /** end subsetting parameters **/
 
         case 'E':
-            enable_error_stack = TRUE;
+            if (opt_arg != NULL)
+                enable_error_stack = HDatoi(opt_arg);
+            else
+                enable_error_stack = 1;
             break;
         case 'C':
             disable_compact_subset = TRUE;
@@ -1374,7 +1377,7 @@ main(int argc, const char *argv[])
         goto done;
     }
 
-    if (enable_error_stack) {
+    if (enable_error_stack > 0) {
         H5Eset_auto2(H5E_DEFAULT, func, edata);
         H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
     }
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index 36a8c21..76e78af 100644
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -1405,7 +1405,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
     const char *err14a = "COMPRESSION-PARAM keyword appears twice in %s.\n";
     const char *err14b = "Error in retrieving the compression parameter from %s.\n";
     const char *err15a = "EXTERNAL-STORAGE keyword appears twice in %s.\n";
-    const char *err15b = "Error in retrieving the external storage paramters from %s.\n";
+    const char *err15b = "Error in retrieving the external storage parameters from %s.\n";
     const char *err16a = "MAXIMUM-DIMENSIONS keyword appears twice in %s.\n";
     const char *err16b = "MAXIMUM-DIMENSIONS cannot appear before DIMENSION-SIZES are provided.\n";
     const char *err16c = "Error in retrieving the maximum dimension sizes from %s.\n";
@@ -3690,7 +3690,7 @@ static int getCompressionParameter(struct Input *in, FILE *strm)
 {
     /*  currently supports only GZIP */
     /*  can be extended by adding more values to COMPRESSION-TYPE and */
-    /*  handling the paramters here by adding more cases  */
+    /*  handling the parameters here by adding more cases  */
 
     int         ival;
     const char *err1 = "Unable to get integer value.\n";
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 583f8bf..78a2cce 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -2680,6 +2680,7 @@ main(int argc, const char *argv[])
                     case 'h': /* --help */
                         usage();
                         leave(EXIT_SUCCESS);
+                        break;
 
                     case 'a': /* --address */
                         address_g = TRUE;
@@ -2730,6 +2731,7 @@ main(int argc, const char *argv[])
                     case 'V': /* --version */
                         print_version(h5tools_getprogname());
                         leave(EXIT_SUCCESS);
+                        break;
 
                     case 'x': /* --hexdump */
                         hexdump_g = TRUE;
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index 0c5aac6..c739960 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -558,8 +558,8 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
                 break;
 
             case 'E':
-            enable_error_stack = TRUE;
-            break;
+                enable_error_stack = 1;
+                break;
 
             default:
                 break;
@@ -651,7 +651,7 @@ int main(int argc, const char **argv)
         }
     }
 
-    if (enable_error_stack) {
+    if (enable_error_stack > 0) {
         H5Eset_auto2(H5E_DEFAULT, func, edata);
         H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
     }
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 9230bb1..8ceaecc 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -43,7 +43,7 @@ unsigned    packed_bits_num;    /* number of packed bits to display */
 unsigned    packed_data_offset; /* offset of packed bits to display */
 unsigned    packed_data_length; /* length of packed bits to display */
 unsigned long long packed_data_mask;  /* mask in which packed bits to display */
-int          enable_error_stack= FALSE; /* re-enable error stack */
+int         enable_error_stack = 0;   /* re-enable error stack; disable=0 enable=1 */
 
 /* sort parameters */
 H5_index_t   sort_by           = H5_INDEX_NAME; /*sort_by [creation_order | name]  */
@@ -548,9 +548,15 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl, const char *driver,
         if ((my_fapl = h5tools_get_fapl(fapl, driver, &drivernum)) < 0)
             goto done;
 
-        H5E_BEGIN_TRY {
+        /* allow error stack display if enable-error-stack has optional arg number */
+        if (enable_error_stack > 1) {
             fid = H5Fopen(fname, flags, my_fapl);
-        } H5E_END_TRY;
+        }
+        else {
+            H5E_BEGIN_TRY {
+                fid = H5Fopen(fname, flags, my_fapl);
+            } H5E_END_TRY;
+        }
 
         if (fid == FAIL)
             goto done;
@@ -563,9 +569,15 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl, const char *driver,
             if((my_fapl = h5tools_get_fapl(fapl, drivernames[drivernum], NULL)) < 0)
                 goto done;
 
-            H5E_BEGIN_TRY {
+            /* allow error stack display if enable-error-stack has optional arg number */
+            if (enable_error_stack > 1) {
                 fid = H5Fopen(fname, flags, my_fapl);
-            } H5E_END_TRY;
+            }
+            else {
+                H5E_BEGIN_TRY {
+                    fid = H5Fopen(fname, flags, my_fapl);
+                } H5E_END_TRY;
+            }
 
             if (fid != FAIL)
                 break;
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index 09ec527..e24d654 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -545,7 +545,7 @@ H5TOOLS_DLLVAR H5_index_t   sort_by;        /*sort_by [creation_order | name]  *
 H5TOOLS_DLLVAR H5_iter_order_t sort_order;  /*sort_order [ascending | descending]   */
 
 /* things to display or which are set via command line parameters */
-H5TOOLS_DLLVAR int     enable_error_stack; /* re-enable error stack */
+H5TOOLS_DLLVAR int     enable_error_stack; /* re-enable error stack; disable=0 enable=1 */
 
 /* Strings for output */
 #define H5_TOOLS_GROUP           "GROUP"
-- 
cgit v0.12


From 4de5558a97b189ad889c7933644e8dc9fc8566c1 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 19 Feb 2018 13:24:29 -0600
Subject: HDFFV-10384 merge from develop

---
 release_docs/RELEASE.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 571afe4..3ab9fc0 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -171,6 +171,18 @@ Bug Fixes since HDF5-1.8.20
     -----
     - h5dump
 
+      the tools library will hide the error stack during file open.
+
+      While this is preferable almost always, there are reasons to enable
+      display of the error stack when a tool will not open a file. Adding an
+      optional argument to the --enable-error-stack will provide this use case.
+      As an optional argument it will not affect the operation of the
+      --enable-error-stack. h5dump is the only tool to implement this change.
+
+      (ADB - 2018/02/15, HDFFV-10384)
+
+    - h5dump
+
       h5dump would output an indented blank line in the filters section.
 
       h5dump overused the h5tools_simple_prefix function, which is a
-- 
cgit v0.12


From a4ea00337111da256d250618bd15d84758c94dce Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 19 Feb 2018 13:27:46 -0600
Subject: HDFFV-10384 update ref files - merge from develop

---
 tools/testfiles/h5dump-help.txt                        | 4 ++--
 tools/testfiles/pbits/tnofilename-with-packed-bits.ddl | 4 ++--
 tools/testfiles/pbits/tpbitsIncomplete.ddl             | 4 ++--
 tools/testfiles/pbits/tpbitsLengthExceeded.ddl         | 6 ++++--
 tools/testfiles/pbits/tpbitsLengthPositive.ddl         | 4 ++--
 tools/testfiles/pbits/tpbitsMaxExceeded.ddl            | 4 ++--
 tools/testfiles/pbits/tpbitsOffsetExceeded.ddl         | 4 ++--
 tools/testfiles/pbits/tpbitsOffsetNegative.ddl         | 4 ++--
 8 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index c80999e..bc37a8f 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -42,8 +42,8 @@ usage: h5dump [OPTIONS] files
      -m T, --format=T     Set the floating point output format
      -q Q, --sort_by=Q    Sort groups and attributes by index Q
      -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
+     --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                          Optional value 2 also prints file open errors.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
      -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
index c16fdf9..9de5727 100644
--- a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
@@ -42,8 +42,8 @@ usage: h5dump [OPTIONS] files
      -m T, --format=T     Set the floating point output format
      -q Q, --sort_by=Q    Sort groups and attributes by index Q
      -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
+     --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                          Optional value 2 also prints file open errors.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
      -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/testfiles/pbits/tpbitsIncomplete.ddl
index 0a9d38c..206cd0e 100644
--- a/tools/testfiles/pbits/tpbitsIncomplete.ddl
+++ b/tools/testfiles/pbits/tpbitsIncomplete.ddl
@@ -42,8 +42,8 @@ usage: h5dump [OPTIONS] files
      -m T, --format=T     Set the floating point output format
      -q Q, --sort_by=Q    Sort groups and attributes by index Q
      -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
+     --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                          Optional value 2 also prints file open errors.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
      -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
index 796f0f9..ffe0da9 100644
--- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
@@ -25,6 +25,8 @@ usage: h5dump [OPTIONS] files
                           P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
+     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.
+     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers
 --------------- Object Property Options ---------------
      -i,   --object-ids   Print the object ids
      -p,   --properties   Print dataset filters, storage layout and fill value
@@ -42,8 +44,8 @@ usage: h5dump [OPTIONS] files
      -m T, --format=T     Set the floating point output format
      -q Q, --sort_by=Q    Sort groups and attributes by index Q
      -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
+     --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                          Optional value 2 also prints file open errors.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
      -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
index 55a0e76..5a82df1 100644
--- a/tools/testfiles/pbits/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
@@ -42,8 +42,8 @@ usage: h5dump [OPTIONS] files
      -m T, --format=T     Set the floating point output format
      -q Q, --sort_by=Q    Sort groups and attributes by index Q
      -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
+     --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                          Optional value 2 also prints file open errors.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
      -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
index 89901c6..7aae845 100644
--- a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
@@ -42,8 +42,8 @@ usage: h5dump [OPTIONS] files
      -m T, --format=T     Set the floating point output format
      -q Q, --sort_by=Q    Sort groups and attributes by index Q
      -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
+     --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                          Optional value 2 also prints file open errors.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
      -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
index 51777d8..6982a78 100644
--- a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
@@ -42,8 +42,8 @@ usage: h5dump [OPTIONS] files
      -m T, --format=T     Set the floating point output format
      -q Q, --sort_by=Q    Sort groups and attributes by index Q
      -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
+     --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                          Optional value 2 also prints file open errors.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
      -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
index e76ff7f..086c3ce 100644
--- a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
@@ -42,8 +42,8 @@ usage: h5dump [OPTIONS] files
      -m T, --format=T     Set the floating point output format
      -q Q, --sort_by=Q    Sort groups and attributes by index Q
      -z Z, --sort_order=Z Sort groups and attributes by order Z
-     --enable-error-stack Prints messages from the HDF5 error stack as they
-                          occur.
+     --enable-error-stack Prints messages from the HDF5 error stack as they occur.
+                          Optional value 2 also prints file open errors.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
      -w N, --width=N      Set the number of columns of output. A value of 0 (zero)
-- 
cgit v0.12


From 85590e85cbe38d4491e4d79e0c277bcfe81b8e4c Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 22 Feb 2018 11:37:06 -0600
Subject: HDFFV-10412 merge from develop

---
 release_docs/RELEASE.txt                           | 12 +++++++
 tools/h5repack/h5repack_filters.c                  | 38 +++++++++++-----------
 .../testfiles/deflate_limit.h5repack_layout.h5.ddl |  4 +--
 .../testfiles/h5repack_layout.h5-plugin_test.ddl   |  2 +-
 .../h5repack_layout.h5-plugin_version_test.ddl     |  2 +-
 5 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 3ab9fc0..5d01e13 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -169,6 +169,18 @@ Bug Fixes since HDF5-1.8.20
 
     Tools
     -----
+    - h5repack
+
+      h5repack changes the chunk parameters when a change of layout is not
+      specified and a filter is applied.
+
+      HDFFV-10297, HDFFV-10319 reworked code for h5repack and h5diff code
+      in the tools library. The check for an existing layout was incorrectly
+      placed into an if block and not executed. The check was moved into
+      the normal path of the function.
+
+      (ADB - 2018/02/21, HDFFV-10412)
+
     - h5dump
 
       the tools library will hide the error stack during file open.
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index eb8d724..8cc7b92 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -277,25 +277,6 @@ int apply_filters(const char* name, /* object name from traverse list */
         *has_filter = 1;
         if (H5Premove_filter(dcpl_id, H5Z_FILTER_ALL) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Premove_filter failed");
-
-        /*-------------------------------------------------------------------------
-         * check if there is an existent chunk
-         * read it only if there is not a requested layout
-         *-------------------------------------------------------------------------
-         */
-        if (obj.layout == -1) {
-            if ((layout = H5Pget_layout(dcpl_id)) < 0)
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_layout failed");
-
-            if (layout == H5D_CHUNKED) {
-                if ((rank = H5Pget_chunk(dcpl_id, NELMTS(chsize), chsize/*out*/)) < 0)
-                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_chunk failed");
-                obj.layout = H5D_CHUNKED;
-                obj.chunk.rank = rank;
-                for (i = 0; i < rank; i++)
-                    obj.chunk.chunk_lengths[i] = chsize[i];
-            }
-        }
     }
     else if(nfilters) {
         *has_filter = 1;
@@ -304,6 +285,25 @@ int apply_filters(const char* name, /* object name from traverse list */
     }
 
     /*-------------------------------------------------------------------------
+     * check if there is an existent chunk
+     * read it only if there is not a requested layout
+     *-------------------------------------------------------------------------
+     */
+    if (obj.layout == -1) {
+        if ((layout = H5Pget_layout(dcpl_id)) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_layout failed");
+
+        if (layout == H5D_CHUNKED) {
+            if ((rank = H5Pget_chunk(dcpl_id, NELMTS(chsize), chsize/*out*/)) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_chunk failed");
+            obj.layout = H5D_CHUNKED;
+            obj.chunk.rank = rank;
+            for (i = 0; i < rank; i++)
+                obj.chunk.chunk_lengths[i] = chsize[i];
+        }
+    }
+
+    /*-------------------------------------------------------------------------
      * the type of filter and additional parameter
      * type can be one of the filters
      * H5Z_FILTER_NONE        0 , uncompress if compressed
diff --git a/tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl b/tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
index 1b0b821..80b8a19 100644
--- a/tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
+++ b/tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
@@ -76,8 +76,8 @@ GROUP "/" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
       STORAGE_LAYOUT {
-         CHUNKED ( 40, 20 )
-         SIZE 1150 (2.783:1 COMPRESSION)
+         CHUNKED ( 20, 10 )
+         SIZE 1283 (2.494:1 COMPRESSION)
       }
       FILTERS {
          COMPRESSION DEFLATE { LEVEL 1 }
diff --git a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
index 9e80c72..87b133d 100644
--- a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
+++ b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
@@ -92,7 +92,7 @@ GROUP "/" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
       STORAGE_LAYOUT {
-         CHUNKED ( 40, 20 )
+         CHUNKED ( 20, 10 )
          SIZE 3200 (1.000:1 COMPRESSION)
       }
       FILTERS {
diff --git a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
index d582d2d..e8ac9a4 100644
--- a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
+++ b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
@@ -92,7 +92,7 @@ GROUP "/" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
       STORAGE_LAYOUT {
-         CHUNKED ( 40, 20 )
+         CHUNKED ( 20, 10 )
          SIZE 3200 (1.000:1 COMPRESSION)
       }
       FILTERS {
-- 
cgit v0.12


From a3fc897d5e8fa6cec58a0c4fcbbc336514a436f6 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 22 Feb 2018 12:14:43 -0600
Subject: Correct merge typo

---
 tools/testfiles/pbits/tpbitsLengthExceeded.ddl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
index ffe0da9..6b37ac6 100644
--- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
@@ -25,8 +25,6 @@ usage: h5dump [OPTIONS] files
                           P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
-     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.
-     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers
 --------------- Object Property Options ---------------
      -i,   --object-ids   Print the object ids
      -p,   --properties   Print dataset filters, storage layout and fill value
-- 
cgit v0.12


From 4ceeadc767518dba99d81de1c458ae35ad2a8625 Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Sun, 25 Feb 2018 21:31:12 -0600
Subject: Snapshot version 1.8 release 21 (snap8)

---
 README.txt                            |  2 +-
 c++/src/cpp_doc_config                |  2 +-
 config/cmake/scripts/HDF5config.cmake |  2 +-
 configure                             | 22 +++++++++++-----------
 configure.ac                          |  2 +-
 release_docs/RELEASE.txt              |  2 +-
 src/H5public.h                        |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.txt b/README.txt
index 757294f..2c5d7d8 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap8 currently under development
+HDF5 version 1.8.21-snap9 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index a10a675..c446992 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap8, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap9, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 9530638..bbce0ad 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -35,7 +35,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
-set (CTEST_SOURCE_VERSEXT "-snap8")
+set (CTEST_SOURCE_VERSEXT "-snap9")
 
 ##############################################################################
 # handle input parameters to script.
diff --git a/configure b/configure
index 815f71f..cf782b3 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap8.
+# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap9.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.8.21-snap8'
-PACKAGE_STRING='HDF5 1.8.21-snap8'
+PACKAGE_VERSION='1.8.21-snap9'
+PACKAGE_STRING='HDF5 1.8.21-snap9'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.8.21-snap8 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.8.21-snap9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.8.21-snap8:";;
+     short | recursive ) echo "Configuration of HDF5 1.8.21-snap9:";;
    esac
   cat <<\_ACEOF
 
@@ -1745,7 +1745,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.8.21-snap8
+HDF5 configure 1.8.21-snap9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2682,7 +2682,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.8.21-snap8, which was
+It was created by HDF5 $as_me 1.8.21-snap9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3553,7 +3553,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.8.21-snap8'
+ VERSION='1.8.21-snap9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -29313,7 +29313,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-HDF5 config.lt 1.8.21-snap8
+HDF5 config.lt 1.8.21-snap9
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -31373,7 +31373,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.8.21-snap8, which was
+This file was extended by HDF5 $as_me 1.8.21-snap9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31439,7 +31439,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.8.21-snap8
+HDF5 config.status 1.8.21-snap9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index a7703c5..2fe7412 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap8], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap9], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 5d01e13..5228b37 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap8 currently under development
+HDF5 version 1.8.21-snap9 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index 54f89d6..d003af9 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap8"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap9"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap8"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap9"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
-- 
cgit v0.12


From 6db78aab250683d5b5a4add876a4aca299f629ce Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 26 Feb 2018 14:16:45 -0600
Subject: Update list of options

---
 release_docs/INSTALL_CMake.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 58169fc..a9d9726 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -564,7 +564,6 @@ if (HDF5_BUILD_FORTRAN)
 ALLOW_UNSUPPORTED              "Allow unsupported combinations of configure options"          OFF
 HDF5_DISABLE_COMPILER_WARNINGS "Disable compiler warnings"                                    OFF
 HDF5_Enable_Clear_File_Buffers "Securely clear file buffers before writing to file"           ON
-HDF5_Enable_Instrument         "Instrument The library"                                       OFF
 HDF5_ENABLE_CODESTACK          "Enable the function stack tracing (for developer debugging)." OFF
 HDF5_ENABLE_COVERAGE           "Enable code coverage for Libraries and Programs"              OFF
 HDF5_ENABLE_DEPRECATED_SYMBOLS "Enable deprecated public API symbols"                         ON
@@ -580,6 +579,8 @@ HDF5_METADATA_TRACE_FILE       "Enable metadata trace file collection"
 HDF5_NO_PACKAGES               "Do not include CPack Packaging"                               OFF
 HDF5_PACK_EXAMPLES             "Package the HDF5 Library Examples Compressed File"            OFF
 HDF5_PACK_MACOSX_FRAMEWORK     "Package the HDF5 Library in a Frameworks"                     OFF
+HDF5_BUILD_FRAMEWORKS          "TRUE to build as frameworks libraries,
+                                FALSE to build according to BUILD_SHARED_LIBS"                FALSE
 HDF5_PACKAGE_EXTLIBS           "CPACK - include external libraries"                           OFF
 HDF5_STRICT_FORMAT_CHECKS      "Whether to perform strict file format checks"                 OFF
 HDF_TEST_EXPRESS               "Control testing framework (0-3)"                              "0"
@@ -593,7 +594,7 @@ SKIP_HDF5_FORTRAN_SHARED       "Do not build the fortran shared libraries"
 if (APPLE)
     HDF5_BUILD_WITH_INSTALL_NAME "Build with library install_name set to the installation path"  OFF
 if (CMAKE_BUILD_TYPE MATCHES Debug)
-    HDF5_ENABLE_TRACE          "Enable API tracing capability"               ON
+    HDF5_ENABLE_INSTRUMENT     "Instrument The library"                      OFF
 if (HDF5_TEST_VFD)
     HDF5_TEST_FHEAP_VFD        "Execute fheap test with different VFDs"      ON
 
-- 
cgit v0.12


From e1107fa559474a6b6a4147d24192be75a495b971 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Mon, 26 Feb 2018 14:19:29 -0600
Subject: Update list

---
 release_docs/INSTALL_CMake.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index a9d9726..2c8bc1a 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -563,6 +563,7 @@ if (HDF5_BUILD_FORTRAN)
 ---------------- HDF5 Advanced Options ---------------------
 ALLOW_UNSUPPORTED              "Allow unsupported combinations of configure options"          OFF
 HDF5_DISABLE_COMPILER_WARNINGS "Disable compiler warnings"                                    OFF
+HDF5_ENABLE_ALL_WARNINGS       "Enable all warnings"                                          OFF
 HDF5_Enable_Clear_File_Buffers "Securely clear file buffers before writing to file"           ON
 HDF5_ENABLE_CODESTACK          "Enable the function stack tracing (for developer debugging)." OFF
 HDF5_ENABLE_COVERAGE           "Enable code coverage for Libraries and Programs"              OFF
-- 
cgit v0.12


From 344940dd2dc894c8e1474ddd20d30886fcc74a1e Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 1 Mar 2018 10:58:53 -0600
Subject: Merge compiler versions from develop

---
 config/cmake/libhdf5.settings.cmake.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index 8ef67a5..c337dea 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -15,7 +15,7 @@ General Information:
 
 Compiling Options:
 ------------------
-               Compilation Mode: @CMAKE_BUILD_TYPE@
+               Compilation Mode: @CMAKE_BUILD_TYPE@ @CMAKE_C_COMPILER_VERSION@
                      C Compiler: @CMAKE_C_COMPILER@
                          CFLAGS: @CMAKE_C_FLAGS@
                       H5_CFLAGS: @H5_CFLAGS@
@@ -37,7 +37,7 @@ Compiling Options:
 Languages:
 ----------
                         Fortran: @HDF5_BUILD_FORTRAN@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               Fortran Compiler: @CMAKE_Fortran_COMPILER@
+@BUILD_FORTRAN_CONDITIONAL_TRUE@               Fortran Compiler: @CMAKE_Fortran_COMPILER@ @CMAKE_Fortran_COMPILER_VERSION@
 @BUILD_FORTRAN_CONDITIONAL_TRUE@          Fortran 2003 Compiler: @HDF5_ENABLE_F2003@
 @BUILD_FORTRAN_CONDITIONAL_TRUE@                  Fortran Flags: @CMAKE_Fortran_FLAGS@
 @BUILD_FORTRAN_CONDITIONAL_TRUE@               H5 Fortran Flags: @H5_FCFLAGS@
@@ -46,7 +46,7 @@ Languages:
 @BUILD_FORTRAN_CONDITIONAL_TRUE@         Static Fortran Library: YES
 
                             C++: @HDF5_BUILD_CPP_LIB@
-@BUILD_CXX_CONDITIONAL_TRUE@                   C++ Compiler: @CMAKE_CXX_COMPILER@
+@BUILD_CXX_CONDITIONAL_TRUE@                   C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
 @BUILD_CXX_CONDITIONAL_TRUE@                      C++ Flags: @CMAKE_CXX_FLAGS@
 @BUILD_CXX_CONDITIONAL_TRUE@                   H5 C++ Flags: @H5_CXXFLAGS@
 @BUILD_CXX_CONDITIONAL_TRUE@                   AM C++ Flags: @AM_CXXFLAGS@
-- 
cgit v0.12


From c1cc4a123fd1a7b3acdad6c3d9376168c87108b0 Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Sun, 4 Mar 2018 21:23:03 -0600
Subject: Snapshot version 1.8 release 21 (snap9)

---
 README.txt                            |  2 +-
 c++/src/cpp_doc_config                |  2 +-
 config/cmake/scripts/HDF5config.cmake |  2 +-
 configure                             | 22 +++++++++++-----------
 configure.ac                          |  2 +-
 release_docs/RELEASE.txt              |  2 +-
 src/H5public.h                        |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.txt b/README.txt
index 2c5d7d8..5c52946 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap9 currently under development
+HDF5 version 1.8.21-snap10 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index c446992..c8869af 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap9, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap10, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index bbce0ad..c220c66e 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -35,7 +35,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
-set (CTEST_SOURCE_VERSEXT "-snap9")
+set (CTEST_SOURCE_VERSEXT "-snap10")
 
 ##############################################################################
 # handle input parameters to script.
diff --git a/configure b/configure
index cf782b3..e09da0b 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap9.
+# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap10.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.8.21-snap9'
-PACKAGE_STRING='HDF5 1.8.21-snap9'
+PACKAGE_VERSION='1.8.21-snap10'
+PACKAGE_STRING='HDF5 1.8.21-snap10'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.8.21-snap9 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.8.21-snap10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.8.21-snap9:";;
+     short | recursive ) echo "Configuration of HDF5 1.8.21-snap10:";;
    esac
   cat <<\_ACEOF
 
@@ -1745,7 +1745,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.8.21-snap9
+HDF5 configure 1.8.21-snap10
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2682,7 +2682,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.8.21-snap9, which was
+It was created by HDF5 $as_me 1.8.21-snap10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3553,7 +3553,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.8.21-snap9'
+ VERSION='1.8.21-snap10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -29313,7 +29313,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-HDF5 config.lt 1.8.21-snap9
+HDF5 config.lt 1.8.21-snap10
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -31373,7 +31373,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.8.21-snap9, which was
+This file was extended by HDF5 $as_me 1.8.21-snap10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31439,7 +31439,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.8.21-snap9
+HDF5 config.status 1.8.21-snap10
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 2fe7412..6303100 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap9], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap10], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 5228b37..84bed48 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap9 currently under development
+HDF5 version 1.8.21-snap10 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index d003af9..3aba4c3 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap9"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap10"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap9"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap10"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
-- 
cgit v0.12


From e835063ebfada628b80046cc8328d8771abd9e11 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 9 Mar 2018 12:38:48 -0600
Subject: Change CMake min to 3.10

---
 CMakeLists.txt                                     |    2 +-
 c++/CMakeLists.txt                                 |    2 +-
 c++/examples/CMakeLists.txt                        |    2 +-
 c++/src/CMakeLists.txt                             |    2 +-
 c++/test/CMakeLists.txt                            |    2 +-
 config/cmake/CTestScript.cmake                     |    2 +-
 config/cmake/HDF518_Examples.cmake.in              |    2 +-
 config/cmake/scripts/CTestScript.cmake             |    2 +-
 config/cmake/scripts/HDF5config.cmake              |    2 +-
 config/cmake_ext_mod/FindMPI.cmake                 | 1514 --------------------
 .../cmake_ext_mod/FindMPI/fortranparam_mpi.f90.in  |    4 -
 config/cmake_ext_mod/FindMPI/libver_mpi.c          |   19 -
 config/cmake_ext_mod/FindMPI/libver_mpi.f90.in     |    7 -
 config/cmake_ext_mod/FindMPI/mpiver.f90.in         |   10 -
 config/cmake_ext_mod/FindMPI/test_mpi.c            |   37 -
 config/cmake_ext_mod/FindMPI/test_mpi.f90.in       |    6 -
 examples/CMakeLists.txt                            |    2 +-
 fortran/CMakeLists.txt                             |    2 +-
 fortran/examples/CMakeLists.txt                    |    2 +-
 fortran/src/CMakeLists.txt                         |    2 +-
 fortran/test/CMakeLists.txt                        |    2 +-
 fortran/testpar/CMakeLists.txt                     |    2 +-
 hl/CMakeLists.txt                                  |    2 +-
 hl/c++/CMakeLists.txt                              |    2 +-
 hl/c++/examples/CMakeLists.txt                     |    2 +-
 hl/c++/src/CMakeLists.txt                          |    2 +-
 hl/c++/test/CMakeLists.txt                         |    2 +-
 hl/examples/CMakeLists.txt                         |    2 +-
 hl/fortran/CMakeLists.txt                          |    2 +-
 hl/fortran/examples/CMakeLists.txt                 |    2 +-
 hl/fortran/src/CMakeLists.txt                      |    2 +-
 hl/fortran/test/CMakeLists.txt                     |    2 +-
 hl/src/CMakeLists.txt                              |    2 +-
 hl/test/CMakeLists.txt                             |    2 +-
 hl/tools/CMakeLists.txt                            |    2 +-
 hl/tools/gif2h5/CMakeLists.txt                     |    2 +-
 release_docs/INSTALL_CMake.txt                     |    2 +-
 release_docs/USING_HDF5_CMake.txt                  |    4 +-
 src/CMakeLists.txt                                 |    2 +-
 test/CMakeLists.txt                                |    2 +-
 testpar/CMakeLists.txt                             |    2 +-
 tools/CMakeLists.txt                               |    2 +-
 tools/h5copy/CMakeLists.txt                        |    2 +-
 tools/h5diff/CMakeLists.txt                        |    2 +-
 tools/h5dump/CMakeLists.txt                        |    2 +-
 tools/h5import/CMakeLists.txt                      |    2 +-
 tools/h5jam/CMakeLists.txt                         |    2 +-
 tools/h5ls/CMakeLists.txt                          |    2 +-
 tools/h5repack/CMakeLists.txt                      |    2 +-
 tools/h5stat/CMakeLists.txt                        |    2 +-
 tools/lib/CMakeLists.txt                           |    2 +-
 tools/misc/CMakeLists.txt                          |    2 +-
 tools/perform/CMakeLists.txt                       |    2 +-
 53 files changed, 47 insertions(+), 1644 deletions(-)
 delete mode 100644 config/cmake_ext_mod/FindMPI.cmake
 delete mode 100644 config/cmake_ext_mod/FindMPI/fortranparam_mpi.f90.in
 delete mode 100644 config/cmake_ext_mod/FindMPI/libver_mpi.c
 delete mode 100644 config/cmake_ext_mod/FindMPI/libver_mpi.f90.in
 delete mode 100644 config/cmake_ext_mod/FindMPI/mpiver.f90.in
 delete mode 100644 config/cmake_ext_mod/FindMPI/test_mpi.c
 delete mode 100644 config/cmake_ext_mod/FindMPI/test_mpi.f90.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd40b2c..61ed4c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.3)
+cmake_minimum_required (VERSION 3.10) (VERSION 3.3)
 PROJECT (HDF5 C CXX)
 
 #-----------------------------------------------------------------------------
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
index adbf1a4..2c161f1 100644
--- a/c++/CMakeLists.txt
+++ b/c++/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_CPP)
 
 #-----------------------------------------------------------------------------
diff --git a/c++/examples/CMakeLists.txt b/c++/examples/CMakeLists.txt
index 300f6bc..22ecb19 100644
--- a/c++/examples/CMakeLists.txt
+++ b/c++/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_CPP_EXAMPLES)
 
 # --------------------------------------------------------------------
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 82ece33..1352c66 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_CPP_SRC)
 
 #-----------------------------------------------------------------------------
diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
index 9bf983d..665a49f 100644
--- a/c++/test/CMakeLists.txt
+++ b/c++/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_CPP_TEST)
 # --------------------------------------------------------------------
 # Notes: When creating unit test executables they should be prefixed
diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake
index a8b7bbc..0269ba8 100644
--- a/config/cmake/CTestScript.cmake
+++ b/config/cmake/CTestScript.cmake
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)
 ########################################################
 # For any comments please contact cdashhelp@hdfgroup.org
 #
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
index 1aedda3..f1f5ac2 100644
--- a/config/cmake/HDF518_Examples.cmake.in
+++ b/config/cmake/HDF518_Examples.cmake.in
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)(VERSION 3.2.2 FATAL_ERROR)
 ###############################################################################################################
 # This script will build and run the examples from a folder
 # Execute from a command line:
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index f826e31..670196b 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)
 ########################################################
 # This dashboard is maintained by The HDF Group
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index c220c66e..33ef682 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -15,7 +15,7 @@
 ### ctest -S HDF518config.cmake,BUILD_GENERATOR=VS201264 -C Release -VV -O hdf518.log     ###
 #############################################################################################
 
-cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)
 ############################################################################
 # Usage:
 #     ctest -S HDF518config.cmake,OPTION=VALUE -C Release -VV -O test.log
diff --git a/config/cmake_ext_mod/FindMPI.cmake b/config/cmake_ext_mod/FindMPI.cmake
deleted file mode 100644
index d01dd35..0000000
--- a/config/cmake_ext_mod/FindMPI.cmake
+++ /dev/null
@@ -1,1514 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See https://cmake.org/licensing for details.
-
-#.rst:
-# FindMPI
-# -------
-#
-# Find a Message Passing Interface (MPI) implementation.
-#
-# The Message Passing Interface (MPI) is a library used to write
-# high-performance distributed-memory parallel applications, and is
-# typically deployed on a cluster.  MPI is a standard interface (defined
-# by the MPI forum) for which many implementations are available.
-#
-# Variables for using MPI
-# ^^^^^^^^^^^^^^^^^^^^^^^
-#
-# The module exposes the components ``C``, ``CXX``, ``MPICXX`` and ``Fortran``.
-# Each of these controls the various MPI languages to search for.
-# The difference between ``CXX`` and ``MPICXX`` is that ``CXX`` refers to the
-# MPI C API being usable from C++, whereas ``MPICXX`` refers to the MPI-2 C++ API
-# that was removed again in MPI-3.
-#
-# Depending on the enabled components the following variables will be set:
-#
-# ``MPI_FOUND``
-#   Variable indicating that MPI settings for all requested languages have been found.
-#   If no components are specified, this is true if MPI settings for all enabled languages
-#   were detected. Note that the ``MPICXX`` component does not affect this variable.
-# ``MPI_VERSION``
-#   Minimal version of MPI detected among the requested languages, or all enabled languages
-#   if no components were specified.
-#
-# This module will set the following variables per language in your
-# project, where ``<lang>`` is one of C, CXX, or Fortran:
-#
-# ``MPI_<lang>_FOUND``
-#   Variable indicating the MPI settings for ``<lang>`` were found and that
-#   simple MPI test programs compile with the provided settings.
-# ``MPI_<lang>_COMPILER``
-#   MPI compiler for ``<lang>`` if such a program exists.
-# ``MPI_<lang>_COMPILE_OPTIONS``
-#   Compilation options for MPI programs in ``<lang>``, given as a :ref:`;-list <CMake Language Lists>`.
-# ``MPI_<lang>_COMPILE_DEFINITIONS``
-#   Compilation definitions for MPI programs in ``<lang>``, given as a :ref:`;-list <CMake Language Lists>`.
-# ``MPI_<lang>_INCLUDE_DIRS``
-#   Include path(s) for MPI header.
-# ``MPI_<lang>_LINK_FLAGS``
-#   Linker flags for MPI programs.
-# ``MPI_<lang>_LIBRARIES``
-#   All libraries to link MPI programs against.
-#
-# Additionally, the following :prop_tgt:`IMPORTED` targets are defined:
-#
-# ``MPI::MPI_<lang>``
-#   Target for using MPI from ``<lang>``.
-#
-# The following variables indicating which bindings are present will be defined:
-#
-# ``MPI_MPICXX_FOUND``
-#   Variable indicating whether the MPI-2 C++ bindings are present (introduced in MPI-2, removed with MPI-3).
-# ``MPI_Fortran_HAVE_F77_HEADER``
-#   True if the Fortran 77 header ``mpif.h`` is available.
-# ``MPI_Fortran_HAVE_F90_MODULE``
-#   True if the Fortran 90 module ``mpi`` can be used for accessing MPI (MPI-2 and higher only).
-# ``MPI_Fortran_HAVE_F08_MODULE``
-#   True if the Fortran 2008 ``mpi_f08`` is available to MPI programs (MPI-3 and higher only).
-#
-# If possible, the MPI version will be determined by this module. The facilities to detect the MPI version
-# were introduced with MPI-1.2, and therefore cannot be found for older MPI versions.
-#
-# ``MPI_<lang>_VERSION_MAJOR``
-#   Major version of MPI implemented for ``<lang>`` by the MPI distribution.
-# ``MPI_<lang>_VERSION_MINOR``
-#   Minor version of MPI implemented for ``<lang>`` by the MPI distribution.
-# ``MPI_<lang>_VERSION``
-#   MPI version implemented for ``<lang>`` by the MPI distribution.
-#
-# Note that there's no variable for the C bindings being accessible through ``mpi.h``, since the MPI standards
-# always have required this binding to work in both C and C++ code.
-#
-# For running MPI programs, the module sets the following variables
-#
-# ``MPIEXEC_EXECUTABLE``
-#   Executable for running MPI programs, if such exists.
-# ``MPIEXEC_NUMPROC_FLAG``
-#   Flag to pass to ``mpiexec`` before giving it the number of processors to run on.
-# ``MPIEXEC_MAX_NUMPROCS``
-#   Number of MPI processors to utilize. Defaults to the number
-#   of processors detected on the host system.
-# ``MPIEXEC_PREFLAGS``
-#   Flags to pass to ``mpiexec`` directly before the executable to run.
-# ``MPIEXEC_POSTFLAGS``
-#   Flags to pass to ``mpiexec`` after other flags.
-#
-# Variables for locating MPI
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^
-#
-# This module performs a three step search for an MPI implementation:
-#
-# 1. Check if the compiler has MPI support built-in. This is the case if the user passed a
-#    compiler wrapper as ``CMAKE_<LANG>_COMPILER`` or if they're on a Cray system.
-# 2. Attempt to find an MPI compiler wrapper and determine the compiler information from it.
-# 3. Try to find an MPI implementation that does not ship such a wrapper by guessing settings.
-#    Currently, only Microsoft MPI and MPICH2 on Windows are supported.
-#
-# For controlling the second step, the following variables may be set:
-#
-# ``MPI_<lang>_COMPILER``
-#   Search for the specified compiler wrapper and use it.
-# ``MPI_<lang>_COMPILER_FLAGS``
-#   Flags to pass to the MPI compiler wrapper during interrogation. Some compiler wrappers
-#   support linking debug or tracing libraries if a specific flag is passed and this variable
-#   may be used to obtain them.
-# ``MPI_COMPILER_FLAGS``
-#   Used to initialize ``MPI_<lang>_COMPILER_FLAGS`` if no language specific flag has been given.
-#   Empty by default.
-# ``MPI_EXECUTABLE_SUFFIX``
-#   A suffix which is appended to all names that are being looked for. For instance you may set this
-#   to ``.mpich`` or ``.openmpi`` to prefer the one or the other on Debian and its derivatives.
-#
-# In order to control the guessing step, the following variable may be set:
-#
-# ``MPI_GUESS_LIBRARY_NAME``
-#   Valid values are ``MSMPI`` and ``MPICH2``. If set, only the given library will be searched for.
-#   By default, ``MSMPI`` will be preferred over ``MPICH2`` if both are available.
-#   This also sets ``MPI_SKIP_COMPILER_WRAPPER`` to ``true``, which may be overridden.
-#
-# Each of the search steps may be skipped with the following control variables:
-#
-# ``MPI_ASSUME_NO_BUILTIN_MPI``
-#   If true, the module assumes that the compiler itself does not provide an MPI implementation and
-#   skips to step 2.
-# ``MPI_SKIP_COMPILER_WRAPPER``
-#   If true, no compiler wrapper will be searched for.
-# ``MPI_SKIP_GUESSING``
-#   If true, the guessing step will be skipped.
-#
-# Additionally, the following control variable is available to change search behavior:
-#
-# ``MPI_CXX_SKIP_MPICXX``
-#   Add some definitions that will disable the MPI-2 C++ bindings.
-#   Currently supported are MPICH, Open MPI, Platform MPI and derivatives thereof,
-#   for example MVAPICH or Intel MPI.
-#
-# If the find procedure fails for a variable ``MPI_<lang>_WORKS``, then the settings detected by or passed to
-# the module did not work and even a simple MPI test program failed to compile.
-#
-# If all of these parameters were not sufficient to find the right MPI implementation, a user may
-# disable the entire autodetection process by specifying both a list of libraries in ``MPI_<lang>_LIBRARIES``
-# and a list of include directories in ``MPI_<lang>_ADDITIONAL_INCLUDE_DIRS``.
-# Any other variable may be set in addition to these two. The module will then validate the MPI settings and store the
-# settings in the cache.
-#
-# Cache variables for MPI
-# ^^^^^^^^^^^^^^^^^^^^^^^
-#
-# The variable ``MPI_<lang>_INCLUDE_DIRS`` will be assembled from the following variables.
-# For C and CXX:
-#
-# ``MPI_<lang>_HEADER_DIR``
-#   Location of the ``mpi.h`` header on disk.
-#
-# For Fortran:
-#
-# ``MPI_Fortran_F77_HEADER_DIR``
-#   Location of the Fortran 77 header ``mpif.h``, if it exists.
-# ``MPI_Fortran_MODULE_DIR``
-#   Location of the ``mpi`` or ``mpi_f08`` modules, if available.
-#
-# For all languages the following variables are additionally considered:
-#
-# ``MPI_<lang>_ADDITIONAL_INCLUDE_DIRS``
-#   A :ref:`;-list <CMake Language Lists>` of paths needed in addition to the normal include directories.
-# ``MPI_<include_name>_INCLUDE_DIR``
-#   Path variables for include folders referred to by ``<include_name>``.
-# ``MPI_<lang>_ADDITIONAL_INCLUDE_VARS``
-#   A :ref:`;-list <CMake Language Lists>` of ``<include_name>`` that will be added to the include locations of ``<lang>``.
-#
-# The variable ``MPI_<lang>_LIBRARIES`` will be assembled from the following variables:
-#
-# ``MPI_<lib_name>_LIBRARY``
-#   The location of a library called ``<lib_name>`` for use with MPI.
-# ``MPI_<lang>_LIB_NAMES``
-#   A :ref:`;-list <CMake Language Lists>` of ``<lib_name>`` that will be added to the include locations of ``<lang>``.
-#
-# Usage of mpiexec
-# ^^^^^^^^^^^^^^^^
-#
-# When using ``MPIEXEC_EXECUTABLE`` to execute MPI applications, you should typically
-# use all of the ``MPIEXEC_EXECUTABLE`` flags as follows:
-#
-# ::
-#
-#    ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS}
-#      ${MPIEXEC_PREFLAGS} EXECUTABLE ${MPIEXEC_POSTFLAGS} ARGS
-#
-# where ``EXECUTABLE`` is the MPI program, and ``ARGS`` are the arguments to
-# pass to the MPI program.
-#
-# Advanced variables for using MPI
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-#
-# The module can perform some advanced feature detections upon explicit request.
-#
-# **Important notice:** The following checks cannot be performed without *executing* an MPI test program.
-# Consider the special considerations for the behavior of :command:`try_run` during cross compilation.
-# Moreover, running an MPI program can cause additional issues, like a firewall notification on some systems.
-# You should only enable these detections if you absolutely need the information.
-#
-# If the following variables are set to true, the respective search will be performed:
-#
-# ``MPI_DETERMINE_Fortran_CAPABILITIES``
-#   Determine for all available Fortran bindings what the values of ``MPI_SUBARRAYS_SUPPORTED`` and
-#   ``MPI_ASYNC_PROTECTS_NONBLOCKING`` are and make their values available as ``MPI_Fortran_<binding>_SUBARRAYS``
-#   and ``MPI_Fortran_<binding>_ASYNCPROT``, where ``<binding>`` is one of ``F77_HEADER``, ``F90_MODULE`` and
-#   ``F08_MODULE``.
-# ``MPI_DETERMINE_LIBRARY_VERSION``
-#   For each language, find the output of ``MPI_Get_library_version`` and make it available as ``MPI_<lang>_LIBRARY_VERSION``.
-#   This information is usually tied to the runtime component of an MPI implementation and might differ depending on ``<lang>``.
-#   Note that the return value is entirely implementation defined. This information might be used to identify
-#   the MPI vendor and for example pick the correct one of multiple third party binaries that matches the MPI vendor.
-#
-# Backward Compatibility
-# ^^^^^^^^^^^^^^^^^^^^^^
-#
-# For backward compatibility with older versions of FindMPI, these
-# variables are set, but deprecated:
-#
-# ::
-#
-#    MPI_COMPILER        MPI_LIBRARY        MPI_EXTRA_LIBRARY
-#    MPI_COMPILE_FLAGS   MPI_INCLUDE_PATH   MPI_LINK_FLAGS
-#    MPI_LIBRARIES
-#
-# In new projects, please use the ``MPI_<lang>_XXX`` equivalents.
-# Additionally, the following variables are deprecated:
-#
-# ``MPI_<lang>_COMPILE_FLAGS``
-#   Use ``MPI_<lang>_COMPILE_OPTIONS`` and ``MPI_<lang>_COMPILE_DEFINITIONS`` instead.
-# ``MPI_<lang>_INCLUDE_PATH``
-#   For consumption use ``MPI_<lang>_INCLUDE_DIRS`` and for specifying folders use ``MPI_<lang>_ADDITIONAL_INCLUDE_DIRS`` instead.
-# ``MPIEXEC``
-#   Use ``MPIEXEC_EXECUTABLE`` instead.
-
-cmake_policy(PUSH)
-cmake_policy(SET CMP0057 NEW) # if IN_LIST
-
-# include this to handle the QUIETLY and REQUIRED arguments
-include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-include(GetPrerequisites)
-
-# Generic compiler names
-set(_MPI_C_GENERIC_COMPILER_NAMES          mpicc    mpcc      mpicc_r mpcc_r)
-set(_MPI_CXX_GENERIC_COMPILER_NAMES        mpicxx   mpiCC     mpcxx   mpCC    mpic++   mpc++
-                                           mpicxx_r mpiCC_r   mpcxx_r mpCC_r  mpic++_r mpc++_r)
-set(_MPI_Fortran_GENERIC_COMPILER_NAMES    mpif95   mpif95_r  mpf95   mpf95_r
-                                           mpif90   mpif90_r  mpf90   mpf90_r
-                                           mpif77   mpif77_r  mpf77   mpf77_r
-                                           mpifc)
-
-# GNU compiler names
-set(_MPI_GNU_C_COMPILER_NAMES              mpigcc mpgcc mpigcc_r mpgcc_r)
-set(_MPI_GNU_CXX_COMPILER_NAMES            mpig++ mpg++ mpig++_r mpg++_r mpigxx)
-set(_MPI_GNU_Fortran_COMPILER_NAMES        mpigfortran mpgfortran mpigfortran_r mpgfortran_r
-                                           mpig77 mpig77_r mpg77 mpg77_r)
-
-# Intel MPI compiler names on Windows
-if(WIN32)
-  list(APPEND _MPI_C_GENERIC_COMPILER_NAMES       mpicc.bat)
-  list(APPEND _MPI_CXX_GENERIC_COMPILER_NAMES     mpicxx.bat)
-  list(APPEND _MPI_Fortran_GENERIC_COMPILER_NAMES mpifc.bat)
-
-  # Intel MPI compiler names
-  set(_MPI_Intel_C_COMPILER_NAMES            mpiicc.bat)
-  set(_MPI_Intel_CXX_COMPILER_NAMES          mpiicpc.bat)
-  set(_MPI_Intel_Fortran_COMPILER_NAMES      mpiifort.bat mpif77.bat mpif90.bat)
-
-  # Intel MPI compiler names for MSMPI
-  set(_MPI_MSVC_C_COMPILER_NAMES             mpicl.bat)
-  set(_MPI_MSVC_CXX_COMPILER_NAMES           mpicl.bat)
-else()
-  # Intel compiler names
-  set(_MPI_Intel_C_COMPILER_NAMES            mpiicc)
-  set(_MPI_Intel_CXX_COMPILER_NAMES          mpiicpc  mpiicxx mpiic++)
-  set(_MPI_Intel_Fortran_COMPILER_NAMES      mpiifort mpiif95 mpiif90 mpiif77)
-endif()
-
-# PGI compiler names
-set(_MPI_PGI_C_COMPILER_NAMES              mpipgcc mppgcc)
-set(_MPI_PGI_CXX_COMPILER_NAMES            mpipgCC mppgCC)
-set(_MPI_PGI_Fortran_COMPILER_NAMES        mpipgf95 mpipgf90 mppgf95 mppgf90 mpipgf77 mppgf77)
-
-# XLC MPI Compiler names
-set(_MPI_XL_C_COMPILER_NAMES               mpxlc      mpxlc_r    mpixlc     mpixlc_r)
-set(_MPI_XL_CXX_COMPILER_NAMES             mpixlcxx   mpixlC     mpixlc++   mpxlcxx   mpxlc++   mpixlc++   mpxlCC
-                                           mpixlcxx_r mpixlC_r   mpixlc++_r mpxlcxx_r mpxlc++_r mpixlc++_r mpxlCC_r)
-set(_MPI_XL_Fortran_COMPILER_NAMES         mpixlf95   mpixlf95_r mpxlf95 mpxlf95_r
-                                           mpixlf90   mpixlf90_r mpxlf90 mpxlf90_r
-                                           mpixlf77   mpixlf77_r mpxlf77 mpxlf77_r
-                                           mpixlf     mpixlf_r   mpxlf   mpxlf_r)
-
-# Prepend vendor-specific compiler wrappers to the list. If we don't know the compiler,
-# attempt all of them.
-# By attempting vendor-specific compiler names first, we should avoid situations where the compiler wrapper
-# stems from a proprietary MPI and won't know which compiler it's being used for. For instance, Intel MPI
-# controls its settings via the I_MPI_CC environment variables if the generic name is being used.
-# If we know which compiler we're working with, we can use the most specialized wrapper there is in order to
-# pick up the right settings for it.
-foreach (LANG IN ITEMS C CXX Fortran)
-  set(_MPI_${LANG}_COMPILER_NAMES "")
-  foreach (id IN ITEMS GNU Intel MSVC PGI XL)
-    if (NOT CMAKE_${LANG}_COMPILER_ID OR CMAKE_${LANG}_COMPILER_ID STREQUAL id)
-      list(APPEND _MPI_${LANG}_COMPILER_NAMES ${_MPI_${id}_${LANG}_COMPILER_NAMES}${MPI_EXECUTABLE_SUFFIX})
-    endif()
-    unset(_MPI_${id}_${LANG}_COMPILER_NAMES)
-  endforeach()
-  list(APPEND _MPI_${LANG}_COMPILER_NAMES ${_MPI_${LANG}_GENERIC_COMPILER_NAMES}${MPI_EXECUTABLE_SUFFIX})
-  unset(_MPI_${LANG}_GENERIC_COMPILER_NAMES)
-endforeach()
-
-# Names to try for mpiexec
-# Only mpiexec commands are guaranteed to behave as described in the standard,
-# mpirun commands are not covered by the standard in any way whatsoever.
-# lamexec is the executable for LAM/MPI, srun is for SLURM or Open MPI with SLURM support.
-# srun -n X <executable> is however a valid command, so it behaves 'like' mpiexec.
-set(_MPIEXEC_NAMES_BASE                   mpiexec mpiexec.hydra mpiexec.mpd mpirun lamexec srun)
-
-unset(_MPIEXEC_NAMES)
-foreach(_MPIEXEC_NAME IN LISTS _MPIEXEC_NAMES_BASE)
-  list(APPEND _MPIEXEC_NAMES "${_MPIEXEC_NAME}${MPI_EXECUTABLE_SUFFIX}")
-endforeach()
-unset(_MPIEXEC_NAMES_BASE)
-
-function (_MPI_check_compiler LANG QUERY_FLAG OUTPUT_VARIABLE RESULT_VARIABLE)
-  if(DEFINED MPI_${LANG}_COMPILER_FLAGS)
-    separate_arguments(_MPI_COMPILER_WRAPPER_OPTIONS NATIVE_COMMAND "${MPI_${LANG}_COMPILER_FLAGS}")
-  else()
-    separate_arguments(_MPI_COMPILER_WRAPPER_OPTIONS NATIVE_COMMAND "${MPI_COMPILER_FLAGS}")
-  endif()
-  execute_process(
-    COMMAND ${MPI_${LANG}_COMPILER} ${_MPI_COMPILER_WRAPPER_OPTIONS} ${QUERY_FLAG}
-    OUTPUT_VARIABLE  WRAPPER_OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE
-    ERROR_VARIABLE   WRAPPER_OUTPUT ERROR_STRIP_TRAILING_WHITESPACE
-    RESULT_VARIABLE  WRAPPER_RETURN)
-  # Some compiler wrappers will yield spurious zero return values, for example
-  # Intel MPI tolerates unknown arguments and if the MPI wrappers loads a shared
-  # library that has invalid or missing version information there would be warning
-  # messages emitted by ld.so in the compiler output. In either case, we'll treat
-  # the output as invalid.
-  if("${WRAPPER_OUTPUT}" MATCHES "undefined reference|unrecognized|need to set|no version information available|command not found")
-    set(WRAPPER_RETURN 255)
-  endif()
-  # Ensure that no error output might be passed upwards.
-  if(NOT WRAPPER_RETURN EQUAL 0)
-    unset(WRAPPER_OUTPUT)
-  endif()
-  set(${OUTPUT_VARIABLE} "${WRAPPER_OUTPUT}" PARENT_SCOPE)
-  set(${RESULT_VARIABLE} "${WRAPPER_RETURN}" PARENT_SCOPE)
-endfunction()
-
-function (_MPI_interrogate_compiler lang)
-  unset(MPI_COMPILE_CMDLINE)
-  unset(MPI_LINK_CMDLINE)
-
-  unset(MPI_COMPILE_OPTIONS_WORK)
-  unset(MPI_COMPILE_DEFINITIONS_WORK)
-  unset(MPI_INCLUDE_DIRS_WORK)
-  unset(MPI_LINK_FLAGS_WORK)
-  unset(MPI_LIB_NAMES_WORK)
-  unset(MPI_LIB_FULLPATHS_WORK)
-
-  # Check whether the -showme:compile option works. This indicates that we have either Open MPI
-  # or a newer version of LAM/MPI, and implies that -showme:link will also work.
-  # Open MPI also supports -show, but separates linker and compiler information
-  _MPI_check_compiler(${LANG} "-showme:compile" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
-  if (MPI_COMPILER_RETURN EQUAL 0)
-    _MPI_check_compiler(${LANG} "-showme:link" MPI_LINK_CMDLINE MPI_COMPILER_RETURN)
-
-    if (NOT MPI_COMPILER_RETURN EQUAL 0)
-      unset(MPI_COMPILE_CMDLINE)
-    endif()
-  endif()
-
-  # MPICH and MVAPICH offer -compile-info and -link-info.
-  # For modern versions, both do the same as -show. However, for old versions, they do differ
-  # when called for mpicxx and mpif90 and it's necessary to use them over -show in order to find the
-  # removed MPI C++ bindings.
-  if (NOT MPI_COMPILER_RETURN EQUAL 0)
-    _MPI_check_compiler(${LANG} "-compile-info" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
-
-    if (MPI_COMPILER_RETURN EQUAL 0)
-      _MPI_check_compiler(${LANG} "-link-info" MPI_LINK_CMDLINE MPI_COMPILER_RETURN)
-
-      if (NOT MPI_COMPILER_RETURN EQUAL 0)
-        unset(MPI_COMPILE_CMDLINE)
-      endif()
-    endif()
-  endif()
-
-  # MPICH, MVAPICH2 and Intel MPI just use "-show". Open MPI also offers this, but the
-  # -showme commands are more specialized.
-  if (NOT MPI_COMPILER_RETURN EQUAL 0)
-    _MPI_check_compiler(${LANG} "-show" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
-  endif()
-
-  # Older versions of LAM/MPI have "-showme". Open MPI also supports this.
-  # Unknown to MPICH, MVAPICH and Intel MPI.
-  if (NOT MPI_COMPILER_RETURN EQUAL 0)
-    _MPI_check_compiler(${LANG} "-showme" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
-  endif()
-
-  if (NOT (MPI_COMPILER_RETURN EQUAL 0) OR NOT (DEFINED MPI_COMPILE_CMDLINE))
-    # Cannot interrogate this compiler, so exit.
-    set(MPI_${LANG}_WRAPPER_FOUND FALSE PARENT_SCOPE)
-    return()
-  endif()
-  unset(MPI_COMPILER_RETURN)
-
-  # We have our command lines, but we might need to copy MPI_COMPILE_CMDLINE
-  # into MPI_LINK_CMDLINE, if we didn't find the link line.
-  if (NOT DEFINED MPI_LINK_CMDLINE)
-    set(MPI_LINK_CMDLINE "${MPI_COMPILE_CMDLINE}")
-  endif()
-
-  # At this point, we obtained some output from a compiler wrapper that works.
-  # We'll now try to parse it into variables with meaning to us.
-  if("${LANG}" STREQUAL "Fortran")
-    # Some MPICH-1 and MVAPICH-1 versions return a three command answer for Fortran, consisting
-    # out of a symlink command for mpif.h, the actual compiler command and a deletion of the
-    # created symlink. We need to detect that case, remember the include path and drop the
-    # symlink/deletion operation to obtain the link/compile lines we'd usually expect.
-    if("${MPI_COMPILE_CMDLINE}" MATCHES "^ln -s ([^\" ]+|\"[^\"]+\") mpif.h")
-      get_filename_component(MPI_INCLUDE_DIRS_WORK "${CMAKE_MATCH_1}" DIRECTORY)
-      string(REGEX REPLACE "^ln -s ([^\" ]+|\"[^\"]+\") mpif.h\n" "" MPI_COMPILE_CMDLINE "${MPI_COMPILE_CMDLINE}")
-      string(REGEX REPLACE "^ln -s ([^\" ]+|\"[^\"]+\") mpif.h\n" "" MPI_LINK_CMDLINE "${MPI_LINK_CMDLINE}")
-      string(REGEX REPLACE "\nrm -f mpif.h$" "" MPI_COMPILE_CMDLINE "${MPI_COMPILE_CMDLINE}")
-      string(REGEX REPLACE "\nrm -f mpif.h$" "" MPI_LINK_CMDLINE "${MPI_LINK_CMDLINE}")
-    endif()
-  endif()
-
-  # The Intel MPI wrapper on Linux will emit some objcopy commands after its compile command
-  # if -static_mpi was passed to the wrapper. To avoid spurious matches, we need to drop these lines.
-  if(UNIX)
-    string(REGEX REPLACE "(^|\n)objcopy[^\n]+(\n|$)" "" MPI_COMPILE_CMDLINE "${MPI_COMPILE_CMDLINE}")
-    string(REGEX REPLACE "(^|\n)objcopy[^\n]+(\n|$)" "" MPI_LINK_CMDLINE "${MPI_LINK_CMDLINE}")
-  endif()
-
-  # Extract compile options from the compile command line.
-  string(REGEX MATCHALL "(^| )-f([^\" ]+|\"[^\"]+\")" MPI_ALL_COMPILE_OPTIONS "${MPI_COMPILE_CMDLINE}")
-
-  foreach(_MPI_COMPILE_OPTION IN LISTS MPI_ALL_COMPILE_OPTIONS)
-    string(REGEX REPLACE "^ " "" _MPI_COMPILE_OPTION "${_MPI_COMPILE_OPTION}")
-    # Ignore -fstack-protector directives: These occur on MPICH and MVAPICH when the libraries
-    # themselves were built with this flag. However, this flag is unrelated to using MPI, and
-    # we won't match the accompanying --param-ssp-size and -Wp,-D_FORTIFY_SOURCE flags and therefore
-    # produce inconsistent results with the regularly flags.
-    # Similarly, aliasing flags do not belong into our flag array.
-    if(NOT "${_MPI_COMPILE_OPTION}" MATCHES "^-f(stack-protector|(no-|)strict-aliasing|PI[CE]|pi[ce])")
-      list(APPEND MPI_COMPILE_OPTIONS_WORK "${_MPI_COMPILE_OPTION}")
-    endif()
-  endforeach()
-
-  # Same deal, with the definitions. We also treat arguments passed to the preprocessor directly.
-  string(REGEX MATCHALL "(^| )(-Wp,|-Xpreprocessor |)[-/]D([^\" ]+|\"[^\"]+\")" MPI_ALL_COMPILE_DEFINITIONS "${MPI_COMPILE_CMDLINE}")
-
-  foreach(_MPI_COMPILE_DEFINITION IN LISTS MPI_ALL_COMPILE_DEFINITIONS)
-    string(REGEX REPLACE "^ ?(-Wp,|-Xpreprocessor )?[-/]D" "" _MPI_COMPILE_DEFINITION "${_MPI_COMPILE_DEFINITION}")
-    string(REPLACE "\"" "" _MPI_COMPILE_DEFINITION "${_MPI_COMPILE_DEFINITION}")
-    if(NOT "${_MPI_COMPILE_DEFINITION}" MATCHES "^_FORTIFY_SOURCE.*")
-      list(APPEND MPI_COMPILE_DEFINITIONS_WORK "${_MPI_COMPILE_DEFINITION}")
-    endif()
-  endforeach()
-
-  # Extract include paths from compile command line
-  string(REGEX MATCHALL "(^| )[-/]I([^\" ]+|\"[^\"]+\")" MPI_ALL_INCLUDE_PATHS "${MPI_COMPILE_CMDLINE}")
-
-  # If extracting failed to work, we'll try using -showme:incdirs.
-  if (NOT MPI_ALL_INCLUDE_PATHS)
-    _MPI_check_compiler(${LANG} "-showme:incdirs" MPI_INCDIRS_CMDLINE MPI_INCDIRS_COMPILER_RETURN)
-    if(MPI_INCDIRS_COMPILER_RETURN)
-      separate_arguments(MPI_ALL_INCLUDE_PATHS NATIVE_COMMAND "${MPI_INCDIRS_CMDLINE}")
-    endif()
-  endif()
-
-  foreach(_MPI_INCLUDE_PATH IN LISTS MPI_ALL_INCLUDE_PATHS)
-    string(REGEX REPLACE "^ ?[-/]I" "" _MPI_INCLUDE_PATH "${_MPI_INCLUDE_PATH}")
-    string(REPLACE "\"" "" _MPI_INCLUDE_PATH "${_MPI_INCLUDE_PATH}")
-    get_filename_component(_MPI_INCLUDE_PATH "${_MPI_INCLUDE_PATH}" REALPATH)
-    list(APPEND MPI_INCLUDE_DIRS_WORK "${_MPI_INCLUDE_PATH}")
-  endforeach()
-
-  # Extract linker paths from the link command line
-  string(REGEX MATCHALL "(^| )(-Wl,|-Xlinker |)(-L|[/-]LIBPATH:|[/-]libpath:)([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_PATHS "${MPI_LINK_CMDLINE}")
-
-  # If extracting failed to work, we'll try using -showme:libdirs.
-  if (NOT MPI_ALL_LINK_PATHS)
-    _MPI_check_compiler(${LANG} "-showme:libdirs" MPI_LIBDIRS_CMDLINE MPI_LIBDIRS_COMPILER_RETURN)
-    if(MPI_LIBDIRS_COMPILER_RETURN)
-      separate_arguments(MPI_ALL_LINK_PATHS NATIVE_COMMAND "${MPI_LIBDIRS_CMDLINE}")
-    endif()
-  endif()
-
-  foreach(_MPI_LPATH IN LISTS MPI_ALL_LINK_PATHS)
-    string(REGEX REPLACE "^ ?(-Wl,|-Xlinker )?(-L|[/-]LIBPATH:|[/-]libpath:)" "" _MPI_LPATH "${_MPI_LPATH}")
-    string(REPLACE "\"" "" _MPI_LPATH "${_MPI_LPATH}")
-    get_filename_component(_MPI_LPATH "${_MPI_LPATH}" REALPATH)
-    list(APPEND MPI_LINK_DIRECTORIES_WORK "${_MPI_LPATH}")
-  endforeach()
-
-  # Extract linker flags from the link command line
-  string(REGEX MATCHALL "(^| )(-Wl,|-Xlinker )([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_FLAGS "${MPI_LINK_CMDLINE}")
-
-  foreach(_MPI_LINK_FLAG IN LISTS MPI_ALL_LINK_FLAGS)
-    string(STRIP "${_MPI_LINK_FLAG}" _MPI_LINK_FLAG)
-    # MPI might be marked to build with non-executable stacks but this should not propagate.
-    if (NOT "${_MPI_LINK_FLAG}" MATCHES "(-Wl,|-Xlinker )-z,noexecstack")
-      if (MPI_LINK_FLAGS_WORK)
-        string(APPEND MPI_LINK_FLAGS_WORK " ${_MPI_LINK_FLAG}")
-      else()
-        set(MPI_LINK_FLAGS_WORK "${_MPI_LINK_FLAG}")
-      endif()
-    endif()
-  endforeach()
-
-  # Extract the set of libraries to link against from the link command
-  # line
-  string(REGEX MATCHALL "(^| )-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}")
-
-  foreach(_MPI_LIB_NAME IN LISTS MPI_LIBNAMES)
-    string(REGEX REPLACE "^ ?-l" "" _MPI_LIB_NAME "${_MPI_LIB_NAME}")
-    string(REPLACE "\"" "" _MPI_LIB_NAME "${_MPI_LIB_NAME}")
-    get_filename_component(_MPI_LIB_PATH "${_MPI_LIB_NAME}" DIRECTORY)
-    if(NOT "${_MPI_LIB_PATH}" STREQUAL "")
-      list(APPEND MPI_LIB_FULLPATHS_WORK "${_MPI_LIB_NAME}")
-    else()
-      list(APPEND MPI_LIB_NAMES_WORK "${_MPI_LIB_NAME}")
-    endif()
-  endforeach()
-
-  if(WIN32)
-    # A compiler wrapper on Windows will just have the name of the
-    # library to link on its link line, potentially with a full path
-    string(REGEX MATCHALL "(^| )([^\" ]+\\.lib|\"[^\"]+\\.lib\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}")
-    foreach(_MPI_LIB_NAME IN LISTS MPI_LIBNAMES)
-      string(REGEX REPLACE "^ " "" _MPI_LIB_NAME "${_MPI_LIB_NAME}")
-      string(REPLACE "\"" "" _MPI_LIB_NAME "${_MPI_LIB_NAME}")
-      get_filename_component(_MPI_LIB_PATH "${_MPI_LIB_NAME}" DIRECTORY)
-      if(NOT "${_MPI_LIB_PATH}" STREQUAL "")
-        list(APPEND MPI_LIB_FULLPATHS_WORK "${_MPI_LIB_NAME}")
-      else()
-        list(APPEND MPI_LIB_NAMES_WORK "${_MPI_LIB_NAME}")
-      endif()
-    endforeach()
-  else()
-    # On UNIX platforms, archive libraries can be given with full path.
-    string(REGEX MATCHALL "(^| )([^\" ]+\\.a|\"[^\"]+\\.a\")" MPI_LIBFULLPATHS "${MPI_LINK_CMDLINE}")
-    foreach(_MPI_LIB_NAME IN LISTS MPI_LIBFULLPATHS)
-      string(REGEX REPLACE "^ " "" _MPI_LIB_NAME "${_MPI_LIB_NAME}")
-      string(REPLACE "\"" "" _MPI_LIB_NAME "${_MPI_LIB_NAME}")
-      get_filename_component(_MPI_LIB_PATH "${_MPI_LIB_NAME}" DIRECTORY)
-      if(NOT "${_MPI_LIB_PATH}" STREQUAL "")
-        list(APPEND MPI_LIB_FULLPATHS_WORK "${_MPI_LIB_NAME}")
-      else()
-        list(APPEND MPI_LIB_NAMES_WORK "${_MPI_LIB_NAME}")
-      endif()
-    endforeach()
-  endif()
-
-  # An MPI compiler wrapper could have its MPI libraries in the implictly
-  # linked directories of the compiler itself.
-  if(DEFINED CMAKE_${LANG}_IMPLICIT_LINK_DIRECTORIES)
-    list(APPEND MPI_LINK_DIRECTORIES_WORK "${CMAKE_${LANG}_IMPLICIT_LINK_DIRECTORIES}")
-  endif()
-
-  # Determine full path names for all of the libraries that one needs
-  # to link against in an MPI program
-  unset(MPI_PLAIN_LIB_NAMES_WORK)
-  foreach(_MPI_LIB_NAME IN LISTS MPI_LIB_NAMES_WORK)
-    get_filename_component(_MPI_PLAIN_LIB_NAME "${_MPI_LIB_NAME}" NAME_WE)
-    list(APPEND MPI_PLAIN_LIB_NAMES_WORK "${_MPI_PLAIN_LIB_NAME}")
-    find_library(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY
-      NAMES "${_MPI_LIB_NAME}" "lib${_MPI_LIB_NAME}"
-      HINTS ${MPI_LINK_DIRECTORIES_WORK}
-      DOC "Location of the ${_MPI_PLAIN_LIB_NAME} library for MPI"
-    )
-    mark_as_advanced(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY)
-  endforeach()
-
-  # Deal with the libraries given with full path next
-  unset(MPI_DIRECT_LIB_NAMES_WORK)
-  foreach(_MPI_LIB_FULLPATH IN LISTS MPI_LIB_FULLPATHS_WORK)
-    get_filename_component(_MPI_PLAIN_LIB_NAME "${_MPI_LIB_FULLPATH}" NAME_WE)
-    get_filename_component(_MPI_LIB_NAME "${_MPI_LIB_FULLPATH}" NAME)
-    get_filename_component(_MPI_LIB_PATH "${_MPI_LIB_FULLPATH}" DIRECTORY)
-    list(APPEND MPI_DIRECT_LIB_NAMES_WORK "${_MPI_PLAIN_LIB_NAME}")
-    find_library(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY
-      NAMES "${_MPI_LIB_NAME}"
-      HINTS ${_MPI_LIB_PATH}
-      DOC "Location of the ${_MPI_PLAIN_LIB_NAME} library for MPI"
-    )
-    mark_as_advanced(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY)
-  endforeach()
-  if(MPI_DIRECT_LIB_NAMES_WORK)
-    set(MPI_PLAIN_LIB_NAMES_WORK "${MPI_DIRECT_LIB_NAMES_WORK};${MPI_PLAIN_LIB_NAMES_WORK}")
-  endif()
-
-  # MPI might require pthread to work. The above mechanism wouldn't detect it, but we need to
-  # link it in that case. -lpthread is covered by the normal library treatment on the other hand.
-  if("${MPI_COMPILE_CMDLINE}" MATCHES "-pthread")
-    list(APPEND MPI_COMPILE_OPTIONS_WORK "-pthread")
-    if(MPI_LINK_FLAGS_WORK)
-      string(APPEND MPI_LINK_FLAGS_WORK " -pthread")
-    else()
-      set(MPI_LINK_FLAGS_WORK "-pthread")
-    endif()
-  endif()
-
-  if(MPI_${LANG}_EXTRA_COMPILE_DEFINITIONS)
-    list(APPEND MPI_COMPILE_DEFINITIONS_WORK "${MPI_${LANG}_EXTRA_COMPILE_DEFINITIONS}")
-  endif()
-  if(MPI_${LANG}_EXTRA_COMPILE_OPTIONS)
-    list(APPEND MPI_COMPILE_OPTIONS_WORK "${MPI_${LANG}_EXTRA_COMPILE_OPTIONS}")
-  endif()
-  if(MPI_${LANG}_EXTRA_LIB_NAMES)
-    list(APPEND MPI_PLAIN_LIB_NAMES_WORK "${MPI_${LANG}_EXTRA_LIB_NAMES}")
-  endif()
-
-  # If we found MPI, set up all of the appropriate cache entries
-  if(NOT MPI_${LANG}_COMPILE_OPTIONS)
-    set(MPI_${LANG}_COMPILE_OPTIONS          ${MPI_COMPILE_OPTIONS_WORK}     CACHE STRING "MPI ${LANG} compilation options"            FORCE)
-  endif()
-  if(NOT MPI_${LANG}_COMPILE_DEFINITIONS)
-    set(MPI_${LANG}_COMPILE_DEFINITIONS      ${MPI_COMPILE_DEFINITIONS_WORK} CACHE STRING "MPI ${LANG} compilation definitions"        FORCE)
-  endif()
-  if(NOT MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS)
-    set(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS  ${MPI_INCLUDE_DIRS_WORK}        CACHE STRING "MPI ${LANG} additional include directories" FORCE)
-  endif()
-  if(NOT MPI_${LANG}_LINK_FLAGS)
-    set(MPI_${LANG}_LINK_FLAGS               ${MPI_LINK_FLAGS_WORK}          CACHE STRING "MPI ${LANG} linker flags"                   FORCE)
-  endif()
-  if(NOT MPI_${LANG}_LIB_NAMES)
-    set(MPI_${LANG}_LIB_NAMES                ${MPI_PLAIN_LIB_NAMES_WORK}     CACHE STRING "MPI ${LANG} libraries to link against"      FORCE)
-  endif()
-  set(MPI_${LANG}_WRAPPER_FOUND TRUE PARENT_SCOPE)
-endfunction()
-
-function(_MPI_guess_settings LANG)
-  set(MPI_GUESS_FOUND FALSE)
-  # Currently only MSMPI and MPICH2 on Windows are supported, so we can skip this search if we're not targeting that.
-  if(WIN32)
-    # MSMPI
-
-    # The environment variables MSMPI_INC and MSMPILIB32/64 are the only ways of locating the MSMPI_SDK,
-    # which is installed separately from the runtime. Thus it's possible to have mpiexec but not MPI headers
-    # or import libraries and vice versa.
-    if(NOT MPI_GUESS_LIBRARY_NAME OR "${MPI_GUESS_LIBRARY_NAME}" STREQUAL "MSMPI")
-      # We first attempt to locate the msmpi.lib. Should be find it, we'll assume that the MPI present is indeed
-      # Microsoft MPI.
-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
-        set(MPI_MSMPI_LIB_PATH "$ENV{MSMPI_LIB64}")
-        set(MPI_MSMPI_INC_PATH_EXTRA "$ENV{MSMPI_INC}/x64")
-      else()
-        set(MPI_MSMPI_LIB_PATH "$ENV{MSMPI_LIB32}")
-        set(MPI_MSMPI_INC_PATH_EXTRA "$ENV{MSMPI_INC}/x86")
-      endif()
-
-      find_library(MPI_msmpi_LIBRARY
-        NAMES msmpi
-        HINTS ${MPI_MSMPI_LIB_PATH}
-        DOC "Location of the msmpi library for Microsoft MPI")
-      mark_as_advanced(MPI_msmpi_LIBRARY)
-
-      if(MPI_msmpi_LIBRARY)
-        # Next, we attempt to locate the MPI header. Note that for Fortran we know that mpif.h is a way
-        # MSMPI can be used and therefore that header has to be present.
-        if(NOT MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS)
-          get_filename_component(MPI_MSMPI_INC_DIR "$ENV{MSMPI_INC}" REALPATH)
-          set(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS "${MPI_MSMPI_INC_DIR}" CACHE STRING "MPI ${LANG} additional include directories" FORCE)
-          unset(MPI_MSMPI_INC_DIR)
-        endif()
-
-        # For MSMPI, one can compile the MPI module by building the mpi.f90 shipped with the MSMPI SDK,
-        # thus it might be present or provided by the user. Figuring out which is supported is done later on.
-        # The PGI Fortran compiler for instance ships a prebuilt set of modules in its own include folder.
-        # Should a user be employing PGI or have built its own set and provided it via cache variables, the
-        # splitting routine would have located the module files.
-
-        # For C and C++, we're done here (MSMPI does not ship the MPI-2 C++ bindings) - however, for Fortran
-        # we need some extra library to glue Fortran support together:
-        # MSMPI ships 2-4 Fortran libraries, each for different Fortran compiler behaviors. The library names
-        # ending with a c are using the cdecl calling convention, whereas those ending with an s are for Fortran
-        # implementations using stdcall. Therefore, the 64-bit MSMPI only ships those ending in 'c', whereas the 32-bit
-        # has both variants available.
-        # The second difference is the last but one letter, if it's an e(nd), the length of a string argument is
-        # passed by the Fortran compiler after all other arguments on the parameter list, if it's an m(ixed),
-        # it's passed immediately after the string address.
-
-        # To summarize:
-        #   - msmpifec: CHARACTER length passed after the parameter list and using cdecl calling convention
-        #   - msmpifmc: CHARACTER length passed directly after string address and using cdecl calling convention
-        #   - msmpifes: CHARACTER length passed after the parameter list and using stdcall calling convention
-        #   - msmpifms: CHARACTER length passed directly after string address and using stdcall calling convention
-        # 32-bit MSMPI ships all four libraries, 64-bit MSMPI ships only the first two.
-
-        # As is, Intel Fortran and PGI Fortran both use the 'ec' variant of the calling convention, whereas
-        # the old Compaq Visual Fortran compiler defaulted to the 'ms' version. It's possible to make Intel Fortran
-        # use the CVF calling convention using /iface:cvf, but we assume - and this is also assumed in FortranCInterface -
-        # this isn't the case. It's also possible to make CVF use the 'ec' variant, using /iface=(cref,nomixed_str_len_arg).
-
-        # Our strategy is now to locate all libraries, but enter msmpifec into the LIB_NAMES array.
-        # Should this not be adequate it's a straightforward way for a user to change the LIB_NAMES array and
-        # have his library found. Still, this should not be necessary outside of exceptional cases, as reasoned.
-        if ("${LANG}" STREQUAL "Fortran")
-          set(MPI_MSMPI_CALLINGCONVS c)
-          if("${CMAKE_SIZEOF_VOID_P}" EQUAL 4)
-            list(APPEND MPI_MSMPI_CALLINGCONVS s)
-          endif()
-          foreach(mpistrlenpos IN ITEMS e m)
-            foreach(mpicallingconv IN LISTS MPI_MSMPI_CALLINGCONVS)
-              find_library(MPI_msmpif${mpistrlenpos}${mpicallingconv}_LIBRARY
-                NAMES msmpif${mpistrlenpos}${mpicallingconv}
-                HINTS "${MPI_MSMPI_LIB_PATH}"
-                DOC "Location of the msmpi${mpistrlenpos}${mpicallingconv} library for Microsoft MPI")
-              mark_as_advanced(MPI_msmpif${mpistrlenpos}${mpicallingconv}_LIBRARY)
-            endforeach()
-          endforeach()
-          if(NOT MPI_${LANG}_LIB_NAMES)
-            set(MPI_${LANG}_LIB_NAMES "msmpi;msmpifec" CACHE STRING "MPI ${LANG} libraries to link against" FORCE)
-          endif()
-
-          # At this point we're *not* done. MSMPI requires an additional include file for Fortran giving the value
-          # of MPI_AINT. This file is called mpifptr.h located in the x64 and x86 subfolders, respectively.
-          find_path(MPI_mpifptr_INCLUDE_DIR
-            NAMES "mpifptr.h"
-            HINTS "${MPI_MSMPI_INC_PATH_EXTRA}"
-            DOC "Location of the mpifptr.h extra header for Microsoft MPI")
-          if(NOT MPI_${LANG}_ADDITIONAL_INCLUDE_VARS)
-            set(MPI_${LANG}_ADDITIONAL_INCLUDE_VARS "mpifptr" CACHE STRING "MPI ${LANG} additional include directory variables, given in the form MPI_<name>_INCLUDE_DIR." FORCE)
-          endif()
-          mark_as_advanced(MPI_${LANG}_ADDITIONAL_INCLUDE_VARS MPI_mpifptr_INCLUDE_DIR)
-        else()
-          if(NOT MPI_${LANG}_LIB_NAMES)
-            set(MPI_${LANG}_LIB_NAMES "msmpi" CACHE STRING "MPI ${LANG} libraries to link against" FORCE)
-          endif()
-        endif()
-        mark_as_advanced(MPI_${LANG}_LIB_NAMES)
-        set(MPI_GUESS_FOUND TRUE)
-      endif()
-    endif()
-
-    # At this point there's not many MPIs that we could still consider.
-    # OpenMPI 1.6.x and below supported Windows, but these ship compiler wrappers that still work.
-    # The only other relevant MPI implementation without a wrapper is MPICH2, which had Windows support in 1.4.1p1 and older.
-    if(NOT MPI_GUESS_LIBRARY_NAME OR "${MPI_GUESS_LIBRARY_NAME}" STREQUAL "MPICH2")
-      set(MPI_MPICH_PREFIX_PATHS
-        "$ENV{ProgramW6432}/MPICH2/lib"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/../lib"
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH2;Path]/lib"
-      )
-
-      # All of C, C++ and Fortran will need mpi.lib, so we'll look for this first
-      find_library(MPI_mpi_LIBRARY
-        NAMES mpi
-        HINTS ${MPI_MPICH_PREFIX_PATHS})
-      mark_as_advanced(MPI_mpi_LIBRARY)
-      # If we found mpi.lib, we detect the rest of MPICH2
-      if(MPI_mpi_LIBRARY)
-        set(MPI_MPICH_LIB_NAMES "mpi")
-        # If MPI-2 C++ bindings are requested, we need to locate cxx.lib as well.
-        # Otherwise, MPICH_SKIP_MPICXX will be defined and these bindings aren't needed.
-        if("${LANG}" STREQUAL "CXX" AND NOT MPI_CXX_SKIP_MPICXX)
-          find_library(MPI_cxx_LIBRARY
-            NAMES cxx
-            HINTS ${MPI_MPICH_PREFIX_PATHS})
-          mark_as_advanced(MPI_cxx_LIBRARY)
-          list(APPEND MPI_MPICH_LIB_NAMES "cxx")
-        # For Fortran, MPICH2 provides three different libraries:
-        #   fmpich2.lib which uses uppercase symbols and cdecl,
-        #   fmpich2s.lib which uses uppercase symbols and stdcall (32-bit only),
-        #   fmpich2g.lib which uses lowercase symbols with double underscores and cdecl.
-        # fmpich2s.lib would be useful for Compaq Visual Fortran, fmpich2g.lib has to be used with GNU g77 and is also
-        # provided in the form of an .a archive for MinGW and Cygwin. From our perspective, fmpich2.lib is the only one
-        # we need to try, and if it doesn't work with the given Fortran compiler we'd find out later on during validation
-        elseif("${LANG}" STREQUAL "Fortran")
-          find_library(MPI_fmpich2_LIBRARY
-            NAMES fmpich2
-            HINTS ${MPI_MPICH_PREFIX_PATHS})
-          find_library(MPI_fmpich2s_LIBRARY
-            NAMES fmpich2s
-            HINTS ${MPI_MPICH_PREFIX_PATHS})
-          find_library(MPI_fmpich2g_LIBRARY
-            NAMES fmpich2g
-            HINTS ${MPI_MPICH_PREFIX_PATHS})
-          mark_as_advanced(MPI_fmpich2_LIBRARY MPI_fmpich2s_LIBRARY MPI_fmpich2g_LIBRARY)
-          list(APPEND MPI_MPICH_LIB_NAMES "fmpich2")
-        endif()
-
-        if(NOT MPI_${LANG}_LIB_NAMES)
-          set(MPI_${LANG}_LIB_NAMES "${MPI_MPICH_LIB_NAMES}" CACHE STRING "MPI ${LANG} libraries to link against" FORCE)
-        endif()
-        unset(MPI_MPICH_LIB_NAMES)
-
-        if(NOT MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS)
-          # For MPICH2, the include folder would be in ../include relative to the library folder.
-          get_filename_component(MPI_MPICH_ROOT_DIR "${MPI_mpi_LIBRARY}" DIRECTORY)
-          get_filename_component(MPI_MPICH_ROOT_DIR "${MPI_MPICH_ROOT_DIR}" DIRECTORY)
-          if(IS_DIRECTORY "${MPI_MPICH_ROOT_DIR}/include")
-            set(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS "${MPI_MPICH_ROOT_DIR}/include" CACHE STRING "MPI ${LANG} additional include directory variables, given in the form MPI_<name>_INCLUDE_DIR." FORCE)
-          endif()
-          unset(MPI_MPICH_ROOT_DIR)
-        endif()
-        set(MPI_GUESS_FOUND TRUE)
-      endif()
-      unset(MPI_MPICH_PREFIX_PATHS)
-    endif()
-  endif()
-  set(MPI_${LANG}_GUESS_FOUND "${MPI_GUESS_FOUND}" PARENT_SCOPE)
-endfunction()
-
-function(_MPI_adjust_compile_definitions LANG)
-  if("${LANG}" STREQUAL "CXX")
-    # To disable the C++ bindings, we need to pass some definitions since the mpi.h header has to deal with both C and C++
-    # bindings in MPI-2.
-    if(MPI_CXX_SKIP_MPICXX AND NOT MPI_${LANG}_COMPILE_DEFINITIONS MATCHES "SKIP_MPICXX")
-      # MPICH_SKIP_MPICXX is being used in MPICH and derivatives like MVAPICH or Intel MPI
-      # OMPI_SKIP_MPICXX is being used in Open MPI
-      # _MPICC_H is being used for IBM Platform MPI
-      list(APPEND MPI_${LANG}_COMPILE_DEFINITIONS "MPICH_SKIP_MPICXX" "OMPI_SKIP_MPICXX" "_MPICC_H")
-      set(MPI_${LANG}_COMPILE_DEFINITIONS "${MPI_${LANG}_COMPILE_DEFINITIONS}" CACHE STRING "MPI ${LANG} compilation definitions" FORCE)
-    endif()
-  endif()
-endfunction()
-
-macro(_MPI_assemble_libraries LANG)
-  set(MPI_${LANG}_LIBRARIES "")
-  # Only for libraries do we need to check whether the compiler's linking stage is separate.
-  if(NOT "${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}" OR NOT MPI_${LANG}_WORKS_IMPLICIT)
-    foreach(mpilib IN LISTS MPI_${LANG}_LIB_NAMES)
-      list(APPEND MPI_${LANG}_LIBRARIES ${MPI_${mpilib}_LIBRARY})
-    endforeach()
-  endif()
-endmacro()
-
-macro(_MPI_assemble_include_dirs LANG)
-  if("${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
-    set(MPI_${LANG}_INCLUDE_DIRS "")
-  else()
-    set(MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS}")
-    if("${LANG}" MATCHES "(C|CXX)")
-      if(MPI_${LANG}_HEADER_DIR)
-        list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_HEADER_DIR}")
-      endif()
-    else() # Fortran
-      if(MPI_${LANG}_F77_HEADER_DIR)
-        list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_F77_HEADER_DIR}")
-      endif()
-      if(MPI_${LANG}_MODULE_DIR AND NOT "${MPI_${LANG}_MODULE_DIR}" IN_LIST MPI_${LANG}_INCLUDE_DIRS)
-        list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_MODULE_DIR}")
-      endif()
-    endif()
-    if(MPI_${LANG}_ADDITIONAL_INCLUDE_VARS)
-      foreach(MPI_ADDITIONAL_INC_DIR IN LISTS MPI_${LANG}_ADDITIONAL_INCLUDE_VARS)
-        list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${MPI_ADDITIONAL_INC_DIR}_INCLUDE_DIR}")
-      endforeach()
-    endif()
-  endif()
-endmacro()
-
-function(_MPI_split_include_dirs LANG)
-  if("${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
-    return()
-  endif()
-  # Backwards compatibility: Search INCLUDE_PATH if given.
-  if(MPI_${LANG}_INCLUDE_PATH)
-    list(APPEND MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS "${MPI_${LANG}_INCLUDE_PATH}")
-  endif()
-
-  # We try to find the headers/modules among those paths (and system paths)
-  # For C/C++, we just need to have a look for mpi.h.
-  if("${LANG}" MATCHES "(C|CXX)")
-    find_path(MPI_${LANG}_HEADER_DIR "mpi.h"
-      HINTS ${MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS}
-    )
-    mark_as_advanced(MPI_${LANG}_HEADER_DIR)
-    if(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS)
-      list(REMOVE_ITEM MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS "${MPI_${LANG}_HEADER_DIR}")
-    endif()
-  # Fortran is more complicated here: An implementation could provide
-  # any of the Fortran 77/90/2008 APIs for MPI. For example, MSMPI
-  # only provides Fortran 77 and - if mpi.f90 is built - potentially
-  # a Fortran 90 module.
-  elseif("${LANG}" STREQUAL "Fortran")
-    find_path(MPI_${LANG}_F77_HEADER_DIR "mpif.h"
-      HINTS ${MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS}
-    )
-    find_path(MPI_${LANG}_MODULE_DIR
-      NAMES "mpi.mod" "mpi_f08.mod"
-      HINTS ${MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS}
-    )
-    if(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS)
-      list(REMOVE_ITEM MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS
-        "${MPI_${LANG}_F77_HEADER_DIR}"
-        "${MPI_${LANG}_MODULE_DIR}"
-      )
-    endif()
-    mark_as_advanced(MPI_${LANG}_F77_HEADER_DIR MPI_${LANG}_MODULE_DIR)
-  endif()
-  # Remove duplicates and default system directories from the list.
-  if(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS)
-    list(REMOVE_DUPLICATES MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS)
-    foreach(MPI_IMPLICIT_INC_DIR IN LISTS CMAKE_${LANG}_IMPLICIT_LINK_DIRECTORIES)
-      list(REMOVE_ITEM MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS ${MPI_IMPLICIT_INC_DIR})
-    endforeach()
-  endif()
-  set(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS ${MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS} CACHE STRING "MPI ${LANG} additional include directories" FORCE)
-endfunction()
-
-macro(_MPI_create_imported_target LANG)
-  if(NOT TARGET MPI::MPI_${LANG})
-    add_library(MPI::MPI_${LANG} INTERFACE IMPORTED)
-  endif()
-
-  set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_COMPILE_OPTIONS "${MPI_${LANG}_COMPILE_OPTIONS}")
-  set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_COMPILE_DEFINITIONS "${MPI_${LANG}_COMPILE_DEFINITIONS}")
-
-  set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_LINK_LIBRARIES "")
-  if(MPI_${LANG}_LINK_FLAGS)
-    set_property(TARGET MPI::MPI_${LANG} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${MPI_${LANG}_LINK_FLAGS}")
-  endif()
-  # If the compiler links MPI implicitly, no libraries will be found as they're contained within
-  # CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES already.
-  if(MPI_${LANG}_LIBRARIES)
-    set_property(TARGET MPI::MPI_${LANG} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${MPI_${LANG}_LIBRARIES}")
-  endif()
-  # Given the new design of FindMPI, INCLUDE_DIRS will always be located, even under implicit linking.
-  set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${MPI_${LANG}_INCLUDE_DIRS}")
-endmacro()
-
-function(_MPI_try_staged_settings LANG MPI_TEST_FILE_NAME MODE RUN_BINARY)
-  set(WORK_DIR "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindMPI")
-  set(SRC_DIR "${CMAKE_CURRENT_LIST_DIR}/FindMPI")
-  set(BIN_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindMPI/${MPI_TEST_FILE_NAME}_${LANG}.bin")
-  unset(MPI_TEST_COMPILE_DEFINITIONS)
-  if("${LANG}" STREQUAL "Fortran")
-    if("${MODE}" STREQUAL "F90_MODULE")
-      set(MPI_Fortran_INCLUDE_LINE "use mpi\n      implicit none")
-    elseif("${MODE}" STREQUAL "F08_MODULE")
-      set(MPI_Fortran_INCLUDE_LINE "use mpi_f08\n      implicit none")
-    else() # F77 header
-      set(MPI_Fortran_INCLUDE_LINE "implicit none\n      include 'mpif.h'")
-    endif()
-    configure_file("${SRC_DIR}/${MPI_TEST_FILE_NAME}.f90.in" "${WORK_DIR}/${MPI_TEST_FILE_NAME}.f90" @ONLY)
-    set(MPI_TEST_SOURCE_FILE "${WORK_DIR}/${MPI_TEST_FILE_NAME}.f90")
-  elseif("${LANG}" STREQUAL "CXX")
-    configure_file("${SRC_DIR}/${MPI_TEST_FILE_NAME}.c" "${WORK_DIR}/${MPI_TEST_FILE_NAME}.cpp" COPYONLY)
-    set(MPI_TEST_SOURCE_FILE "${WORK_DIR}/${MPI_TEST_FILE_NAME}.cpp")
-    if("${MODE}" STREQUAL "TEST_MPICXX")
-      set(MPI_TEST_COMPILE_DEFINITIONS TEST_MPI_MPICXX)
-    endif()
-  else() # C
-    set(MPI_TEST_SOURCE_FILE "${SRC_DIR}/${MPI_TEST_FILE_NAME}.c")
-  endif()
-  if(RUN_BINARY)
-    try_run(MPI_RUN_RESULT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE} MPI_RESULT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE}
-     "${CMAKE_BINARY_DIR}" SOURCES "${MPI_TEST_SOURCE_FILE}"
-      COMPILE_DEFINITIONS ${MPI_TEST_COMPILE_DEFINITIONS}
-      LINK_LIBRARIES MPI::MPI_${LANG}
-      RUN_OUTPUT_VARIABLE MPI_RUN_OUTPUT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE})
-    set(MPI_RUN_OUTPUT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE} "${MPI_RUN_OUTPUT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE}}" PARENT_SCOPE)
-  else()
-    try_compile(MPI_RESULT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE}
-      "${CMAKE_BINARY_DIR}" SOURCES "${MPI_TEST_SOURCE_FILE}"
-      COMPILE_DEFINITIONS ${MPI_TEST_COMPILE_DEFINITIONS}
-      LINK_LIBRARIES MPI::MPI_${LANG}
-      COPY_FILE "${BIN_FILE}")
-  endif()
-endfunction()
-
-macro(_MPI_check_lang_works LANG)
-  # For Fortran we may have by the MPI-3 standard an implementation that provides:
-  #   - the mpi_f08 module
-  #   - *both*, the mpi module and 'mpif.h'
-  # Since older MPI standards (MPI-1) did not define anything but 'mpif.h', we need to check all three individually.
-  if( NOT MPI_${LANG}_WORKS )
-    if("${LANG}" STREQUAL "Fortran")
-      set(MPI_Fortran_INTEGER_LINE "(kind=MPI_INTEGER_KIND)")
-      _MPI_try_staged_settings(${LANG} test_mpi F77_HEADER FALSE)
-      _MPI_try_staged_settings(${LANG} test_mpi F90_MODULE FALSE)
-      _MPI_try_staged_settings(${LANG} test_mpi F08_MODULE FALSE)
-
-      set(MPI_${LANG}_WORKS FALSE)
-
-      foreach(mpimethod IN ITEMS F77_HEADER F08_MODULE F90_MODULE)
-        if(MPI_RESULT_${LANG}_test_mpi_${mpimethod})
-          set(MPI_${LANG}_WORKS TRUE)
-          set(MPI_${LANG}_HAVE_${mpimethod} TRUE)
-        else()
-          set(MPI_${LANG}_HAVE_${mpimethod} FALSE)
-        endif()
-      endforeach()
-      # MPI-1 versions had no MPI_INTGER_KIND defined, so we need to try without it.
-      # However, MPI-1 also did not define the Fortran 90 and 08 modules, so we only try the F77 header.
-      unset(MPI_Fortran_INTEGER_LINE)
-      if(NOT MPI_${LANG}_WORKS)
-        _MPI_try_staged_settings(${LANG} test_mpi F77_HEADER_NOKIND FALSE)
-        if(MPI_RESULT_${LANG}_test_mpi_F77_HEADER_NOKIND)
-          set(MPI_${LANG}_WORKS TRUE)
-          set(MPI_${LANG}_HAVE_F77_HEADER TRUE)
-        endif()
-      endif()
-    else()
-      _MPI_try_staged_settings(${LANG} test_mpi normal FALSE)
-      # If 'test_mpi' built correctly, we've found valid MPI settings. There might not be MPI-2 C++ support, but there can't
-      # be MPI-2 C++ support without the C bindings being present, so checking for them is sufficient.
-      set(MPI_${LANG}_WORKS "${MPI_RESULT_${LANG}_test_mpi_normal}")
-    endif()
-  endif()
-endmacro()
-
-# Some systems install various MPI implementations in separate folders in some MPI prefix
-# This macro enumerates all such subfolders and adds them to the list of hints that will be searched.
-macro(MPI_search_mpi_prefix_folder PREFIX_FOLDER)
-  if(EXISTS "${PREFIX_FOLDER}")
-    file(GLOB _MPI_folder_children RELATIVE "${PREFIX_FOLDER}" "${PREFIX_FOLDER}/*")
-    foreach(_MPI_folder_child IN LISTS _MPI_folder_children)
-      if(IS_DIRECTORY "${PREFIX_FOLDER}/${_MPI_folder_child}")
-        list(APPEND MPI_HINT_DIRS "${PREFIX_FOLDER}/${_MPI_folder_child}")
-      endif()
-    endforeach()
-  endif()
-endmacro()
-
-set(MPI_HINT_DIRS ${MPI_HOME} $ENV{MPI_HOME} $ENV{I_MPI_ROOT})
-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
-  # SUSE Linux Enterprise Server stores its MPI implementations under /usr/lib64/mpi/gcc/<name>
-  # We enumerate the subfolders and append each as a prefix
-  MPI_search_mpi_prefix_folder("/usr/lib64/mpi/gcc")
-elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
-  # MSMPI stores its runtime in a special folder, this adds the possible locations to the hints.
-  list(APPEND MPI_HINT_DIRS $ENV{MSMPI_BIN} "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MPI;InstallRoot]")
-elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "FreeBSD")
-  # FreeBSD ships mpich under the normal system paths - but available openmpi implementations
-  # will be found in /usr/local/mpi/<name>
-  MPI_search_mpi_prefix_folder("/usr/local/mpi")
-endif()
-
-# Most MPI distributions have some form of mpiexec or mpirun which gives us something we can look for.
-# The MPI standard does not mandate the existence of either, but instead only makes requirements if a distribution
-# ships an mpiexec program (mpirun executables are not regulated by the standard).
-find_program(MPIEXEC_EXECUTABLE
-  NAMES ${_MPIEXEC_NAMES}
-  PATH_SUFFIXES bin sbin
-  HINTS ${MPI_HINT_DIRS}
-  DOC "Executable for running MPI programs.")
-
-# call get_filename_component twice to remove mpiexec and the directory it exists in (typically bin).
-# This gives us a fairly reliable base directory to search for /bin /lib and /include from.
-get_filename_component(_MPI_BASE_DIR "${MPIEXEC_EXECUTABLE}" PATH)
-get_filename_component(_MPI_BASE_DIR "${_MPI_BASE_DIR}" PATH)
-
-# According to the MPI standard, section 8.8 -n is a guaranteed, and the only guaranteed way to
-# launch an MPI process using mpiexec if such a program exists.
-set(MPIEXEC_NUMPROC_FLAG "-n"  CACHE STRING "Flag used by MPI to specify the number of processes for mpiexec; the next option will be the number of processes.")
-set(MPIEXEC_PREFLAGS     ""    CACHE STRING "These flags will be directly before the executable that is being run by mpiexec.")
-set(MPIEXEC_POSTFLAGS    ""    CACHE STRING "These flags will be placed after all flags passed to mpiexec.")
-
-# Set the number of processes to the physical processor count
-cmake_host_system_information(RESULT _MPIEXEC_NUMPROCS QUERY NUMBER_OF_PHYSICAL_CORES)
-set(MPIEXEC_MAX_NUMPROCS "${_MPIEXEC_NUMPROCS}" CACHE STRING "Maximum number of processors available to run MPI applications.")
-unset(_MPIEXEC_NUMPROCS)
-mark_as_advanced(MPIEXEC_EXECUTABLE MPIEXEC_NUMPROC_FLAG MPIEXEC_PREFLAGS MPIEXEC_POSTFLAGS MPIEXEC_MAX_NUMPROCS)
-
-#=============================================================================
-# Backward compatibility input hacks.  Propagate the FindMPI hints to C and
-# CXX if the respective new versions are not defined.  Translate the old
-# MPI_LIBRARY and MPI_EXTRA_LIBRARY to respective MPI_${LANG}_LIBRARIES.
-#
-# Once we find the new variables, we translate them back into their old
-# equivalents below.
-if(NOT MPI_IGNORE_LEGACY_VARIABLES)
-  foreach (LANG IN ITEMS C CXX)
-    # Old input variables.
-    set(_MPI_OLD_INPUT_VARS COMPILER COMPILE_FLAGS INCLUDE_PATH LINK_FLAGS)
-
-    # Set new vars based on their old equivalents, if the new versions are not already set.
-    foreach (var ${_MPI_OLD_INPUT_VARS})
-      if (NOT MPI_${LANG}_${var} AND MPI_${var})
-        set(MPI_${LANG}_${var} "${MPI_${var}}")
-      endif()
-    endforeach()
-
-    # Chop the old compile flags into options and definitions
-
-    unset(MPI_${LANG}_EXTRA_COMPILE_DEFINITIONS)
-    unset(MPI_${LANG}_EXTRA_COMPILE_OPTIONS)
-    if(MPI_${LANG}_COMPILE_FLAGS)
-      separate_arguments(MPI_SEPARATE_FLAGS NATIVE_COMMAND "${MPI_${LANG}_COMPILE_FLAGS}")
-      foreach(_MPI_FLAG IN LISTS MPI_SEPARATE_FLAGS)
-        if("${_MPI_FLAG}" MATCHES "^ *[-/D]([^ ]+)")
-          list(APPEND MPI_${LANG}_EXTRA_COMPILE_DEFINITIONS "${CMAKE_MATCH_1}")
-        else()
-          list(APPEND MPI_${LANG}_EXTRA_COMPILE_OPTIONS "${_MPI_FLAG}")
-        endif()
-      endforeach()
-      unset(MPI_SEPARATE_FLAGS)
-    endif()
-
-    # If a list of libraries was given, we'll split it into new-style cache variables
-    unset(MPI_${LANG}_EXTRA_LIB_NAMES)
-    if(NOT MPI_${LANG}_LIB_NAMES)
-      foreach(_MPI_LIB IN LISTS MPI_${LANG}_LIBRARIES MPI_LIBRARY MPI_EXTRA_LIBRARY)
-        if(_MPI_LIB)
-          get_filename_component(_MPI_PLAIN_LIB_NAME "${_MPI_LIB}" NAME_WE)
-          get_filename_component(_MPI_LIB_NAME "${_MPI_LIB}" NAME)
-          get_filename_component(_MPI_LIB_DIR "${_MPI_LIB}" DIRECTORY)
-          list(APPEND MPI_${LANG}_EXTRA_LIB_NAMES "${_MPI_PLAIN_LIB_NAME}")
-          find_library(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY
-            NAMES "${_MPI_LIB_NAME}" "lib${_MPI_LIB_NAME}"
-            HINTS ${_MPI_LIB_DIR} $ENV{MPI_LIB}
-            DOC "Location of the ${_MPI_PLAIN_LIB_NAME} library for MPI"
-          )
-          mark_as_advanced(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY)
-        endif()
-      endforeach()
-    endif()
-  endforeach()
-endif()
-#=============================================================================
-
-unset(MPI_VERSION)
-unset(MPI_VERSION_MAJOR)
-unset(MPI_VERSION_MINOR)
-
-unset(_MPI_MIN_VERSION)
-
-# If the user specified a library name we assume they prefer that library over a wrapper. If not, they can disable skipping manually.
-if(NOT DEFINED MPI_SKIP_COMPILER_WRAPPER AND MPI_GUESS_LIBRARY_NAME)
-  set(MPI_SKIP_COMPILER_WRAPPER TRUE)
-endif()
-
-# This loop finds the compilers and sends them off for interrogation.
-foreach(LANG IN ITEMS C CXX Fortran)
-  if(CMAKE_${LANG}_COMPILER_LOADED)
-    if(NOT MPI_FIND_COMPONENTS)
-      set(_MPI_FIND_${LANG} TRUE)
-    elseif( ${LANG} IN_LIST MPI_FIND_COMPONENTS)
-      set(_MPI_FIND_${LANG} TRUE)
-    elseif( ${LANG} STREQUAL CXX AND NOT MPI_CXX_SKIP_MPICXX AND MPICXX IN_LIST MPI_FIND_COMPONENTS )
-      set(_MPI_FIND_${LANG} TRUE)
-    else()
-      set(_MPI_FIND_${LANG} FALSE)
-    endif()
-  else()
-    set(_MPI_FIND_${LANG} FALSE)
-  endif()
-  if(_MPI_FIND_${LANG})
-    if( ${LANG} STREQUAL CXX AND NOT MPICXX IN_LIST MPI_FIND_COMPONENTS )
-      set(MPI_CXX_SKIP_MPICXX FALSE CACHE BOOL "If true, the MPI-2 C++ bindings are disabled using definitions.")
-      mark_as_advanced(MPI_CXX_SKIP_MPICXX)
-    endif()
-    if(NOT (MPI_${LANG}_LIB_NAMES AND (MPI_${LANG}_INCLUDE_PATH OR MPI_${LANG}_INCLUDE_DIRS OR MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS)))
-      set(MPI_${LANG}_TRIED_IMPLICIT FALSE)
-      set(MPI_${LANG}_WORKS_IMPLICIT FALSE)
-      if(NOT MPI_${LANG}_COMPILER AND NOT MPI_ASSUME_NO_BUILTIN_MPI)
-        # Should the imported targets be empty, we effectively try whether the compiler supports MPI on its own, which is the case on e.g.
-        # Cray PrgEnv.
-        _MPI_create_imported_target(${LANG})
-        _MPI_check_lang_works(${LANG})
-
-        # If the compiler can build MPI code on its own, it functions as an MPI compiler and we'll set the variable to point to it.
-        if(MPI_${LANG}_WORKS)
-          set(MPI_${LANG}_COMPILER "${CMAKE_${LANG}_COMPILER}" CACHE FILEPATH "MPI compiler for ${LANG}" FORCE)
-          set(MPI_${LANG}_WORKS_IMPLICIT TRUE)
-        endif()
-        set(MPI_${LANG}_TRIED_IMPLICIT TRUE)
-      endif()
-
-      if(NOT "${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}" OR NOT MPI_${LANG}_WORKS)
-        set(MPI_${LANG}_WRAPPER_FOUND FALSE)
-        set(MPI_PINNED_COMPILER FALSE)
-
-        if(NOT MPI_SKIP_COMPILER_WRAPPER)
-          if(MPI_${LANG}_COMPILER)
-            # If the user supplies a compiler *name* instead of an absolute path, assume that we need to find THAT compiler.
-            if (NOT IS_ABSOLUTE "${MPI_${LANG}_COMPILER}")
-              # Get rid of our default list of names and just search for the name the user wants.
-              set(_MPI_${LANG}_COMPILER_NAMES "${MPI_${LANG}_COMPILER}")
-              unset(MPI_${LANG}_COMPILER CACHE)
-            endif()
-            # If the user specifies a compiler, we don't want to try to search libraries either.
-            set(MPI_PINNED_COMPILER TRUE)
-          endif()
-
-          # If we have an MPI base directory, we'll try all compiler names in that one first.
-          # This should prevent mixing different MPI environments
-          if(_MPI_BASE_DIR)
-            find_program(MPI_${LANG}_COMPILER
-              NAMES  ${_MPI_${LANG}_COMPILER_NAMES}
-              PATH_SUFFIXES bin sbin
-              HINTS  ${_MPI_BASE_DIR}
-              NO_DEFAULT_PATH
-              DOC    "MPI compiler for ${LANG}"
-            )
-          endif()
-
-          # If the base directory did not help (for example because the mpiexec isn't in the same directory as the compilers),
-          # we shall try searching in the default paths.
-          find_program(MPI_${LANG}_COMPILER
-            NAMES  ${_MPI_${LANG}_COMPILER_NAMES}
-            PATH_SUFFIXES bin sbin
-            DOC    "MPI compiler for ${LANG}"
-          )
-
-          if("${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
-            set(MPI_PINNED_COMPILER TRUE)
-
-            # If we haven't made the implicit compiler test yet, perform it now.
-            if(NOT MPI_${LANG}_TRIED_IMPLICIT)
-              _MPI_create_imported_target(${LANG})
-              _MPI_check_lang_works(${LANG})
-            endif()
-
-            # Should the MPI compiler not work implicitly for MPI, still interrogate it.
-            # Otherwise, MPI compilers for which CMake has separate linking stages, e.g. Intel MPI on Windows where link.exe is being used
-            # directly during linkage instead of CMAKE_<LANG>_COMPILER will not work.
-            if(NOT MPI_${LANG}_WORKS)
-              set(MPI_${LANG}_WORKS_IMPLICIT FALSE)
-              _MPI_interrogate_compiler(${LANG})
-            else()
-              set(MPI_${LANG}_WORKS_IMPLICIT TRUE)
-            endif()
-          elseif(MPI_${LANG}_COMPILER)
-            _MPI_interrogate_compiler(${LANG})
-          endif()
-        endif()
-
-        if(NOT MPI_SKIP_GUESSING AND NOT MPI_${LANG}_WRAPPER_FOUND AND NOT MPI_PINNED_COMPILER)
-          # For C++, we may use the settings for C. Should a given compiler wrapper for C++ not exist, but one for C does, we copy over the
-          # settings for C. An MPI distribution that is in this situation would be IBM Platform MPI.
-          if("${LANG}" STREQUAL "CXX" AND MPI_C_WRAPPER_FOUND)
-            set(MPI_${LANG}_COMPILE_OPTIONS          ${MPI_C_COMPILE_OPTIONS}     CACHE STRING "MPI ${LANG} compilation options"           )
-            set(MPI_${LANG}_COMPILE_DEFINITIONS      ${MPI_C_COMPILE_DEFINITIONS} CACHE STRING "MPI ${LANG} compilation definitions"       )
-            set(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS  ${MPI_C_INCLUDE_DIRS}        CACHE STRING "MPI ${LANG} additional include directories")
-            set(MPI_${LANG}_LINK_FLAGS               ${MPI_C_LINK_FLAGS}          CACHE STRING "MPI ${LANG} linker flags"                  )
-            set(MPI_${LANG}_LIB_NAMES                ${MPI_C_LIB_NAMES}           CACHE STRING "MPI ${LANG} libraries to link against"     )
-          else()
-            _MPI_guess_settings(${LANG})
-          endif()
-        endif()
-      endif()
-    endif()
-
-    _MPI_split_include_dirs(${LANG})
-    _MPI_assemble_include_dirs(${LANG})
-    _MPI_assemble_libraries(${LANG})
-
-    _MPI_adjust_compile_definitions(${LANG})
-    # We always create imported targets even if they're empty
-    _MPI_create_imported_target(${LANG})
-
-    if(NOT MPI_${LANG}_WORKS)
-      _MPI_check_lang_works(${LANG})
-    endif()
-
-    # Next, we'll initialize the MPI variables that have not been previously set.
-    set(MPI_${LANG}_COMPILE_OPTIONS          "" CACHE STRING "MPI ${LANG} compilation flags"             )
-    set(MPI_${LANG}_COMPILE_DEFINITIONS      "" CACHE STRING "MPI ${LANG} compilation definitions"       )
-    set(MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS  "" CACHE STRING "MPI ${LANG} additional include directories")
-    set(MPI_${LANG}_LINK_FLAGS               "" CACHE STRING "MPI ${LANG} linker flags"                  )
-    if(NOT MPI_${LANG}_COMPILER STREQUAL CMAKE_${LANG}_COMPILER)
-      set(MPI_${LANG}_LIB_NAMES                "" CACHE STRING "MPI ${LANG} libraries to link against"   )
-    endif()
-    mark_as_advanced(MPI_${LANG}_COMPILE_OPTIONS MPI_${LANG}_COMPILE_DEFINITIONS MPI_${LANG}_LINK_FLAGS
-      MPI_${LANG}_LIB_NAMES MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS MPI_${LANG}_COMPILER)
-
-    # If we've found MPI, then we'll perform additional analysis: Determine the MPI version, MPI library version, supported
-    # MPI APIs (i.e. MPI-2 C++ bindings). For Fortran we also need to find specific parameters if we're under MPI-3.
-    if(MPI_${LANG}_WORKS)
-      if("${LANG}" STREQUAL "CXX" AND NOT DEFINED MPI_MPICXX_FOUND)
-        if(NOT MPI_CXX_SKIP_MPICXX AND NOT MPI_CXX_VALIDATE_SKIP_MPICXX)
-          _MPI_try_staged_settings(${LANG} test_mpi MPICXX FALSE)
-          if(MPI_RESULT_${LANG}_test_mpi_MPICXX)
-            set(MPI_MPICXX_FOUND TRUE)
-          else()
-            set(MPI_MPICXX_FOUND FALSE)
-          endif()
-        else()
-          set(MPI_MPICXX_FOUND FALSE)
-        endif()
-      endif()
-
-      # At this point, we know the bindings present but not the MPI version or anything else.
-      if(NOT DEFINED MPI_${LANG}_VERSION)
-        unset(MPI_${LANG}_VERSION_MAJOR)
-        unset(MPI_${LANG}_VERSION_MINOR)
-      endif()
-      set(MPI_BIN_FOLDER ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindMPI)
-
-      # For Fortran, we'll want to use the most modern MPI binding to test capabilities other than the
-      # Fortran parameters, since those depend on the method of consumption.
-      # For C++, we can always use the C bindings, and should do so, since the C++ bindings do not exist in MPI-3
-      # whereas the C bindings do, and the C++ bindings never offered any feature advantage over their C counterparts.
-      if("${LANG}" STREQUAL "Fortran")
-        if(MPI_${LANG}_HAVE_F08_MODULE)
-          set(MPI_${LANG}_HIGHEST_METHOD F08_MODULE)
-        elseif(MPI_${LANG}_HAVE_F90_MODULE)
-          set(MPI_${LANG}_HIGHEST_METHOD F90_MODULE)
-        else()
-          set(MPI_${LANG}_HIGHEST_METHOD F77_HEADER)
-        endif()
-
-        # Another difference between C and Fortran is that we can't use the preprocessor to determine whether MPI_VERSION
-        # and MPI_SUBVERSION are provided. These defines did not exist in MPI 1.0 and 1.1 and therefore might not
-        # exist. For C/C++, test_mpi.c will handle the MPI_VERSION extraction, but for Fortran, we need mpiver.f90.
-        if(NOT DEFINED MPI_${LANG}_VERSION)
-          _MPI_try_staged_settings(${LANG} mpiver ${MPI_${LANG}_HIGHEST_METHOD} FALSE)
-          if(MPI_RESULT_${LANG}_mpiver_${MPI_${LANG}_HIGHEST_METHOD})
-            file(STRINGS ${MPI_BIN_FOLDER}/mpiver_${LANG}.bin _MPI_VERSION_STRING LIMIT_COUNT 1 REGEX "INFO:MPI-VER")
-            if("${_MPI_VERSION_STRING}" MATCHES ".*INFO:MPI-VER\\[([0-9]+)\\.([0-9]+)\\].*")
-              set(MPI_${LANG}_VERSION_MAJOR "${CMAKE_MATCH_1}")
-              set(MPI_${LANG}_VERSION_MINOR "${CMAKE_MATCH_2}")
-              set(MPI_${LANG}_VERSION "${MPI_${LANG}_VERSION_MAJOR}.${MPI_${LANG}_VERSION_MINOR}")
-            endif()
-          endif()
-        endif()
-
-        # Finally, we want to find out which capabilities a given interface supports, compare the MPI-3 standard.
-        # This is determined by interface specific parameters MPI_SUBARRAYS_SUPPORTED and MPI_ASYNC_PROTECTS_NONBLOCKING
-        # and might vary between the different methods of consumption.
-        if(MPI_DETERMINE_Fortran_CAPABILITIES AND NOT MPI_Fortran_CAPABILITIES_DETERMINED)
-          foreach(mpimethod IN ITEMS F08_MODULE F90_MODULE F77_HEADER)
-            if(MPI_${LANG}_HAVE_${mpimethod})
-              set(MPI_${LANG}_${mpimethod}_SUBARRAYS FALSE)
-              set(MPI_${LANG}_${mpimethod}_ASYNCPROT FALSE)
-              _MPI_try_staged_settings(${LANG} fortranparam_mpi ${mpimethod} TRUE)
-              if(MPI_RESULT_${LANG}_fortranparam_mpi_${mpimethod} AND
-                NOT "${MPI_RUN_RESULT_${LANG}_fortranparam_mpi_${mpimethod}}" STREQUAL "FAILED_TO_RUN")
-                if("${MPI_RUN_OUTPUT_${LANG}_fortranparam_mpi_${mpimethod}}" MATCHES
-                  ".*INFO:SUBARRAYS\\[ *([TF]) *\\]-ASYNCPROT\\[ *([TF]) *\\].*")
-                  if("${CMAKE_MATCH_1}" STREQUAL "T")
-                    set(MPI_${LANG}_${mpimethod}_SUBARRAYS TRUE)
-                  endif()
-                  if("${CMAKE_MATCH_2}" STREQUAL "T")
-                    set(MPI_${LANG}_${mpimethod}_ASYNCPROT TRUE)
-                  endif()
-                endif()
-              endif()
-            endif()
-          endforeach()
-          set(MPI_Fortran_CAPABILITIES_DETERMINED TRUE)
-        endif()
-      else()
-        set(MPI_${LANG}_HIGHEST_METHOD normal)
-
-        # By the MPI-2 standard, MPI_VERSION and MPI_SUBVERSION are valid for both C and C++ bindings.
-        if(NOT DEFINED MPI_${LANG}_VERSION)
-          file(STRINGS ${MPI_BIN_FOLDER}/test_mpi_${LANG}.bin _MPI_VERSION_STRING LIMIT_COUNT 1 REGEX "INFO:MPI-VER")
-          if("${_MPI_VERSION_STRING}" MATCHES ".*INFO:MPI-VER\\[([0-9]+)\\.([0-9]+)\\].*")
-            set(MPI_${LANG}_VERSION_MAJOR "${CMAKE_MATCH_1}")
-            set(MPI_${LANG}_VERSION_MINOR "${CMAKE_MATCH_2}")
-            set(MPI_${LANG}_VERSION "${MPI_${LANG}_VERSION_MAJOR}.${MPI_${LANG}_VERSION_MINOR}")
-          endif()
-        endif()
-      endif()
-
-      unset(MPI_BIN_FOLDER)
-
-      # At this point, we have dealt with determining the MPI version and parameters for each Fortran method available.
-      # The one remaining issue is to determine which MPI library is installed.
-      # Determining the version and vendor of the MPI library is only possible via MPI_Get_library_version() at runtime,
-      # and therefore we cannot do this while cross-compiling (a user may still define MPI_<lang>_LIBRARY_VERSION_STRING
-      # themselves and we'll attempt splitting it, which is equivalent to provide the try_run output).
-      # It's also worth noting that the installed version string can depend on the language, or on the system the binary
-      # runs on if MPI is not statically linked.
-      if(MPI_DETERMINE_LIBRARY_VERSION AND NOT MPI_${LANG}_LIBRARY_VERSION_STRING)
-        _MPI_try_staged_settings(${LANG} libver_mpi ${MPI_${LANG}_HIGHEST_METHOD} TRUE)
-        if(MPI_RESULT_${LANG}_libver_mpi_${MPI_${LANG}_HIGHEST_METHOD} AND
-          "${MPI_RUN_RESULT_${LANG}_libver_mpi_${MPI_${LANG}_HIGHEST_METHOD}}" EQUAL "0")
-          string(STRIP "${MPI_RUN_OUTPUT_${LANG}_libver_mpi_${MPI_${LANG}_HIGHEST_METHOD}}"
-            MPI_${LANG}_LIBRARY_VERSION_STRING)
-        else()
-          set(MPI_${LANG}_LIBRARY_VERSION_STRING "NOTFOUND")
-        endif()
-      endif()
-    endif()
-
-    set(MPI_${LANG}_FIND_QUIETLY ${MPI_FIND_QUIETLY})
-    set(MPI_${LANG}_FIND_VERSION ${MPI_FIND_VERSION})
-    set(MPI_${LANG}_FIND_VERSION_EXACT ${MPI_FIND_VERSION_EXACT})
-
-    unset(MPI_${LANG}_REQUIRED_VARS)
-    if (NOT "${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
-      foreach(mpilibname IN LISTS MPI_${LANG}_LIB_NAMES)
-        list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${mpilibname}_LIBRARY")
-      endforeach()
-      list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${LANG}_LIB_NAMES")
-      if("${LANG}" STREQUAL "Fortran")
-        # For Fortran we only need one of the module or header directories to have *some* support for MPI.
-        if(NOT MPI_${LANG}_MODULE_DIR)
-          list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${LANG}_F77_HEADER_DIR")
-        endif()
-        if(NOT MPI_${LANG}_F77_HEADER_DIR)
-          list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${LANG}_MODULE_DIR")
-        endif()
-      else()
-        list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${LANG}_HEADER_DIR")
-      endif()
-      if(MPI_${LANG}_ADDITIONAL_INCLUDE_VARS)
-        foreach(mpiincvar IN LISTS MPI_${LANG}_ADDITIONAL_INCLUDE_VARS)
-          list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${mpiincvar}_INCLUDE_DIR")
-        endforeach()
-      endif()
-      # Append the works variable now. If the settings did not work, this will show up properly.
-      list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${LANG}_WORKS")
-    else()
-      # If the compiler worked implicitly, use its path as output.
-      # Should the compiler variable be set, we also require it to work.
-      list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${LANG}_COMPILER")
-      if(MPI_${LANG}_COMPILER)
-        list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${LANG}_WORKS")
-      endif()
-    endif()
-    find_package_handle_standard_args(MPI_${LANG} REQUIRED_VARS ${MPI_${LANG}_REQUIRED_VARS}
-      VERSION_VAR MPI_${LANG}_VERSION)
-
-    if(DEFINED MPI_${LANG}_VERSION)
-      if(NOT _MPI_MIN_VERSION OR _MPI_MIN_VERSION VERSION_GREATER MPI_${LANG}_VERSION)
-        set(_MPI_MIN_VERSION MPI_${LANG}_VERSION)
-      endif()
-    endif()
-  endif()
-endforeach()
-
-unset(_MPI_REQ_VARS)
-foreach(LANG IN ITEMS C CXX Fortran)
-  if((NOT MPI_FIND_COMPONENTS AND CMAKE_${LANG}_COMPILER_LOADED) OR LANG IN_LIST MPI_FIND_COMPONENTS)
-    list(APPEND _MPI_REQ_VARS "MPI_${LANG}_FOUND")
-  endif()
-endforeach()
-
-if(MPICXX IN_LIST MPI_FIND_COMPONENTS)
-  list(APPEND _MPI_REQ_VARS "MPI_MPICXX_FOUND")
-endif()
-
-find_package_handle_standard_args(MPI
-    REQUIRED_VARS ${_MPI_REQ_VARS}
-    VERSION_VAR ${_MPI_MIN_VERSION}
-    HANDLE_COMPONENTS)
-
-#=============================================================================
-# More backward compatibility stuff
-
-# For compatibility reasons, we also define MPIEXEC
-set(MPIEXEC "${MPIEXEC_EXECUTABLE}")
-
-# Copy over MPI_<LANG>_INCLUDE_PATH from the assembled INCLUDE_DIRS.
-foreach(LANG IN ITEMS C CXX Fortran)
-  if(MPI_${LANG}_FOUND)
-    set(MPI_${LANG}_INCLUDE_PATH "${MPI_${LANG}_INCLUDE_DIRS}")
-    unset(MPI_${LANG}_COMPILE_FLAGS)
-    if(MPI_${LANG}_COMPILE_OPTIONS)
-      set(MPI_${LANG}_COMPILE_FLAGS "${MPI_${LANG}_COMPILE_OPTIONS}")
-    endif()
-    if(MPI_${LANG}_COMPILE_DEFINITIONS)
-      foreach(_MPI_DEF IN LISTS MPI_${LANG}_COMPILE_DEFINITIONS)
-        string(APPEND MPI_${LANG}_COMPILE_FLAGS " -D${_MPI_DEF}")
-      endforeach()
-    endif()
-  endif()
-endforeach()
-
-# Bare MPI sans ${LANG} vars are set to CXX then C, depending on what was found.
-# This mimics the behavior of the old language-oblivious FindMPI.
-set(_MPI_OLD_VARS COMPILER INCLUDE_PATH COMPILE_FLAGS LINK_FLAGS LIBRARIES)
-if (MPI_CXX_FOUND)
-  foreach (var ${_MPI_OLD_VARS})
-    set(MPI_${var} ${MPI_CXX_${var}})
-  endforeach()
-elseif (MPI_C_FOUND)
-  foreach (var ${_MPI_OLD_VARS})
-    set(MPI_${var} ${MPI_C_${var}})
-  endforeach()
-endif()
-
-# Chop MPI_LIBRARIES into the old-style MPI_LIBRARY and MPI_EXTRA_LIBRARY, and set them in cache.
-if (MPI_LIBRARIES)
-  list(GET MPI_LIBRARIES 0 MPI_LIBRARY_WORK)
-  set(MPI_LIBRARY "${MPI_LIBRARY_WORK}")
-  unset(MPI_LIBRARY_WORK)
-else()
-  set(MPI_LIBRARY "MPI_LIBRARY-NOTFOUND")
-endif()
-
-list(LENGTH MPI_LIBRARIES MPI_NUMLIBS)
-if (MPI_NUMLIBS GREATER 1)
-  set(MPI_EXTRA_LIBRARY_WORK "${MPI_LIBRARIES}")
-  list(REMOVE_AT MPI_EXTRA_LIBRARY_WORK 0)
-  set(MPI_EXTRA_LIBRARY "${MPI_EXTRA_LIBRARY_WORK}")
-  unset(MPI_EXTRA_LIBRARY_WORK)
-else()
-  set(MPI_EXTRA_LIBRARY "MPI_EXTRA_LIBRARY-NOTFOUND")
-endif()
-set(MPI_IGNORE_LEGACY_VARIABLES TRUE)
-#=============================================================================
-
-# unset these vars to cleanup namespace
-unset(_MPI_OLD_VARS)
-unset(_MPI_PREFIX_PATH)
-unset(_MPI_BASE_DIR)
-foreach (lang C CXX Fortran)
-  unset(_MPI_${LANG}_COMPILER_NAMES)
-endforeach()
-
-cmake_policy(POP)
diff --git a/config/cmake_ext_mod/FindMPI/fortranparam_mpi.f90.in b/config/cmake_ext_mod/FindMPI/fortranparam_mpi.f90.in
deleted file mode 100644
index 30f912c..0000000
--- a/config/cmake_ext_mod/FindMPI/fortranparam_mpi.f90.in
+++ /dev/null
@@ -1,4 +0,0 @@
-      program mpi_ver
-      @MPI_Fortran_INCLUDE_LINE@
-      print *, 'INFO:SUBARRAYS[', MPI_SUBARRAYS_SUPPORTED, ']-ASYNCPROT[', MPI_ASYNC_PROTECTS_NONBLOCKING, ']'
-      end program mpi_ver
diff --git a/config/cmake_ext_mod/FindMPI/libver_mpi.c b/config/cmake_ext_mod/FindMPI/libver_mpi.c
deleted file mode 100644
index be9d19d..0000000
--- a/config/cmake_ext_mod/FindMPI/libver_mpi.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <mpi.h>
-
-#ifdef __cplusplus
-#include <cstdio>
-#else
-#include <stdio.h>
-#endif
-
-int main(int argc, char* argv[])
-{
-  char mpilibver_str[MPI_MAX_LIBRARY_VERSION_STRING];
-  int mpilibver_len;
-  MPI_Get_library_version(mpilibver_str, &mpilibver_len);
-#ifdef __cplusplus
-  std::puts(mpilibver_str);
-#else
-  puts(mpilibver_str);
-#endif
-}
diff --git a/config/cmake_ext_mod/FindMPI/libver_mpi.f90.in b/config/cmake_ext_mod/FindMPI/libver_mpi.f90.in
deleted file mode 100644
index 7938587..0000000
--- a/config/cmake_ext_mod/FindMPI/libver_mpi.f90.in
+++ /dev/null
@@ -1,7 +0,0 @@
-      program mpi_ver
-      @MPI_Fortran_INCLUDE_LINE@
-      character(len=MPI_MAX_LIBRARY_VERSION_STRING) :: mpilibver_str
-      integer(kind=MPI_INTEGER_KIND) :: ierror, reslen
-      call MPI_GET_LIBRARY_VERSION(mpilibver_str, reslen, ierror)
-      print *, mpilibver_str
-      end program mpi_ver
diff --git a/config/cmake_ext_mod/FindMPI/mpiver.f90.in b/config/cmake_ext_mod/FindMPI/mpiver.f90.in
deleted file mode 100644
index a254523..0000000
--- a/config/cmake_ext_mod/FindMPI/mpiver.f90.in
+++ /dev/null
@@ -1,10 +0,0 @@
-      program mpi_ver
-      @MPI_Fortran_INCLUDE_LINE@
-      integer(kind=kind(MPI_VERSION)), parameter :: zero = ichar('0')
-      character, dimension(17), parameter :: mpiver_str =&
-      (/ 'I', 'N', 'F', 'O', ':', 'M', 'P', 'I', '-', 'V', 'E', 'R', '[', &
-        char(zero + MPI_VERSION), &
-        '.', &
-        char(zero + MPI_SUBVERSION), ']' /)
-      print *, mpiver_str
-      end program mpi_ver
diff --git a/config/cmake_ext_mod/FindMPI/test_mpi.c b/config/cmake_ext_mod/FindMPI/test_mpi.c
deleted file mode 100644
index b8a308a..0000000
--- a/config/cmake_ext_mod/FindMPI/test_mpi.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <mpi.h>
-
-#ifdef __cplusplus
-#include <cstdio>
-#else
-#include <stdio.h>
-#endif
-
-#if defined(MPI_VERSION) && defined(MPI_SUBVERSION)
-const char mpiver_str[] = { 'I', 'N',
-                            'F', 'O',
-                            ':', 'M',
-                            'P', 'I',
-                            '-', 'V',
-                            'E', 'R',
-                            '[', ('0' + MPI_VERSION),
-                            '.', ('0' + MPI_SUBVERSION),
-                            ']', '\0' };
-#endif
-
-int main(int argc, char* argv[])
-{
-#if defined(MPI_VERSION) && defined(MPI_SUBVERSION)
-#ifdef __cplusplus
-  std::puts(mpiver_str);
-#else
-  puts(mpiver_str);
-#endif
-#endif
-#ifdef TEST_MPI_MPICXX
-  MPI::MPI_Init(&argc, &argv);
-  MPI::MPI_Finalize();
-#else
-  MPI_Init(&argc, &argv);
-  MPI_Finalize();
-#endif
-}
diff --git a/config/cmake_ext_mod/FindMPI/test_mpi.f90.in b/config/cmake_ext_mod/FindMPI/test_mpi.f90.in
deleted file mode 100644
index 4d43a04..0000000
--- a/config/cmake_ext_mod/FindMPI/test_mpi.f90.in
+++ /dev/null
@@ -1,6 +0,0 @@
-      program hello
-      @MPI_Fortran_INCLUDE_LINE@
-      integer@MPI_Fortran_INTEGER_LINE@ ierror
-      call MPI_INIT(ierror)
-      call MPI_FINALIZE(ierror)
-      end program
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 174c787..d643f35 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_EXAMPLES)
 
 #-----------------------------------------------------------------------------
diff --git a/fortran/CMakeLists.txt b/fortran/CMakeLists.txt
index a0f92d3..8c7b8f6 100644
--- a/fortran/CMakeLists.txt
+++ b/fortran/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_F90 C CXX Fortran)
 
 if (H5_HAVE_PARALLEL)
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index e5b277d..5300453 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_F90_EXAMPLES C CXX Fortran)
 # --------------------------------------------------------------------
 # Notes: When creating examples they should be prefixed
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index f094b47..964a302 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_F90_SRC C CXX Fortran)
 
 #-----------------------------------------------------------------------------
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index c7416df..1ba6ed7 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_FORTRAN_TESTS C CXX Fortran)
 
 #-----------------------------------------------------------------------------
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index ed9d28c..979d305 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_FORTRAN_TESTPAR C CXX Fortran)
 
 #-----------------------------------------------------------------------------
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index d80b4f9..54d5976 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL C CXX)
 
 #-----------------------------------------------------------------------------
diff --git a/hl/c++/CMakeLists.txt b/hl/c++/CMakeLists.txt
index 9a1d059..71e5bb3 100644
--- a/hl/c++/CMakeLists.txt
+++ b/hl/c++/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_CPP)
 
 #-----------------------------------------------------------------------------
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index 8c48795..25158f2 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_CPP_EXAMPLES)
 
 #-----------------------------------------------------------------------------
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index fca96fb..ce4da72 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_CPP_SRC)
 
 #-----------------------------------------------------------------------------
diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt
index 54afd7c..b48d147 100644
--- a/hl/c++/test/CMakeLists.txt
+++ b/hl/c++/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_CPP_TEST)
 
 #-----------------------------------------------------------------------------
diff --git a/hl/examples/CMakeLists.txt b/hl/examples/CMakeLists.txt
index 68f0128..79dfee1 100644
--- a/hl/examples/CMakeLists.txt
+++ b/hl/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_EXAMPLES )
 
 #-----------------------------------------------------------------------------
diff --git a/hl/fortran/CMakeLists.txt b/hl/fortran/CMakeLists.txt
index 00d7517..7955de2 100644
--- a/hl/fortran/CMakeLists.txt
+++ b/hl/fortran/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_F90 C CXX Fortran)
 
 #-----------------------------------------------------------------------------
diff --git a/hl/fortran/examples/CMakeLists.txt b/hl/fortran/examples/CMakeLists.txt
index d920d64..411ceea 100644
--- a/hl/fortran/examples/CMakeLists.txt
+++ b/hl/fortran/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_F90_EXAMPLES C CXX Fortran)
 
 #-----------------------------------------------------------------------------
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index 93ba5ed..fa6abf6 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT(HDF5_HL_F90_SRC C CXX Fortran)
 
 if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt
index 25fe40d..9939fec 100644
--- a/hl/fortran/test/CMakeLists.txt
+++ b/hl/fortran/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_FORTRAN_TESTS C CXX Fortran)
 
 #-----------------------------------------------------------------------------
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index 0a48f77..526c866 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_SRC)
 
 #-----------------------------------------------------------------------------
diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt
index 52194a8..054b786 100644
--- a/hl/test/CMakeLists.txt
+++ b/hl/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_TEST)
 # --------------------------------------------------------------------
 # Notes: When creating unit test executables they should be prefixed
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt
index 5503f41..407a0bb 100644
--- a/hl/tools/CMakeLists.txt
+++ b/hl/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_TOOLS C CXX)
 
 add_subdirectory (gif2h5)
diff --git a/hl/tools/gif2h5/CMakeLists.txt b/hl/tools/gif2h5/CMakeLists.txt
index 34d7074..2697dfd 100644
--- a/hl/tools/gif2h5/CMakeLists.txt
+++ b/hl/tools/gif2h5/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_HL_TOOLS_GIF2H5)
 
 #-----------------------------------------------------------------------------
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 2c8bc1a..d464ef8 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -645,7 +645,7 @@ adding an option (${CTEST_SCRIPT_ARG}) to the platform configuration script.
 ### ctest -S HDF518config.cmake,BUILD_GENERATOR=VS201264 -C Release -VV -O hdf518.log      ###
 #############################################################################################
 
-cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)(VERSION 3.2.2 FATAL_ERROR)
 ############################################################################
 # Usage:
 #     ctest -S HDF518config.cmake,OPTION=VALUE -C Release -VV -O test.log
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index dbd2ddc..caa0c1d 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -180,7 +180,7 @@ Given the preconditions in section I, create a CMakeLists.txt file at the
 source root. Include the following text in the file:
 
 ##########################################################
-cmake_minimum_required (VERSION 3.10.1)
+cmake_minimum_required (VERSION 3.10) (VERSION 3.10.1)
 project (HDF5MyApp C CXX)
 
 set (LIB_TYPE STATIC) # or SHARED
@@ -229,7 +229,7 @@ your application with an installed HDF5 binary.
 ctest use of HDF518_Examples.cmake and HDF5_Examples_options.cmake
 ========================================================================
 
-cmake_minimum_required(VERSION 3.2.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)(VERSION 3.2.2 FATAL_ERROR)
 ###############################################################################################################
 # This script will build and run the examples from a folder
 # Execute from a command line:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1593466..b1109d1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_SRC C CXX)
 
 #-----------------------------------------------------------------------------
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 40db60f..86678f1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TEST)
 
 #-----------------------------------------------------------------------------
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt
index 891645c..b341782 100644
--- a/testpar/CMakeLists.txt
+++ b/testpar/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TEST_PAR)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 0b812bf..6a12aa0 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TOOLS)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt
index d40656b..f94e369 100644
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TOOLS_H5COPY)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt
index 3a900f5..61ae8a5 100644
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TOOLS_H5DIFF)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index e40c6f5..5f5978f 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TOOLS_H5DUMP)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index 6e0ac7e..095b596 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TOOLS_H5IMPORT)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt
index 58ad777..eaa6e20 100644
--- a/tools/h5jam/CMakeLists.txt
+++ b/tools/h5jam/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TOOLS_H5JAM)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt
index 6cf6fc0..33db24a 100644
--- a/tools/h5ls/CMakeLists.txt
+++ b/tools/h5ls/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TOOLS_H5LS)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index fd1ad3e..f5af433 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TOOLS_H5REPACK)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt
index 6b3c06b..6e601d9 100644
--- a/tools/h5stat/CMakeLists.txt
+++ b/tools/h5stat/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TOOLS_H5STAT)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 068a635..6fd0280 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TOOLS_LIB)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
index 919535f..de41a76 100644
--- a/tools/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_TOOLS_MISC)
 
 #-----------------------------------------------------------------------------
diff --git a/tools/perform/CMakeLists.txt b/tools/perform/CMakeLists.txt
index 647f846..afafd42 100644
--- a/tools/perform/CMakeLists.txt
+++ b/tools/perform/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.2)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5_PERFORM )
 
 #-----------------------------------------------------------------------------
-- 
cgit v0.12


From 542ef4045634ad84cee2e49962d105f6008a3651 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 9 Mar 2018 12:50:34 -0600
Subject: Merge from develop HDFFV-8359 and remove FindMPI copies

---
 CMakeLists.txt                        |  2 +-
 MANIFEST                              |  2 ++
 c++/src/CMakeLists.txt                | 47 ++++++++++++++++++++++++++++++++++
 config/cmake/HDF518_Examples.cmake.in |  2 +-
 config/cmake/libh5cc.in               | 32 +++++++++++++++++++++++
 config/cmake/libhdf5.pc.in            | 14 ++++++++++
 hl/c++/src/CMakeLists.txt             | 47 ++++++++++++++++++++++++++++++++++
 hl/src/CMakeLists.txt                 | 46 +++++++++++++++++++++++++++++++++
 release_docs/INSTALL_CMake.txt        |  2 +-
 release_docs/RELEASE.txt              | 20 +++++++++++++++
 release_docs/USING_HDF5_CMake.txt     |  4 +--
 src/CMakeLists.txt                    | 48 +++++++++++++++++++++++++++++++++++
 12 files changed, 261 insertions(+), 5 deletions(-)
 create mode 100644 config/cmake/libh5cc.in
 create mode 100644 config/cmake/libhdf5.pc.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61ed4c7..dfbfbe7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10) (VERSION 3.3)
+cmake_minimum_required (VERSION 3.10)
 PROJECT (HDF5 C CXX)
 
 #-----------------------------------------------------------------------------
diff --git a/MANIFEST b/MANIFEST
index d1a0f7f..85e0c13 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2331,6 +2331,8 @@
 ./config/cmake/hdf5-config-version.cmake.in
 ./config/cmake/HDFCompilerFlags.cmake
 ./config/cmake/HDF5Macros.cmake
+./config/cmake/libh5cc.in
+./config/cmake/libhdf5.pc.in
 ./config/cmake/libhdf5.settings.cmake.in
 ./config/cmake/mccacheinit.cmake
 ./config/cmake/patch.xml
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 1352c66..4e36521 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -139,3 +139,50 @@ if (HDF5_EXPORTED_TARGETS)
       INCLUDES DESTINATION include
   )
 endif ()
+
+#-----------------------------------------------------------------------------
+# Create pkgconfig files
+#-----------------------------------------------------------------------------
+set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
+set (_PKG_CONFIG_LIBNAME "${HDF5_CPP_LIB_CORENAME}")
+set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+set (_PKG_CONFIG_LIBS_PRIVATE)
+
+set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}")
+if (BUILD_SHARED_LIBS)
+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}")
+endif ()
+
+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}")
+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}")
+
+configure_file (
+    ${HDF_RESOURCES_DIR}/libhdf5.pc.in
+    ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_CPP_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc
+    @ONLY
+)
+install (
+    FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_CPP_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc
+    DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig
+    COMPONENT cpplibraries
+)
+
+if (NOT WIN32)
+  set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
+  configure_file (
+      ${HDF_RESOURCES_DIR}/libh5cc.in
+      ${HDF5_BINARY_DIR}/CMakeFiles/h5c++
+      @ONLY
+  )
+  install (
+      FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5c++
+      DESTINATION ${HDF5_INSTALL_BIN_DIR}
+      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+      COMPONENT cpplibraries
+  )
+endif ()
+
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
index f1f5ac2..c95a6f6 100644
--- a/config/cmake/HDF518_Examples.cmake.in
+++ b/config/cmake/HDF518_Examples.cmake.in
@@ -9,7 +9,7 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.10)(VERSION 3.2.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)
 ###############################################################################################################
 # This script will build and run the examples from a folder
 # Execute from a command line:
diff --git a/config/cmake/libh5cc.in b/config/cmake/libh5cc.in
new file mode 100644
index 0000000..f462d56
--- /dev/null
+++ b/config/cmake/libh5cc.in
@@ -0,0 +1,32 @@
+#! /bin/sh
+##
+# Copyright by The HDF Group.
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+##
+
+prg=$0
+if [ ! -e "$prg" ]; then
+  case $prg in
+    (*/*) exit 1;;
+    (*) prg=$(command -v -- "$prg") || exit;;
+  esac
+fi
+dir=$(
+  cd -P -- "$(dirname -- "$prg")/.." && pwd -P
+) || exit
+prg=$dir/$(basename -- "$prg") || exit
+
+printf '%s\n' "$prg"
+printf 'dir is %s\n' "$dir"
+
+export PKG_CONFIG_PATH=$dir/lib/pkgconfig
+
+@_PKG_CONFIG_COMPILER@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@
diff --git a/config/cmake/libhdf5.pc.in b/config/cmake/libhdf5.pc.in
new file mode 100644
index 0000000..4a2ebaa
--- /dev/null
+++ b/config/cmake/libhdf5.pc.in
@@ -0,0 +1,14 @@
+prefix=@_PKG_CONFIG_PREFIX@
+exec_prefix=@_PKG_CONFIG_EXEC_PREFIX@
+libdir=@_PKG_CONFIG_LIBDIR@
+includedir=@_PKG_CONFIG_INCLUDEDIR@
+
+Name: @_PKG_CONFIG_LIBNAME@
+Description: HDF5 (Hierarchical Data Format 5) Software Library
+Version: @_PKG_CONFIG_VERSION@
+
+Cflags: -I${includedir}
+Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@
+Requires: @_PKG_CONFIG_REQUIRES@
+Libs.private: @_PKG_CONFIG_LIBS_PRIVATE@ @_PKG_CONFIG_LIBS@
+Requires.private: @_PKG_CONFIG_REQUIRES_PRIVATE@
diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index ce4da72..e6b374e 100644
--- a/hl/c++/src/CMakeLists.txt
+++ b/hl/c++/src/CMakeLists.txt
@@ -69,3 +69,50 @@ if (HDF5_EXPORTED_TARGETS)
       INCLUDES DESTINATION include
   )
 endif ()
+
+#-----------------------------------------------------------------------------
+# Create pkgconfig files
+#-----------------------------------------------------------------------------
+set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
+set (_PKG_CONFIG_LIBNAME "${HDF5_HL_CPP_LIB_CORENAME}")
+set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+set (_PKG_CONFIG_LIBS_PRIVATE)
+
+set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
+if (BUILD_SHARED_LIBS)
+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
+endif ()
+
+set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}")
+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}")
+
+configure_file (
+    ${HDF_RESOURCES_DIR}/libhdf5.pc.in
+    ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_HL_CPP_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc
+    @ONLY
+)
+install (
+    FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_HL_CPP_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc
+    DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig
+    COMPONENT hlcpplibraries
+)
+
+if (NOT WIN32)
+  set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
+  configure_file (
+      ${HDF_RESOURCES_DIR}/libh5cc.in
+      ${HDF5_BINARY_DIR}/CMakeFiles/h5hlc++
+      @ONLY
+  )
+  install (
+      FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5hlc++
+      DESTINATION ${HDF5_INSTALL_BIN_DIR}
+      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+      COMPONENT hlcpplibraries
+  )
+endif ()
+
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index 526c866..d9ecf4e 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -85,3 +85,49 @@ if (HDF5_EXPORTED_TARGETS)
       INCLUDES DESTINATION include
   )
 endif ()
+
+#-----------------------------------------------------------------------------
+# Create pkgconfig files
+#-----------------------------------------------------------------------------
+set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
+set (_PKG_CONFIG_LIBNAME "${HDF5_HL_LIB_CORENAME}")
+set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+set (_PKG_CONFIG_LIBS_PRIVATE)
+
+set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_LIB_CORENAME}")
+if (BUILD_SHARED_LIBS)
+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}")
+endif ()
+
+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}")
+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}")
+
+configure_file (
+    ${HDF_RESOURCES_DIR}/libhdf5.pc.in
+    ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc
+    @ONLY
+)
+install (
+    FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc
+    DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig
+    COMPONENT hllibraries
+)
+
+if (NOT WIN32)
+  set (_PKG_CONFIG_COMPILER ${CMAKE_C_COMPILER})
+  configure_file (
+      ${HDF_RESOURCES_DIR}/libh5cc.in
+      ${HDF5_BINARY_DIR}/CMakeFiles/h5chl
+      @ONLY
+  )
+  install (
+      FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5chl
+      DESTINATION ${HDF5_INSTALL_BIN_DIR}
+      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+      COMPONENT hllibraries
+  )
+endif ()
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index d464ef8..e33615d 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -645,7 +645,7 @@ adding an option (${CTEST_SCRIPT_ARG}) to the platform configuration script.
 ### ctest -S HDF518config.cmake,BUILD_GENERATOR=VS201264 -C Release -VV -O hdf518.log      ###
 #############################################################################################
 
-cmake_minimum_required (VERSION 3.10)(VERSION 3.2.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)
 ############################################################################
 # Usage:
 #     ctest -S HDF518config.cmake,OPTION=VALUE -C Release -VV -O test.log
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 84bed48..f7e698d 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -59,6 +59,26 @@ New Features
     -------------
     - CMake
 
+      Change minimum version to 3.10.
+
+      This change removes the need to support a copy of the FindMPI.cmake module,
+      which has been removed, along with its subfolder in the config/cmake_ext_mod
+      location.
+
+      (ADB - 2018/03/09)
+
+    - CMake
+
+      Add pkg-config file generation
+
+      Added pkg-config file generation for the C, C++, HL, and HL C++ libraries.
+      In addition, builds on linux will create h5cXXX scripts that use the pkg-config
+      files. This is a limited implementation of a script like autotools h5cc.
+
+      (ADB - 2018/03/08, HDFFV-4359)
+
+    - CMake
+
       Refactor use of CMAKE_BUILD_TYPE for new variable, which understands
       the type of generator in use.
 
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index caa0c1d..e5be666 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -180,7 +180,7 @@ Given the preconditions in section I, create a CMakeLists.txt file at the
 source root. Include the following text in the file:
 
 ##########################################################
-cmake_minimum_required (VERSION 3.10) (VERSION 3.10.1)
+cmake_minimum_required (VERSION 3.10)
 project (HDF5MyApp C CXX)
 
 set (LIB_TYPE STATIC) # or SHARED
@@ -229,7 +229,7 @@ your application with an installed HDF5 binary.
 ctest use of HDF518_Examples.cmake and HDF5_Examples_options.cmake
 ========================================================================
 
-cmake_minimum_required (VERSION 3.10)(VERSION 3.2.2 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.10)
 ###############################################################################################################
 # This script will build and run the examples from a folder
 # Execute from a command line:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b1109d1..8177835 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -785,3 +785,51 @@ if (HDF5_EXPORTED_TARGETS)
       INCLUDES DESTINATION include
   )
 endif ()
+
+#-----------------------------------------------------------------------------
+# Create pkgconfig files
+#-----------------------------------------------------------------------------
+set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
+set (_PKG_CONFIG_LIBNAME "${HDF5_LIB_CORENAME}")
+set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+
+foreach (libs ${LINK_LIBS} ${LINK_COMP_LIBS})
+  set (_PKG_CONFIG_LIBS_PRIVATE "${_PKG_CONFIG_LIBS_PRIVATE} -l${libs}")
+endforeach ()
+
+set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_LIB_CORENAME}")
+if (BUILD_SHARED_LIBS)
+  set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_LIB_CORENAME}")
+endif ()
+
+set (_PKG_CONFIG_REQUIRES)
+set (_PKG_CONFIG_REQUIRES_PRIVATE)
+
+configure_file (
+    ${HDF_RESOURCES_DIR}/libhdf5.pc.in
+    ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc
+    @ONLY
+)
+install (
+    FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc
+    DESTINATION ${HDF5_INSTALL_LIB_DIR}/pkgconfig
+    COMPONENT libraries
+)
+
+if (NOT WIN32)
+  set (_PKG_CONFIG_COMPILER ${CMAKE_C_COMPILER})
+  configure_file (
+      ${HDF_RESOURCES_DIR}/libh5cc.in
+      ${HDF5_BINARY_DIR}/CMakeFiles/h5cc
+      @ONLY
+  )
+  install (
+      FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5cc
+      DESTINATION ${HDF5_INSTALL_BIN_DIR}
+      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+      COMPONENT libraries
+  )
+endif ()
-- 
cgit v0.12


From 6bda7f4a9d908771488c4652ecd4e6fe1ae51efd Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 13 Mar 2018 12:44:06 -0500
Subject: Remove obsolete files

---
 MANIFEST | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index 85e0c13..9ab8b46 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2343,7 +2343,6 @@
 
 ./config/cmake_ext_mod/ConfigureChecks.cmake
 ./config/cmake_ext_mod/CTestCustom.cmake
-./config/cmake_ext_mod/FindMPI.cmake
 ./config/cmake_ext_mod/FindSZIP.cmake
 ./config/cmake_ext_mod/GetTimeOfDayTest.cpp
 ./config/cmake_ext_mod/grepTest.cmake
@@ -2359,12 +2358,6 @@
 ./config/cmake_ext_mod/NSIS.template.in
 ./config/cmake_ext_mod/runTest.cmake
 ./config/cmake_ext_mod/version.plist.in
-./config/cmake_ext_mod/FindMPI/fortranparam_mpi.f90.in
-./config/cmake_ext_mod/FindMPI/libver_mpi.c
-./config/cmake_ext_mod/FindMPI/libver_mpi.f90.in
-./config/cmake_ext_mod/FindMPI/mpiver.f90.in
-./config/cmake_ext_mod/FindMPI/test_mpi.c
-./config/cmake_ext_mod/FindMPI/test_mpi.f90.in
 
 # CMake-specific User Files
 ./config/cmake/UserMacros/Windows_MT.cmake
-- 
cgit v0.12


From b7514b5990559c49674032bc5d431638f3d33310 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 22 Mar 2018 14:07:02 -0500
Subject: Puul vs2017 readme fix from develop

---
 config/cmake_ext_mod/HDFMacros.cmake | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 4097ca9..04d60e1 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -27,8 +27,12 @@ macro (SET_HDF_BUILD_TYPE)
       set(HDF_BUILD_TYPE "Release")
     endif()
   endif()
-  if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release")
+  if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.")
+    set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
+    # Set the possible values of build type for cmake-gui
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
+      "MinSizeRel" "RelWithDebInfo")
   endif()
 endmacro ()
 
@@ -287,9 +291,11 @@ macro (HDF_README_PROPERTIES target_fortran)
       elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^18.*")
         set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2013")
       elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*")
-        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015")
-      elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^20.*")
-        set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017")
+        if (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.0.*")
+          set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015")
+        else ()
+          set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017")
+         endif ()
       else ()
         set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}")
       endif ()
-- 
cgit v0.12


From b372465824217a10cac606d02487a5e59071ab38 Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Sun, 25 Mar 2018 21:34:31 -0500
Subject: Snapshot version 1.8 release 21 (snap10)

---
 README.txt                            |  2 +-
 c++/src/cpp_doc_config                |  2 +-
 config/cmake/scripts/HDF5config.cmake |  2 +-
 configure                             | 22 +++++++++++-----------
 configure.ac                          |  2 +-
 release_docs/RELEASE.txt              |  2 +-
 src/H5public.h                        |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.txt b/README.txt
index 5c52946..3e9740d 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap10 currently under development
+HDF5 version 1.8.21-snap11 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index c8869af..5ac9452 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap10, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap11, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 33ef682..bddd6a0 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -35,7 +35,7 @@ cmake_minimum_required (VERSION 3.10)
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
-set (CTEST_SOURCE_VERSEXT "-snap10")
+set (CTEST_SOURCE_VERSEXT "-snap11")
 
 ##############################################################################
 # handle input parameters to script.
diff --git a/configure b/configure
index e09da0b..79aadd9 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap10.
+# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap11.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.8.21-snap10'
-PACKAGE_STRING='HDF5 1.8.21-snap10'
+PACKAGE_VERSION='1.8.21-snap11'
+PACKAGE_STRING='HDF5 1.8.21-snap11'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.8.21-snap10 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.8.21-snap11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.8.21-snap10:";;
+     short | recursive ) echo "Configuration of HDF5 1.8.21-snap11:";;
    esac
   cat <<\_ACEOF
 
@@ -1745,7 +1745,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.8.21-snap10
+HDF5 configure 1.8.21-snap11
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2682,7 +2682,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.8.21-snap10, which was
+It was created by HDF5 $as_me 1.8.21-snap11, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3553,7 +3553,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.8.21-snap10'
+ VERSION='1.8.21-snap11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -29313,7 +29313,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-HDF5 config.lt 1.8.21-snap10
+HDF5 config.lt 1.8.21-snap11
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -31373,7 +31373,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.8.21-snap10, which was
+This file was extended by HDF5 $as_me 1.8.21-snap11, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31439,7 +31439,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.8.21-snap10
+HDF5 config.status 1.8.21-snap11
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 6303100..afafe9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap10], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap11], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index f7e698d..040974d 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap10 currently under development
+HDF5 version 1.8.21-snap11 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index 3aba4c3..75905cf 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap10"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap11"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap10"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap11"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
-- 
cgit v0.12


From 87d751eb2805d774deaa45eefe06413c8d450922 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 28 Mar 2018 12:29:15 -0500
Subject: Correct name of hl compile script

---
 hl/src/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
index d9ecf4e..b3710e5 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -121,11 +121,11 @@ if (NOT WIN32)
   set (_PKG_CONFIG_COMPILER ${CMAKE_C_COMPILER})
   configure_file (
       ${HDF_RESOURCES_DIR}/libh5cc.in
-      ${HDF5_BINARY_DIR}/CMakeFiles/h5chl
+      ${HDF5_BINARY_DIR}/CMakeFiles/h5hlcc
       @ONLY
   )
   install (
-      FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5chl
+      FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5hlcc
       DESTINATION ${HDF5_INSTALL_BIN_DIR}
       PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
       COMPONENT hllibraries
-- 
cgit v0.12


From 727ef7c334464bb5068c0b90c9e442e72e8cd6a9 Mon Sep 17 00:00:00 2001
From: hdftest <hdftest@hdfgroup.org>
Date: Sun, 1 Apr 2018 20:43:28 -0500
Subject: Snapshot version 1.8 release 21 (snap11)

---
 README.txt                            |  2 +-
 c++/src/cpp_doc_config                |  2 +-
 config/cmake/scripts/HDF5config.cmake |  2 +-
 configure                             | 22 +++++++++++-----------
 configure.ac                          |  2 +-
 release_docs/RELEASE.txt              |  2 +-
 src/H5public.h                        |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.txt b/README.txt
index 3e9740d..223ccc1 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap11 currently under development
+HDF5 version 1.8.21-snap12 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index 5ac9452..86f0675 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -49,7 +49,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "1.8.21-snap11, currently under development"
+PROJECT_NUMBER         = "1.8.21-snap12, currently under development"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index bddd6a0..0af9e16 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -35,7 +35,7 @@ cmake_minimum_required (VERSION 3.10)
 ##############################################################################
 
 set (CTEST_SOURCE_VERSION "1.8.21")
-set (CTEST_SOURCE_VERSEXT "-snap11")
+set (CTEST_SOURCE_VERSEXT "-snap12")
 
 ##############################################################################
 # handle input parameters to script.
diff --git a/configure b/configure
index 79aadd9..6d22908 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap11.
+# Generated by GNU Autoconf 2.69 for HDF5 1.8.21-snap12.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.8.21-snap11'
-PACKAGE_STRING='HDF5 1.8.21-snap11'
+PACKAGE_VERSION='1.8.21-snap12'
+PACKAGE_STRING='HDF5 1.8.21-snap12'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.8.21-snap11 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.8.21-snap12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1550,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.8.21-snap11:";;
+     short | recursive ) echo "Configuration of HDF5 1.8.21-snap12:";;
    esac
   cat <<\_ACEOF
 
@@ -1745,7 +1745,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.8.21-snap11
+HDF5 configure 1.8.21-snap12
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2682,7 +2682,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.8.21-snap11, which was
+It was created by HDF5 $as_me 1.8.21-snap12, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3553,7 +3553,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.8.21-snap11'
+ VERSION='1.8.21-snap12'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -29313,7 +29313,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-HDF5 config.lt 1.8.21-snap11
+HDF5 config.lt 1.8.21-snap12
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -31373,7 +31373,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.8.21-snap11, which was
+This file was extended by HDF5 $as_me 1.8.21-snap12, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31439,7 +31439,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.8.21-snap11
+HDF5 config.status 1.8.21-snap12
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index afafe9d..bd9203e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.21-snap11], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.8.21-snap12], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADERS([src/H5config.h])
 
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 040974d..662127f 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.21-snap11 currently under development
+HDF5 version 1.8.21-snap12 currently under development
 ================================================================================
 
 INTRODUCTION
diff --git a/src/H5public.h b/src/H5public.h
index 75905cf..6bb14f8 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,9 +93,9 @@ extern "C" {
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	8	/* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	21	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "snap11"	/* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "snap12"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap11"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.21-snap12"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
-- 
cgit v0.12