From 1efe978ae0ea97272d1796e43b1cb1b0f4e58272 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 21 Dec 2017 13:48:39 -0600
Subject: Fix library interface commands, add missing JNI

---
 CMakeLists.txt                          |    3 -
 c++/src/CMakeLists.txt                  |    4 +-
 hl/c++/src/CMakeLists.txt               |   12 +-
 hl/fortran/src/CMakeLists.txt           |    8 +-
 hl/src/CMakeLists.txt                   |    4 +-
 java/src/hdf/hdf5lib/H5.java            |  135 +++-
 java/src/hdf/hdf5lib/HDF5Constants.java |    3 +
 java/src/hdf/overview.html              |    6 +-
 java/src/jni/CMakeLists.txt             |    2 +-
 java/src/jni/h5Constants.c              |    2 +
 java/src/jni/h5pImp.c                   |  144 ++++
 java/src/jni/h5pImp.h                   |   55 +-
 java/test/JUnit-interface.txt           |    6 +-
 java/test/TestH5P.java                  |   53 +-
 java/test/TestH5Pfapl.java              |   14 +
 release_docs/RELEASE.txt                |   11 +
 test/CMakeLists.txt                     |   26 +-
 test/vds.c                              | 1086 ++++++++++++++-----------------
 testpar/CMakeLists.txt                  |   10 +-
 tools/lib/CMakeLists.txt                |   10 +-
 20 files changed, 930 insertions(+), 664 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6165b35..d4e6300 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -640,7 +640,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 ()
@@ -865,7 +864,6 @@ if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/for
 
     include (${HDF_RESOURCES_DIR}/HDF5UseFortran.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)
@@ -876,7 +874,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++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index b147cfa..3b9a0c3 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_SOURCES} ${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_SOURCES} ${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/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
index 38604cd..70f0a79 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_SOURCES})
 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_SOURCES})
   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 c870aed..3fc66c4 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -77,7 +77,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_SOURCES} ${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
@@ -90,7 +90,7 @@ set (install_targets ${HDF5_HL_F90_C_LIB_TARGET})
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_HL_F90_C_LIBSH_TARGET} SHARED ${HDF5_HL_F90_C_SOURCES} ${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
@@ -170,7 +170,7 @@ endif ()
 
 add_library (${HDF5_HL_F90_LIB_TARGET} STATIC ${HDF5_HL_F90_F_SOURCES})
 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
@@ -194,7 +194,7 @@ if (BUILD_SHARED_LIBS)
     set (SHARED_LINK_FLAGS "/DLL /DEF:${HDF5_HL_F90_SRC_BINARY_DIR}/hdf5_hl_fortrandll.def")
   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 86472fb..3dd6ce8 100644
--- a/hl/src/CMakeLists.txt
+++ b/hl/src/CMakeLists.txt
@@ -31,7 +31,7 @@ set (HL_HEADERS
 
 add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SOURCES} ${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
@@ -43,7 +43,7 @@ set (install_targets ${HDF5_HL_LIB_TARGET})
 if (BUILD_SHARED_LIBS)
   add_library (${HDF5_HL_LIBSH_TARGET} SHARED ${HL_SOURCES} ${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/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index 35b61bd..17be736 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -4451,7 +4451,7 @@ public class H5 implements java.io.Serializable {
     // //
     // ////////////////////////////////////////////////////////////
 
-    // Generic property list routines
+    // /////// Generic property list routines ///////
 
     /**
      * H5Pget_class_name retrieves the name of a generic property list class
@@ -4767,7 +4767,7 @@ public class H5 implements java.io.Serializable {
 
     public synchronized static native int H5Piterate(long plist, int[] idx, H5P_iterate_cb op, H5P_iterate_t op_data) throws HDF5LibraryException;
 
-    // Object creation property list (OCPL) routines
+    // /////// Object creation property list (OCPL) routines ///////
 
     /**
      * H5Pget_attr_phase_change retrieves attribute storage phase change thresholds.
@@ -5071,7 +5071,7 @@ public class H5 implements java.io.Serializable {
     public synchronized static native int H5Pset_fletcher32(long plist) throws HDF5LibraryException,
     NullPointerException;
 
-    // File creation property list (FCPL) routines
+    // /////// File creation property list (FCPL) routines ///////
 
     /**
      * H5Pget_userblock retrieves the size of a user block in a file creation property list.
@@ -5480,7 +5480,7 @@ public class H5 implements java.io.Serializable {
            throws HDF5LibraryException, IllegalArgumentException;
 
 
-    // File access property list (FAPL) routines
+    // /////// File access property list (FAPL) routines ///////
 
     /**
      * H5Pget_alignment retrieves the current settings for alignment properties from a file access property list.
@@ -5860,6 +5860,37 @@ public class H5 implements java.io.Serializable {
     public synchronized static native void H5Pset_metadata_read_attempts(long plist_id, long attempts)
             throws HDF5LibraryException;
 
+    /**
+     * H5Pget_evict_on_close retrieves the file access property list setting that determines whether an HDF5 object
+     * will be evicted from the library's metadata cache when it is closed.
+     *
+     * @param fapl_id
+     *            IN: File access property list identifier
+     *
+     * @return indication if the object will be evicted on close.
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     *
+     **/
+    public synchronized static native boolean H5Pget_evict_on_close(long fapl_id)
+            throws HDF5LibraryException;
+
+    /**
+     * H5Pset_evict_on_close controls the library's behavior of evicting metadata associated with a closed object.
+     *
+     * @param fapl_id
+     *            IN: File access property list identifier
+     * @param evict_on_close
+     *            IN: Whether the HDF5 object should be evicted on close.
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     *
+     **/
+    public synchronized static native void H5Pset_evict_on_close(long fapl_id, boolean evict_on_close)
+            throws HDF5LibraryException;
+
     // Dataset creation property list (DCPL) routines //
 
     /**
@@ -6285,7 +6316,37 @@ public class H5 implements java.io.Serializable {
     public synchronized static native int H5Pset_fill_time(long plist_id, int fill_time) throws HDF5LibraryException,
     NullPointerException;
 
-    // Dataset access property list (DAPL) routines //
+    // /////// Dataset creation property list (DCPL) routines ///////
+
+    /**
+     * H5Pset_chunk_opts Sets the edge chunk option in a dataset creation property list.
+     *
+     * @param dcpl_id
+     *            IN: Dataset creation property list identifier
+     * @param opts
+     *            IN: Edge chunk option flag. Valid values are:
+     *                H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS - filters are not applied to partial edge chunks.
+     *                0 - Disables option; partial edge chunks will be compressed.
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library
+     **/
+    public synchronized static native void H5Pset_chunk_opts(long dcpl_id, int opts) throws HDF5LibraryException;
+
+    /**
+     * H5Pget_chunk_opts retrieves the edge chunk option setting stored in the dataset creation property list .
+     *
+     * @param dcpl_id
+     *            IN: Dataset creation property list
+
+     * @return The edge chunk option setting.
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library
+     **/
+    public synchronized static native int H5Pget_chunk_opts(long dcpl_id) throws HDF5LibraryException;
+
+    // /////// Dataset access property list (DAPL) routines ///////
 
     /**
      * Retrieves the maximum possible number of elements in the meta data cache and the maximum possible number of bytes
@@ -6388,12 +6449,44 @@ public class H5 implements java.io.Serializable {
      **/
     public synchronized static native long H5Pget_virtual_printf_gap(long dapl_id) throws HDF5LibraryException;
 
+    /**
+     * H5Pget_efile_prefix Retrieves prefix applied to external file paths.
+     *
+     * @param dapl_id
+     *            IN: Link access property list identifier
+     *
+     * @return the prefix to be applied to external file paths.
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     *
+     **/
+    public synchronized static native String H5Pget_efile_prefix(long dapl_id)
+            throws HDF5LibraryException;
+
+    /**
+     * H5Pset_efile_prefix Sets prefix to be applied to external file paths.
+     *
+     * @param dapl_id
+     *            IN: Dataset access property list identifier
+     * @param prefix
+     *            IN: Prefix to be applied to external file paths
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     * @exception NullPointerException
+     *                - prefix is null.
+     *
+     **/
+    public synchronized static native void H5Pset_efile_prefix(long dapl_id, String prefix)
+            throws HDF5LibraryException, NullPointerException;
+
     // public synchronized static native void H5Pset_append_flush(long plist_id, int ndims, long[] boundary, H5D_append_cb func, H5D_append_t udata) throws HDF5LibraryException;
 
     // public synchronized static native void H5Pget_append_flush(long plist_id, int dims, long[] boundary, H5D_append_cb func, H5D_append_t udata) throws HDF5LibraryException;
 
 
-    // Dataset xfer property list (DXPL) routines //
+    // /////// Dataset xfer property list (DXPL) routines ///////
 
     /**
      * H5Pget_data_transform retrieves the data transform expression previously set in the dataset transfer property
@@ -6544,7 +6637,7 @@ public class H5 implements java.io.Serializable {
     public synchronized static native int H5Pset_hyper_vector_size(long dxpl_id, long vector_size)
             throws HDF5LibraryException, NullPointerException;
 
-    // Link creation property list (LCPL) routines //
+    // /////// Link creation property list (LCPL) routines ///////
 
     /**
      * H5Pget_create_intermediate_group determines whether property is set to enable creating missing intermediate
@@ -6579,7 +6672,7 @@ public class H5 implements java.io.Serializable {
     public synchronized static native int H5Pset_create_intermediate_group(long lcpl_id, boolean crt_intermed_group)
             throws HDF5LibraryException;
 
-    // Group creation property list (GCPL) routines //
+    // /////// Group creation property list (GCPL) routines ///////
 
     /**
      * H5Pget_local_heap_size_hint Retrieves the anticipated size of the local heap for original-style groups.
@@ -6736,14 +6829,14 @@ public class H5 implements java.io.Serializable {
     public synchronized static native int H5Pset_link_creation_order(long gcpl_id, int crt_order_flags)
             throws HDF5LibraryException;
 
-    // String creation property list (STRCPL) routines //
+    // /////// String creation property list (STRCPL) routines ///////
 
     public synchronized static native int H5Pget_char_encoding(long plist_id) throws HDF5LibraryException;
 
     public synchronized static native void H5Pset_char_encoding(long plist_id, int encoding)
             throws HDF5LibraryException;
 
-    // Link access property list (LAPL) routines //
+    // /////// Link access property list (LAPL) routines ///////
 
     /**
      * H5Pget_nlinks retrieves the maximum number of soft or user-defined link traversals allowed, nlinks, before the
@@ -6896,7 +6989,7 @@ public class H5 implements java.io.Serializable {
     public synchronized static native int H5Pset_elink_acc_flags(long lapl_id, int flags) throws HDF5LibraryException,
     IllegalArgumentException;
 
-    // Object copy property list (OCPYPL) routines //
+    // /////// Object copy property list (OCPYPL) routines ///////
 
     /**
      * H5Pget_copy_object retrieves the properties to be used when an object is copied.
@@ -6927,7 +7020,7 @@ public class H5 implements java.io.Serializable {
     public synchronized static native void H5Pset_copy_object(long ocp_plist_id, int copy_options)
             throws HDF5LibraryException;
 
-    // Other/Older property list routines //
+    // /////// Other/Older property list routines ///////
 
     /**
      * H5Pget_version retrieves the version information of various objects for a file creation property list.
@@ -6955,7 +7048,7 @@ public class H5 implements java.io.Serializable {
     public synchronized static native int H5Pget_version(long plist, int[] version_info) throws HDF5LibraryException,
     NullPointerException, IllegalArgumentException;
 
-    // file drivers property list routines //
+    // /////// file drivers property list routines ///////
 
     public synchronized static native void H5Pget_fapl_core(long fapl_id, long[] increment, boolean[] backing_store)
             throws HDF5LibraryException, NullPointerException;
@@ -7102,20 +7195,28 @@ public class H5 implements java.io.Serializable {
     // File creation property list (FCPL) routines //
 
     // File access property list (FAPL) routines //
-    // herr_t H5Pset_driver( hid_t plist_id, hid_t new_driver_id, const void *new_driver_info )
-    // const void *H5Pget_driver_info( hid_t plist_id )
-    // herr_t H5Pget_multi_type ( hid_t fapl_id, H5FD_mem_t *type )
-    // herr_t H5Pset_multi_type ( hid_t fapl_id, H5FD_mem_t type )
+    // herr_t H5Pset_driver(hid_t plist_id, hid_t new_driver_id, const void *new_driver_info)
+    // const void *H5Pget_driver_info(hid_t plist_id)
+    // herr_t H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type)
+    // herr_t H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type)
     // herr_t H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr);
     // herr_t H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len);
     // herr_t H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr);
     // herr_t H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr);
     // herr_t H5Pset_core_write_tracking(hid_t fapl_id, hbool_t is_enabled, size_t page_size);
     // herr_t H5Pget_core_write_tracking(hid_t fapl_id, hbool_t *is_enabled, size_t *page_size);
+    // herr_t H5Pset_all_coll_metadata_ops(hid_t accpl_id, hbool_t is_collective);
+    // herr_t H5Pset_coll_metadata_write(hid_t fapl_id, hbool_t is_collective);
+    // herr_t H5Pget_coll_metadata_write(hid_t fapl_id, hbool_t *is_collective);
+    // herr_t H5Pget_page_buffer_size(hid_t fapl_id, size_t *buf_size, unsigned *min_meta_perc, unsigned *min_raw_perc);
+    // herr_t H5Pset_object_flush_cb (hid_t fapl_id, H5F_flush_cb_t func, void *user_data);
+    // herr_t H5Pget_object_flush_cb (hid_t fapl_id, H5F_flush_cb_t *func, void **user_data);
 
     // Dataset creation property list (DCPL) routines //
 
     // Dataset access property list (DAPL) routines //
+    // herr_t H5Pset_append_flush (hid_t dapl_id, int ndims, const hsize_t boundary[], H5D_append_cb_t func, void *user_data);
+    // herr_t H5Pget_append_flush(hid_t dapl_id, int ndims, hsize_t boundary[], H5D_append_cb_t *func, void **user_data)
 
     // Dataset xfer property list (DXPL) routines //
     // herr_t H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg);
diff --git a/java/src/hdf/hdf5lib/HDF5Constants.java b/java/src/hdf/hdf5lib/HDF5Constants.java
index 8a3d6c8..3e43ba2 100644
--- a/java/src/hdf/hdf5lib/HDF5Constants.java
+++ b/java/src/hdf/hdf5lib/HDF5Constants.java
@@ -88,6 +88,7 @@ public class HDF5Constants {
     public static final int H5D_VDS_ERROR = H5D_VDS_ERROR();
     public static final int H5D_VDS_FIRST_MISSING = H5D_VDS_FIRST_MISSING();
     public static final int H5D_VDS_LAST_AVAILABLE = H5D_VDS_LAST_AVAILABLE();
+    public static final int H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS = H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS();
 
     public static final int H5E_MAJOR = H5E_MAJOR();
     public static final int H5E_MINOR = H5E_MINOR();
@@ -768,6 +769,8 @@ public class HDF5Constants {
 
     private static native final int H5D_VDS_LAST_AVAILABLE();
 
+    private static native final int H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS();
+
     private static native final long H5E_ALIGNMENT();
 
     private static native final long H5E_ALREADYEXISTS();
diff --git a/java/src/hdf/overview.html b/java/src/hdf/overview.html
index 39d75b7..9c19442 100644
--- a/java/src/hdf/overview.html
+++ b/java/src/hdf/overview.html
@@ -47,20 +47,20 @@ which has a method:
 The native method is implemented in C using the
 <a href="http://java.sun.com/javase/6/docs/technotes/guides/jni/index.html">Java
 Native Method Interface </a>(JNI). This is written something like the following:
-<pre><b>JNIEXPORT jint
+<pre><b>JNIEXPORT jlong
 JNICALL Java_hdf_hdf5lib_H5_H5Fopen
 (
 &nbsp;JNIEnv *env,
 &nbsp;jclass class,
 &nbsp;jstring hdfFile,
 &nbsp;jint flags,
-&nbsp;jint access)
+&nbsp;jlong access)
 &nbsp;{
 
 &nbsp;/* ...convert Java String to (char *) */
 
 &nbsp;/* call the HDF library */
-&nbsp;retVal = H5Fopen((char *)file, (unsigned)flags, (hid_t)access );
+&nbsp;retVal = H5Fopen((char *)file, (unsigned)flags, (hid_t)access);
 
 &nbsp;/* ... */
 }</b></pre>
diff --git a/java/src/jni/CMakeLists.txt b/java/src/jni/CMakeLists.txt
index 9e6c099..10d1b6d 100644
--- a/java/src/jni/CMakeLists.txt
+++ b/java/src/jni/CMakeLists.txt
@@ -51,7 +51,7 @@ set (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
 ########### JNI libraries always must be built shared  ###############
 add_library (${HDF5_JAVA_JNI_LIB_TARGET} SHARED ${HDF5_JAVA_JNI_CSRCS} ${HDF5_JAVA_JNI_CHDRS})
 TARGET_C_PROPERTIES (${HDF5_JAVA_JNI_LIB_TARGET} SHARED " " " ")
-target_link_libraries (${HDF5_JAVA_JNI_LIB_TARGET} ${HDF5_LIB_TARGET})
+target_link_libraries (${HDF5_JAVA_JNI_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET})
 set_target_properties (${HDF5_JAVA_JNI_LIB_TARGET} PROPERTIES FOLDER libraries/jni)
 SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_JAVA_JNI_LIB_TARGET}")
 H5_SET_LIB_OPTIONS (${HDF5_JAVA_JNI_LIB_TARGET} ${HDF5_JAVA_JNI_LIB_NAME} SHARED ${HDF5_JAVA_PACKAGE_SOVERSION})
diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c
index f6f8bfa..5a4b53e 100644
--- a/java/src/jni/h5Constants.c
+++ b/java/src/jni/h5Constants.c
@@ -140,6 +140,8 @@ JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5D_1VDS_1FIRST_1MISSING(JNIEnv *env, jclass cls) { return H5D_VDS_FIRST_MISSING; }
 JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5D_1VDS_1LAST_1AVAILABLE(JNIEnv *env, jclass cls) { return H5D_VDS_LAST_AVAILABLE; }
+JNIEXPORT jint JNICALL
+Java_hdf_hdf5lib_HDF5Constants_H5D_1CHUNK_1DONT_1FILTER_1PARTIAL_1CHUNKS(JNIEnv *env, jclass cls) { return H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS; }
 
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5E_1ALIGNMENT(JNIEnv *env, jclass cls) { return H5E_ALIGNMENT; }
diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c
index dcfcd82..2b73266 100644
--- a/java/src/jni/h5pImp.c
+++ b/java/src/jni/h5pImp.c
@@ -5733,6 +5733,150 @@ Java_hdf_hdf5lib_H5_H5Pset_1metadata_1read_1attempts
      } /* end else */
 } /* end Java_hdf_hdf5lib_H5_H5Pset_1metadata_1read_1attempts */
 
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pset_efile_prefix
+ * Signature: (JLjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Pset_1efile_1prefix
+    (JNIEnv *env, jclass clss, jlong dapl_id, jstring prefix)
+{
+    herr_t      retVal = -1;
+    const char *aName;
+
+    PIN_JAVA_STRING(prefix, aName);
+    if (aName != NULL) {
+        retVal = H5Pset_efile_prefix((hid_t)dapl_id, aName);
+
+        UNPIN_JAVA_STRING(prefix, aName);
+
+        if(retVal < 0)
+            h5libraryError(env);
+    }
+} /* end Java_hdf_hdf5lib_H5_H5Pset_1efile_1prefix */
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pget_efile_prefix
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL
+Java_hdf_hdf5lib_H5_H5Pget_1efile_1prefix
+    (JNIEnv *env, jclass clss, jlong dapl_id)
+{
+    size_t  size = 0;
+    char   *pre;
+    jlong   prefix_size = -1;
+    jstring str = NULL;
+
+    prefix_size = (jlong)H5Pget_efile_prefix((hid_t)dapl_id, (char*)NULL, size);
+    if(prefix_size < 0) {
+        h5libraryError(env);
+    } /* end if */
+    else {
+        size = (size_t)prefix_size + 1;/* add extra space for the null terminator */
+        pre = (char*)HDmalloc(sizeof(char)*size);
+        if (pre == NULL) {
+            h5outOfMemory(env, "H5Pget_efile_prefix:  malloc failed ");
+        } /* end if */
+        else {
+            prefix_size = (jlong)H5Pget_efile_prefix((hid_t)dapl_id, (char*)pre, size);
+
+            if (prefix_size >= 0) {
+                str = ENVPTR->NewStringUTF(ENVPAR pre);
+                HDfree(pre);
+                if (str == NULL)
+                    h5JNIFatalError( env, "H5Pget_efile_prefix:  return string not allocated");
+            } /* end if */
+            else {
+                HDfree(pre);
+                h5libraryError(env);
+            } /* end else */
+        } /* end else */
+    } /* end else */
+
+    return (jstring)str;
+} /* end Java_hdf_hdf5lib_H5_H5Pget_1efile_1prefix */
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pset_evict_on_close
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Pset_1evict_1on_1close
+    (JNIEnv *env, jclass clss, jlong fapl_id, jboolean evict_on_close)
+{
+    herr_t   retVal = -1;
+    hbool_t  evict_on_close_val;
+
+    if (evict_on_close == JNI_TRUE)
+        evict_on_close_val = TRUE;
+    else
+        evict_on_close_val = FALSE;
+
+    retVal = H5Pset_evict_on_close((hid_t)fapl_id, (hbool_t)evict_on_close_val);
+    if (retVal < 0)
+        h5libraryError(env);
+} /* end Java_hdf_hdf5lib_H5_H5Pset_1evict_1on_1close */
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pget_evict_on_close
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_hdf_hdf5lib_H5_H5Pget_1evict_1on_1close
+    (JNIEnv *env, jclass clss, jlong fapl_id)
+{
+    hbool_t   evict_on_close_val = FALSE;
+    jboolean  bval = JNI_FALSE;
+
+    if (H5Pget_evict_on_close((hid_t)fapl_id, (hbool_t *)&evict_on_close_val) < 0) {
+        h5libraryError(env);
+    } /* end if */
+    else {
+        if (evict_on_close_val == TRUE)
+            bval =  JNI_TRUE;
+    } /* end else */
+
+    return bval;
+} /* end Java_hdf_hdf5lib_H5_H5Pget_1evict_1on_1close */
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pset_chunk_opts
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Pset_1chunk_1opts
+    (JNIEnv *env, jclass clss, jlong dcpl_id, jint opts)
+{
+    herr_t   retVal = -1;
+
+    retVal = H5Pset_chunk_opts((hid_t)dcpl_id, (unsigned)opts);
+    if (retVal < 0)
+        h5libraryError(env);
+} /* end Java_hdf_hdf5lib_H5_H5Pset_1chunk_1opts */
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pget_chunk_opts
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL
+Java_hdf_hdf5lib_H5_H5Pget_1chunk_1opts
+    (JNIEnv *env, jclass clss, jlong dcpl_id)
+{
+    unsigned   opts = 0;
+
+    if (H5Pget_chunk_opts((hid_t)dcpl_id, opts) < 0)
+        h5libraryError(env);
+
+    return (jint)opts;
+} /* end Java_hdf_hdf5lib_H5_H5Pget_1chunk_1opts */
+
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5pImp.h b/java/src/jni/h5pImp.h
index d413f69..f5dba6b 100644
--- a/java/src/jni/h5pImp.h
+++ b/java/src/jni/h5pImp.h
@@ -1533,7 +1533,6 @@ JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Pget_1metadata_1read_1attempts
 (JNIEnv *, jclass, jlong);
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_metadata_read_attempts
@@ -1543,6 +1542,60 @@ JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Pset_1metadata_1read_1attempts
 (JNIEnv *, jclass, jlong, jlong);
 
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pset_efile_prefix
+ * Signature: (JLjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Pset_1efile_1prefix
+(JNIEnv *, jclass, jlong, jstring);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pget_efile_prefix
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL
+Java_hdf_hdf5lib_H5_H5Pget_1efile_1prefix
+(JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pset_evict_on_close
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Pset_1evict_1on_1close
+(JNIEnv *, jclass, jlong, jboolean);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pget_evict_on_close
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_hdf_hdf5lib_H5_H5Pget_1evict_1on_1close
+(JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pset_chunk_opts
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL
+Java_hdf_hdf5lib_H5_H5Pset_1chunk_1opts
+(JNIEnv *, jclass, jlong, jint);
+
+/*
+ * Class:     hdf_hdf5lib_H5
+ * Method:    H5Pget_chunk_opts
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL
+Java_hdf_hdf5lib_H5_H5Pget_1chunk_1opts
+(JNIEnv *, jclass, jlong);
+
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/test/JUnit-interface.txt b/java/test/JUnit-interface.txt
index ab2f3b1..6d2754f 100644
--- a/java/test/JUnit-interface.txt
+++ b/java/test/JUnit-interface.txt
@@ -415,6 +415,7 @@ JUnit version 4.11
 .testH5PH5Pset_shared_mesg_phase_change_HighMaxlistValue
 .testH5P_layout
 .testH5Pget_link_creation_order
+.testH5Pget_efile_prefix
 .testH5Pset_shared_mesg_nindexes_InvalidHIGHnindexes
 .testH5P_file_space_page_size
 .testH5Pget_shared_mesg_index_Invalid_indexnum
@@ -444,6 +445,7 @@ JUnit version 4.11
 .testH5Pset_est_link_info_InvalidValues
 .testH5Pset_local_heap_size_hint
 .testH5Pget_est_link_info
+.testH5Pset_efile_prefix_null
 .testH5Pset_scaleoffset
 .testH5Pset_create_intermediate_group_invalidobject
 .testH5PH5Pset_shared_mesg_phase_change_HighMinbtreeValue
@@ -466,6 +468,7 @@ JUnit version 4.11
 .testH5Pget_sym_k_null
 .testH5Pset_nlinks
 .testH5P_obj_track_times
+.testH5Pset_efile_prefix
 .testH5P_userblock
 .testH5Pget_local_heap_size_hint
 .testH5Pset_shared_mesg_index_Invalid_indexnum
@@ -504,6 +507,7 @@ JUnit version 4.11
 .testH5Pset_mdc_config
 .testH5P_small_data_block_size
 .testH5Pset_fapl_log
+.testH5P_evict_on_close
 .testH5Pset_libver_bounds
 .testH5P_sieve_buf_size
 .testH5P_elink_file_cache_size
@@ -640,7 +644,7 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (638 tests)
+OK (642 tests)
 
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Fopen(): can't set access and transfer property lists
diff --git a/java/test/TestH5P.java b/java/test/TestH5P.java
index 5aafb5b..9e45e4c 100644
--- a/java/test/TestH5P.java
+++ b/java/test/TestH5P.java
@@ -28,6 +28,7 @@ import hdf.hdf5lib.exceptions.HDF5LibraryException;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
@@ -852,7 +853,7 @@ public class TestH5P {
         }
         catch (Throwable err) {
             err.printStackTrace();
-            fail("H5Pset_est_link_info: " + err);
+            fail("H5Pset_elink_prefix: " + err);
         }
         assertTrue("H5Pset_elink_prefix", ret_val >= 0);
     }
@@ -1232,4 +1233,54 @@ public class TestH5P {
             fail("testH5P_file_space_page_size: " + err);
         }
    }
+
+    @Test
+    public void testH5Pset_efile_prefix() {
+        String prefix = "tmp";
+        try {
+            H5.H5Pset_efile_prefix(lapl_id, prefix);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("H5Pset_efile_prefix: " + err);
+        }
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testH5Pset_efile_prefix_null() throws Throwable{
+        H5.H5Pset_efile_prefix(lapl_id, null);
+    }
+
+    @Test
+    public void testH5Pget_efile_prefix() {
+        String prefix = "tmp";
+        String pre = "";
+
+        try {
+            H5.H5Pset_efile_prefix(lapl_id, prefix);
+            pre = H5.H5Pget_efile_prefix(lapl_id);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("H5Pget_efile_prefix: " + err);
+        }
+        assertTrue("The prefix: ", prefix.equals(pre));
+    }
+
+    @Ignore
+    public void testH5P_chunk_opts() {
+        int chunk_opts = -1;
+
+        try {
+            chunk_opts = H5.H5Pget_chunk_opts(ocpl_id);
+            assertTrue("chunk_opts: "+chunk_opts, chunk_opts == 0);
+            H5.H5Pset_chunk_opts(ocpl_id, HDF5Constants.H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS);
+            chunk_opts = H5.H5Pget_chunk_opts(ocpl_id);
+            assertTrue("chunk_opts: "+chunk_opts, chunk_opts == HDF5Constants.H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("H5Pget_lchunk_opts: " + err);
+        }
+    }
 }
diff --git a/java/test/TestH5Pfapl.java b/java/test/TestH5Pfapl.java
index d4a2231..48a5986 100644
--- a/java/test/TestH5Pfapl.java
+++ b/java/test/TestH5Pfapl.java
@@ -1376,4 +1376,18 @@ public class TestH5Pfapl {
         deleteH5file();
         _deleteLogFile();
     }
+
+    @Test
+    public void testH5P_evict_on_close() {
+        boolean ret_val_id = false;
+        try {
+            H5.H5Pset_evict_on_close(fapl_id, true);
+            ret_val_id = H5.H5Pget_evict_on_close(fapl_id);
+            assertTrue("H5P_evict_on_close", ret_val_id);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("H5P_evict_on_close: " + err);
+        }
+    }
 }
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 796a4a0..d36eb42 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -180,6 +180,17 @@ New Features
 
     Java Library:
     -------------
+    - Wrappers added for the following APIs:
+      H5Pset_evict_on_close
+      H5Pget_evict_on_close
+      H5Pset_chunk_opts
+      H5Pget_chunk_opts
+      H5Pset_efile_prefix
+      H5Pget_efile_prefix
+      H5Pset_virtual_prefix
+      H5Pget_virtual_prefix
+
+      (ADB - 2017/12/20)
 
     - The H5I_REFERENCE value in the H5I_type_t enum (defined in H5Ipublic.h)
       has been marked as deprectated.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fca864b..713f2bd 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -32,12 +32,13 @@ set (TEST_LIB_HEADERS
 add_library (${HDF5_TEST_LIB_TARGET} STATIC ${TEST_LIB_SOURCES} ${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
@@ -48,12 +49,13 @@ if (BUILD_SHARED_LIBS)
   add_library (${HDF5_TEST_LIBSH_TARGET} SHARED ${TEST_LIB_SOURCES} ${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
@@ -97,7 +99,7 @@ endif ()
 
     add_library (${HDF5_TEST_PLUGIN_TARGET} SHARED ${HDF5_TEST_SOURCE_DIR}/${plugin_name}.c)
     TARGET_C_PROPERTIES (${HDF5_TEST_PLUGIN_TARGET} SHARED " " " ")
-    target_link_libraries (${HDF5_TEST_PLUGIN_TARGET} ${HDF5_TEST_LIB_TARGET})
+    target_link_libraries (${HDF5_TEST_PLUGIN_TARGET} PUBLIC ${HDF5_TEST_LIB_TARGET})
     H5_SET_LIB_OPTIONS (${HDF5_TEST_PLUGIN_TARGET} ${HDF5_TEST_PLUGIN_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
     set_target_properties (${HDF5_TEST_PLUGIN_TARGET} PROPERTIES FOLDER libraries/TEST_PLUGIN)
 
@@ -123,7 +125,7 @@ endif ()
 
     add_library (${HDF5_TEST_PLUGIN_TARGET} SHARED ${HDF5_TEST_SOURCE_DIR}/${plugin_name}.c)
     TARGET_C_PROPERTIES (${HDF5_TEST_PLUGIN_TARGET} SHARED " " " ")
-    target_link_libraries (${HDF5_TEST_PLUGIN_TARGET} ${HDF5_TEST_LIB_TARGET})
+    target_link_libraries (${HDF5_TEST_PLUGIN_TARGET} PUBLIC ${HDF5_TEST_LIB_TARGET})
     H5_SET_LIB_OPTIONS (${HDF5_TEST_PLUGIN_TARGET} ${HDF5_TEST_PLUGIN_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
     set_target_properties (${HDF5_TEST_PLUGIN_TARGET} PROPERTIES FOLDER libraries/TEST_PLUGIN)
 
@@ -172,13 +174,13 @@ set (testhdf5_SOURCES
 add_executable (testhdf5 ${testhdf5_SOURCES})
 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_SOURCES})
   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 ()
 
@@ -186,13 +188,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/vds.c b/test/vds.c
index 68ac397..10da0de 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -57,14 +57,7 @@ const char *FILENAME[] = {
  *              provided dataspaces are the same.
  *
  * Return:      Success:        0
- *
  *              Failure:        -1
- *
- * Programmer:  Neil Fortner
- *              Monday, March 2, 2015
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static htri_t
@@ -130,7 +123,7 @@ vds_select_equal(hid_t space1, hid_t space2)
                     if(buf1[i] != buf2[i]) {
                         ret_value = FALSE;
                         break;
-                    } /* end if */
+                    }
 
                 /* Free buffers */
                 HDfree(buf1);
@@ -180,7 +173,7 @@ vds_select_equal(hid_t space1, hid_t space2)
                     if(buf1[i] != buf2[i]) {
                         ret_value = FALSE;
                         break;
-                    } /* end if */
+                    }
 
                 /* Free buffers */
                 HDfree(buf1);
@@ -217,14 +210,7 @@ error:
  *              parameters.
  *
  * Return:      Success:        0
- *
  *              Failure:        -1
- *
- * Programmer:  Neil Fortner
- *              Monday, March 2, 2015
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -298,8 +284,7 @@ vds_check_mapping(hid_t dcpl, size_t i, hid_t vspace, hid_t srcspace,
 
 error:
     H5E_BEGIN_TRY {
-        if(space_out >= 0)
-            (void)H5Sclose(space_out);
+        H5Sclose(space_out);
     } H5E_END_TRY
 
     return -1;
@@ -312,14 +297,7 @@ error:
  * Purpose:     Tests API functions related to virtual datasets.
  *
  * Return:      Success:        0
- *
  *              Failure:        number of errors
- *
- * Programmer:  Neil Fortner
- *              Monday, February 16, 2015
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 /* Helper function to get DCPL for examination depending on config */
@@ -370,12 +348,12 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl,
                 file = -1;
                 if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
                     TEST_ERROR
-            } /* end if */
+            }
 
             /* Open dataset */
             if((dset = H5Dopen2(file, "vdset", H5P_DEFAULT)) < 0)
                 TEST_ERROR
-        } /* end if */
+        }
 
         /* Get DCPL from dataset */
         if((*ex_dcpl = H5Dget_create_plist(dset)) < 0)
@@ -394,8 +372,8 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl,
             if(oinfo.meta_size.obj.heap_size != exp_meta_size) {
                 printf("VDS metadata size: %llu Expected: %llu\n", (long long unsigned)oinfo.meta_size.obj.heap_size, (long long unsigned)exp_meta_size);
                 TEST_ERROR
-            } /* end if */
-        } /* end if */
+            }
+        }
         else
             if((oinfo.meta_size.obj.heap_size != exp_meta_size)
                     && (oinfo.meta_size.obj.heap_size != (hsize_t)0))
@@ -424,12 +402,12 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl,
         if(H5Fclose(file) < 0)
             TEST_ERROR
         file = -1;
-    } /* end if */
+    }
     else if(config == TEST_API_COPY_PLIST) {
         /* Copy property list */
         if((*ex_dcpl = H5Pcopy(dcpl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else if(config == TEST_API_ENCDEC_PLIST) {
         size_t plist_buf_size;
 
@@ -448,14 +426,14 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl,
         /* Free plist_buf */
         HDfree(plist_buf);
         plist_buf = NULL;
-    } /* end if */
+    }
     else {
         /* Simply copy the id to ex_dcpl and increment the ref count so ex_dcpl
          * can be closed */
         if(H5Iinc_ref(dcpl) < 0)
             TEST_ERROR
         *ex_dcpl = dcpl;
-    } /* end else */
+    }
 
     /* Verify examination DCPL is equal to original DCPL.  Do not compare the
      * plist to itself, and do not do the comparison if we reopened the file,
@@ -466,16 +444,14 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl,
             TEST_ERROR
         if(!tri_ret)
             TEST_ERROR
-    } /* end if */
+    }
 
     return 0;
 
 error:
     H5E_BEGIN_TRY {
-        if(file >= 0)
-            (void)H5Fclose(file);
-        if(dset >= 0)
-            (void)H5Dclose(dset);
+        H5Fclose(file);
+        H5Dclose(dset);
     } H5E_END_TRY;
     if(plist_buf)
         HDfree(plist_buf);
@@ -532,7 +508,7 @@ test_api(test_api_config_t config, hid_t fapl)
         case TEST_API_NTESTS:
         default:
             TEST_ERROR
-    } /* end switch */
+    }
 
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
 
@@ -818,7 +794,7 @@ test_api(test_api_config_t config, hid_t fapl)
         /* Create virtual dataspace */
         if((vspace[i] = H5Screate_simple(2, dims, NULL)) < 0)
             TEST_ERROR
-    } /* end for */
+    }
 
     /* Select all (should not be necessary, but just to be sure) */
     if(H5Sselect_all(srcspace[0]) < 0)
@@ -932,7 +908,7 @@ test_api(test_api_config_t config, hid_t fapl)
         if(H5Sclose(vspace[i]) < 0)
             TEST_ERROR
         vspace[i] = -1;
-    } /* end for */
+    }
     if(H5Pclose(ex_dcpl) < 0)
         TEST_ERROR
     ex_dcpl = -1;
@@ -1038,7 +1014,7 @@ test_api(test_api_config_t config, hid_t fapl)
         /* Add virtual layout mapping */
         if(H5Pset_virtual(dcpl, vspace[i], tmp_filename, tmp_dsetname, srcspace[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get examination DCPL */
     if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)697) < 0)
@@ -1063,7 +1039,7 @@ test_api(test_api_config_t config, hid_t fapl)
         /* Check that the mapping in the DCPL is correct */
         if(vds_check_mapping(ex_dcpl, (size_t)i, vspace[i], srcspace[0], tmp_filename, tmp_dsetname) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Close */
     if(H5Sclose(srcspace[0]) < 0)
@@ -1073,7 +1049,7 @@ test_api(test_api_config_t config, hid_t fapl)
         if(H5Sclose(vspace[i]) < 0)
             TEST_ERROR
         vspace[i] = -1;
-    } /* end for */
+    }
     if(H5Pclose(ex_dcpl) < 0)
         TEST_ERROR
     ex_dcpl = -1;
@@ -1123,18 +1099,12 @@ test_api(test_api_config_t config, hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-        for(i = 0; i < (sizeof(srcspace) / sizeof(srcspace[0])); i++) {
-            if(srcspace[i] >= 0)
-                (void)H5Sclose(srcspace[i]);
-        } /* end for */
-        for(i = 0; i < (sizeof(vspace) / sizeof(vspace[0])); i++) {
-            if(vspace[i] >= 0)
-                (void)H5Sclose(vspace[i]);
-        } /* end for */
-        if(dcpl >= 0)
-            (void)H5Pclose(dcpl);
-        if(ex_dcpl >= 0)
-            (void)H5Pclose(ex_dcpl);
+        for(i = 0; i < (sizeof(srcspace) / sizeof(srcspace[0])); i++)
+            H5Sclose(srcspace[i]);
+        for(i = 0; i < (sizeof(vspace) / sizeof(vspace[0])); i++)
+            H5Sclose(vspace[i]);
+        H5Pclose(dcpl);
+        H5Pclose(ex_dcpl);
     } H5E_END_TRY;
 
      return 1;
@@ -1148,14 +1118,7 @@ error:
  *              pattern-matching file/dataset strings
  *
  * Return:      Success:        0
- *
  *              Failure:        number of errors
- *
- * Programmer:  Neil Fortner
- *              Tuesday, March 3, 2015
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -1238,12 +1201,12 @@ test_basic_io(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create source dataset */
     if((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -1272,8 +1235,8 @@ test_basic_io(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -1287,7 +1250,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data through virtual dataset */
     HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -1316,7 +1279,7 @@ test_basic_io(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[0] = H5Dopen2(srcfile[0], "src_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data directly from source dataset */
     HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -1400,12 +1363,12 @@ test_basic_io(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create source datasets */
     if((srcdset[0] = H5Dcreate2(srcfile[0], "%src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -1441,8 +1404,8 @@ test_basic_io(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -1456,7 +1419,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data through virtual dataset */
     HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -1487,7 +1450,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2%", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data directly from source datasets */
     HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -1536,8 +1499,8 @@ test_basic_io(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -1546,7 +1509,7 @@ test_basic_io(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Open v_dset2 */
     if((vdset = H5Dopen2(vfile, "v_dset2", H5P_DEFAULT)) < 0)
@@ -1572,7 +1535,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2%", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Only copy to a different file if the source datasets are in a different
      * file */
@@ -1614,8 +1577,8 @@ test_basic_io(unsigned config, hid_t fapl)
                 if(H5Fclose(srcfile[0]) < 0)
                     TEST_ERROR
                 srcfile[0] = -1;
-            } /* end if */
-        } /* end if */
+            }
+        }
 
         /* Reopen copied virtual file if config option specified */
         if(config & TEST_IO_REOPEN_VIRT) {
@@ -1624,7 +1587,7 @@ test_basic_io(unsigned config, hid_t fapl)
             vfile2 = -1;
             if((vfile2 = H5Fopen(vfilename2, H5F_ACC_RDWR, fapl)) < 0)
                 TEST_ERROR
-        } /* end if */
+        }
 
         /* Open v_dset3 */
         if((vdset = H5Dopen2(vfile2, "v_dset3", H5P_DEFAULT)) < 0)
@@ -1650,13 +1613,13 @@ test_basic_io(unsigned config, hid_t fapl)
                 TEST_ERROR
             if((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2%", H5P_DEFAULT)) < 0)
                 TEST_ERROR
-        } /* end if */
+        }
 
         /* Close copied virtual file */
         if(H5Fclose(vfile2) < 0)
             TEST_ERROR
         vfile2 = -1;
-    } /* end if */
+    }
 
     /* Close */
     if(H5Dclose(srcdset[0]) < 0)
@@ -1735,12 +1698,12 @@ test_basic_io(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create source datasets */
     if((srcdset[0] = H5Dcreate2(srcfile[0], "%src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -1782,8 +1745,8 @@ test_basic_io(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -1797,7 +1760,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data through virtual dataset */
     HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -1828,7 +1791,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2%", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data directly from source datasets */
     HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -1923,12 +1886,12 @@ test_basic_io(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilenamepct, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create source datasets */
     if((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -1964,8 +1927,8 @@ test_basic_io(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -1979,7 +1942,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read first source dataset through virtual dataset */
     HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -2032,7 +1995,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data directly from source datasets */
     HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -2131,12 +2094,12 @@ test_basic_io(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create source datasets */
     if((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -2164,7 +2127,7 @@ test_basic_io(unsigned config, hid_t fapl)
             evbuf[i][j] = buf[2 * i][j];
         for(/* j = 13 */; j < 26; j++)
             evbuf[i][j] = buf[2 * i + 1][j - 13];
-    } /* end for */
+    }
 
     /* Adjust write buffer */
     for(i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2181,7 +2144,7 @@ test_basic_io(unsigned config, hid_t fapl)
             evbuf[i + 5][j] = buf[2 * i][j + 13];
         for(/* j = 13 */; j < 26; j++)
             evbuf[i + 5][j] = buf[2 * i + 1][j];
-    } /* end for */
+    }
 
     /* Close srcdsets and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -2196,8 +2159,8 @@ test_basic_io(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -2211,7 +2174,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data through virtual dataset by hyperslab */
     /* Reset rbuf */
@@ -2227,7 +2190,7 @@ test_basic_io(unsigned config, hid_t fapl)
             erbuf[i][j] = evbuf[2 * i][j];
         for(/* j = 13 */; j < 26; j++)
             erbuf[i][j] = evbuf[2 * i + 1][j - 13];
-    } /* end for */
+    }
 
     /* Read second slice */
     if(H5Dread(vdset, H5T_NATIVE_INT, vspace[1], srcspace[1], H5P_DEFAULT, rbuf[0]) < 0)
@@ -2239,7 +2202,7 @@ test_basic_io(unsigned config, hid_t fapl)
             erbuf[i + 5][j] = evbuf[2 * i][j + 13];
         for(/* j = 13 */; j < 26; j++)
             erbuf[i + 5][j] = evbuf[2 * i + 1][j];
-    } /* end for */
+    }
 
     /* Verify read data */
     for(i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2263,7 +2226,7 @@ test_basic_io(unsigned config, hid_t fapl)
             evbuf[2 * i][j] = buf[i][j];
         for(/* j = 13 */; j < 26; j++)
             evbuf[2 * i + 1][j - 13] = buf[i][j];
-    } /* end for */
+    }
 
     /* Adjust write buffer */
     for(i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2280,7 +2243,7 @@ test_basic_io(unsigned config, hid_t fapl)
             evbuf[2 * i][j + 13] = buf[i + 5][j];
         for(/* j = 13 */; j < 26; j++)
             evbuf[2 * i + 1][j] = buf[i + 5][j];
-    } /* end for */
+    }
 
     /* Reopen srcdsets and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -2291,7 +2254,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data directly from source datasets */
     /* Reset rbuf */
@@ -2307,7 +2270,7 @@ test_basic_io(unsigned config, hid_t fapl)
             erbuf[2 * i][j] = evbuf[i][j];
         for(/* j = 13 */; j < 26; j++)
             erbuf[2 * i + 1][j - 13] = evbuf[i][j];
-    } /* end for */
+    }
 
     /* Read second dataset */
     if(H5Dread(srcdset[1], H5T_NATIVE_INT, srcspace[1], srcspace[1], H5P_DEFAULT, rbuf[0]) < 0)
@@ -2319,7 +2282,7 @@ test_basic_io(unsigned config, hid_t fapl)
             erbuf[2 * i][j + 13] = evbuf[i + 5][j];
         for(/* j = 13 */; j < 26; j++)
             erbuf[2 * i + 1][j] = evbuf[i + 5][j];
-    } /* end for */
+    }
 
     /* Verify read data */
     for(i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2439,12 +2402,12 @@ test_basic_io(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create source datasets */
     if((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -2498,8 +2461,8 @@ test_basic_io(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -2513,7 +2476,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data through virtual dataset by hyperslab */
     /* Reset rbuf */
@@ -2538,7 +2501,7 @@ test_basic_io(unsigned config, hid_t fapl)
         for(j = 0; j < 26; j++) {
             erbuf[i][j] += (int)(sizeof(buf) / sizeof(buf[0][0]));
             erbuf[i + 1][j] -= (int)(sizeof(buf) / sizeof(buf[0][0]));
-        } /* end for */
+        }
 
     /* Verify read data */
     for(i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++)
@@ -2584,7 +2547,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data directly from source datasets */
     /* Reset rbuf */
@@ -2605,7 +2568,7 @@ test_basic_io(unsigned config, hid_t fapl)
         for(j = 0; j < 26; j++) {
             erbuf[i][j] += (int)(sizeof(buf) / sizeof(buf[0][0]));
             erbuf[i + 1][j] -= (int)(sizeof(buf) / sizeof(buf[0][0]));
-        } /* end for */
+        }
 
     /* Read second dataset */
     if(H5Dread(srcdset[1], H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, rbuf[0]) < 0)
@@ -2780,12 +2743,12 @@ test_basic_io(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create source dataset */
     if((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -2822,8 +2785,8 @@ test_basic_io(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -2837,7 +2800,7 @@ test_basic_io(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data through virtual dataset */
     /* Reset rbuf */
@@ -2943,7 +2906,7 @@ test_basic_io(unsigned config, hid_t fapl)
             if((j >= 3) && (j < 6)) {
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
@@ -2996,7 +2959,7 @@ test_basic_io(unsigned config, hid_t fapl)
             if((j >= 6) && (j < 9)) {
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
@@ -3214,7 +3177,7 @@ test_basic_io(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read data directly from source dataset */
     /* Select hyperslab in memory space */
@@ -3289,32 +3252,19 @@ test_basic_io(unsigned config, hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-        for(i = 0; i < (int)(sizeof(srcdset) / sizeof(srcdset[0])); i++) {
-            if(srcdset[i] >= 0)
-                (void)H5Dclose(srcdset[i]);
-        } /* end for */
-        if(vdset >= 0)
-            (void)H5Dclose(vdset);
-        for(i = 0; i < (int)(sizeof(srcfile) / sizeof(srcfile[0])); i++) {
-            if(srcfile[i] >= 0)
-                (void)H5Fclose(srcfile[i]);
-        } /* end for */
-        if(vfile >= 0)
-            (void)H5Fclose(vfile);
-        if(vfile2 >= 0)
-            (void)H5Fclose(vfile2);
-        for(i = 0; i < (int)(sizeof(srcspace) / sizeof(srcspace[0])); i++) {
-            if(srcspace[i] >= 0)
-                (void)H5Sclose(srcspace[i]);
-        } /* end for */
-        for(i = 0; i < (int)(sizeof(vspace) / sizeof(vspace[0])); i++) {
-            if(vspace[i] >= 0)
-                (void)H5Sclose(vspace[i]);
-        } /* end for */
-        if(memspace >= 0)
-            (void)H5Sclose(memspace);
-        if(dcpl >= 0)
-            (void)H5Pclose(dcpl);
+        for(i = 0; i < (int)(sizeof(srcdset) / sizeof(srcdset[0])); i++)
+            H5Dclose(srcdset[i]);
+        H5Dclose(vdset);
+        for(i = 0; i < (int)(sizeof(srcfile) / sizeof(srcfile[0])); i++)
+            H5Fclose(srcfile[i]);
+        H5Fclose(vfile);
+        H5Fclose(vfile2);
+        for(i = 0; i < (int)(sizeof(srcspace) / sizeof(srcspace[0])); i++)
+            H5Sclose(srcspace[i]);
+        for(i = 0; i < (int)(sizeof(vspace) / sizeof(vspace[0])); i++)
+            H5Sclose(vspace[i]);
+        H5Sclose(memspace);
+        H5Pclose(dcpl);
     } H5E_END_TRY;
 
      return 1;
@@ -3327,14 +3277,7 @@ error:
  * Purpose:     Tests VDS with unlimited selections
  *
  * Return:      Success:        0
- *
  *              Failure:        number of errors
- *
- * Programmer:  Neil Fortner
- *              Thursday, April 30, 2015
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -3447,12 +3390,12 @@ test_unlim(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create source datasets */
     if((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, srcdcpl, H5P_DEFAULT)) < 0)
@@ -3517,8 +3460,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -3532,7 +3475,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -3577,11 +3520,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Test H5Pget_virtual_view() */
     if(H5Pget_virtual_view(dapl, &virtual_view) < 0)
@@ -3601,7 +3544,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -3649,11 +3592,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcdset[0] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -3662,7 +3605,7 @@ test_unlim(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Extend srcdset[0] */
     dims[0] = 5;
@@ -3699,8 +3642,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -3714,7 +3657,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -3761,11 +3704,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
      * as well if config option specified */
@@ -3779,7 +3722,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -3832,11 +3775,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcdset[1] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -3845,7 +3788,7 @@ test_unlim(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Extend srcdset[1] */
     dims[0] = 5;
@@ -3887,8 +3830,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -3902,7 +3845,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -3964,7 +3907,7 @@ test_unlim(unsigned config, hid_t fapl)
             if((i == 4) || (i == 5)) {
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
@@ -4029,11 +3972,11 @@ test_unlim(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
+            }
 
         /* Shrink to 15 */
         dims[1] = 15;
@@ -4060,12 +4003,12 @@ test_unlim(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
-    } /* end if */
+            }
+    }
 
     /* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
      * as well if config option specified */
@@ -4079,7 +4022,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -4127,11 +4070,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Now test reopening virtual dataset without calling H5Dget_space, if
      * REOPEN_VIRT flag set */
@@ -4166,11 +4109,11 @@ test_unlim(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
+            }
 
         /* Now try setting extent manually */
         /* Grow to 18 */
@@ -4198,11 +4141,11 @@ test_unlim(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
+            }
 
         /* Grow to 20 */
         dims[1] = 20;
@@ -4228,7 +4171,7 @@ test_unlim(unsigned config, hid_t fapl)
             for(j = 0; j < (int)mdims[1]; j++)
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-    } /* end if */
+    }
 
     /* Close */
     if(!(config & TEST_IO_CLOSE_SRC)) {
@@ -4241,12 +4184,12 @@ test_unlim(unsigned config, hid_t fapl)
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     else if(!(config & TEST_IO_DIFFERENT_FILE)) {
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     if(H5Dclose(vdset) < 0)
         TEST_ERROR
     vdset = -1;
@@ -4322,12 +4265,12 @@ test_unlim(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create source datasets */
     if((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, srcdcpl, H5P_DEFAULT)) < 0)
@@ -4392,8 +4335,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -4407,7 +4350,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -4451,11 +4394,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
      * as well if config option specified */
@@ -4469,7 +4412,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -4511,11 +4454,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcdset[0] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -4524,7 +4467,7 @@ test_unlim(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Extend srcdset[0] */
     dims[1] = 7;
@@ -4566,8 +4509,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -4581,7 +4524,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -4627,11 +4570,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
      * as well if config option specified */
@@ -4645,7 +4588,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -4696,11 +4639,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcdset[1] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -4709,7 +4652,7 @@ test_unlim(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Extend srcdset[1] */
     dims[1] = 10;
@@ -4751,8 +4694,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -4766,7 +4709,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -4828,7 +4771,7 @@ test_unlim(unsigned config, hid_t fapl)
             if((i == 4) || (i == 5)) {
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
@@ -4845,7 +4788,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -4897,11 +4840,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close */
     if(!(config & TEST_IO_CLOSE_SRC)) {
@@ -4914,12 +4857,12 @@ test_unlim(unsigned config, hid_t fapl)
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     else if(!(config & TEST_IO_DIFFERENT_FILE)) {
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     if(H5Dclose(vdset) < 0)
         TEST_ERROR
     vdset = -1;
@@ -5014,12 +4957,12 @@ test_unlim(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create source datasets */
     if((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, srcdcpl, H5P_DEFAULT)) < 0)
@@ -5059,7 +5002,7 @@ test_unlim(unsigned config, hid_t fapl)
         for(j = 0; j < 2; j++) {
             erbuf[i][6 * j] = buf[i][2 * j];
             erbuf[i][(6 * j) + 1] = buf[i][(2 * j) + 1];
-        } /* end for */
+        }
 
     /* Adjust write buffer */
     for(i = 0; i < (int)mdims[0]; i++)
@@ -5075,7 +5018,7 @@ test_unlim(unsigned config, hid_t fapl)
         for(j = 0; j < 2; j++) {
             erbuf[i][(6 * j) + 2] = buf[i][2 * j];
             erbuf[i][(6 * j) + 3] = buf[i][(2 * j) + 1];
-        } /* end for */
+        }
 
     /* Adjust write buffer */
     for(i = 0; i < (int)mdims[0]; i++)
@@ -5096,7 +5039,7 @@ test_unlim(unsigned config, hid_t fapl)
     for(i = 0; i < 10; i++) {
         erbuf[i][4] = buf[i][0];
         erbuf[i][5] = buf[i][1];
-    } /* end for */
+    }
 
     /* Close srcdsets and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -5114,8 +5057,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -5129,7 +5072,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -5173,11 +5116,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
      * as well if config option specified */
@@ -5191,7 +5134,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -5233,11 +5176,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcdset[0] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -5246,7 +5189,7 @@ test_unlim(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Extend srcdset[0] */
     dims[1] = 7;
@@ -5283,8 +5226,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -5298,7 +5241,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -5343,11 +5286,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
      * as well if config option specified */
@@ -5361,7 +5304,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -5371,7 +5314,7 @@ test_unlim(unsigned config, hid_t fapl)
         erbuf[i][12] = buf[i][0];
         erbuf[i][13] = buf[i][1];
         erbuf[i][18] = buf[i][2];
-    } /* end for */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -5415,11 +5358,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcdset[2] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -5428,7 +5371,7 @@ test_unlim(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[2] = H5Dopen2(srcfile[0], "src_dset3", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Extend srcdset[2] */
     dims[1] = 5;
@@ -5460,7 +5403,7 @@ test_unlim(unsigned config, hid_t fapl)
         erbuf[i][10] = buf[i][0];
         erbuf[i][11] = buf[i][1];
         erbuf[i][16] = buf[i][2];
-    } /* end for */
+    }
 
     /* Close srcdset[2] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -5472,8 +5415,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -5487,7 +5430,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -5532,11 +5475,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
      * as well if config option specified */
@@ -5550,7 +5493,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -5596,11 +5539,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcdset[1] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -5609,7 +5552,7 @@ test_unlim(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Extend srcdset[1] */
     dims[1] = 6;
@@ -5640,7 +5583,7 @@ test_unlim(unsigned config, hid_t fapl)
     for(i = 0; i < 10; i++) {
         erbuf[i][14] = buf[i][0];
         erbuf[i][15] = buf[i][1];
-    } /* end for */
+    }
 
     /* Close srcdset[1] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -5652,8 +5595,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -5667,7 +5610,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -5711,11 +5654,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
      * as well if config option specified */
@@ -5729,7 +5672,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -5771,11 +5714,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Now just read middle 2 rows */
     HDmemset(rbuf[0], 0, sizeof(rbuf));
@@ -5801,11 +5744,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else if((i == 4) || (i == 5)) {
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
@@ -5824,12 +5767,12 @@ test_unlim(unsigned config, hid_t fapl)
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     else if(!(config & TEST_IO_DIFFERENT_FILE)) {
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     if(H5Dclose(vdset) < 0)
         TEST_ERROR
     vdset = -1;
@@ -5910,12 +5853,12 @@ test_unlim(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create source datasets */
     if((srcdset[0] = H5Dcreate2(srcfile[0], "src_dset1", H5T_NATIVE_INT, srcspace[0], H5P_DEFAULT, srcdcpl, H5P_DEFAULT)) < 0)
@@ -5968,8 +5911,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -5983,7 +5926,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -6029,11 +5972,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
      * as well if config option specified */
@@ -6047,7 +5990,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -6089,11 +6032,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcdset[0] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -6102,7 +6045,7 @@ test_unlim(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[0] = H5Dopen2(srcfile[0], "src_dset1", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Extend srcdset[0] */
     dims[0] = 5;
@@ -6140,8 +6083,8 @@ test_unlim(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -6155,7 +6098,7 @@ test_unlim(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -6201,11 +6144,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
      * as well if config option specified */
@@ -6219,7 +6162,7 @@ test_unlim(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -6267,11 +6210,11 @@ test_unlim(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close */
     if(!(config & TEST_IO_CLOSE_SRC)) {
@@ -6284,12 +6227,12 @@ test_unlim(unsigned config, hid_t fapl)
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     else if(!(config & TEST_IO_DIFFERENT_FILE)) {
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     if(H5Dclose(vdset) < 0)
         TEST_ERROR
     vdset = -1;
@@ -6329,36 +6272,21 @@ test_unlim(unsigned config, hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-        for(i = 0; i < (int)(sizeof(srcdset) / sizeof(srcdset[0])); i++) {
-            if(srcdset[i] >= 0)
-                (void)H5Dclose(srcdset[i]);
-        } /* end for */
-        if(vdset >= 0)
-            (void)H5Dclose(vdset);
-        for(i = 0; i < (int)(sizeof(srcfile) / sizeof(srcfile[0])); i++) {
-            if(srcfile[i] >= 0)
-                (void)H5Fclose(srcfile[i]);
-        } /* end for */
-        if(vfile >= 0)
-            (void)H5Fclose(vfile);
-        for(i = 0; i < (int)(sizeof(srcspace) / sizeof(srcspace[0])); i++) {
-            if(srcspace[i] >= 0)
-                (void)H5Sclose(srcspace[i]);
-        } /* end for */
-        for(i = 0; i < (int)(sizeof(vspace) / sizeof(vspace[0])); i++) {
-            if(vspace[i] >= 0)
-                (void)H5Sclose(vspace[i]);
-        } /* end for */
-        if(filespace >= 0)
-            (void)H5Sclose(filespace);
-        if(memspace >= 0)
-            (void)H5Sclose(memspace);
-        if(dcpl >= 0)
-            (void)H5Pclose(dcpl);
-        if(srcdcpl >= 0)
-            (void)H5Pclose(srcdcpl);
-        if(dapl >= 0)
-            (void)H5Pclose(dapl);
+        for(i = 0; i < (int)(sizeof(srcdset) / sizeof(srcdset[0])); i++)
+            H5Dclose(srcdset[i]);
+        H5Dclose(vdset);
+        for(i = 0; i < (int)(sizeof(srcfile) / sizeof(srcfile[0])); i++)
+            H5Fclose(srcfile[i]);
+        H5Fclose(vfile);
+        for(i = 0; i < (int)(sizeof(srcspace) / sizeof(srcspace[0])); i++)
+            H5Sclose(srcspace[i]);
+        for(i = 0; i < (int)(sizeof(vspace) / sizeof(vspace[0])); i++)
+            H5Sclose(vspace[i]);
+        H5Sclose(filespace);
+        H5Sclose(memspace);
+        H5Pclose(dcpl);
+        H5Pclose(srcdcpl);
+        H5Pclose(dapl);
     } H5E_END_TRY;
 
      return 1;
@@ -6372,14 +6300,7 @@ error:
  *              source dataset resolution
  *
  * Return:      Success:        0
- *
  *              Failure:        number of errors
- *
- * Programmer:  Neil Fortner
- *              Tuesday, May 26, 2015
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -6485,12 +6406,12 @@ test_printf(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create virtual dataset */
     if((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
@@ -6502,7 +6423,7 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
+        }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -6516,7 +6437,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -6602,8 +6523,8 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -6617,7 +6538,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -6661,11 +6582,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcfile if config option specified */
     if((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
@@ -6702,8 +6623,8 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -6717,7 +6638,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -6757,11 +6678,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Now try with different selections */
     count[0] = 10;
@@ -6788,12 +6709,12 @@ test_printf(unsigned config, hid_t fapl)
                     if((j < (int)start[1]) || (j >= (int)(start[1] + count[1]))) {
                         if(rbuf[i][j] != 0)
                             TEST_ERROR
-                    } /* end if */
+                    }
                     else
                         if(rbuf[i][j] != erbuf[i][j])
                             TEST_ERROR
-                } /* end for */
-        } /* end for */
+                }
+        }
     start[1] = 0;
 
     /* Now try writing through VDS */
@@ -6829,7 +6750,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((srcdset[2] = H5Dopen2(srcfile[0], "src_dset2", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Read srcdset[0] */
     count[0] = 10;
@@ -6931,12 +6852,12 @@ test_printf(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilenamepct, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create virtual dataset */
     if((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
@@ -6948,7 +6869,7 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
+        }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -6962,7 +6883,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -7100,14 +7021,14 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Dclose(srcdset[i]) < 0)
                 TEST_ERROR
             srcdset[i] = -1;
-        } /* end for */
+        }
 
         if(config & TEST_IO_DIFFERENT_FILE) {
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -7121,7 +7042,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -7165,11 +7086,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Test H5Pget_virtual_printf_gap() */
     if(H5Pget_virtual_printf_gap(dapl, &gap_size) < 0)
@@ -7189,7 +7110,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -7241,11 +7162,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with printf gap set to 2, reopen file as well if
      * config option specified */
@@ -7259,7 +7180,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -7311,11 +7232,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with printf gap set to 3, reopen file as well if
      * config option specified */
@@ -7329,7 +7250,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -7381,11 +7302,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with printf gap set to 4, reopen file as well if
      * config option specified */
@@ -7399,7 +7320,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -7451,11 +7372,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
      * as well if config option specified */
@@ -7469,7 +7390,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -7515,11 +7436,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reset dapl */
     if(H5Pset_virtual_printf_gap(dapl, (hsize_t)0) < 0)
@@ -7533,16 +7454,16 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Dclose(srcdset[i]) < 0)
                 TEST_ERROR
             srcdset[i] = -1;
-        } /* end for */
+        }
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     else if(!(config & TEST_IO_DIFFERENT_FILE)) {
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     if(H5Dclose(vdset) < 0)
         TEST_ERROR
     vdset = -1;
@@ -7615,7 +7536,7 @@ test_printf(unsigned config, hid_t fapl)
                 TEST_ERROR
             if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
                 TEST_ERROR
-        } /* end if */
+        }
 
         /* Get VDS space */
         if((filespace = H5Dget_space(vdset)) < 0)
@@ -7681,7 +7602,7 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[1]) < 0)
                 TEST_ERROR
             srcfile[1] = -1;
-        } /* end if */
+        }
 
         /* Reopen virtual dataset and file if config option specified */
         if(config & TEST_IO_REOPEN_VIRT) {
@@ -7695,7 +7616,7 @@ test_printf(unsigned config, hid_t fapl)
                 TEST_ERROR
             if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
                 TEST_ERROR
-        } /* end if */
+        }
 
         /* Get VDS space */
         if((filespace = H5Dget_space(vdset)) < 0)
@@ -7739,11 +7660,11 @@ test_printf(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
+            }
 
         /* Reopen srcfile[1] if config option specified */
         if(config & TEST_IO_CLOSE_SRC)
@@ -7778,7 +7699,7 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[1]) < 0)
                 TEST_ERROR
             srcfile[1] = -1;
-        } /* end if */
+        }
 
         /* Reopen virtual dataset and file if config option specified */
         if(config & TEST_IO_REOPEN_VIRT) {
@@ -7792,7 +7713,7 @@ test_printf(unsigned config, hid_t fapl)
                 TEST_ERROR
             if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
                 TEST_ERROR
-        } /* end if */
+        }
 
         /* Get VDS space */
         if((filespace = H5Dget_space(vdset)) < 0)
@@ -7836,11 +7757,11 @@ test_printf(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
+            }
 
         /* Close */
         if(!(config & TEST_IO_CLOSE_SRC)) {
@@ -7856,7 +7777,7 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[1]) < 0)
                 TEST_ERROR
             srcfile[1] = -1;
-        } /* end if */
+        }
         if(H5Dclose(vdset) < 0)
             TEST_ERROR
         vdset = -1;
@@ -7926,7 +7847,7 @@ test_printf(unsigned config, hid_t fapl)
                 TEST_ERROR
             if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
                 TEST_ERROR
-        } /* end if */
+        }
 
         /* Get VDS space */
         if((filespace = H5Dget_space(vdset)) < 0)
@@ -7992,7 +7913,7 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[1]) < 0)
                 TEST_ERROR
             srcfile[1] = -1;
-        } /* end if */
+        }
 
         /* Reopen virtual dataset and file if config option specified */
         if(config & TEST_IO_REOPEN_VIRT) {
@@ -8006,7 +7927,7 @@ test_printf(unsigned config, hid_t fapl)
                 TEST_ERROR
             if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
                 TEST_ERROR
-        } /* end if */
+        }
 
         /* Get VDS space */
         if((filespace = H5Dget_space(vdset)) < 0)
@@ -8050,11 +7971,11 @@ test_printf(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
+            }
 
         /* Reopen srcfile[1] if config option specified */
         if(config & TEST_IO_CLOSE_SRC)
@@ -8089,7 +8010,7 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[1]) < 0)
                 TEST_ERROR
             srcfile[1] = -1;
-        } /* end if */
+        }
 
         /* Reopen virtual dataset and file if config option specified */
         if(config & TEST_IO_REOPEN_VIRT) {
@@ -8103,7 +8024,7 @@ test_printf(unsigned config, hid_t fapl)
                 TEST_ERROR
             if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
                 TEST_ERROR
-        } /* end if */
+        }
 
         /* Get VDS space */
         if((filespace = H5Dget_space(vdset)) < 0)
@@ -8147,11 +8068,11 @@ test_printf(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
+            }
 
         /* Close */
         if(!(config & TEST_IO_CLOSE_SRC)) {
@@ -8167,7 +8088,7 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[1]) < 0)
                 TEST_ERROR
             srcfile[1] = -1;
-        } /* end if */
+        }
         if(H5Dclose(vdset) < 0)
             TEST_ERROR
         vdset = -1;
@@ -8180,7 +8101,7 @@ test_printf(unsigned config, hid_t fapl)
         if(H5Sclose(vspace[0]) < 0)
             TEST_ERROR
         vspace[0] = -1;
-    } /* end if */
+    }
 
 
     /*
@@ -8238,12 +8159,12 @@ test_printf(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create virtual dataset */
     if((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
@@ -8255,7 +8176,7 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
+        }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -8269,7 +8190,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -8355,8 +8276,8 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -8370,7 +8291,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -8414,11 +8335,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcfile if config option specified */
     if((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
@@ -8454,8 +8375,8 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -8469,7 +8390,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -8513,11 +8434,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
      * as well if config option specified */
@@ -8531,7 +8452,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -8578,11 +8499,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcfile if config option specified */
     if((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
@@ -8618,8 +8539,8 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -8633,7 +8554,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -8677,11 +8598,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
      * as well if config option specified */
@@ -8695,7 +8616,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -8742,11 +8663,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with printf_gap set to 1, reopen file as well if
      * config option specified */
@@ -8760,7 +8681,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -8807,11 +8728,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reset dapl */
     if(H5Pset_virtual_printf_gap(dapl, (hsize_t)0) < 0)
@@ -8825,16 +8746,16 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Dclose(srcdset[i]) < 0)
                 TEST_ERROR
             srcdset[i] = -1;
-        } /* end for */
+        }
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     else if(!(config & TEST_IO_DIFFERENT_FILE)) {
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     if(H5Dclose(vdset) < 0)
         TEST_ERROR
     vdset = -1;
@@ -8910,12 +8831,12 @@ test_printf(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create virtual dataset */
     if((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
@@ -8927,7 +8848,7 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
+        }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -8941,7 +8862,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -9037,8 +8958,8 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -9052,7 +8973,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -9096,11 +9017,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
      * as well if config option specified */
@@ -9114,7 +9035,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -9161,11 +9082,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcfile if config option specified */
     if((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
@@ -9205,8 +9126,8 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -9220,7 +9141,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -9264,11 +9185,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with view set to H5D_VDS_LAST_AVAILABLE, reopen file
      * as well if config option specified */
@@ -9282,7 +9203,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -9328,11 +9249,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcfile if config option specified */
     if((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
@@ -9369,8 +9290,8 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -9384,7 +9305,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -9428,11 +9349,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Now test reopening virtual dataset without calling H5Dget_space, if
      * REOPEN_VIRT flag set */
@@ -9466,11 +9387,11 @@ test_printf(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
+            }
 
         /* Now try setting extent manually */
         /* Shrink to 12 */
@@ -9496,11 +9417,11 @@ test_printf(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
+            }
 
         /* Shrink to 10 */
         dims[1] = 12;
@@ -9525,12 +9446,12 @@ test_printf(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
-    } /* end if */
+            }
+    }
 
     /* Close VDS and reopen with view set to H5D_VDS_FIRST_MISSING, reopen file
      * as well if config option specified */
@@ -9544,7 +9465,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -9590,11 +9511,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Now test reopening virtual dataset without calling H5Dget_space, if
      * REOPEN_VIRT flag set */
@@ -9628,11 +9549,11 @@ test_printf(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
+            }
 
         /* Now try setting extent manually */
         /* Grow to 12 */
@@ -9658,11 +9579,11 @@ test_printf(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
+            }
 
         /* Grow to 15 */
         dims[1] = 15;
@@ -9687,12 +9608,12 @@ test_printf(unsigned config, hid_t fapl)
                 if(j >= (int)dims[1]) {
                     if(rbuf[i][j] != 0)
                         TEST_ERROR
-                } /* end if */
+                }
                 else
                     if(rbuf[i][j] != erbuf[i][j])
                         TEST_ERROR
-            } /* end for */
-    } /* end if */
+            }
+    }
 
     /* Reset dapl */
     if(H5Pset_virtual_view(dapl, H5D_VDS_LAST_AVAILABLE) < 0)
@@ -9704,16 +9625,16 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Dclose(srcdset[i]) < 0)
                 TEST_ERROR
             srcdset[i] = -1;
-        } /* end for */
+        }
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     else if(!(config & TEST_IO_DIFFERENT_FILE)) {
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     if(H5Dclose(vdset) < 0)
         TEST_ERROR
     vdset = -1;
@@ -9770,12 +9691,12 @@ test_printf(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile[0] = H5Fcreate(srcfilenamepct, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile[0] = vfile;
         if(H5Iinc_ref(srcfile[0]) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create virtual dataset */
     if((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, dapl)) < 0)
@@ -9787,7 +9708,7 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
+        }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -9801,7 +9722,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -9867,8 +9788,8 @@ test_printf(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile[0]) < 0)
                 TEST_ERROR
             srcfile[0] = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -9882,7 +9803,7 @@ test_printf(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -9926,11 +9847,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Close VDS and reopen with printf gap set to 127, reopen file as well if
      * config option specified */
@@ -9944,7 +9865,7 @@ test_printf(unsigned config, hid_t fapl)
         vfile = -1;
         if((vfile = H5Fopen(vfilename, H5F_ACC_RDWR, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     if((vdset = H5Dopen2(vfile, "v_dset", dapl)) < 0)
         TEST_ERROR
 
@@ -9990,11 +9911,11 @@ test_printf(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reset dapl */
     if(H5Pset_virtual_printf_gap(dapl, (hsize_t)0) < 0)
@@ -10008,12 +9929,12 @@ test_printf(unsigned config, hid_t fapl)
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     else if(!(config & TEST_IO_DIFFERENT_FILE)) {
         if(H5Fclose(srcfile[0]) < 0)
             TEST_ERROR
         srcfile[0] = -1;
-    } /* end if */
+    }
     if(H5Dclose(vdset) < 0)
         TEST_ERROR
     vdset = -1;
@@ -10044,32 +9965,19 @@ test_printf(unsigned config, hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-        for(i = 0; i < (int)(sizeof(srcdset) / sizeof(srcdset[0])); i++) {
-            if(srcdset[i] >= 0)
-                (void)H5Dclose(srcdset[i]);
-        } /* end for */
-        if(vdset >= 0)
-            (void)H5Dclose(vdset);
-        for(i = 0; i < (int)(sizeof(srcfile) / sizeof(srcfile[0])); i++) {
-            if(srcfile[i] >= 0)
-                (void)H5Fclose(srcfile[i]);
-        } /* end for */
-        if(vfile >=  0)
-            (void)H5Fclose(vfile);
-        if(srcspace >= 0)
-            (void)H5Sclose(srcspace);
-        for(i = 0; i < (int)(sizeof(vspace) / sizeof(vspace[0])); i++) {
-            if(vspace[i] >= 0)
-                (void)H5Sclose(vspace[i]);
-        } /* end for */
-        if(filespace >= 0)
-            (void)H5Sclose(filespace);
-        if(memspace >= 0)
-            (void)H5Sclose(memspace);
-        if(dcpl >= 0)
-            (void)H5Pclose(dcpl);
-        if(dapl >= 0)
-            (void)H5Pclose(dapl);
+        for(i = 0; i < (int)(sizeof(srcdset) / sizeof(srcdset[0])); i++)
+            H5Dclose(srcdset[i]);
+        H5Dclose(vdset);
+        for(i = 0; i < (int)(sizeof(srcfile) / sizeof(srcfile[0])); i++)
+            H5Fclose(srcfile[i]);
+        H5Fclose(vfile);
+        H5Sclose(srcspace);
+        for(i = 0; i < (int)(sizeof(vspace) / sizeof(vspace[0])); i++)
+            H5Sclose(vspace[i]);
+        H5Sclose(filespace);
+        H5Sclose(memspace);
+        H5Pclose(dcpl);
+        H5Pclose(dapl);
     } H5E_END_TRY;
 
      return 1;
@@ -10083,14 +9991,7 @@ error:
  *              VDS
  *
  * Return:      Success:        0
- *
  *              Failure:        number of errors
- *
- * Programmer:  Neil Fortner
- *              Friday, August 14, 2015
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -10212,12 +10113,12 @@ test_all(unsigned config, hid_t fapl)
     if(config & TEST_IO_DIFFERENT_FILE) {
         if((srcfile = H5Fcreate(srcfilename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
     else {
         srcfile = vfile;
         if(H5Iinc_ref(srcfile) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Create virtual dataset */
     if((vdset = H5Dcreate2(vfile, "v_dset", H5T_NATIVE_INT, vspace[0], H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
@@ -10229,7 +10130,7 @@ test_all(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile) < 0)
                 TEST_ERROR
             srcfile = -1;
-        } /* end if */
+        }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -10243,7 +10144,7 @@ test_all(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -10314,14 +10215,14 @@ test_all(unsigned config, hid_t fapl)
             if(H5Dclose(srcdset[i]) < 0)
                 TEST_ERROR
             srcdset[i] = -1;
-        } /* end for */
+        }
 
         if(config & TEST_IO_DIFFERENT_FILE) {
             if(H5Fclose(srcfile) < 0)
                 TEST_ERROR
             srcfile = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -10335,7 +10236,7 @@ test_all(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -10381,11 +10282,11 @@ test_all(unsigned config, hid_t fapl)
             if((i >= (int)dims[0]) || (j >= (int)dims[1])) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcdset[1] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -10394,7 +10295,7 @@ test_all(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile, "src_dset_unlim", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Extend srcdset[1] */
     dims[0] = 2;
@@ -10429,8 +10330,8 @@ test_all(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile) < 0)
                 TEST_ERROR
             srcfile = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -10444,7 +10345,7 @@ test_all(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -10490,11 +10391,11 @@ test_all(unsigned config, hid_t fapl)
             if((i >= (int)dims[0]) || (j >= (int)dims[1])) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcfile if config option specified */
     if((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
@@ -10534,8 +10435,8 @@ test_all(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile) < 0)
                 TEST_ERROR
             srcfile = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -10549,7 +10450,7 @@ test_all(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -10595,11 +10496,11 @@ test_all(unsigned config, hid_t fapl)
             if((i >= (int)dims[0]) || (j >= (int)dims[1])) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcdset[1] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -10608,7 +10509,7 @@ test_all(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile, "src_dset_unlim", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Extend srcdset[1] */
     dims[0] = 3;
@@ -10652,8 +10553,8 @@ test_all(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile) < 0)
                 TEST_ERROR
             srcfile = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -10667,7 +10568,7 @@ test_all(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -10713,11 +10614,11 @@ test_all(unsigned config, hid_t fapl)
             if((i >= (int)dims[0]) || (j >= (int)dims[1])) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcfile if config option specified */
     if((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
@@ -10757,8 +10658,8 @@ test_all(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile) < 0)
                 TEST_ERROR
             srcfile = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -10772,7 +10673,7 @@ test_all(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -10818,11 +10719,11 @@ test_all(unsigned config, hid_t fapl)
             if((i >= (int)dims[0]) || (j >= (int)dims[1])) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcdset[1] and srcfile if config option specified */
     if(config & TEST_IO_CLOSE_SRC) {
@@ -10831,7 +10732,7 @@ test_all(unsigned config, hid_t fapl)
                 TEST_ERROR
         if((srcdset[1] = H5Dopen2(srcfile, "src_dset_unlim", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Extend srcdset[1] */
     dims[0] = 7;
@@ -10876,8 +10777,8 @@ test_all(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile) < 0)
                 TEST_ERROR
             srcfile = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -10891,7 +10792,7 @@ test_all(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -10937,11 +10838,11 @@ test_all(unsigned config, hid_t fapl)
             if(j >= (int)dims[1]) {
                 if(rbuf[i][j] != 0)
                     TEST_ERROR
-            } /* end if */
+            }
             else
                 if(rbuf[i][j] != erbuf[i][j])
                     TEST_ERROR
-        } /* end for */
+        }
 
     /* Reopen srcfile if config option specified */
     if((config & TEST_IO_CLOSE_SRC) && (config & TEST_IO_DIFFERENT_FILE))
@@ -10981,8 +10882,8 @@ test_all(unsigned config, hid_t fapl)
             if(H5Fclose(srcfile) < 0)
                 TEST_ERROR
             srcfile = -1;
-        } /* end if */
-    } /* end if */
+        }
+    }
 
     /* Reopen virtual dataset and file if config option specified */
     if(config & TEST_IO_REOPEN_VIRT) {
@@ -10996,7 +10897,7 @@ test_all(unsigned config, hid_t fapl)
             TEST_ERROR
         if((vdset = H5Dopen2(vfile, "v_dset", H5P_DEFAULT)) < 0)
             TEST_ERROR
-    } /* end if */
+    }
 
     /* Get VDS space */
     if((filespace = H5Dget_space(vdset)) < 0)
@@ -11048,16 +10949,16 @@ test_all(unsigned config, hid_t fapl)
             if(H5Dclose(srcdset[i]) < 0)
                 TEST_ERROR
             srcdset[i] = -1;
-        } /* end for */
+        }
         if(H5Fclose(srcfile) < 0)
             TEST_ERROR
         srcfile = -1;
-    } /* end if */
+    }
     else if(!(config & TEST_IO_DIFFERENT_FILE)) {
         if(H5Fclose(srcfile) < 0)
             TEST_ERROR
         srcfile = -1;
-    } /* end if */
+    }
     if(H5Dclose(vdset) < 0)
         TEST_ERROR
     vdset = -1;
@@ -11068,12 +10969,12 @@ test_all(unsigned config, hid_t fapl)
         if(H5Sclose(srcspace[i]) < 0)
             TEST_ERROR
         srcspace[i] = -1;
-    } /* end for */
+    }
     for(i = 0; i < (int)(sizeof(vspace) / sizeof(vspace[0])); i++) {
         if(H5Sclose(vspace[i]) < 0)
             TEST_ERROR
         vspace[i] = -1;
-    } /* end for */
+    }
     if(H5Pclose(dcpl) < 0)
         TEST_ERROR
     dcpl = -1;
@@ -11089,32 +10990,19 @@ test_all(unsigned config, hid_t fapl)
 
 error:
     H5E_BEGIN_TRY {
-        for(i = 0; i < (int)(sizeof(srcdset) / sizeof(srcdset[0])); i++) {
-            if(srcdset[i] >= 0)
-                (void)H5Dclose(srcdset[i]);
-        } /* end for */
-        if(vdset >= 0)
-            (void)H5Dclose(vdset);
-        if(srcfile >= 0)
-            (void)H5Fclose(srcfile);
-        if(vfile >=  0)
-            (void)H5Fclose(vfile);
-        for(i = 0; i < (int)(sizeof(srcspace) / sizeof(srcspace[0])); i++) {
-            if(srcspace[i] >= 0)
-                (void)H5Sclose(srcspace[i]);
-        } /* end for */
-        for(i = 0; i < (int)(sizeof(vspace) / sizeof(vspace[0])); i++) {
-            if(vspace[i] >= 0)
-                (void)H5Sclose(vspace[i]);
-        } /* end for */
-        if(filespace >= 0)
-            (void)H5Sclose(filespace);
-        if(memspace >= 0)
-            (void)H5Sclose(memspace);
-        if(dcpl >= 0)
-            (void)H5Pclose(dcpl);
-        if(srcdcpl >= 0)
-            (void)H5Pclose(srcdcpl);
+        for(i = 0; i < (int)(sizeof(srcdset) / sizeof(srcdset[0])); i++)
+            H5Dclose(srcdset[i]);
+        H5Dclose(vdset);
+        H5Fclose(srcfile);
+        H5Fclose(vfile);
+        for(i = 0; i < (int)(sizeof(srcspace) / sizeof(srcspace[0])); i++)
+            H5Sclose(srcspace[i]);
+        for(i = 0; i < (int)(sizeof(vspace) / sizeof(vspace[0])); i++)
+            H5Sclose(vspace[i]);
+        H5Sclose(filespace);
+        H5Sclose(memspace);
+        H5Pclose(dcpl);
+        H5Pclose(srcdcpl);
     } H5E_END_TRY;
 
      return 1;
@@ -11128,10 +11016,6 @@ error:
  *
  * Return:      Success:    0
  *              Failure:    1
- *
- * Programmer:  Dana Robinson
- *              March 2016
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -11273,10 +11157,6 @@ test_dapl_values(hid_t fapl_id)
  * Purpose:     Tests datasets with virtual layout
  *
  * Return:      EXIT_SUCCESS/EXIT_FAILURE
- *
- * Programmer:  Neil Fortner
- *              Tuesday, February 17, 2015
- *
  *-------------------------------------------------------------------------
  */
 int
@@ -11302,7 +11182,7 @@ main(void)
         nerrors += test_unlim(bit_config, fapl);
         nerrors += test_printf(bit_config, fapl);
         nerrors += test_all(bit_config, fapl);
-    } /* end for */
+    }
 
     nerrors += test_dapl_values(fapl);
 
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt
index b116d66..997d1a1 100644
--- a/testpar/CMakeLists.txt
+++ b/testpar/CMakeLists.txt
@@ -30,14 +30,20 @@ set (testphdf5_SOURCES
 add_executable (testphdf5 ${testphdf5_SOURCES})
 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)
 
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index ade7671..0fc1981 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_SOURCES} ${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_SOURCES} ${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
-- 
cgit v0.12