Merge pull request #811 in HDFFV/hdf5 from hdf5_1_8_20 to 1.8/masterhdf5-1_8_20

* commit '60f76980aab92f0e0730170b99a2363acd3c97fa': (108 commits)
  Update version numbers and remove empty sections in RELEASE.txt.
  Restore line 1154: C2Cppfunction_map.mht to HTML_EXTRA_FILES.
  Update version for 1.8.20 release.
  Fixed documentation warnings
  HDFFV-10329 Correct LINK INTERFACE and VS20013 compile
  Switch default build mode from development to production. Increment version string to pre2.
  Add RELEASE.txt note for HDFFV-10274. (cherry picked from commit f7a7d0a00613cba997212fa8032091629a678797)
  Initialize hid_t variables in test_Attr_bug9. (cherry picked from commit 97bc393449f3fe02c5992872ab2842e12f611ef0)
  Fix HDFFV-10274.  When deleting all (or almost all) of the messages in an object header chunk, where the total amount deleted was greater than 64K, an error would occur due to an off by one error in the code that handled that case.  Fixed this and added a test case. (cherry picked from commit 1b2c2ca9a6a7d7e1fcd5c3302e203f2e2dabf0af)
  Fix linking of libs
  Changed file path to relative.
  iAdd NAG to supported compilers in RELEASE.txt.
  Add description to RELEASE.txt for HDFFV-10323
  Correct issue number
  Set version to 1.8.20-pre1
  Update supported and tested platforms in RELEASE.txt.
  HDFFV-10321 Merge from 1.8
  Incremented lib file .so numbers: revision for all except c++ for code change; current incremented, revision and age set to 0 for c++ due to symbols added and removed.
  updated issues related to Fortran
  Incremented lib file .so numbers: revision for all except c++ for dcode change; current incremented, revision and age set to 0 for c++ due to symbols added and removed.
  ...

157 files changed, 12253 insertions, 12324 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 15a6547..d5b5ef8 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -584,6 +584,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/h5copy/CMakeTests.cmake b/tools/h5copy/CMakeTests.cmake
index 99bccff..ad6d07e 100644
--- a/tools/h5copy/CMakeTests.cmake
+++ b/tools/h5copy/CMakeTests.cmake
@@ -24,10 +24,16 @@
       ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/h5copy_extlinks_trg.h5
       ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/h5copy_ref.h5
       ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/h5copytst.h5
+      ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5
+      ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/tudfilter2.h5
   )
 
   set (LIST_OTHER_TEST_FILES
       ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/h5copy_misc1.out
+      ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5.txt
+      ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5_ERR.txt
+      ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/h5copy_plugin_fail_ERR.out.h5.txt
+      ${HDF5_TOOLS_H5COPY_SOURCE_DIR}/testfiles/h5copy_plugin_test.out.h5.txt
   )
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
@@ -71,13 +77,13 @@
     endif ()
 
     # resultcode=2 will cause the test to skip the diff test
-    if (NOT ${resultcode} STREQUAL "2")
+    if (NOT "${resultcode}" STREQUAL "2")
       add_test (
           NAME H5COPY_F-${testname}-DIFF
-          COMMAND $<TARGET_FILE:h5diff> -q ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
+          COMMAND $<TARGET_FILE:h5diff> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
-      SET_TESTS_PROPERTIES(H5COPY_F-${testname}-DIFF PROPERTIES DEPENDS H5COPY_F-${testname})
-      if (${resultcode} STREQUAL "1")
+      set_tests_properties (H5COPY_F-${testname}-DIFF PROPERTIES DEPENDS H5COPY_F-${testname})
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5COPY_F-${testname}-DIFF PROPERTIES WILL_FAIL "true")
       endif ()
     endif ()
@@ -107,13 +113,13 @@
     endif ()
 
     # resultcode=2 will cause the test to skip the diff test
-    if (NOT ${resultcode} STREQUAL "2")
+    if (NOT "${resultcode}" STREQUAL "2")
       add_test (
           NAME H5COPY-${testname}-DIFF
-          COMMAND $<TARGET_FILE:h5diff> -q ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
+          COMMAND $<TARGET_FILE:h5diff> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
-      SET_TESTS_PROPERTIES(H5COPY-${testname}-DIFF PROPERTIES DEPENDS H5COPY-${testname})
-      if (${resultcode} STREQUAL "1")
+      set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES DEPENDS H5COPY-${testname})
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES WILL_FAIL "true")
       endif ()
     endif ()
@@ -157,13 +163,13 @@
     )
     set_tests_properties (H5COPY-${testname} PROPERTIES DEPENDS H5COPY-${testname}-prefill)
     # resultcode=2 will cause the test to skip the diff test
-    if (NOT ${resultcode} STREQUAL "2")
+    if (NOT "${resultcode}" STREQUAL "2")
       add_test (
           NAME H5COPY-${testname}-DIFF
-          COMMAND $<TARGET_FILE:h5diff> -q ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
+          COMMAND $<TARGET_FILE:h5diff> -v ./testfiles/${infile} ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
-      SET_TESTS_PROPERTIES(H5COPY-${testname}-DIFF PROPERTIES DEPENDS H5COPY-${testname})
-      if (${resultcode} STREQUAL "1")
+      set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES DEPENDS H5COPY-${testname})
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5COPY-${testname}-DIFF PROPERTIES WILL_FAIL "true")
       endif ()
     endif ()
@@ -198,13 +204,13 @@
     )
     set_tests_properties (H5COPY_SAME-${testname} PROPERTIES DEPENDS H5COPY_SAME-${testname}-prefill)
     # resultcode=2 will cause the test to skip the diff test
-    if (NOT ${resultcode} STREQUAL "2")
+    if (NOT "${resultcode}" STREQUAL "2")
       add_test (
           NAME H5COPY_SAME-${testname}-DIFF
-          COMMAND $<TARGET_FILE:h5diff> -q ./testfiles/${testname}.out.h5 ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
+          COMMAND $<TARGET_FILE:h5diff> -v ./testfiles/${testname}.out.h5 ./testfiles/${testname}.out.h5 ${srcname} ${dstname}
       )
-      SET_TESTS_PROPERTIES(H5COPY_SAME-${testname}-DIFF PROPERTIES DEPENDS H5COPY_SAME-${testname})
-      if (${resultcode} STREQUAL "1")
+      set_tests_properties (H5COPY_SAME-${testname}-DIFF PROPERTIES DEPENDS H5COPY_SAME-${testname})
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5COPY_SAME-${testname}-DIFF PROPERTIES WILL_FAIL "true")
       endif ()
     endif ()
@@ -218,7 +224,7 @@
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5COPY-CMP-${testname} COMMAND $<TARGET_FILE:h5copy> -i ./testfiles/${infile} -o ./testfiles/${testname}.out.h5 ${vparam} ${sparam} ${srcname} ${dparam} ${dstname} ${ARGN})
-      if (${resultcode} STREQUAL "1")
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5COPY-CMP-${testname} PROPERTIES WILL_FAIL "true")
       endif ()
       if (NOT "${last_test}" STREQUAL "")
@@ -231,6 +237,8 @@
           COMMAND    ${CMAKE_COMMAND}
               -E remove
               ./testfiles/${testname}.out.h5
+              ./testfiles/${testname}.out.out
+              ./testfiles/${testname}.out.out.err
       )
       add_test (
           NAME H5COPY-CMP-${testname}
@@ -248,6 +256,134 @@
     endif ()
   endmacro ()
 
+  macro (ADD_H5_UD_TEST testname resultcode infile sparam srcname dparam dstname cmpfile)
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5COPY_UD-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/${testname}.out.h5
+              testfiles/${infile}.out
+              testfiles/${infile}.out.err
+              testfiles/${testname}.out.h5.out
+              testfiles/${testname}.out.h5.out.err
+      )
+      if ("${resultcode}" STREQUAL "2")
+        add_test (
+            NAME H5COPY_UD-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5copy-shared>"
+                -D "TEST_ARGS:STRING=-v;-i;./testfiles/${infile};-o;./testfiles/${testname}.out.h5;${sparam};${srcname};${dparam};${dstname}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+                -D "TEST_OUTPUT=./testfiles/${infile}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=./testfiles/${infile}.txt"
+                -D "TEST_APPEND=EXIT CODE:"
+                -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
+                -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      else ()
+        add_test (
+            NAME H5COPY_UD-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5copy-shared>"
+                -D "TEST_ARGS:STRING=-v;-i;./testfiles/${infile};-o;./testfiles/${testname}.out.h5;${sparam};${srcname};${dparam};${dstname}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+                -D "TEST_OUTPUT=./testfiles/${infile}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=./testfiles/${infile}.txt"
+                -D "TEST_APPEND=EXIT CODE:"
+                -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
+                -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
+      set_tests_properties (H5COPY_UD-${testname} PROPERTIES DEPENDS H5COPY_UD-${testname}-clear-objects)
+      add_test (
+          NAME H5COPY_UD-${testname}-DIFF
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5diff-shared>"
+              -D "TEST_ARGS:STRING=-v;./testfiles/${cmpfile};./testfiles/${testname}.out.h5;${srcname};${dstname}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+              -D "TEST_OUTPUT=./testfiles/${testname}.out.h5.out"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_REFERENCE=./testfiles/${testname}.out.h5.txt"
+              -D "TEST_APPEND=EXIT CODE:"
+              -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
+              -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5COPY_UD-${testname}-DIFF PROPERTIES DEPENDS H5COPY_UD-${testname})
+    endif ()
+  endmacro ()
+
+  macro (ADD_H5_UD_ERR_TEST testname resultcode infile sparam srcname dparam dstname cmpfile)
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5COPY_UD_ERR-${testname}-clearall-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/${testname}_ERR.out.h5
+              testfiles/${infile}_ERR.out
+              testfiles/${infile}_ERR.out.err
+              testfiles/${testname}_ERR.out.h5.out
+              testfiles/${testname}_ERR.out.h5.out.err
+      )
+      if ("${resultcode}" STREQUAL "2")
+        add_test (
+            NAME H5COPY_UD_ERR-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5copy-shared>"
+                -D "TEST_ARGS:STRING=-v;--enable-error-stack;-i;./testfiles/${infile};-o;./testfiles/${testname}_ERR.out.h5;${sparam};${srcname};${dparam};${dstname}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+                -D "TEST_OUTPUT=./testfiles/${infile}_ERR.out"
+                -D "TEST_EXPECT=0"
+                -D "TEST_REFERENCE=./testfiles/${infile}_ERR.txt"
+                -D "TEST_MASK_ERROR=true"
+                -D "TEST_APPEND=EXIT CODE:"
+                -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
+                -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      else ()
+        add_test (
+            NAME H5COPY_UD_ERR-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5copy-shared>"
+                -D "TEST_ARGS:STRING=-v;--enable-error-stack;-i;./testfiles/${infile};-o;./testfiles/${testname}_ERR.out.h5;${sparam};${srcname};${dparam};${dstname}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+                -D "TEST_OUTPUT=./testfiles/${infile}_ERR.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=./testfiles/${infile}_ERR.txt"
+                -D "TEST_MASK_ERROR=true"
+                -D "TEST_APPEND=EXIT CODE:"
+                -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
+                -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
+      set_tests_properties (H5COPY_UD_ERR-${testname} PROPERTIES DEPENDS H5COPY_UD_ERR-${testname}-clearall-objects)
+      add_test (
+          NAME H5COPY_UD_ERR-${testname}-DIFF
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5diff-shared>"
+              -D "TEST_ARGS:STRING=-v;./testfiles/${cmpfile};./testfiles/${testname}_ERR.out.h5;${srcname};${dstname}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+              -D "TEST_OUTPUT=./testfiles/${testname}_ERR.out.h5.out"
+              -D "TEST_EXPECT=0"
+              -D "TEST_REFERENCE=./testfiles/${testname}_ERR.out.h5.txt"
+              -D "TEST_APPEND=EXIT CODE:"
+              -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
+              -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5COPY_UD_ERR-${testname}-DIFF PROPERTIES DEPENDS H5COPY_UD_ERR-${testname})
+    endif ()
+  endmacro ()
+
 ##############################################################################
 ##############################################################################
 ###           T H E   T E S T S                                            ###
@@ -432,3 +568,11 @@
   else ()
     ADD_H5_TEST_SAME (samefile2 2 ${HDF_FILE1}.h5 /grp_dsets /grp_dsets -v -s /grp_dsets -d /grp_dsets_cp)
   endif ()
+
+##############################################################################
+###    P L U G I N  T E S T S
+##############################################################################
+if (BUILD_SHARED_LIBS)
+  ADD_H5_UD_TEST (h5copy_plugin_test 0 tudfilter.h5 -s /dynlibud -d /dynlibud tudfilter2.h5 )
+  ADD_H5_UD_ERR_TEST (h5copy_plugin_fail 2 tudfilter.h5 -s /dynlibud -d /dynlibud tudfilter2.h5)
+endif ()
diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in
index 5f93ffc..981c7a2 100644
--- a/tools/h5copy/Makefile.in
+++ b/tools/h5copy/Makefile.in
@@ -591,6 +591,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/h5copy/dynlib_copy.c b/tools/h5copy/dynlib_copy.c
new file mode 100644
index 0000000..571452e
--- /dev/null
+++ b/tools/h5copy/dynlib_copy.c
@@ -0,0 +1,89 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5. The full HDF5 copyright notice, including      *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/*
+ * Purpose:    Tests the plugin module (H5PL)
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "H5PLextern.h"
+
+#define H5Z_FILTER_DYNLIBUD      300
+#define MULTIPLIER              3
+
+static size_t H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
+                const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
+
+/* This message derives from H5Z */
+const H5Z_class2_t H5Z_DYNLIBUD[1] = {{
+    H5Z_CLASS_T_VERS,                /* H5Z_class_t version             */
+    H5Z_FILTER_DYNLIBUD,             /* Filter id number        */
+    1, 1,                            /* Encoding and decoding enabled   */
+    "dynlibud",                 /* Filter name for debugging    */
+    NULL,                            /* The "can apply" callback        */
+    NULL,                            /* The "set local" callback        */
+    (H5Z_func_t)H5Z_filter_dynlibud,    /* The actual filter function    */
+}};
+
+H5PL_type_t   H5PLget_plugin_type(void) {return H5PL_TYPE_FILTER;}
+const void   *H5PLget_plugin_info(void) {return H5Z_DYNLIBUD;}
+
+/*-------------------------------------------------------------------------
+ * Function:    H5Z_filter_dynlibud
+ *
+ * Purpose:    A dynlib2 filter method that multiplies the original value
+ *              during write and divide the original value during read. It
+ *              will be built as a shared library.  plugin.c test will load
+ *              and use this filter library.
+ *
+ * Return:    Success:    Data chunk size
+ *
+ *        Failure:    0
+ *-------------------------------------------------------------------------
+ */
+static size_t
+H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
+      const unsigned int *cd_values, size_t nbytes,
+      size_t *buf_size, void **buf)
+{
+    char *int_ptr = (char *)*buf;          /* Pointer to the data values */
+    size_t buf_left = *buf_size;  /* Amount of data buffer left to process */
+
+    /* Check for the correct number of parameters */
+    if(cd_nelmts > 0)
+        return(0);
+
+    /* Assignment to eliminate unused parameter warning. */
+    cd_values = cd_values;
+
+    if(flags & H5Z_FLAG_REVERSE) { /*read*/
+        /* Subtract the original value with MULTIPLIER */
+        while(buf_left > 0) {
+            char temp = *int_ptr;
+            *int_ptr = temp - MULTIPLIER;
+            int_ptr++;
+            buf_left -= sizeof(*int_ptr);
+        } /* end while */
+    } /* end if */
+    else { /*write*/
+        /* Add the original value with MULTIPLIER */
+        while(buf_left > 0) {
+            char temp = *int_ptr;
+            *int_ptr = temp + MULTIPLIER;
+            int_ptr++;
+            buf_left -= sizeof(*int_ptr);
+        } /* end while */
+    } /* end else */
+
+    return nbytes;
+} /* end H5Z_filter_dynlibud() */
+
diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c
index 390b93e..1d15d12 100644
--- a/tools/h5copy/h5copy.c
+++ b/tools/h5copy/h5copy.c
@@ -14,8 +14,6 @@
 #include "H5private.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 /* Name of tool */
 #define PROGRAMNAME "h5copy"
@@ -103,6 +101,8 @@ usage (void)
     PRINTVALSTREAM(rawoutstream, "      -p, --parents      No error if existing, make parent groups as needed\n");
     PRINTVALSTREAM(rawoutstream, "      -v, --verbose      Print information about OBJECTS and OPTIONS\n");
     PRINTVALSTREAM(rawoutstream, "      -V, --version      Print version number and exit\n");
+    PRINTVALSTREAM(rawoutstream, "      --enable-error-stack\n");
+    PRINTVALSTREAM(rawoutstream, "                  Prints messages from the HDF5 error stack as they occur.\n");
     PRINTVALSTREAM(rawoutstream, "      -f, --flag         Flag type\n\n");
     PRINTVALSTREAM(rawoutstream, "      Flag type is one of the following strings:\n\n");
     PRINTVALSTREAM(rawoutstream, "      shallow     Copy only immediate members for groups\n\n");
@@ -161,36 +161,28 @@ static int parse_flag(const char* s_flag, unsigned *flag)
 {
     unsigned fla=0;
 
-    if (HDstrcmp(s_flag,"shallow")==0)
-    {
+    if (HDstrcmp(s_flag, "shallow") == 0) {
         fla = H5O_COPY_SHALLOW_HIERARCHY_FLAG;
     }
-    else  if (HDstrcmp(s_flag,"soft")==0)
-    {
+    else  if (HDstrcmp(s_flag, "soft") == 0) {
         fla = H5O_COPY_EXPAND_SOFT_LINK_FLAG;
     }
-    else  if (HDstrcmp(s_flag,"ext")==0)
-    {
+    else  if (HDstrcmp(s_flag, "ext") == 0) {
         fla = H5O_COPY_EXPAND_EXT_LINK_FLAG;
     }
-    else  if (HDstrcmp(s_flag,"ref")==0)
-    {
+    else  if (HDstrcmp(s_flag, "ref") == 0) {
         fla = H5O_COPY_EXPAND_REFERENCE_FLAG;
     }
-    else  if (HDstrcmp(s_flag,"noattr")==0)
-    {
+    else  if (HDstrcmp(s_flag, "noattr") == 0) {
         fla = H5O_COPY_WITHOUT_ATTR_FLAG;
     }
-    else  if (HDstrcmp(s_flag,"allflags")==0)
-    {
+    else  if (HDstrcmp(s_flag, "allflags") == 0) {
         fla = H5O_COPY_ALL;
     }
-    else  if (HDstrcmp(s_flag,"nullmsg")==0)
-    {
+    else  if (HDstrcmp(s_flag, "nullmsg") == 0) {
         fla = H5O_COPY_PRESERVE_NULL_FLAG;
     }
-    else
-    {
+    else {
         error_msg("Error in input flag\n");
         return -1;
     }
@@ -249,25 +241,21 @@ main (int argc, const char *argv[])
     HDmemset(&linkinfo, 0, sizeof(h5tool_link_info_t));
 
     /* Check for no command line parameters */
-    if(argc == 1)
-    {
+    if(argc == 1) {
         usage();
         leave(EXIT_FAILURE);
     } /* end if */
 
     /* parse command line options */
-    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF)
-    {
-        switch ((char)opt)
-        {
+    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
+        switch ((char)opt) {
         case 'd':
             oname_dst = HDstrdup(opt_arg);
             break;
 
         case 'f':
             /* validate flag */
-            if (parse_flag(opt_arg,&flag)<0)
-            {
+            if (parse_flag(opt_arg, &flag) < 0) {
                 usage();
                 leave(EXIT_FAILURE);
             }
@@ -318,29 +306,25 @@ main (int argc, const char *argv[])
  * check for missing file/object names
  *-------------------------------------------------------------------------*/
 
-    if (fname_src==NULL)
-    {
+    if (fname_src==NULL) {
         error_msg("Input file name missing\n");
         usage();
         leave(EXIT_FAILURE);
     }
 
-    if (fname_dst==NULL)
-    {
+    if (fname_dst==NULL) {
         error_msg("Output file name missing\n");
         usage();
         leave(EXIT_FAILURE);
     }
 
-    if (oname_src==NULL)
-    {
+    if (oname_src==NULL) {
         error_msg("Source object name missing\n");
         usage();
         leave(EXIT_FAILURE);
     }
 
-    if (oname_dst==NULL)
-    {
+    if (oname_dst==NULL) {
         error_msg("Destination object name missing\n");
         usage();
         leave(EXIT_FAILURE);
@@ -369,8 +353,7 @@ main (int argc, const char *argv[])
    /*-------------------------------------------------------------------------
     * test for error in opening input file
     *-------------------------------------------------------------------------*/
-    if (fid_src==-1)
-    {
+    if (fid_src==-1) {
         error_msg("Could not open input file <%s>...Exiting\n", fname_src);
         leave(EXIT_FAILURE);
     }
@@ -388,8 +371,7 @@ main (int argc, const char *argv[])
    /*-------------------------------------------------------------------------
     * test for error in opening output file
     *-------------------------------------------------------------------------*/
-    if (fid_dst==-1)
-    {
+    if (fid_dst==-1) {
         error_msg("Could not open output file <%s>...Exiting\n", fname_dst);
         leave(EXIT_FAILURE);
     }
@@ -398,12 +380,10 @@ main (int argc, const char *argv[])
     * print some info
     *-------------------------------------------------------------------------*/
 
-    if (verbose)
-    {
+    if (verbose) {
         printf("Copying file <%s> and object <%s> to file <%s> and object <%s>\n",
         fname_src, oname_src, fname_dst, oname_dst);
         if (flag) {
-            HDassert(str_flag);
             printf("Using %s flag\n", str_flag);
         }
     }
@@ -418,8 +398,7 @@ main (int argc, const char *argv[])
         HGOTO_ERROR(EXIT_FAILURE, H5E_tools_min_id_g, "H5Pcreate failed");
 
     /* set options for object copy */
-    if (flag)
-    {
+    if (flag) {
         if ( H5Pset_copy_object(ocpl_id, flag) < 0)
             HGOTO_ERROR(EXIT_FAILURE, H5E_tools_min_id_g, "H5Pset_copy_object failed");
     }
@@ -442,24 +421,21 @@ main (int argc, const char *argv[])
         if(verbose)
             printf("%s: Creating parent groups\n", h5tools_getprogname());
     } /* end if */
-    else /* error, if parent groups doesn't already exist in destination file */
-    {
+    else {
+        /* error, if parent groups doesn't already exist in destination file */
         size_t        i, len;
 
         len = HDstrlen(oname_dst);
 
         /* check if all the parents groups exist. skip root group */
-        for (i = 1; i < len; i++)
-        {
-            if ('/'==oname_dst[i])
-            {
+        for (i = 1; i < len; i++) {
+            if ('/'==oname_dst[i]) {
                 char         *str_ptr;
 
                 str_ptr = (char *)HDcalloc(i + 1, sizeof(char));
                 HDstrncpy(str_ptr, oname_dst, i);
                 str_ptr[i]='\0';
-                if (H5Lexists(fid_dst, str_ptr, H5P_DEFAULT) <= 0)
-                {
+                if (H5Lexists(fid_dst, str_ptr, H5P_DEFAULT) <= 0) {
                     error_msg("group <%s> doesn't exist. Use -p to create parent groups.\n", str_ptr);
                     HDfree(str_ptr);
                     HGOTO_ERROR(EXIT_FAILURE, H5E_tools_min_id_g, "H5Lexists failed");
@@ -477,15 +453,15 @@ main (int argc, const char *argv[])
         linkinfo.opt.msg_mode = 1;
 
     li_ret = H5tools_get_symlink_info(fid_src, oname_src, &linkinfo, 1);
-    if (li_ret == 0) /* dangling link */
-    {
+    if (li_ret == 0) {
+        /* dangling link */
         if(H5Lcopy(fid_src, oname_src,
                    fid_dst, oname_dst,
                    H5P_DEFAULT, H5P_DEFAULT) < 0)
             HGOTO_ERROR(EXIT_FAILURE, H5E_tools_min_id_g, "H5Lcopy failed");
     }
-    else /* valid link */
-    {
+    else {
+        /* valid link */
         if (H5Ocopy(fid_src,          /* Source file or group identifier */
                   oname_src,        /* Name of the source object to be copied */
                   fid_dst,          /* Destination file or group identifier  */
@@ -520,13 +496,13 @@ done:
     if (linkinfo.trg_path)
         HDfree(linkinfo.trg_path);
 
- H5E_BEGIN_TRY {
-    H5Pclose(ocpl_id);
-    H5Pclose(lcpl_id);
-    H5Fclose(fid_src);
-    H5Fclose(fid_dst);
- } H5E_END_TRY;
+    H5E_BEGIN_TRY {
+        H5Pclose(ocpl_id);
+        H5Pclose(lcpl_id);
+        H5Fclose(fid_src);
+        H5Fclose(fid_dst);
+    } H5E_END_TRY;
 
- leave(ret_value);
+    leave(ret_value);
 }
 
diff --git a/tools/h5copy/h5copygentest.c b/tools/h5copy/h5copygentest.c
index 587ad45..0af4dc1 100644
--- a/tools/h5copy/h5copygentest.c
+++ b/tools/h5copy/h5copygentest.c
@@ -14,7 +14,6 @@
 /*
  * Generate the binary hdf5 file for the h5copy tests
  */
-#include <stdlib.h>
 #include "hdf5.h"
 #include "H5private.h"
 
@@ -335,7 +334,7 @@ static void gent_att_compound_vlstr(hid_t loc_id)
 {
     typedef struct { /* Compound structure for the attribute */
         int i;
-        char *v;
+        const char *v;
     } s1;
     hsize_t dim[1] = {1};	/* Dimension size */
     hid_t sid = -1; 		/* Dataspace ID */
diff --git a/tools/h5copy/testfiles/h5copy_plugin_fail_ERR.out.h5.txt b/tools/h5copy/testfiles/h5copy_plugin_fail_ERR.out.h5.txt
new file mode 100644
index 0000000..66e9eb2
--- /dev/null
+++ b/tools/h5copy/testfiles/h5copy_plugin_fail_ERR.out.h5.txt
@@ -0,0 +1,3 @@
+dataset: </dynlibud> and </dynlibud>
+0 differences found
+EXIT CODE: 0
diff --git a/tools/h5copy/testfiles/h5copy_plugin_test.out.h5.txt b/tools/h5copy/testfiles/h5copy_plugin_test.out.h5.txt
new file mode 100644
index 0000000..66e9eb2
--- /dev/null
+++ b/tools/h5copy/testfiles/h5copy_plugin_test.out.h5.txt
@@ -0,0 +1,3 @@
+dataset: </dynlibud> and </dynlibud>
+0 differences found
+EXIT CODE: 0
diff --git a/tools/h5copy/testfiles/tudfilter.h5 b/tools/h5copy/testfiles/tudfilter.h5
new file mode 100644
index 0000000..081b000
--- /dev/null
+++ b/tools/h5copy/testfiles/tudfilter.h5
diff --git a/tools/h5copy/testfiles/tudfilter.h5.txt b/tools/h5copy/testfiles/tudfilter.h5.txt
new file mode 100644
index 0000000..eabe407
--- /dev/null
+++ b/tools/h5copy/testfiles/tudfilter.h5.txt
@@ -0,0 +1,2 @@
+Copying file <./testfiles/tudfilter.h5> and object </dynlibud> to file <./testfiles/h5copy_plugin_test.out.h5> and object </dynlibud>
+EXIT CODE: 0
diff --git a/tools/h5copy/testfiles/tudfilter.h5_ERR.txt b/tools/h5copy/testfiles/tudfilter.h5_ERR.txt
new file mode 100644
index 0000000..3c5b3ca
--- /dev/null
+++ b/tools/h5copy/testfiles/tudfilter.h5_ERR.txt
@@ -0,0 +1,2 @@
+Copying file <./testfiles/tudfilter.h5> and object </dynlibud> to file <./testfiles/h5copy_plugin_fail_ERR.out.h5> and object </dynlibud>
+EXIT CODE: 0
diff --git a/tools/h5copy/testfiles/tudfilter2.h5 b/tools/h5copy/testfiles/tudfilter2.h5
new file mode 100644
index 0000000..081b000
--- /dev/null
+++ b/tools/h5copy/testfiles/tudfilter2.h5
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt
index 41897da..d26c742 100644
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@@ -64,30 +64,32 @@ if (BUILD_TESTING)
   #-----------------------------------------------------------------------------
   # If plugin library tests can be tested
   #-----------------------------------------------------------------------------
-  set (HDF5_TOOL_PLUGIN_LIB_CORENAME         "dynlibdiff")
-  set (HDF5_TOOL_PLUGIN_LIB_NAME             "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TOOL_PLUGIN_LIB_CORENAME}")
-  set (HDF5_TOOL_PLUGIN_LIB_TARGET           ${HDF5_TOOL_PLUGIN_LIB_CORENAME})
-  add_definitions (${HDF_EXTRA_C_FLAGS})
-  INCLUDE_DIRECTORIES (${HDF5_SRC_DIR})
-
-  add_library (${HDF5_TOOL_PLUGIN_LIB_TARGET} SHARED dynlib_diff.c)
-  TARGET_C_PROPERTIES (${HDF5_TOOL_PLUGIN_LIB_TARGET} SHARED " " " ")
-  target_link_libraries (${HDF5_TOOL_PLUGIN_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-  H5_SET_LIB_OPTIONS (${HDF5_TOOL_PLUGIN_LIB_TARGET} ${HDF5_TOOL_PLUGIN_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
-
-  # make plugins dir
-  file (MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugins")
-  #-----------------------------------------------------------------------------
-  # Copy plugin library to a plugins folder
-  #-----------------------------------------------------------------------------
-  add_custom_command (
-      TARGET     ${HDF5_TOOL_PLUGIN_LIB_TARGET}
-      POST_BUILD
-      COMMAND    ${CMAKE_COMMAND}
-      ARGS       -E copy_if_different
-          "$<TARGET_FILE:${HDF5_TOOL_PLUGIN_LIB_TARGET}>"
-          "${CMAKE_BINARY_DIR}/plugins/$<TARGET_FILE_NAME:${HDF5_TOOL_PLUGIN_LIB_TARGET}>"
-  )
+  if (BUILD_SHARED_LIBS)
+    set (HDF5_TOOL_PLUGIN_LIB_CORENAME         "dynlibdiff")
+    set (HDF5_TOOL_PLUGIN_LIB_NAME             "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TOOL_PLUGIN_LIB_CORENAME}")
+    set (HDF5_TOOL_PLUGIN_LIB_TARGET           ${HDF5_TOOL_PLUGIN_LIB_CORENAME})
+    add_definitions (${HDF_EXTRA_C_FLAGS})
+    INCLUDE_DIRECTORIES (${HDF5_SRC_DIR})
+
+    add_library (${HDF5_TOOL_PLUGIN_LIB_TARGET} SHARED dynlib_diff.c)
+    TARGET_C_PROPERTIES (${HDF5_TOOL_PLUGIN_LIB_TARGET} SHARED " " " ")
+    target_link_libraries (${HDF5_TOOL_PLUGIN_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+    H5_SET_LIB_OPTIONS (${HDF5_TOOL_PLUGIN_LIB_TARGET} ${HDF5_TOOL_PLUGIN_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
+
+    # make plugins dir
+    file (MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugins")
+    #-----------------------------------------------------------------------------
+    # Copy plugin library to a plugins folder
+    #-----------------------------------------------------------------------------
+    add_custom_command (
+        TARGET     ${HDF5_TOOL_PLUGIN_LIB_TARGET}
+        POST_BUILD
+        COMMAND    ${CMAKE_COMMAND}
+        ARGS       -E copy_if_different
+            "$<TARGET_FILE:${HDF5_TOOL_PLUGIN_LIB_TARGET}>"
+            "${CMAKE_BINARY_DIR}/plugins/$<TARGET_FILE_NAME:${HDF5_TOOL_PLUGIN_LIB_TARGET}>"
+    )
+  endif ()
 
   include (CMakeTests.cmake)
 
diff --git a/tools/h5diff/CMakeTests.cmake b/tools/h5diff/CMakeTests.cmake
index 7f6f8c3..14fc534 100644
--- a/tools/h5diff/CMakeTests.cmake
+++ b/tools/h5diff/CMakeTests.cmake
@@ -66,6 +66,8 @@
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/tudfilter2.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/diff_strings1.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/diff_strings2.h5
+      # tools/testfiles
+      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5
   )
 
   set (LIST_OTHER_TEST_FILES
@@ -139,11 +141,21 @@
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_452.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_453.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_454.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_454_ERR.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_454_ERR.err
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_455.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_455_ERR.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_455_ERR.err
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_456.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_457.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_457_ERR.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_457_ERR.err
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_458.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_458_ERR.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_458_ERR.err
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_459.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_459_ERR.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_459_ERR.err
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_465.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_466.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_467.txt
@@ -199,6 +211,8 @@
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_63.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_600.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601_ERR.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601_ERR.err
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_603.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_604.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_605.txt
@@ -251,6 +265,7 @@
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_90.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ud.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_vlstr.txt
   )
 
   set (LIST_WIN_TEST_FILES
@@ -276,6 +291,11 @@
       HDFTEST_COPY_FILE("${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}" "h5diff_files")
     endif ()
   endforeach ()
+  # copy second version of tvlstr.h5
+  HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files")
+  if (H5_HAVE_PARALLEL)
+      HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files")
+  endif ()
 
 
   #
@@ -311,13 +331,24 @@
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DIFF-${resultfile} COMMAND $<TARGET_FILE:h5diff> ${ARGN})
       set_tests_properties (H5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      if (NOT ${resultcode} STREQUAL "0")
+      if (NOT "${resultcode}" STREQUAL "0")
         set_tests_properties (H5DIFF-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
       if (NOT "${last_test}" STREQUAL "")
         set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
       endif ()
     else ()
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5DIFF-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/${resultfile}.out
+              testfiles/${resultfile}.out.err
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5DIFF-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
       add_test (
           NAME H5DIFF-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -330,28 +361,81 @@
               -D "TEST_APPEND=EXIT CODE:"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DIFF-${resultfile} PROPERTIES DEPENDS H5DIFF-${resultfile}-clear-objects)
     endif ()
     if (H5_HAVE_PARALLEL)
       ADD_PH5_TEST (${resultfile} ${resultcode} ${ARGN})
     endif ()
   endmacro ()
 
+  macro (ADD_H5_ERR_TEST resultfile resultcode)
+    # If using memchecker add tests without using scripts
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME H5DIFF_ERR-${resultfile} COMMAND $<TARGET_FILE:h5diff> --enable-error-stack ${ARGN})
+      set_tests_properties (H5DIFF_ERR-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+      if (NOT "${resultcode}" STREQUAL "0")
+        set_tests_properties (H5DIFF_ERR-${resultfile} PROPERTIES WILL_FAIL "true")
+      endif ()
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5DIFF_ERR-${resultfile} PROPERTIES DEPENDS ${last_test})
+      endif ()
+    else ()
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5DIFF_ERR-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/${resultfile}_ERR.out
+              testfiles/${resultfile}_ERR.out.err
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5DIFF_ERR-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
+      add_test (
+          NAME H5DIFF_ERR-${resultfile}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5diff>"
+              -D "TEST_ARGS:STRING=--enable-error-stack;${ARGN}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=${resultfile}_ERR.out"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_REFERENCE=${resultfile}_ERR.txt"
+              -D "TEST_MASK_ERROR=true"
+              -D "TEST_APPEND=EXIT CODE:"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5DIFF_ERR-${resultfile} PROPERTIES DEPENDS H5DIFF_ERR-${resultfile}-clear-objects)
+    endif ()
+    set (last_test "H5DIFF_ERR-${resultfile}")
+  endmacro ()
+
   macro (ADD_PH5_TEST resultfile resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME PH5DIFF-${resultfile} COMMAND $<TARGET_FILE:ph5diff> ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} ${ARGN})
+      add_test (NAME PH5DIFF-${resultfile} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:ph5diff> ${MPIEXEC_POSTFLAGS} ${ARGN})
       set_tests_properties (PH5DIFF-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/PAR/testfiles")
-      if (NOT ${resultcode} STREQUAL "0")
+      if (NOT "${resultcode}" STREQUAL "0")
         set_tests_properties (PH5DIFF-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
       if (NOT "${last_test}" STREQUAL "")
         set_tests_properties (PH5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
       endif ()
     else ()
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME PH5DIFF-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              PAR/testfiles/${resultfile}.out
+              PAR/testfiles/${resultfile}.out.err
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (PH5DIFF-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
       add_test (
           NAME PH5DIFF-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=${MPIEXEC};${MPIEXEC_PREFLAGS};${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_POSTFLAGS};$<TARGET_FILE:ph5diff>"
+              -D "TEST_PROGRAM=${MPIEXEC_EXECUTABLE};${MPIEXEC_NUMPROC_FLAG};${MPIEXEC_MAX_NUMPROCS};${MPIEXEC_PREFLAGS};$<TARGET_FILE:ph5diff>;${MPIEXEC_POSTFLAGS}"
               -D "TEST_ARGS:STRING=${ARGN}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/PAR/testfiles"
               -D "TEST_OUTPUT=${resultfile}.out"
@@ -363,9 +447,7 @@
               -D "TEST_SORT_COMPARE=TRUE"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (PH5DIFF-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif ()
+      set_tests_properties (PH5DIFF-${resultfile} PROPERTIES DEPENDS PH5DIFF-${resultfile}-clear-objects)
       set (last_test "PH5DIFF-${resultfile}")
     endif ()
   endmacro ()
@@ -374,17 +456,17 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       # Remove any output file left over from previous test run
       add_test (
-          NAME H5DIFF_UD-${testname}-clearall-objects
+          NAME H5DIFF_UD-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove
               testfiles/${resultfile}.out
               testfiles/${resultfile}.out.err
       )
-      if (${resultcode} STREQUAL "2")
+      if ("${resultcode}" STREQUAL "2")
         add_test (
             NAME H5DIFF_UD-${testname}
             COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:h5diff>"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5diff-shared>"
                 -D "TEST_ARGS:STRING=${ARGN}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
                 -D "TEST_OUTPUT=${resultfile}.out"
@@ -399,7 +481,7 @@
         add_test (
             NAME H5DIFF_UD-${testname}
             COMMAND "${CMAKE_COMMAND}"
-                -D "TEST_PROGRAM=$<TARGET_FILE:h5diff>"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5diff-shared>"
                 -D "TEST_ARGS:STRING=${ARGN}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
                 -D "TEST_OUTPUT=${resultfile}.out"
@@ -411,7 +493,54 @@
                 -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
         )
       endif ()
-      set_tests_properties (H5DIFF_UD-${testname} PROPERTIES DEPENDS H5DIFF_UD-${testname}-clearall-objects)
+      set_tests_properties (H5DIFF_UD-${testname} PROPERTIES DEPENDS H5DIFF_UD-${testname}-clear-objects)
+    endif ()
+  endmacro ()
+
+  macro (ADD_H5_UD_ERR_TEST testname resultcode resultfile)
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5DIFF_UD_ERR-${testname}-clearall-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/${resultfile}_ERR.out
+              testfiles/${resultfile}_ERR.out.err
+      )
+      if ("${resultcode}" STREQUAL "2")
+        add_test (
+            NAME H5DIFF_UD_ERR-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5diff-shared>"
+                -D "TEST_ARGS:STRING=--enable-error-stack;${ARGN}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${resultfile}_ERR.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${resultfile}_ERR.txt"
+                -D "TEST_MASK_ERROR=true"
+                -D "TEST_APPEND=EXIT CODE:"
+                -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
+                -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      else ()
+        add_test (
+            NAME H5DIFF_UD_ERR-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5diff-shared>"
+                -D "TEST_ARGS:STRING=--enable-error-stack;${ARGN}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${resultfile}_ERR.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${resultfile}_ERR.txt"
+                -D "TEST_MASK_ERROR=true"
+                -D "TEST_APPEND=EXIT CODE:"
+                -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
+                -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif ()
+      set_tests_properties (H5DIFF_UD_ERR-${testname} PROPERTIES DEPENDS H5DIFF_UD_ERR-${testname}-clearall-objects)
     endif ()
   endmacro ()
 
@@ -629,16 +758,26 @@
           h5diff_453.out.err
           h5diff_454.out
           h5diff_454.out.err
+          h5diff_454_ERR.out
+          h5diff_454_ERR.out.err
           h5diff_455.out
           h5diff_455.out.err
+          h5diff_455_ERR.out
+          h5diff_455_ERR.out.err
           h5diff_456.out
           h5diff_456.out.err
           h5diff_457.out
           h5diff_457.out.err
+          h5diff_457_ERR.out
+          h5diff_457_ERR.out.err
           h5diff_458.out
           h5diff_458.out.err
+          h5diff_458_ERR.out
+          h5diff_458_ERR.out.err
           h5diff_459.out
           h5diff_459.out.err
+          h5diff_459_ERR.out
+          h5diff_459_ERR.out.err
           h5diff_465.out
           h5diff_465.out.err
           h5diff_466.out
@@ -743,6 +882,8 @@
           h5diff_600.out.err
           h5diff_601.out
           h5diff_601.out.err
+          h5diff_601_ERR.out
+          h5diff_601_ERR.out.err
           h5diff_603.out
           h5diff_603.out.err
           h5diff_604.out
@@ -839,6 +980,8 @@
           h5diff_801.out.err
           h5diff_90.out
           h5diff_90.out.err
+          h5diff_vlstr.out
+          h5diff_vlstr.out.err
     )
     set_tests_properties (H5DIFF-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
     if (NOT "${last_test}" STREQUAL "")
@@ -979,6 +1122,7 @@ ADD_H5_TEST (h5diff_600 1 ${FILE1})
 
 # 6.1: Check if non-exist object name is specified
 ADD_H5_TEST (h5diff_601 2 ${FILE1} ${FILE1} nono_obj)
+ADD_H5_ERR_TEST (h5diff_601 2 ${FILE1} ${FILE1} nono_obj)
 
 # ##############################################################################
 # # -d
@@ -1278,21 +1422,26 @@ ADD_H5_TEST (h5diff_453 2  --follow-symlinks -v --no-dangling-links  ${FILE13} $
 
 # dangling link found for soft links (obj to obj)
 ADD_H5_TEST (h5diff_454 2  --follow-symlinks -v --no-dangling-links  ${FILE13} ${FILE13} /softlink_dset2 /softlink_noexist)
+ADD_H5_ERR_TEST (h5diff_454 2  --follow-symlinks -v --no-dangling-links  ${FILE13} ${FILE13} /softlink_dset2 /softlink_noexist)
 
 # dangling link found for soft links (obj to obj) Both dangle links
 ADD_H5_TEST (h5diff_455 2  --follow-symlinks -v --no-dangling-links  ${FILE13} ${FILE13} /softlink_noexist /softlink_noexist)
+ADD_H5_ERR_TEST (h5diff_455 2  --follow-symlinks -v --no-dangling-links  ${FILE13} ${FILE13} /softlink_noexist /softlink_noexist)
 
 # dangling link found for ext links (FILE to FILE)
 ADD_H5_TEST (h5diff_456 2  --follow-symlinks -v --no-dangling-links  ${FILE15} ${FILE15})
 
 # dangling link found for ext links (obj to obj). target file exist
 ADD_H5_TEST (h5diff_457 2  --follow-symlinks -v --no-dangling-links  ${FILE15} ${FILE15} /ext_link_dset1 /ext_link_noexist1)
+ADD_H5_ERR_TEST (h5diff_457 2  --follow-symlinks -v --no-dangling-links  ${FILE15} ${FILE15} /ext_link_dset1 /ext_link_noexist1)
 
 # dangling link found for ext links (obj to obj). target file NOT exist
 ADD_H5_TEST (h5diff_458 2  --follow-symlinks -v --no-dangling-links  ${FILE15} ${FILE15} /ext_link_dset1 /ext_link_noexist2)
+ADD_H5_ERR_TEST (h5diff_458 2  --follow-symlinks -v --no-dangling-links  ${FILE15} ${FILE15} /ext_link_dset1 /ext_link_noexist2)
 
 # dangling link found for ext links (obj to obj). Both dangle links
 ADD_H5_TEST (h5diff_459 2  --follow-symlinks -v --no-dangling-links  ${FILE15} ${FILE15} /ext_link_noexist1 /ext_link_noexist2)
+ADD_H5_ERR_TEST (h5diff_459 2  --follow-symlinks -v --no-dangling-links  ${FILE15} ${FILE15} /ext_link_noexist1 /ext_link_noexist2)
 
 # dangling link --follow-symlinks (obj vs obj)
 # (HDFFV-7836)
@@ -1403,6 +1552,7 @@ ADD_H5_TEST (h5diff_487 1 -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5
 # # diff various multiple vlen and fixed strings in a compound type dataset
 # ##############################################################################
 ADD_H5_TEST (h5diff_530 0 -v  ${COMP_VL_STRS_FILE} ${COMP_VL_STRS_FILE} /group /group_copy)
+ADD_H5_TEST (h5diff_vlstr 0 -v tvlstr.h5 tvlstr2.h5)
 
 # ##############################################################################
 # # Test container types (array,vlen) with multiple nested compound types
@@ -1434,8 +1584,10 @@ ADD_H5_TEST (h5diff_801 1 -v ${FILE7} ${FILE8A} /g1/array /g1/array)
 ##############################################################################
 ###    P L U G I N  T E S T S
 ##############################################################################
-ADD_H5_UD_TEST (h5diff_plugin_test 0 h5diff_ud -v tudfilter.h5 tudfilter2.h5)
-ADD_H5_UD_TEST (h5diff_plugin_fail 2 h5diff_udfail -v tudfilter.h5 tudfilter2.h5)
+if (BUILD_SHARED_LIBS)
+  ADD_H5_UD_TEST (h5diff_plugin_test 0 h5diff_ud -v tudfilter.h5 tudfilter2.h5)
+  ADD_H5_UD_TEST (h5diff_plugin_fail 2 h5diff_udfail -v tudfilter.h5 tudfilter2.h5)
+endif ()
 
 # ##############################################################################
 # # END
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 5371541..5f44cfd 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -611,6 +611,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index f87fdf2..67977e9 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -11,23 +11,21 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
 #include "H5private.h"
 #include "h5diff.h"
 #include "h5diff_common.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
 
-static int check_n_input( const char* );
-static int check_p_input( const char* );
-static int check_d_input( const char* );
+static int check_n_input(const char*);
+static int check_p_input(const char*);
+static int check_d_input(const char*);
 
 /*
  * Command-line options: The user can specify short or long-named
  * parameters.
  */
-static const char *s_opts = "hVrv:qn:d:p:Nc";
+static const char *s_opts = "hVrv:qn:d:p:NcelxE:S";
 static struct long_options l_opts[] = {
     { "help", no_arg, 'h' },
     { "version", no_arg, 'V' },
@@ -43,6 +41,7 @@ static struct long_options l_opts[] = {
     { "follow-symlinks", no_arg, 'l' },
     { "no-dangling-links", no_arg, 'x' },
     { "exclude-path", require_arg, 'E' },
+    { "enable-error-stack", no_arg, 'S' },
     { NULL, 0, '\0' }
 };
 
@@ -53,7 +52,7 @@ static struct long_options l_opts[] = {
  *
  *-------------------------------------------------------------------------
  */
-static void check_options(diff_opt_t* options)
+static void check_options(diff_opt_t* opts)
 {
     /*--------------------------------------------------------------
      * check for mutually exclusive options
@@ -62,8 +61,7 @@ static void check_options(diff_opt_t* options)
     /* check between -d , -p, --use-system-epsilon.
      * These options are mutually exclusive.
      */
-    if ((options->d + options->p + options->use_system_epsilon) > 1)
-    {
+    if ((opts->d + opts->p + opts->use_system_epsilon) > 1) {
         printf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME);
         printf("use no more than one.\n");
         printf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 Reference Manual'.\n", PROGRAMNAME);
@@ -86,101 +84,105 @@ void parse_command_line(int argc,
                         const char** fname2,
                         const char** objname1,
                         const char** objname2,
-                        diff_opt_t* options)
+                        diff_opt_t* opts)
 {
     int i;
     int opt;
     struct exclude_path_list *exclude_head, *exclude_prev, *exclude_node;
 
     /* process the command-line */
-    memset(options, 0, sizeof (diff_opt_t));
+    memset(opts, 0, sizeof (diff_opt_t));
 
     /* assume equal contents initially */
-    options->contents = 1;
+    opts->contents = 1;
 
     /* NaNs are handled by default */
-    options->do_nans = 1;
+    opts->do_nans = 1;
 
     /* not Listing objects that are not comparable */
-    options->m_list_not_cmp = 0;
+    opts->m_list_not_cmp = 0;
 
     /* initially no not-comparable. */
     /**this is bad in mixing option with results**/
-    options->not_cmp=0;
+    opts->not_cmp=0;
 
     /* init for exclude-path option */
     exclude_head = NULL;
 
     /* parse command line options */
-    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF)
-    {
-        switch ((char)opt)
-        {
+    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
+        switch ((char)opt) {
         default:
             usage();
             h5diff_exit(EXIT_FAILURE);
+
         case 'h':
             usage();
             h5diff_exit(EXIT_SUCCESS);
+
         case 'V':
             print_version(h5tools_getprogname());
             h5diff_exit(EXIT_SUCCESS);
+
         case 'v':
-            options->m_verbose = 1;
+            opts->m_verbose = 1;
             /* This for loop is for handling style like
              * -v, -v1, --verbose, --verbose=1.
              */
-            for (i = 1; i < argc; i++)
-            {
+            for (i = 1; i < argc; i++) {
                 /*
                  * short opt
                  */
-                if (!strcmp (argv[i], "-v"))  /* no arg */
-            {
+                if (!strcmp (argv[i], "-v")) {  /* no arg */
                     opt_ind--;
-                    options->m_verbose_level = 0;
+                    opts->m_verbose_level = 0;
                     break;
-            }
-                else if (!strncmp (argv[i], "-v", (size_t)2))
-            {
-                    options->m_verbose_level = atoi(&argv[i][2]);
+                }
+                else if (!strncmp (argv[i], "-v", (size_t)2)) {
+                    opts->m_verbose_level = atoi(&argv[i][2]);
                     break;
-            }
+                }
 
                 /*
                  * long opt
                  */
-                if (!strcmp (argv[i], "--verbose"))  /* no arg */
-            {
-                    options->m_verbose_level = 0;
+                if (!strcmp (argv[i], "--verbose")) {  /* no arg */
+                    opts->m_verbose_level = 0;
                     break;
-            }
-            else if ( !strncmp (argv[i], "--verbose", (size_t)9) && argv[i][9]=='=')
-            {
-                    options->m_verbose_level = atoi(&argv[i][10]);
+                }
+                else if ( !strncmp (argv[i], "--verbose", (size_t)9) && argv[i][9]=='=') {
+                    opts->m_verbose_level = atoi(&argv[i][10]);
                     break;
                 }
             }
             break;
+
         case 'q':
             /* use quiet mode; supress the message "0 differences found" */
-            options->m_quiet = 1;
+            opts->m_quiet = 1;
             break;
+
         case 'r':
-            options->m_report = 1;
+            opts->m_report = 1;
             break;
+
         case 'l':
-            options->follow_links = TRUE;
+            opts->follow_links = TRUE;
             break;
+
         case 'x':
-            options->no_dangle_links = 1;
+            opts->no_dangle_links = 1;
+            break;
+
+        case 'S':
+            enable_error_stack = TRUE;
             break;
+
         case 'E':
-            options->exclude_path = 1;
+            opts->exclude_path = 1;
 
             /* create linked list of excluding objects */
-            if( (exclude_node = (struct exclude_path_list*) HDmalloc(sizeof(struct exclude_path_list))) == NULL)
-            {
+            if( (exclude_node = (struct exclude_path_list*) HDmalloc(sizeof(struct exclude_path_list))) == NULL) {
                 printf("Error: lack of memory!\n");
                 h5diff_exit(EXIT_FAILURE);
             }
@@ -190,13 +192,11 @@ void parse_command_line(int argc,
             exclude_node->obj_type = H5TRAV_TYPE_UNKNOWN;
             exclude_prev = exclude_head;
 
-            if (NULL == exclude_head)
-            {
+            if (NULL == exclude_head) {
                 exclude_head = exclude_node;
                 exclude_head->next = NULL;
             }
-            else
-            {
+            else {
                 while(NULL != exclude_prev->next)
                     exclude_prev=exclude_prev->next;
 
@@ -204,76 +204,69 @@ void parse_command_line(int argc,
                 exclude_prev->next = exclude_node;
             }
             break;
+
         case 'd':
-            options->d=1;
+            opts->d=1;
 
-            if ( check_d_input( opt_arg )==-1)
-            {
-                printf("<-d %s> is not a valid option\n", opt_arg );
+            if (check_d_input(opt_arg) == - 1) {
+                printf("<-d %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
-            options->delta = atof( opt_arg );
+            opts->delta = atof(opt_arg);
 
             /* -d 0 is the same as default */
-            if (options->delta == 0)
-            options->d=0;
-
+            if (H5_DBL_ABS_EQUAL(opts->delta, (double)0.0F))
+                opts->d=0;
             break;
 
         case 'p':
-
-            options->p=1;
-            if ( check_p_input( opt_arg )==-1)
-            {
-                printf("<-p %s> is not a valid option\n", opt_arg );
+            opts->p=1;
+            if (check_p_input(opt_arg) == -1) {
+                printf("<-p %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
-            options->percent = atof( opt_arg );
+            opts->percent = atof(opt_arg);
 
             /* -p 0 is the same as default */
-            if (options->percent == 0)
-            options->p = 0;
-
+            if (H5_DBL_ABS_EQUAL(opts->percent, (double)0.0F))
+                opts->p = 0;
             break;
 
         case 'n':
-
-            options->n=1;
-            if ( check_n_input( opt_arg )==-1)
-            {
-                printf("<-n %s> is not a valid option\n", opt_arg );
+            opts->n=1;
+            if ( check_n_input(opt_arg) == -1) {
+                printf("<-n %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
-            options->count = HDstrtoull(opt_arg, NULL, 0);
+            opts->count = HDstrtoull(opt_arg, NULL, 0);
             break;
 
         case 'N':
-            options->do_nans = 0;
+            opts->do_nans = 0;
             break;
 
         case 'c':
-            options->m_list_not_cmp = 1;
+            opts->m_list_not_cmp = 1;
             break;
 
         case 'e':
-            options->use_system_epsilon = 1;
+            opts->use_system_epsilon = 1;
             break;
         }
     }
 
     /* check options */
-    check_options(options);
+    check_options(opts);
 
     /* if exclude-path option is used, keep the exclude path list */
-    if (options->exclude_path)
-        options->exclude = exclude_head;
+    if (opts->exclude_path)
+        opts->exclude = exclude_head;
 
     /* check for file names to be processed */
-    if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL)
-    {
+    if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL) {
         error_msg("missing file names\n");
         usage();
         h5diff_exit(EXIT_FAILURE);
@@ -283,18 +276,15 @@ void parse_command_line(int argc,
     *fname2 = argv[ opt_ind + 1 ];
     *objname1 = argv[ opt_ind + 2 ];
 
-    if ( *objname1 == NULL )
-    {
+    if (*objname1 == NULL) {
         *objname2 = NULL;
         return;
     }
 
-    if ( argv[ opt_ind + 3 ] != NULL)
-    {
+    if (argv[ opt_ind + 3 ] != NULL) {
         *objname2 = argv[ opt_ind + 3 ];
     }
-    else
-    {
+    else {
         *objname2 = *objname1;
     }
 
@@ -310,34 +300,28 @@ void parse_command_line(int argc,
  *-------------------------------------------------------------------------
  */
 
- void  print_info(diff_opt_t* options)
+ void  print_info(diff_opt_t* opts)
  {
-     if (options->m_quiet || options->err_stat )
+     if (opts->m_quiet || opts->err_stat)
          return;
 
-     if (options->cmn_objs==0)
-     {
+     if (opts->cmn_objs == 0) {
          printf("No common objects found. Files are not comparable.\n");
-         if (!options->m_verbose)
+         if (!opts->m_verbose)
              printf("Use -v for a list of objects.\n");
      }
 
-     if (options->not_cmp==1)
-     {
-         if ( options->m_list_not_cmp == 0 )
-         {
+     if (opts->not_cmp == 1) {
+         if (opts->m_list_not_cmp == 0) {
              printf("--------------------------------\n");
              printf("Some objects are not comparable\n");
              printf("--------------------------------\n");
-             if (options->m_verbose)
+             if (opts->m_verbose)
                  printf("Use -c for a list of objects without details of differences.\n");
              else
                  printf("Use -c for a list of objects.\n");
          }
-
-
      }
-
  }
 
 /*-------------------------------------------------------------------------
@@ -363,16 +347,14 @@ check_n_input( const char *str )
     unsigned i;
     char c;
 
-    for ( i = 0; i < strlen(str); i++)
-    {
+    for (i = 0; i < strlen(str); i++) {
         c = str[i];
-        if ( i==0 )
-        {
-            if ( c < 49 || c > 57  ) /* ascii values between 1 and 9 */
+        if (i == 0) {
+            if (c < 49 || c > 57) /* ascii values between 1 and 9 */
                 return -1;
         }
         else
-            if ( c < 48 || c > 57  ) /* 0 also */
+            if (c < 48 || c > 57) /* 0 also */
                 return -1;
     }
     return 1;
@@ -402,11 +384,11 @@ check_p_input( const char *str )
     the atof return value on a hexadecimal input is different
     on some systems; we do a character check for this
     */
-    if (strlen(str)>2 && str[0]=='0' && str[1]=='x')
+    if (strlen(str) > 2 && str[0] == '0' && str[1] == 'x')
         return -1;
 
-    x=atof(str);
-    if (x<0)
+    x = atof(str);
+    if (x < 0)
         return -1;
 
     return 1;
@@ -436,11 +418,11 @@ check_d_input( const char *str )
     the atof return value on a hexadecimal input is different
     on some systems; we do a character check for this
     */
-    if (strlen(str)>2 && str[0]=='0' && str[1]=='x')
+    if (strlen(str) > 2 && str[0] == '0' && str[1] == 'x')
         return -1;
 
-    x=atof(str);
-    if (x <0)
+    x = atof(str);
+    if (x < 0)
         return -1;
 
     return 1;
@@ -458,151 +440,153 @@ check_d_input( const char *str )
 
 void usage(void)
 {
- printf("usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]\n");
- printf("  file1             File name of the first HDF5 file\n");
- printf("  file2             File name of the second HDF5 file\n");
- printf("  [obj1]            Name of an HDF5 object, in absolute path\n");
- printf("  [obj2]            Name of an HDF5 object, in absolute path\n");
- printf("\n");
- printf("  OPTIONS\n");
- printf("   -h, --help\n");
- printf("         Print a usage message and exit.\n");
- printf("   -V, --version\n");
- printf("         Print version number and exit.\n");
- printf("   -r, --report\n");
- printf("         Report mode. Print differences.\n");
- printf("   -v --verbose\n");
- printf("         Verbose mode. Print differences information and list of objects.\n");
- printf("   -vN --verbose=N\n");
- printf("         Verbose mode with level. Print differences and list of objects.\n");
- printf("         Level of detail depends on value of N:\n");
- printf("          0 : Identical to '-v' or '--verbose'.\n");
- printf("          1 : All level 0 information plus one-line attribute\n");
- printf("              status summary.\n");
- printf("          2 : All level 1 information plus extended attribute\n");
- printf("              status report.\n");
- printf("   -q, --quiet\n");
- printf("         Quiet mode. Do not produce output.\n");
- printf("   --follow-symlinks\n");
- printf("         Follow symbolic links (soft links and external links and compare the)\n");
- printf("         links' target objects.\n");
- printf("         If symbolic link(s) with the same name exist in the files being\n");
- printf("         compared, then determine whether the target of each link is an existing\n");
- printf("         object (dataset, group, or named datatype) or the link is a dangling\n");
- printf("         link (a soft or external link pointing to a target object that does\n");
- printf("         not yet exist).\n");
- printf("         - If both symbolic links are dangling links, they are treated as being\n");
- printf("           the same; by default, h5diff returns an exit code of 0.\n");
- printf("           If, however, --no-dangling-links is used with --follow-symlinks,\n");
- printf("           this situation is treated as an error and h5diff returns an\n");
- printf("           exit code of 2.\n");
- printf("         - If only one of the two links is a dangling link,they are treated as\n");
- printf("           being different and h5diff returns an exit code of 1.\n");
- printf("           If, however, --no-dangling-links is used with --follow-symlinks,\n");
- printf("           this situation is treated as an error and h5diff returns an\n");
- printf("           exit code of 2.\n");
- printf("         - If both symbolic links point to existing objects, h5diff compares the\n");
- printf("           two objects.\n");
- printf("         If any symbolic link specified in the call to h5diff does not exist,\n");
- printf("         h5diff treats it as an error and returns an exit code of 2.\n");
- printf("   --no-dangling-links\n");
- printf("         Must be used with --follow-symlinks option; otherwise, h5diff shows\n");
- printf("         error message and returns an exit code of 2.\n");
- printf("         Check for any symbolic links (soft links or external links) that do not\n");
- printf("         resolve to an existing object (dataset, group, or named datatype).\n");
- printf("         If any dangling link is found, this situation is treated as an error\n");
- printf("         and h5diff returns an exit code of 2.\n");
- printf("   -c, --compare\n");
- printf("         List objects that are not comparable\n");
- printf("   -N, --nan\n");
- printf("         Avoid NaNs detection\n");
- printf("   -n C, --count=C\n");
- printf("         Print differences up to C. C must be a positive integer.\n");
- printf("   -d D, --delta=D\n");
- printf("         Print difference if (|a-b| > D). D must be a positive number. Where a\n");
- printf("         is the data point value in file1 and b is the data point value in file2.\n");
- printf("         Can not use with '-p' or '--use-system-epsilon'.\n");
- printf("   -p R, --relative=R\n");
- printf("         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a\n");
- printf("         is the data point value in file1 and b is the data point value in file2.\n");
- printf("         Can not use with '-d' or '--use-system-epsilon'.\n");
- printf("   --use-system-epsilon\n");
- printf("         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a\n");
- printf("         is the data point value in file1 and b is the data point value in file2.\n");
- printf("         If the system epsilon is not defined,one of the following predefined\n");
- printf("         values will be used:\n");
- printf("           FLT_EPSILON = 1.19209E-07 for floating-point type\n");
- printf("           DBL_EPSILON = 2.22045E-16 for double precision type\n");
- printf("         Can not use with '-p' or '-d'.\n");
- printf("   --exclude-path \"path\"\n");
- printf("         Exclude the specified path to an object when comparing files or groups.\n");
- printf("         If a group is excluded, all member objects will also be excluded.\n");
- printf("         The specified path is excluded wherever it occurs.\n");
- printf("         This flexibility enables the same option to exclude either objects that\n");
- printf("         exist only in one file or common objects that are known to differ.\n");
- printf("\n");
- printf("         When comparing files, \"path\" is the absolute path to the excluded;\n");
- printf("         object; when comparing groups, \"path\" is similar to the relative\n");
- printf("         path from the group to the excluded object. This \"path\" can be\n");
- printf("         taken from the first section of the output of the --verbose option.\n");
- printf("         For example, if you are comparing the group /groupA in two files and\n");
- printf("         you want to exclude /groupA/groupB/groupC in both files, the exclude\n");
- printf("         option would read as follows:\n");
- printf("           --exclude-path \"/groupB/groupC\"\n");
- printf("\n");
- printf("         If there are multiple paths to an object, only the specified path(s)\n");
- printf("         will be excluded; the comparison will include any path not explicitly\n");
- printf("         excluded.\n");
- printf("         This option can be used repeatedly to exclude multiple paths.\n");
- printf("\n");
-
- printf(" Modes of output:\n");
- printf("  Default mode: print the number of differences found and where they occured\n");
- printf("  -r Report mode: print the above plus the differences\n");
- printf("  -v Verbose mode: print the above plus a list of objects and warnings\n");
- printf("  -q Quiet mode: do not print output\n");
-
- printf("\n");
-
- printf(" File comparison:\n");
- printf("  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as\n");
- printf("  a comparison of the two files' root groups.  That is, h5diff first compares\n");
- printf("  the names of root group members, generates a report of root group objects\n");
- printf("  that appear in only one file or in both files, and recursively compares\n");
- printf("  common objects.\n");
- printf("\n");
-
- printf(" Object comparison:\n");
- printf("  1) Groups\n");
- printf("      First compares the names of member objects (relative path, from the\n");
- printf("      specified group) and generates a report of objects that appear in only\n");
- printf("      one group or in both groups. Common objects are then compared recursively.\n");
- printf("  2) Datasets\n");
- printf("      Array rank and dimensions, datatypes, and data values are compared.\n");
- printf("  3) Datatypes\n");
- printf("      The comparison is based on the return value of H5Tequal.\n");
- printf("  4) Symbolic links\n");
- printf("      The paths to the target objects are compared.\n");
- printf("      (The option --follow-symlinks overrides the default behavior when\n");
- printf("       symbolic links are compared.).\n");
- printf("\n");
-
- printf(" Exit code:\n");
- printf("  0 if no differences, 1 if differences found, 2 if error\n");
- printf("\n");
- printf(" Examples of use:\n");
- printf(" 1) h5diff file1 file2 /g1/dset1 /g1/dset2\n");
- printf("    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2\n");
- printf("\n");
- printf(" 2) h5diff file1 file2 /g1/dset1\n");
- printf("    Compares object '/g1/dset1' in both files\n");
- printf("\n");
- printf(" 3) h5diff file1 file2\n");
- printf("    Compares all objects in both files\n");
- printf("\n");
- printf(" Notes:\n");
- printf("  file1 and file2 can be the same file.\n");
- printf("  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare\n");
- printf("  '/g1/dset1' and '/g1/dset2' in the same file\n");
- printf("\n");
+ PRINTVALSTREAM(rawoutstream, "usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]\n");
+ PRINTVALSTREAM(rawoutstream, "  file1             File name of the first HDF5 file\n");
+ PRINTVALSTREAM(rawoutstream, "  file2             File name of the second HDF5 file\n");
+ PRINTVALSTREAM(rawoutstream, "  [obj1]            Name of an HDF5 object, in absolute path\n");
+ PRINTVALSTREAM(rawoutstream, "  [obj2]            Name of an HDF5 object, in absolute path\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+ PRINTVALSTREAM(rawoutstream, "  OPTIONS\n");
+ PRINTVALSTREAM(rawoutstream, "   -h, --help\n");
+ PRINTVALSTREAM(rawoutstream, "         Print a usage message and exit.\n");
+ PRINTVALSTREAM(rawoutstream, "   -V, --version\n");
+ PRINTVALSTREAM(rawoutstream, "         Print version number and exit.\n");
+ PRINTVALSTREAM(rawoutstream, "   -r, --report\n");
+ PRINTVALSTREAM(rawoutstream, "         Report mode. Print differences.\n");
+ PRINTVALSTREAM(rawoutstream, "   -v --verbose\n");
+ PRINTVALSTREAM(rawoutstream, "         Verbose mode. Print differences information and list of objects.\n");
+ PRINTVALSTREAM(rawoutstream, "   -vN --verbose=N\n");
+ PRINTVALSTREAM(rawoutstream, "         Verbose mode with level. Print differences and list of objects.\n");
+ PRINTVALSTREAM(rawoutstream, "         Level of detail depends on value of N:\n");
+ PRINTVALSTREAM(rawoutstream, "          0 : Identical to '-v' or '--verbose'.\n");
+ PRINTVALSTREAM(rawoutstream, "          1 : All level 0 information plus one-line attribute\n");
+ PRINTVALSTREAM(rawoutstream, "              status summary.\n");
+ PRINTVALSTREAM(rawoutstream, "          2 : All level 1 information plus extended attribute\n");
+ PRINTVALSTREAM(rawoutstream, "              status report.\n");
+ PRINTVALSTREAM(rawoutstream, "   -q, --quiet\n");
+ PRINTVALSTREAM(rawoutstream, "         Quiet mode. Do not produce output.\n");
+ PRINTVALSTREAM(rawoutstream, "   --enable-error-stack\n");
+ PRINTVALSTREAM(rawoutstream, "                   Prints messages from the HDF5 error stack as they occur.\n");
+ PRINTVALSTREAM(rawoutstream, "   --follow-symlinks\n");
+ PRINTVALSTREAM(rawoutstream, "         Follow symbolic links (soft links and external links and compare the)\n");
+ PRINTVALSTREAM(rawoutstream, "         links' target objects.\n");
+ PRINTVALSTREAM(rawoutstream, "         If symbolic link(s) with the same name exist in the files being\n");
+ PRINTVALSTREAM(rawoutstream, "         compared, then determine whether the target of each link is an existing\n");
+ PRINTVALSTREAM(rawoutstream, "         object (dataset, group, or named datatype) or the link is a dangling\n");
+ PRINTVALSTREAM(rawoutstream, "         link (a soft or external link pointing to a target object that does\n");
+ PRINTVALSTREAM(rawoutstream, "         not yet exist).\n");
+ PRINTVALSTREAM(rawoutstream, "         - If both symbolic links are dangling links, they are treated as being\n");
+ PRINTVALSTREAM(rawoutstream, "           the same; by default, h5diff returns an exit code of 0.\n");
+ PRINTVALSTREAM(rawoutstream, "           If, however, --no-dangling-links is used with --follow-symlinks,\n");
+ PRINTVALSTREAM(rawoutstream, "           this situation is treated as an error and h5diff returns an\n");
+ PRINTVALSTREAM(rawoutstream, "           exit code of 2.\n");
+ PRINTVALSTREAM(rawoutstream, "         - If only one of the two links is a dangling link,they are treated as\n");
+ PRINTVALSTREAM(rawoutstream, "           being different and h5diff returns an exit code of 1.\n");
+ PRINTVALSTREAM(rawoutstream, "           If, however, --no-dangling-links is used with --follow-symlinks,\n");
+ PRINTVALSTREAM(rawoutstream, "           this situation is treated as an error and h5diff returns an\n");
+ PRINTVALSTREAM(rawoutstream, "           exit code of 2.\n");
+ PRINTVALSTREAM(rawoutstream, "         - If both symbolic links point to existing objects, h5diff compares the\n");
+ PRINTVALSTREAM(rawoutstream, "           two objects.\n");
+ PRINTVALSTREAM(rawoutstream, "         If any symbolic link specified in the call to h5diff does not exist,\n");
+ PRINTVALSTREAM(rawoutstream, "         h5diff treats it as an error and returns an exit code of 2.\n");
+ PRINTVALSTREAM(rawoutstream, "   --no-dangling-links\n");
+ PRINTVALSTREAM(rawoutstream, "         Must be used with --follow-symlinks option; otherwise, h5diff shows\n");
+ PRINTVALSTREAM(rawoutstream, "         error message and returns an exit code of 2.\n");
+ PRINTVALSTREAM(rawoutstream, "         Check for any symbolic links (soft links or external links) that do not\n");
+ PRINTVALSTREAM(rawoutstream, "         resolve to an existing object (dataset, group, or named datatype).\n");
+ PRINTVALSTREAM(rawoutstream, "         If any dangling link is found, this situation is treated as an error\n");
+ PRINTVALSTREAM(rawoutstream, "         and h5diff returns an exit code of 2.\n");
+ PRINTVALSTREAM(rawoutstream, "   -c, --compare\n");
+ PRINTVALSTREAM(rawoutstream, "         List objects that are not comparable\n");
+ PRINTVALSTREAM(rawoutstream, "   -N, --nan\n");
+ PRINTVALSTREAM(rawoutstream, "         Avoid NaNs detection\n");
+ PRINTVALSTREAM(rawoutstream, "   -n C, --count=C\n");
+ PRINTVALSTREAM(rawoutstream, "         Print differences up to C. C must be a positive integer.\n");
+ PRINTVALSTREAM(rawoutstream, "   -d D, --delta=D\n");
+ PRINTVALSTREAM(rawoutstream, "         Print difference if (|a-b| > D). D must be a positive number. Where a\n");
+ PRINTVALSTREAM(rawoutstream, "         is the data point value in file1 and b is the data point value in file2.\n");
+ PRINTVALSTREAM(rawoutstream, "         Can not use with '-p' or '--use-system-epsilon'.\n");
+ PRINTVALSTREAM(rawoutstream, "   -p R, --relative=R\n");
+ PRINTVALSTREAM(rawoutstream, "         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a\n");
+ PRINTVALSTREAM(rawoutstream, "         is the data point value in file1 and b is the data point value in file2.\n");
+ PRINTVALSTREAM(rawoutstream, "         Can not use with '-d' or '--use-system-epsilon'.\n");
+ PRINTVALSTREAM(rawoutstream, "   --use-system-epsilon\n");
+ PRINTVALSTREAM(rawoutstream, "         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a\n");
+ PRINTVALSTREAM(rawoutstream, "         is the data point value in file1 and b is the data point value in file2.\n");
+ PRINTVALSTREAM(rawoutstream, "         If the system epsilon is not defined,one of the following predefined\n");
+ PRINTVALSTREAM(rawoutstream, "         values will be used:\n");
+ PRINTVALSTREAM(rawoutstream, "           FLT_EPSILON = 1.19209E-07 for floating-point type\n");
+ PRINTVALSTREAM(rawoutstream, "           DBL_EPSILON = 2.22045E-16 for double precision type\n");
+ PRINTVALSTREAM(rawoutstream, "         Can not use with '-p' or '-d'.\n");
+ PRINTVALSTREAM(rawoutstream, "   --exclude-path \"path\"\n");
+ PRINTVALSTREAM(rawoutstream, "         Exclude the specified path to an object when comparing files or groups.\n");
+ PRINTVALSTREAM(rawoutstream, "         If a group is excluded, all member objects will also be excluded.\n");
+ PRINTVALSTREAM(rawoutstream, "         The specified path is excluded wherever it occurs.\n");
+ PRINTVALSTREAM(rawoutstream, "         This flexibility enables the same option to exclude either objects that\n");
+ PRINTVALSTREAM(rawoutstream, "         exist only in one file or common objects that are known to differ.\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+ PRINTVALSTREAM(rawoutstream, "         When comparing files, \"path\" is the absolute path to the excluded;\n");
+ PRINTVALSTREAM(rawoutstream, "         object; when comparing groups, \"path\" is similar to the relative\n");
+ PRINTVALSTREAM(rawoutstream, "         path from the group to the excluded object. This \"path\" can be\n");
+ PRINTVALSTREAM(rawoutstream, "         taken from the first section of the output of the --verbose option.\n");
+ PRINTVALSTREAM(rawoutstream, "         For example, if you are comparing the group /groupA in two files and\n");
+ PRINTVALSTREAM(rawoutstream, "         you want to exclude /groupA/groupB/groupC in both files, the exclude\n");
+ PRINTVALSTREAM(rawoutstream, "         option would read as follows:\n");
+ PRINTVALSTREAM(rawoutstream, "           --exclude-path \"/groupB/groupC\"\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+ PRINTVALSTREAM(rawoutstream, "         If there are multiple paths to an object, only the specified path(s)\n");
+ PRINTVALSTREAM(rawoutstream, "         will be excluded; the comparison will include any path not explicitly\n");
+ PRINTVALSTREAM(rawoutstream, "         excluded.\n");
+ PRINTVALSTREAM(rawoutstream, "         This option can be used repeatedly to exclude multiple paths.\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+
+ PRINTVALSTREAM(rawoutstream, " Modes of output:\n");
+ PRINTVALSTREAM(rawoutstream, "  Default mode: print the number of differences found and where they occured\n");
+ PRINTVALSTREAM(rawoutstream, "  -r Report mode: print the above plus the differences\n");
+ PRINTVALSTREAM(rawoutstream, "  -v Verbose mode: print the above plus a list of objects and warnings\n");
+ PRINTVALSTREAM(rawoutstream, "  -q Quiet mode: do not print output\n");
+
+ PRINTVALSTREAM(rawoutstream, "\n");
+
+ PRINTVALSTREAM(rawoutstream, " File comparison:\n");
+ PRINTVALSTREAM(rawoutstream, "  If no objects [obj1[ obj2]] are specified, the h5diff comparison proceeds as\n");
+ PRINTVALSTREAM(rawoutstream, "  a comparison of the two files' root groups.  That is, h5diff first compares\n");
+ PRINTVALSTREAM(rawoutstream, "  the names of root group members, generates a report of root group objects\n");
+ PRINTVALSTREAM(rawoutstream, "  that appear in only one file or in both files, and recursively compares\n");
+ PRINTVALSTREAM(rawoutstream, "  common objects.\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+
+ PRINTVALSTREAM(rawoutstream, " Object comparison:\n");
+ PRINTVALSTREAM(rawoutstream, "  1) Groups\n");
+ PRINTVALSTREAM(rawoutstream, "      First compares the names of member objects (relative path, from the\n");
+ PRINTVALSTREAM(rawoutstream, "      specified group) and generates a report of objects that appear in only\n");
+ PRINTVALSTREAM(rawoutstream, "      one group or in both groups. Common objects are then compared recursively.\n");
+ PRINTVALSTREAM(rawoutstream, "  2) Datasets\n");
+ PRINTVALSTREAM(rawoutstream, "      Array rank and dimensions, datatypes, and data values are compared.\n");
+ PRINTVALSTREAM(rawoutstream, "  3) Datatypes\n");
+ PRINTVALSTREAM(rawoutstream, "      The comparison is based on the return value of H5Tequal.\n");
+ PRINTVALSTREAM(rawoutstream, "  4) Symbolic links\n");
+ PRINTVALSTREAM(rawoutstream, "      The paths to the target objects are compared.\n");
+ PRINTVALSTREAM(rawoutstream, "      (The option --follow-symlinks overrides the default behavior when\n");
+ PRINTVALSTREAM(rawoutstream, "       symbolic links are compared.).\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+
+ PRINTVALSTREAM(rawoutstream, " Exit code:\n");
+ PRINTVALSTREAM(rawoutstream, "  0 if no differences, 1 if differences found, 2 if error\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+ PRINTVALSTREAM(rawoutstream, " Examples of use:\n");
+ PRINTVALSTREAM(rawoutstream, " 1) h5diff file1 file2 /g1/dset1 /g1/dset2\n");
+ PRINTVALSTREAM(rawoutstream, "    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+ PRINTVALSTREAM(rawoutstream, " 2) h5diff file1 file2 /g1/dset1\n");
+ PRINTVALSTREAM(rawoutstream, "    Compares object '/g1/dset1' in both files\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+ PRINTVALSTREAM(rawoutstream, " 3) h5diff file1 file2\n");
+ PRINTVALSTREAM(rawoutstream, "    Compares all objects in both files\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
+ PRINTVALSTREAM(rawoutstream, " Notes:\n");
+ PRINTVALSTREAM(rawoutstream, "  file1 and file2 can be the same file.\n");
+ PRINTVALSTREAM(rawoutstream, "  Use h5diff file1 file1 /g1/dset1 /g1/dset2 to compare\n");
+ PRINTVALSTREAM(rawoutstream, "  '/g1/dset1' and '/g1/dset2' in the same file\n");
+ PRINTVALSTREAM(rawoutstream, "\n");
 }
diff --git a/tools/h5diff/h5diff_common.h b/tools/h5diff/h5diff_common.h
index e5dfe3f..dc0676c 100644
--- a/tools/h5diff/h5diff_common.h
+++ b/tools/h5diff/h5diff_common.h
@@ -23,9 +23,9 @@ extern "C" {
 #endif
 
 void usage(void);
-void parse_command_line(int argc, const char* argv[], const char** fname1, const char** fname2, const char** objname1, const char** objname2, diff_opt_t* options);
+void parse_command_line(int argc, const char* argv[], const char** fname1, const char** fname2, const char** objname1, const char** objname2, diff_opt_t* opts);
 void h5diff_exit(int status);
-void print_info(diff_opt_t* options);
+void print_info(diff_opt_t* opts);
 
 #ifdef __cplusplus
 }
diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index 6b9004b..ad488a4 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -11,9 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <assert.h>
-#include <memory.h>
 #include "H5private.h"
 #include "h5diff.h"
 #include "h5diff_common.h"
@@ -72,33 +69,50 @@
 int main(int argc, const char *argv[])
 {
     int        ret;
+    H5E_auto2_t         func;
+    H5E_auto2_t         tools_func;
+    void               *edata;
+    void               *tools_edata;
     const char *fname1 = NULL;
     const char *fname2 = NULL;
     const char *objname1  = NULL;
     const char *objname2  = NULL;
     hsize_t    nfound=0;
-    diff_opt_t options;
+    diff_opt_t opts;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
+    /* Disable error reporting */
+    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
+    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+
     /* Initialize h5tools lib */
     h5tools_init();
 
+    /* Disable tools error reporting */
+    H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata);
+    H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL);
+
     /*-------------------------------------------------------------------------
     * process the command-line
     *-------------------------------------------------------------------------
     */
-    parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
+    parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &opts);
+
+    if (enable_error_stack) {
+        H5Eset_auto2(H5E_DEFAULT, func, edata);
+        H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
+    }
 
     /*-------------------------------------------------------------------------
     * do the diff
     *-------------------------------------------------------------------------
     */
 
-    nfound = h5diff(fname1,fname2,objname1,objname2,&options);
+    nfound = h5diff(fname1, fname2, objname1, objname2, &opts);
 
-    print_info(&options);
+    print_info(&opts);
 
    /*-------------------------------------------------------------------------
     * exit code
@@ -106,17 +120,17 @@ int main(int argc, const char *argv[])
     *-------------------------------------------------------------------------
     */
 
-    ret = (nfound == 0 ? 0 : 1 );
+    ret = (nfound == 0 ? 0 : 1);
 
     /* if graph difference return 1 for differences  */
-    if ( options.contents == 0 )
+    if (opts.contents == 0)
         ret = 1;
 
     /* and return 2 for error */
-    if (options.err_stat)
+    if (opts.err_stat)
         ret = 2;
 
-    return ret;
+    h5diff_exit(ret);
 }
 
 /*-------------------------------------------------------------------------
@@ -135,8 +149,11 @@ int main(int argc, const char *argv[])
  *
  *-------------------------------------------------------------------------
  */
-void h5diff_exit(int status)
+H5_ATTR_NORETURN void
+h5diff_exit(int status)
 {
+    h5tools_close();
+
     HDexit(status);
 }
 
diff --git a/tools/h5diff/h5diff_plugin.sh.in b/tools/h5diff/h5diff_plugin.sh.in
index 141e948..aca7c6b 100644
--- a/tools/h5diff/h5diff_plugin.sh.in
+++ b/tools/h5diff/h5diff_plugin.sh.in
@@ -161,12 +161,27 @@ if [ -n "$RUNSERIAL_NOEXITCODE" ]; then
     h5haveexitcode=no
 fi
 
+
+# Print a $* message left justified in a field of 70 characters
+#
+MESSAGE() {
+   SPACES="                                                               "
+   echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
+}
+
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
 #
 TESTING() {
-   SPACES="                                                               "
-   echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
+}
+
+# Print a line-line message left justified in a field of 70 characters
+# beginning with the word "Verifying".
+#
+VERIFY() {
+    MESSAGE "Verifying $*"
 }
 
 # Source in the output filter function definitions.
diff --git a/tools/h5diff/ph5diff_main.c b/tools/h5diff/ph5diff_main.c
index bfeb408..83240cb 100644
--- a/tools/h5diff/ph5diff_main.c
+++ b/tools/h5diff/ph5diff_main.c
@@ -11,9 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
 #include "H5private.h"
 #include "h5diff.h"
 #include "ph5diff.h"
@@ -53,7 +50,7 @@ int main(int argc, const char *argv[])
     const char *fname2 = NULL;
     const char *objname1  = NULL;
     const char *objname2  = NULL;
-    diff_opt_t options;
+    diff_opt_t opts;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
@@ -75,11 +72,11 @@ int main(int argc, const char *argv[])
 
         g_Parallel = 0;
 
-        parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
+        parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &opts);
 
-        h5diff(fname1, fname2, objname1, objname2, &options);
+        h5diff(fname1, fname2, objname1, objname2, &opts);
 
-        print_info(&options);
+        print_info(&opts);
     }
     /* Parallel h5diff */
     else {
@@ -87,13 +84,13 @@ int main(int argc, const char *argv[])
         /* Have the manager process the command-line */
         if(nID == 0)
         {
-            parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &options);
+            parse_command_line(argc, argv, &fname1, &fname2, &objname1, &objname2, &opts);
 
-            h5diff(fname1, fname2, objname1, objname2, &options);
+            h5diff(fname1, fname2, objname1, objname2, &opts);
 
             MPI_Barrier(MPI_COMM_WORLD);
 
-            print_info(&options);
+            print_info(&opts);
             print_manager_output();
         }
         /* All other tasks become workers and wait for assignments. */
@@ -181,8 +178,8 @@ ph5diff_worker(int nID)
             MPI_Recv(&args, sizeof(args), MPI_BYTE, 0, MPI_TAG_ARGS, MPI_COMM_WORLD, &Status);
 
             /* Do the diff */
-            diffs.nfound = diff(file1_id, args.name1, file2_id, args.name2, &(args.options), &(args.argdata));
-            diffs.not_cmp = args.options.not_cmp;
+            diffs.nfound = diff(file1_id, args.name1, file2_id, args.name2, &(args.opts), &(args.argdata));
+            diffs.not_cmp = args.opts.not_cmp;
 
             /* If print buffer has something in it, request print token.*/
             if(outBuffOffset>0)
@@ -319,6 +316,8 @@ void h5diff_exit(int status)
         status = EXIT_SUCCESS;  /* Reset exit status, since some mpiexec commands generate output on failure status */
     }
 
+    h5tools_close();
+
     /* Always exit(0), since MPI implementations do weird stuff when they
      *  receive a non-zero exit value. - QAK
      */
diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt
index 0a0ee22..11ad800 100644
--- a/tools/h5diff/testfiles/h5diff_10.txt
+++ b/tools/h5diff/testfiles/h5diff_10.txt
@@ -23,6 +23,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
               status report.
    -q, --quiet
          Quiet mode. Do not produce output.
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/h5diff/testfiles/h5diff_454_ERR.err b/tools/h5diff/testfiles/h5diff_454_ERR.err
new file mode 100644
index 0000000..82802a1
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_454_ERR.err
@@ -0,0 +1,4 @@
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): treat dangling link as error
+    major: Failure in tools library
+    minor: error in function
diff --git a/tools/h5diff/testfiles/h5diff_454_ERR.txt b/tools/h5diff/testfiles/h5diff_454_ERR.txt
new file mode 100644
index 0000000..4501071
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_454_ERR.txt
@@ -0,0 +1,6 @@
+Warning: </softlink_noexist> is a dangling link.
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): treat dangling link as error
+    major: Failure in tools library
+    minor: error in function
+EXIT CODE: 2
diff --git a/tools/h5diff/testfiles/h5diff_455_ERR.err b/tools/h5diff/testfiles/h5diff_455_ERR.err
new file mode 100644
index 0000000..82802a1
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_455_ERR.err
@@ -0,0 +1,4 @@
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): treat dangling link as error
+    major: Failure in tools library
+    minor: error in function
diff --git a/tools/h5diff/testfiles/h5diff_455_ERR.txt b/tools/h5diff/testfiles/h5diff_455_ERR.txt
new file mode 100644
index 0000000..4501071
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_455_ERR.txt
@@ -0,0 +1,6 @@
+Warning: </softlink_noexist> is a dangling link.
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): treat dangling link as error
+    major: Failure in tools library
+    minor: error in function
+EXIT CODE: 2
diff --git a/tools/h5diff/testfiles/h5diff_457_ERR.err b/tools/h5diff/testfiles/h5diff_457_ERR.err
new file mode 100644
index 0000000..82802a1
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_457_ERR.err
@@ -0,0 +1,4 @@
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): treat dangling link as error
+    major: Failure in tools library
+    minor: error in function
diff --git a/tools/h5diff/testfiles/h5diff_457_ERR.txt b/tools/h5diff/testfiles/h5diff_457_ERR.txt
new file mode 100644
index 0000000..9d73750
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_457_ERR.txt
@@ -0,0 +1,6 @@
+Warning: </ext_link_noexist1> is a dangling link.
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): treat dangling link as error
+    major: Failure in tools library
+    minor: error in function
+EXIT CODE: 2
diff --git a/tools/h5diff/testfiles/h5diff_458_ERR.err b/tools/h5diff/testfiles/h5diff_458_ERR.err
new file mode 100644
index 0000000..82802a1
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_458_ERR.err
@@ -0,0 +1,4 @@
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): treat dangling link as error
+    major: Failure in tools library
+    minor: error in function
diff --git a/tools/h5diff/testfiles/h5diff_458_ERR.txt b/tools/h5diff/testfiles/h5diff_458_ERR.txt
new file mode 100644
index 0000000..b084914
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_458_ERR.txt
@@ -0,0 +1,6 @@
+Warning: </ext_link_noexist2> is a dangling link.
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): treat dangling link as error
+    major: Failure in tools library
+    minor: error in function
+EXIT CODE: 2
diff --git a/tools/h5diff/testfiles/h5diff_459_ERR.err b/tools/h5diff/testfiles/h5diff_459_ERR.err
new file mode 100644
index 0000000..82802a1
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_459_ERR.err
@@ -0,0 +1,4 @@
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): treat dangling link as error
+    major: Failure in tools library
+    minor: error in function
diff --git a/tools/h5diff/testfiles/h5diff_459_ERR.txt b/tools/h5diff/testfiles/h5diff_459_ERR.txt
new file mode 100644
index 0000000..9d73750
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_459_ERR.txt
@@ -0,0 +1,6 @@
+Warning: </ext_link_noexist1> is a dangling link.
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): treat dangling link as error
+    major: Failure in tools library
+    minor: error in function
+EXIT CODE: 2
diff --git a/tools/h5diff/testfiles/h5diff_60.txt b/tools/h5diff/testfiles/h5diff_60.txt
index 938f279..dde17f6 100644
--- a/tools/h5diff/testfiles/h5diff_60.txt
+++ b/tools/h5diff/testfiles/h5diff_60.txt
@@ -2,8 +2,8 @@ dataset: </string1> and </string1>
 size:           [3x4]           [3x4]
 position        string1         string1         difference          
 ------------------------------------------------------------
-[ 1 0 ]            5            \000
-[ 1 1 ]            6            \000
+[ 1 0 ]            \000            5
+[ 1 1 ]            \000            6
 [ 1 2 ]            \000            7
 [ 1 3 ]            \000            8
 4 differences found
diff --git a/tools/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt
index 4362711..f3b346a 100644
--- a/tools/h5diff/testfiles/h5diff_600.txt
+++ b/tools/h5diff/testfiles/h5diff_600.txt
@@ -23,6 +23,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
               status report.
    -q, --quiet
          Quiet mode. Do not produce output.
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/h5diff/testfiles/h5diff_601_ERR.err b/tools/h5diff/testfiles/h5diff_601_ERR.err
new file mode 100644
index 0000000..f9a7212
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_601_ERR.err
@@ -0,0 +1,4 @@
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): Error: Object could not be found
+    major: Failure in tools library
+    minor: error in function
diff --git a/tools/h5diff/testfiles/h5diff_601_ERR.txt b/tools/h5diff/testfiles/h5diff_601_ERR.txt
new file mode 100644
index 0000000..b58124a
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_601_ERR.txt
@@ -0,0 +1,6 @@
+Object </nono_obj> could not be found in <h5diff_basic1.h5>
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in h5diff(): Error: Object could not be found
+    major: Failure in tools library
+    minor: error in function
+EXIT CODE: 2
diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt
index 9ab3204..0d6b474 100644
--- a/tools/h5diff/testfiles/h5diff_603.txt
+++ b/tools/h5diff/testfiles/h5diff_603.txt
@@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
               status report.
    -q, --quiet
          Quiet mode. Do not produce output.
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt
index afe0e72..94f44e8 100644
--- a/tools/h5diff/testfiles/h5diff_606.txt
+++ b/tools/h5diff/testfiles/h5diff_606.txt
@@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
               status report.
    -q, --quiet
          Quiet mode. Do not produce output.
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/h5diff/testfiles/h5diff_61.txt b/tools/h5diff/testfiles/h5diff_61.txt
index 1f238b1..5553d63 100644
--- a/tools/h5diff/testfiles/h5diff_61.txt
+++ b/tools/h5diff/testfiles/h5diff_61.txt
@@ -2,29 +2,29 @@ dataset: </string2> and </string2>
 size:           [20]           [20]
 position        string2         string2         difference          
 ------------------------------------------------------------
-[ 8 ]            9            e
-[ 8 ]                         f
-[ 8 ]                         9
-[ 9 ]            0            e
-[ 9 ]                         f
-[ 9 ]                         0
-[ 10 ]            1            e
-[ 10 ]                         f
-[ 10 ]                         1
-[ 11 ]            2            e
-[ 11 ]                         f
-[ 11 ]                         2
-[ 12 ]            e            3
-[ 12 ]            f             
-[ 12 ]            3             
-[ 13 ]            e            4
-[ 13 ]            f             
-[ 13 ]            4             
-[ 14 ]            e            5
-[ 14 ]            f             
-[ 14 ]            5             
-[ 15 ]            e            6
-[ 15 ]            f             
-[ 15 ]            6             
+[ 8 ]            e            9
+[ 8 ]            f             
+[ 8 ]            9             
+[ 9 ]            e            0
+[ 9 ]            f             
+[ 9 ]            0             
+[ 10 ]            e            1
+[ 10 ]            f             
+[ 10 ]            1             
+[ 11 ]            e            2
+[ 11 ]            f             
+[ 11 ]            2             
+[ 12 ]            3            e
+[ 12 ]                         f
+[ 12 ]                         3
+[ 13 ]            4            e
+[ 13 ]                         f
+[ 13 ]                         4
+[ 14 ]            5            e
+[ 14 ]                         f
+[ 14 ]                         5
+[ 15 ]            6            e
+[ 15 ]                         f
+[ 15 ]                         6
 24 differences found
 EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index 97a1747..7f83c64 100644
--- a/tools/h5diff/testfiles/h5diff_612.txt
+++ b/tools/h5diff/testfiles/h5diff_612.txt
@@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
               status report.
    -q, --quiet
          Quiet mode. Do not produce output.
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt
index 78770f0..3cfe6b9 100644
--- a/tools/h5diff/testfiles/h5diff_615.txt
+++ b/tools/h5diff/testfiles/h5diff_615.txt
@@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
               status report.
    -q, --quiet
          Quiet mode. Do not produce output.
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/h5diff/testfiles/h5diff_62.txt b/tools/h5diff/testfiles/h5diff_62.txt
index 0cc0947..934f61e 100644
--- a/tools/h5diff/testfiles/h5diff_62.txt
+++ b/tools/h5diff/testfiles/h5diff_62.txt
@@ -2,36 +2,36 @@ dataset: </string3> and </string3>
 size:           [27]           [27]
 position        string3         string3         difference          
 ------------------------------------------------------------
-[ 12 ]            d            c
-[ 12 ]            2            d
-[ 12 ]            \000            2
-[ 13 ]            3            d
-[ 13 ]            \000            3
-[ 14 ]            b            a
-[ 14 ]            c            b
-[ 14 ]            d            c
-[ 14 ]            4            d
-[ 14 ]            \000            4
-[ 15 ]            c            b
-[ 15 ]            d            c
-[ 15 ]            5            d
-[ 15 ]            \000            5
-[ 16 ]            c            d
-[ 16 ]            d            6
-[ 16 ]            6            \000
-[ 17 ]            d            7
-[ 17 ]            7            \000
-[ 18 ]            a            b
-[ 18 ]            b            c
-[ 18 ]            c            d
-[ 18 ]            d            8
-[ 18 ]            8            \000
-[ 19 ]            b            c
-[ 19 ]            c            d
-[ 19 ]            d            9
-[ 19 ]            9            \000
-[ 24 ]            c            d
-[ 25 ]            c            d
-[ 26 ]            c            d
+[ 12 ]            c            d
+[ 12 ]            d            2
+[ 12 ]            2            \000
+[ 13 ]            d            3
+[ 13 ]            3            \000
+[ 14 ]            a            b
+[ 14 ]            b            c
+[ 14 ]            c            d
+[ 14 ]            d            4
+[ 14 ]            4            \000
+[ 15 ]            b            c
+[ 15 ]            c            d
+[ 15 ]            d            5
+[ 15 ]            5            \000
+[ 16 ]            d            c
+[ 16 ]            6            d
+[ 16 ]            \000            6
+[ 17 ]            7            d
+[ 17 ]            \000            7
+[ 18 ]            b            a
+[ 18 ]            c            b
+[ 18 ]            d            c
+[ 18 ]            8            d
+[ 18 ]            \000            8
+[ 19 ]            c            b
+[ 19 ]            d            c
+[ 19 ]            9            d
+[ 19 ]            \000            9
+[ 24 ]            d            c
+[ 25 ]            d            c
+[ 26 ]            d            c
 31 differences found
 EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index b2a5881..9c34945 100644
--- a/tools/h5diff/testfiles/h5diff_621.txt
+++ b/tools/h5diff/testfiles/h5diff_621.txt
@@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
               status report.
    -q, --quiet
          Quiet mode. Do not produce output.
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt
index 66a3025..2b2df2f 100644
--- a/tools/h5diff/testfiles/h5diff_622.txt
+++ b/tools/h5diff/testfiles/h5diff_622.txt
@@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
               status report.
    -q, --quiet
          Quiet mode. Do not produce output.
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt
index f9258d1..3e80438 100644
--- a/tools/h5diff/testfiles/h5diff_623.txt
+++ b/tools/h5diff/testfiles/h5diff_623.txt
@@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
               status report.
    -q, --quiet
          Quiet mode. Do not produce output.
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt
index 57a4ddd..7a2f585 100644
--- a/tools/h5diff/testfiles/h5diff_624.txt
+++ b/tools/h5diff/testfiles/h5diff_624.txt
@@ -24,6 +24,8 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
               status report.
    -q, --quiet
          Quiet mode. Do not produce output.
+   --enable-error-stack
+                   Prints messages from the HDF5 error stack as they occur.
    --follow-symlinks
          Follow symbolic links (soft links and external links and compare the)
          links' target objects.
diff --git a/tools/h5diff/testfiles/h5diff_63.txt b/tools/h5diff/testfiles/h5diff_63.txt
index 043da16..6b46c18 100644
--- a/tools/h5diff/testfiles/h5diff_63.txt
+++ b/tools/h5diff/testfiles/h5diff_63.txt
@@ -2,9 +2,9 @@ dataset: </string4> and </string4>
 size:           [3]           [3]
 position        string4         string4         difference          
 ------------------------------------------------------------
-[ 1 ]            8             
-[ 1 ]            9             
-[ 2 ]                         8
-[ 2 ]                         9
+[ 1 ]                         8
+[ 1 ]                         9
+[ 2 ]            8             
+[ 2 ]            9             
 4 differences found
 EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_70.txt b/tools/h5diff/testfiles/h5diff_70.txt
index 0a6b0c0..efa34ea 100644
--- a/tools/h5diff/testfiles/h5diff_70.txt
+++ b/tools/h5diff/testfiles/h5diff_70.txt
@@ -11,79 +11,79 @@ attribute: <VLstring of </>> and <VLstring of </>>
 size:           [2]           [2]
 position        VLstring of </> VLstring of </> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </>> and <VLstring2D of </>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </> VLstring2D of </> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </>> and <VLstring3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </> VLstring3D of </> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </>> and <array of </>>
 size:           [2]           [2]
@@ -514,79 +514,79 @@ attribute: <string of </>> and <string of </>>
 size:           [2]           [2]
 position        string of </>   string of </>   difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </>> and <string2D of </>>
 size:           [3x2]           [3x2]
 position        string2D of </> string2D of </> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </>> and <string3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </> string3D of </> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </>> and <vlen of </>>
 size:           [2]           [2]
@@ -683,79 +683,79 @@ attribute: <VLstring of </dset>> and <VLstring of </dset>>
 size:           [2]           [2]
 position        VLstring of </dset> VLstring of </dset> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </dset>> and <VLstring2D of </dset>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </dset> VLstring2D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </dset>> and <VLstring3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </dset> VLstring3D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </dset>> and <array of </dset>>
 size:           [2]           [2]
@@ -1192,79 +1192,79 @@ attribute: <string of </dset>> and <string of </dset>>
 size:           [2]           [2]
 position        string of </dset> string of </dset> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </dset>> and <string2D of </dset>>
 size:           [3x2]           [3x2]
 position        string2D of </dset> string2D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </dset>> and <string3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </dset> string3D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </dset>> and <vlen of </dset>>
 size:           [2]           [2]
@@ -1360,79 +1360,79 @@ attribute: <VLstring of </g1>> and <VLstring of </g1>>
 size:           [2]           [2]
 position        VLstring of </g1> VLstring of </g1> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </g1>> and <VLstring2D of </g1>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </g1> VLstring2D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </g1>> and <VLstring3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </g1> VLstring3D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </g1>> and <array of </g1>>
 size:           [2]           [2]
@@ -1863,79 +1863,79 @@ attribute: <string of </g1>> and <string of </g1>>
 size:           [2]           [2]
 position        string of </g1> string of </g1> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </g1>> and <string2D of </g1>>
 size:           [3x2]           [3x2]
 position        string2D of </g1> string2D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </g1>> and <string3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </g1> string3D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </g1>> and <vlen of </g1>>
 size:           [2]           [2]
diff --git a/tools/h5diff/testfiles/h5diff_700.txt b/tools/h5diff/testfiles/h5diff_700.txt
index 1cf71dd..851a407 100644
--- a/tools/h5diff/testfiles/h5diff_700.txt
+++ b/tools/h5diff/testfiles/h5diff_700.txt
@@ -13,79 +13,79 @@ attribute: <VLstring of </>> and <VLstring of </>>
 size:           [2]           [2]
 position        VLstring of </> VLstring of </> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </>> and <VLstring2D of </>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </> VLstring2D of </> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </>> and <VLstring3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </> VLstring3D of </> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </>> and <array of </>>
 size:           [2]           [2]
@@ -516,79 +516,79 @@ attribute: <string of </>> and <string of </>>
 size:           [2]           [2]
 position        string of </>   string of </>   difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </>> and <string2D of </>>
 size:           [3x2]           [3x2]
 position        string2D of </> string2D of </> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </>> and <string3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </> string3D of </> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </>> and <vlen of </>>
 size:           [2]           [2]
@@ -687,79 +687,79 @@ attribute: <VLstring of </dset>> and <VLstring of </dset>>
 size:           [2]           [2]
 position        VLstring of </dset> VLstring of </dset> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </dset>> and <VLstring2D of </dset>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </dset> VLstring2D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </dset>> and <VLstring3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </dset> VLstring3D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </dset>> and <array of </dset>>
 size:           [2]           [2]
@@ -1196,79 +1196,79 @@ attribute: <string of </dset>> and <string of </dset>>
 size:           [2]           [2]
 position        string of </dset> string of </dset> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </dset>> and <string2D of </dset>>
 size:           [3x2]           [3x2]
 position        string2D of </dset> string2D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </dset>> and <string3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </dset> string3D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </dset>> and <vlen of </dset>>
 size:           [2]           [2]
@@ -1366,79 +1366,79 @@ attribute: <VLstring of </g1>> and <VLstring of </g1>>
 size:           [2]           [2]
 position        VLstring of </g1> VLstring of </g1> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </g1>> and <VLstring2D of </g1>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </g1> VLstring2D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </g1>> and <VLstring3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </g1> VLstring3D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </g1>> and <array of </g1>>
 size:           [2]           [2]
@@ -1869,79 +1869,79 @@ attribute: <string of </g1>> and <string of </g1>>
 size:           [2]           [2]
 position        string of </g1> string of </g1> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </g1>> and <string2D of </g1>>
 size:           [3x2]           [3x2]
 position        string2D of </g1> string2D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </g1>> and <string3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </g1> string3D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </g1>> and <vlen of </g1>>
 size:           [2]           [2]
diff --git a/tools/h5diff/testfiles/h5diff_701.txt b/tools/h5diff/testfiles/h5diff_701.txt
index 405ab2f..33f1a0f 100644
--- a/tools/h5diff/testfiles/h5diff_701.txt
+++ b/tools/h5diff/testfiles/h5diff_701.txt
@@ -45,79 +45,79 @@ attribute: <VLstring of </>> and <VLstring of </>>
 size:           [2]           [2]
 position        VLstring of </> VLstring of </> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </>> and <VLstring2D of </>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </> VLstring2D of </> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </>> and <VLstring3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </> VLstring3D of </> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </>> and <array of </>>
 size:           [2]           [2]
@@ -548,79 +548,79 @@ attribute: <string of </>> and <string of </>>
 size:           [2]           [2]
 position        string of </>   string of </>   difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </>> and <string2D of </>>
 size:           [3x2]           [3x2]
 position        string2D of </> string2D of </> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </>> and <string3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </> string3D of </> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </>> and <vlen of </>>
 size:           [2]           [2]
@@ -754,79 +754,79 @@ attribute: <VLstring of </dset>> and <VLstring of </dset>>
 size:           [2]           [2]
 position        VLstring of </dset> VLstring of </dset> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </dset>> and <VLstring2D of </dset>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </dset> VLstring2D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </dset>> and <VLstring3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </dset> VLstring3D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </dset>> and <array of </dset>>
 size:           [2]           [2]
@@ -1263,79 +1263,79 @@ attribute: <string of </dset>> and <string of </dset>>
 size:           [2]           [2]
 position        string of </dset> string of </dset> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </dset>> and <string2D of </dset>>
 size:           [3x2]           [3x2]
 position        string2D of </dset> string2D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </dset>> and <string3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </dset> string3D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </dset>> and <vlen of </dset>>
 size:           [2]           [2]
@@ -1465,79 +1465,79 @@ attribute: <VLstring of </g1>> and <VLstring of </g1>>
 size:           [2]           [2]
 position        VLstring of </g1> VLstring of </g1> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </g1>> and <VLstring2D of </g1>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </g1> VLstring2D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </g1>> and <VLstring3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </g1> VLstring3D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </g1>> and <array of </g1>>
 size:           [2]           [2]
@@ -1968,79 +1968,79 @@ attribute: <string of </g1>> and <string of </g1>>
 size:           [2]           [2]
 position        string of </g1> string of </g1> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </g1>> and <string2D of </g1>>
 size:           [3x2]           [3x2]
 position        string2D of </g1> string2D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </g1>> and <string3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </g1> string3D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </g1>> and <vlen of </g1>>
 size:           [2]           [2]
diff --git a/tools/h5diff/testfiles/h5diff_702.txt b/tools/h5diff/testfiles/h5diff_702.txt
index 1cf71dd..851a407 100644
--- a/tools/h5diff/testfiles/h5diff_702.txt
+++ b/tools/h5diff/testfiles/h5diff_702.txt
@@ -13,79 +13,79 @@ attribute: <VLstring of </>> and <VLstring of </>>
 size:           [2]           [2]
 position        VLstring of </> VLstring of </> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </>> and <VLstring2D of </>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </> VLstring2D of </> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </>> and <VLstring3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </> VLstring3D of </> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </>> and <array of </>>
 size:           [2]           [2]
@@ -516,79 +516,79 @@ attribute: <string of </>> and <string of </>>
 size:           [2]           [2]
 position        string of </>   string of </>   difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </>> and <string2D of </>>
 size:           [3x2]           [3x2]
 position        string2D of </> string2D of </> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </>> and <string3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </> string3D of </> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </>> and <vlen of </>>
 size:           [2]           [2]
@@ -687,79 +687,79 @@ attribute: <VLstring of </dset>> and <VLstring of </dset>>
 size:           [2]           [2]
 position        VLstring of </dset> VLstring of </dset> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </dset>> and <VLstring2D of </dset>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </dset> VLstring2D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </dset>> and <VLstring3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </dset> VLstring3D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </dset>> and <array of </dset>>
 size:           [2]           [2]
@@ -1196,79 +1196,79 @@ attribute: <string of </dset>> and <string of </dset>>
 size:           [2]           [2]
 position        string of </dset> string of </dset> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </dset>> and <string2D of </dset>>
 size:           [3x2]           [3x2]
 position        string2D of </dset> string2D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </dset>> and <string3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </dset> string3D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </dset>> and <vlen of </dset>>
 size:           [2]           [2]
@@ -1366,79 +1366,79 @@ attribute: <VLstring of </g1>> and <VLstring of </g1>>
 size:           [2]           [2]
 position        VLstring of </g1> VLstring of </g1> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </g1>> and <VLstring2D of </g1>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </g1> VLstring2D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </g1>> and <VLstring3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </g1> VLstring3D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </g1>> and <array of </g1>>
 size:           [2]           [2]
@@ -1869,79 +1869,79 @@ attribute: <string of </g1>> and <string of </g1>>
 size:           [2]           [2]
 position        string of </g1> string of </g1> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </g1>> and <string2D of </g1>>
 size:           [3x2]           [3x2]
 position        string2D of </g1> string2D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </g1>> and <string3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </g1> string3D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </g1>> and <vlen of </g1>>
 size:           [2]           [2]
diff --git a/tools/h5diff/testfiles/h5diff_703.txt b/tools/h5diff/testfiles/h5diff_703.txt
index 405ab2f..33f1a0f 100644
--- a/tools/h5diff/testfiles/h5diff_703.txt
+++ b/tools/h5diff/testfiles/h5diff_703.txt
@@ -45,79 +45,79 @@ attribute: <VLstring of </>> and <VLstring of </>>
 size:           [2]           [2]
 position        VLstring of </> VLstring of </> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </>> and <VLstring2D of </>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </> VLstring2D of </> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </>> and <VLstring3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </> VLstring3D of </> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </>> and <array of </>>
 size:           [2]           [2]
@@ -548,79 +548,79 @@ attribute: <string of </>> and <string of </>>
 size:           [2]           [2]
 position        string of </>   string of </>   difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </>> and <string2D of </>>
 size:           [3x2]           [3x2]
 position        string2D of </> string2D of </> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </>> and <string3D of </>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </> string3D of </> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </>> and <vlen of </>>
 size:           [2]           [2]
@@ -754,79 +754,79 @@ attribute: <VLstring of </dset>> and <VLstring of </dset>>
 size:           [2]           [2]
 position        VLstring of </dset> VLstring of </dset> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </dset>> and <VLstring2D of </dset>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </dset> VLstring2D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </dset>> and <VLstring3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </dset> VLstring3D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </dset>> and <array of </dset>>
 size:           [2]           [2]
@@ -1263,79 +1263,79 @@ attribute: <string of </dset>> and <string of </dset>>
 size:           [2]           [2]
 position        string of </dset> string of </dset> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </dset>> and <string2D of </dset>>
 size:           [3x2]           [3x2]
 position        string2D of </dset> string2D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </dset>> and <string3D of </dset>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </dset> string3D of </dset> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </dset>> and <vlen of </dset>>
 size:           [2]           [2]
@@ -1465,79 +1465,79 @@ attribute: <VLstring of </g1>> and <VLstring of </g1>>
 size:           [2]           [2]
 position        VLstring of </g1> VLstring of </g1> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <VLstring2D of </g1>> and <VLstring2D of </g1>>
 size:           [3x2]           [3x2]
 position        VLstring2D of </g1> VLstring2D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <VLstring3D of </g1>> and <VLstring3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D of </g1> VLstring3D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <array of </g1>> and <array of </g1>>
 size:           [2]           [2]
@@ -1968,79 +1968,79 @@ attribute: <string of </g1>> and <string of </g1>>
 size:           [2]           [2]
 position        string of </g1> string of </g1> difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 attribute: <string2D of </g1>> and <string2D of </g1>>
 size:           [3x2]           [3x2]
 position        string2D of </g1> string2D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 attribute: <string3D of </g1>> and <string3D of </g1>>
 size:           [4x3x2]           [4x3x2]
 position        string3D of </g1> string3D of </g1> difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 attribute: <vlen of </g1>> and <vlen of </g1>>
 size:           [2]           [2]
diff --git a/tools/h5diff/testfiles/h5diff_80.txt b/tools/h5diff/testfiles/h5diff_80.txt
index 836e073..b223eed 100644
--- a/tools/h5diff/testfiles/h5diff_80.txt
+++ b/tools/h5diff/testfiles/h5diff_80.txt
@@ -59,79 +59,79 @@ dataset: </g1/VLstring> and </g1/VLstring>
 size:           [2]           [2]
 position        VLstring        VLstring        difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 dataset: </g1/VLstring2D> and </g1/VLstring2D>
 size:           [3x2]           [3x2]
 position        VLstring2D      VLstring2D      difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 dataset: </g1/VLstring3D> and </g1/VLstring3D>
 size:           [4x3x2]           [4x3x2]
 position        VLstring3D      VLstring3D      difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 dataset: </g1/array> and </g1/array>
 size:           [2]           [2]
@@ -702,79 +702,79 @@ dataset: </g1/string> and </g1/string>
 size:           [2]           [2]
 position        string          string          difference          
 ------------------------------------------------------------
-[ 0 ]            a            z
-[ 0 ]            b            z
-[ 1 ]            d            z
-[ 1 ]            e            z
+[ 0 ]            z            a
+[ 0 ]            z            b
+[ 1 ]            z            d
+[ 1 ]            z            e
 4 differences found
 dataset: </g1/string2D> and </g1/string2D>
 size:           [3x2]           [3x2]
 position        string2D        string2D        difference          
 ------------------------------------------------------------
-[ 0 0 ]            a            z
-[ 0 0 ]            b            z
-[ 0 1 ]            c            z
-[ 0 1 ]            d            z
-[ 1 0 ]            e            z
-[ 1 0 ]            f            z
-[ 1 1 ]            g            z
-[ 1 1 ]            h            z
-[ 2 0 ]            i            z
-[ 2 0 ]            j            z
-[ 2 1 ]            k            z
-[ 2 1 ]            l            z
+[ 0 0 ]            z            a
+[ 0 0 ]            z            b
+[ 0 1 ]            z            c
+[ 0 1 ]            z            d
+[ 1 0 ]            z            e
+[ 1 0 ]            z            f
+[ 1 1 ]            z            g
+[ 1 1 ]            z            h
+[ 2 0 ]            z            i
+[ 2 0 ]            z            j
+[ 2 1 ]            z            k
+[ 2 1 ]            z            l
 12 differences found
 dataset: </g1/string3D> and </g1/string3D>
 size:           [4x3x2]           [4x3x2]
 position        string3D        string3D        difference          
 ------------------------------------------------------------
-[ 0 0 0 ]            a            z
-[ 0 0 0 ]            b            z
-[ 0 0 1 ]            c            z
-[ 0 0 1 ]            d            z
-[ 0 1 0 ]            e            z
-[ 0 1 0 ]            f            z
-[ 0 1 1 ]            g            z
-[ 0 1 1 ]            h            z
-[ 0 2 0 ]            i            z
-[ 0 2 0 ]            j            z
-[ 0 2 1 ]            k            z
-[ 0 2 1 ]            l            z
-[ 1 0 0 ]            m            z
-[ 1 0 0 ]            n            z
-[ 1 0 1 ]            p            z
-[ 1 0 1 ]            q            z
-[ 1 1 0 ]            r            z
-[ 1 1 0 ]            s            z
-[ 1 1 1 ]            t            z
-[ 1 1 1 ]            u            z
-[ 1 2 0 ]            v            z
-[ 1 2 0 ]            w            z
-[ 1 2 1 ]            x            z
-[ 2 0 0 ]            A            z
-[ 2 0 0 ]            B            z
-[ 2 0 1 ]            C            z
-[ 2 0 1 ]            D            z
-[ 2 1 0 ]            E            z
-[ 2 1 0 ]            F            z
-[ 2 1 1 ]            G            z
-[ 2 1 1 ]            H            z
-[ 2 2 0 ]            I            z
-[ 2 2 0 ]            J            z
-[ 2 2 1 ]            K            z
-[ 2 2 1 ]            L            z
-[ 3 0 0 ]            M            z
-[ 3 0 0 ]            N            z
-[ 3 0 1 ]            P            z
-[ 3 0 1 ]            Q            z
-[ 3 1 0 ]            R            z
-[ 3 1 0 ]            S            z
-[ 3 1 1 ]            T            z
-[ 3 1 1 ]            U            z
-[ 3 2 0 ]            V            z
-[ 3 2 0 ]            W            z
-[ 3 2 1 ]            X            z
-[ 3 2 1 ]            Z            z
+[ 0 0 0 ]            z            a
+[ 0 0 0 ]            z            b
+[ 0 0 1 ]            z            c
+[ 0 0 1 ]            z            d
+[ 0 1 0 ]            z            e
+[ 0 1 0 ]            z            f
+[ 0 1 1 ]            z            g
+[ 0 1 1 ]            z            h
+[ 0 2 0 ]            z            i
+[ 0 2 0 ]            z            j
+[ 0 2 1 ]            z            k
+[ 0 2 1 ]            z            l
+[ 1 0 0 ]            z            m
+[ 1 0 0 ]            z            n
+[ 1 0 1 ]            z            p
+[ 1 0 1 ]            z            q
+[ 1 1 0 ]            z            r
+[ 1 1 0 ]            z            s
+[ 1 1 1 ]            z            t
+[ 1 1 1 ]            z            u
+[ 1 2 0 ]            z            v
+[ 1 2 0 ]            z            w
+[ 1 2 1 ]            z            x
+[ 2 0 0 ]            z            A
+[ 2 0 0 ]            z            B
+[ 2 0 1 ]            z            C
+[ 2 0 1 ]            z            D
+[ 2 1 0 ]            z            E
+[ 2 1 0 ]            z            F
+[ 2 1 1 ]            z            G
+[ 2 1 1 ]            z            H
+[ 2 2 0 ]            z            I
+[ 2 2 0 ]            z            J
+[ 2 2 1 ]            z            K
+[ 2 2 1 ]            z            L
+[ 3 0 0 ]            z            M
+[ 3 0 0 ]            z            N
+[ 3 0 1 ]            z            P
+[ 3 0 1 ]            z            Q
+[ 3 1 0 ]            z            R
+[ 3 1 0 ]            z            S
+[ 3 1 1 ]            z            T
+[ 3 1 1 ]            z            U
+[ 3 2 0 ]            z            V
+[ 3 2 0 ]            z            W
+[ 3 2 1 ]            z            X
+[ 3 2 1 ]            z            Z
 47 differences found
 dataset: </g1/vlen> and </g1/vlen>
 size:           [2]           [2]
diff --git a/tools/h5diff/testfiles/h5diff_udfail.txt b/tools/h5diff/testfiles/h5diff_udfail.txt
index c154c6b..d51de38 100644
--- a/tools/h5diff/testfiles/h5diff_udfail.txt
+++ b/tools/h5diff/testfiles/h5diff_udfail.txt
@@ -8,5 +8,5 @@ group  : </> and </>
 0 differences found
 dataset: </dynlibud> and </dynlibud>
 0 differences found
-warning: dataset </dynlibud> cannot be read, user defined filter is not available
+Warning: dataset </dynlibud> cannot be read, user defined filter is not available
 EXIT CODE: 2
diff --git a/tools/h5diff/testfiles/h5diff_vlstr.txt b/tools/h5diff/testfiles/h5diff_vlstr.txt
new file mode 100644
index 0000000..67141f1
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_vlstr.txt
@@ -0,0 +1,16 @@
+
+file1     file2
+---------------------------------------
+    x      x    /              
+    x      x    /Dataset1      
+    x      x    /vl_string_type
+
+group  : </> and </>
+0 differences found
+attribute: <test_scalar of </>> and <test_scalar of </>>
+0 differences found
+dataset: </Dataset1> and </Dataset1>
+0 differences found
+datatype: </vl_string_type> and </vl_string_type>
+0 differences found
+EXIT CODE: 0
diff --git a/tools/h5diff/testh5diff.sh.in b/tools/h5diff/testh5diff.sh.in
index 45a7a45..ff370a9 100644
--- a/tools/h5diff/testh5diff.sh.in
+++ b/tools/h5diff/testh5diff.sh.in
@@ -120,6 +120,7 @@ $SRC_H5DIFF_TESTFILES/non_comparables1.h5
 $SRC_H5DIFF_TESTFILES/non_comparables2.h5
 $SRC_H5DIFF_TESTFILES/diff_strings1.h5
 $SRC_H5DIFF_TESTFILES/diff_strings2.h5
+$SRC_TOOLS_TESTFILES/tvlstr.h5
 "
 
 LIST_OTHER_TEST_FILES="
@@ -308,6 +309,7 @@ $SRC_H5DIFF_TESTFILES/h5diff_80.txt
 $SRC_H5DIFF_TESTFILES/h5diff_90.txt
 $SRC_H5DIFF_TESTFILES/h5diff_tmp1.txt
 $SRC_H5DIFF_TESTFILES/h5diff_tmp2.txt
+$SRC_H5DIFF_TESTFILES/h5diff_vlstr.txt
 $SRC_H5DIFF_TESTFILES/tmptest.he5
 $SRC_H5DIFF_TESTFILES/tmptest2.he5
 $SRC_H5DIFF_TESTFILES/tmpSingleSiteBethe.reference.h5
@@ -522,6 +524,8 @@ SKIP() {
 ##############################################################################
 # prepare for test
 COPY_TESTFILES_TO_TESTDIR
+# second copy of tvlstr.h5
+$CP -f $SRC_TOOLS_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5
 
 # ############################################################################
 # # Common usage
@@ -1097,6 +1101,7 @@ TOOLTEST h5diff_487.txt -v --exclude-path "/group1/dset" h5diff_exclude3-1.h5 h5
 # # diff various multiple vlen and fixed strings in a compound type dataset
 # ##############################################################################
 TOOLTEST h5diff_530.txt -v  h5diff_comp_vl_strs.h5 h5diff_comp_vl_strs.h5 /group /group_copy
+TOOLTEST h5diff_vlstr.txt -v  tvlstr.h5 tvlstr2.h5
 
 # ##############################################################################
 # # Test container types (array,vlen) with multiple nested compound types
diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake
index 0978265..ec1e7e3 100644
--- a/tools/h5dump/CMakeTests.cmake
+++ b/tools/h5dump/CMakeTests.cmake
@@ -103,6 +103,7 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-1.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-2.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.ddl
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrpnullspace.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-1.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-2.ddl
       ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-3.ddl
@@ -270,6 +271,7 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tfvalues.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrpnullspace.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/thyperslab.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tints4dims.h5
@@ -403,8 +405,19 @@
       endif ()
       set (last_test "H5DUMP-${testname}")
     else ()
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5DUMP-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/std/h5dump-${testname}.out
+              testfiles/std/h5dump-${testname}.out.err
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5DUMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
       add_test (
-          NAME H5DUMP-h5dump-${testname}
+          NAME H5DUMP-${testname}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
               -D "TEST_ARGS:STRING=${ARGN}"
@@ -414,11 +427,12 @@
               -D "TEST_REFERENCE=h5dump-${testname}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DUMP-${testname} PROPERTIES DEPENDS H5DUMP-${testname}-clear-objects)
     endif ()
   endmacro ()
 
   macro (ADD_SKIP_H5_TEST skipresultfile skipresultcode testtype)
-    if (${testtype} STREQUAL "SKIP")
+    if ("${testtype}" STREQUAL "SKIP")
       if (NOT HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
             NAME H5DUMP-${skipresultfile}-SKIPPED
@@ -435,7 +449,7 @@
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump> ${ARGN})
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      if (NOT ${resultcode} STREQUAL "0")
+      if (NOT "${resultcode}" STREQUAL "0")
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
       if (NOT "${last_test}" STREQUAL "")
@@ -445,7 +459,10 @@
       add_test (
           NAME H5DUMP-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ${resultfile}.bin
+              -E remove
+              ${resultfile}.bin
+              ${resultfile}.out
+              ${resultfile}.out.err
       )
       set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
@@ -468,7 +485,7 @@
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP-N-${resultfile} COMMAND $<TARGET_FILE:h5dump> ${ARGN})
       set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      if (NOT ${resultcode} STREQUAL "0")
+      if (NOT "${resultcode}" STREQUAL "0")
         set_tests_properties (H5DUMP-N-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
       if (NOT "${last_test}" STREQUAL "")
@@ -478,7 +495,10 @@
       add_test (
           NAME H5DUMP-N-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ${resultfile}-N.bin
+              -E remove
+              ${resultfile}-N.bin
+              ${resultfile}-N.out
+              ${resultfile}-N.out.err
       )
       set_tests_properties (H5DUMP-N-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
@@ -501,7 +521,7 @@
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump> ${ARGN} ${resultfile}.txt ${targetfile})
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      if (NOT ${resultcode} STREQUAL "0")
+      if (NOT "${resultcode}" STREQUAL "0")
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
       if (NOT "${last_test}" STREQUAL "")
@@ -511,7 +531,10 @@
       add_test (
           NAME H5DUMP-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ${resultfile}.txt
+              -E remove
+              ${resultfile}.txt
+              ${resultfile}.out
+              ${resultfile}.out.err
       )
       set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
@@ -541,7 +564,7 @@
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump> --ddl=${ddlfile}.txt ${ARGN} ${resultfile}.txt ${targetfile})
       set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
-      if (NOT ${resultcode} STREQUAL "0")
+      if (NOT "${resultcode}" STREQUAL "0")
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
       if (NOT "${last_test}" STREQUAL "")
@@ -551,7 +574,11 @@
       add_test (
           NAME H5DUMP-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ${ddlfile}.txt ${resultfile}.txt
+              -E remove
+              ${ddlfile}.txt
+              ${resultfile}.txt
+              ${resultfile}.out
+              ${resultfile}.out.err
       )
       set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
@@ -609,6 +636,15 @@
 
   macro (ADD_H5_MASK_TEST resultfile resultcode)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5DUMP-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${resultfile}.out
+              ${resultfile}.out.err
+      )
+      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -621,11 +657,21 @@
               -D "TEST_MASK_ERROR=true"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
     endif ()
   endmacro ()
 
   macro (ADD_H5ERR_MASK_TEST resultfile resultcode)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5DUMP-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${resultfile}.out
+              ${resultfile}.out.err
+      )
+      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -639,11 +685,21 @@
               -D "TEST_MASK_ERROR=true"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
     endif ()
   endmacro ()
 
   macro (ADD_H5ERR_MASK_ENV_TEST resultfile resultcode envvar envval)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5DUMP-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${resultfile}.out
+              ${resultfile}.out.err
+      )
+      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -659,6 +715,7 @@
               -D "TEST_ENV_VALUE:STRING=${envval}"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
     endif ()
   endmacro ()
 
@@ -668,7 +725,10 @@
       add_test (
           NAME H5DUMP-IMPORT-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
-              -E remove ${resultfile}.bin ${resultfile}.h5
+              -E remove
+              ${resultfile}.bin
+              ${resultfile}.h5
+              ${conffile}.out
       )
       set_tests_properties (H5DUMP-IMPORT-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
@@ -696,12 +756,13 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       # Remove any output file left over from previous test run
       add_test (
-          NAME H5DUMP_UD-${testname}-clearall-objects
+          NAME H5DUMP_UD-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove
-              testfiles/std/${resultfile}.out
-              testfiles/std/${resultfile}.out.err
+              ${resultfile}.out
+              ${resultfile}.out.err
       )
+      set_tests_properties (H5DUMP_UD-${testname}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
       add_test (
           NAME H5DUMP_UD-${testname}
           COMMAND "${CMAKE_COMMAND}"
@@ -715,7 +776,7 @@
               -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5DUMP_UD-${testname} PROPERTIES DEPENDS H5DUMP_UD-${testname}-clearall-objects)
+      set_tests_properties (H5DUMP_UD-${testname} PROPERTIES DEPENDS H5DUMP_UD-${testname}-clear-objects)
     endif ()
   endmacro ()
 
@@ -883,6 +944,8 @@
           tgroup-2.out.err
           tgrp_comments.out
           tgrp_comments.out.err
+          tgrpnullspace.out
+          tgrpnullspace.out.err
           thlink-1.out
           thlink-1.out.err
           thlink-2.out
@@ -1389,6 +1452,7 @@
 
   # test for displaying dataset and attribute of null space
   ADD_H5_TEST (tnullspace 0 --enable-error-stack tnullspace.h5)
+  ADD_H5_TEST (tgrpnullspace 0 -p --enable-error-stack tgrpnullspace.h5)
 
   # test for displaying dataset and attribute of space with 0 dimension size
   ADD_H5_TEST (zerodim 0 --enable-error-stack zerodim.h5)
diff --git a/tools/h5dump/CMakeTestsPBITS.cmake b/tools/h5dump/CMakeTestsPBITS.cmake
index c0a0681..c52d67e 100644
--- a/tools/h5dump/CMakeTestsPBITS.cmake
+++ b/tools/h5dump/CMakeTestsPBITS.cmake
@@ -131,6 +131,15 @@
         set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_pbits_test})
       endif ()
     else ()
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5DUMP-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${resultfile}.out
+              ${resultfile}.out.err
+      )
+      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/pbits")
       add_test (
           NAME H5DUMP-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -142,6 +151,7 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS H5DUMP-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
diff --git a/tools/h5dump/CMakeTestsXML.cmake b/tools/h5dump/CMakeTestsXML.cmake
index 49adc6f..20cd89e 100644
--- a/tools/h5dump/CMakeTestsXML.cmake
+++ b/tools/h5dump/CMakeTestsXML.cmake
@@ -50,8 +50,10 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-quot.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-sp.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tnamed_dtype_attr.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/test35.nc
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tnodata.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnullspace.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tobjref.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/topaque.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr.h5
@@ -99,6 +101,7 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-ns.h5.xml
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tempty-ns-2.h5.xml
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tenum.h5.xml
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/test35.nc.xml
       ${HDF5_TOOLS_SRC_DIR}/testfiles/textlink.h5.xml
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tfpformat.h5.xml
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5.xml
@@ -115,6 +118,7 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tname-sp.h5.xml
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5.xml
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tnodata.h5.xml
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnullspace.h5.xml
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tobjref.h5.xml
       ${HDF5_TOOLS_SRC_DIR}/testfiles/topaque.h5.xml
       ${HDF5_TOOLS_SRC_DIR}/testfiles/torderattr1.h5.xml
@@ -157,10 +161,10 @@
 ##############################################################################
 
   macro (ADD_XML_SKIP_H5_TEST skipresultfile skipresultcode testtype)
-    if (${testtype} STREQUAL "SKIP")
+    if ("${testtype}" STREQUAL "SKIP")
       if (NOT HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
-            NAME H5DUMP-XML-${skipresultfile}-SKIPPED
+            NAME H5DUMP_XML-${skipresultfile}-SKIPPED
             COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${skipresultfile}.xml --xml ${ARGN}"
         )
       endif ()
@@ -171,17 +175,26 @@
 
   macro (ADD_XML_H5_TEST resultfile resultcode)
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5DUMP-XML-${resultfile} COMMAND $<TARGET_FILE:h5dump> --xml ${ARGN})
-      set_tests_properties (H5DUMP-XML-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml")
-      if (NOT ${resultcode} STREQUAL "0")
-        set_tests_properties (H5DUMP-XML-${resultfile} PROPERTIES WILL_FAIL "true")
+      add_test (NAME H5DUMP_XML-${resultfile} COMMAND $<TARGET_FILE:h5dump> --xml ${ARGN})
+      set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml")
+      if (NOT "${resultcode}" STREQUAL "0")
+        set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
       if (NOT "${last_xml_test}" STREQUAL "")
-        set_tests_properties (H5DUMP-XML-${resultfile} PROPERTIES DEPENDS ${last_xml_test})
+        set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES DEPENDS ${last_xml_test})
       endif ()
     else ()
+      # Remove any output file left over from previous test run
       add_test (
-          NAME H5DUMP-XML-${resultfile}
+          NAME H5DUMP_XML-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${resultfile}.out
+              ${resultfile}.out.err
+      )
+      set_tests_properties (H5DUMP_XML-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/xml")
+      add_test (
+          NAME H5DUMP_XML-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
               -D "TEST_ARGS:STRING=--xml;${ARGN}"
@@ -191,6 +204,7 @@
               -D "TEST_REFERENCE=${resultfile}.xml"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5DUMP_XML-${resultfile} PROPERTIES DEPENDS H5DUMP_XML-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
@@ -258,6 +272,8 @@
           tempty.h5.out.err
           tenum.h5.out
           tenum.h5.out.err
+          test35.nc.out
+          test35.nc.out.err
           textlink.h5.out
           textlink.h5.out.err
           tfpformat.h5.out
@@ -292,6 +308,8 @@
           tnodata.h5.out.err
           tnoname.h5.out
           tnoname.h5.out.err
+          tnullspace.h5.out
+          tnullspace.h5.out.err
           tobjref.h5.out
           tobjref.h5.out.err
           topaque.h5.out
@@ -398,9 +416,7 @@
   ADD_XML_H5_TEST (tsaf.h5 0 tsaf.h5)
   ADD_XML_H5_TEST (tempty.h5 0 tempty.h5)
   ADD_XML_H5_TEST (tnamed_dtype_attr.h5 0 tnamed_dtype_attr.h5)
-  ##Test dataset and attribute of null space.  Commented out:
-  ## wait until the XML schema is updated for null space.
-  ##  ADD_XML_H5_TEST (tnullspace.h5 0 tnulspace.h5)
+  ADD_XML_H5_TEST (tnullspace.h5 0 tnullspace.h5)
   ## So is dataspace with 0 dimension size.
   ##  ADD_XML_H5_TEST (zerodim.h5 0 zerodim.h5)
 
@@ -430,3 +446,6 @@
   # tests for floating point user defined printf format
   ADD_XML_H5_TEST (tfpformat.h5 0 -u -m %.7f tfpformat.h5)
 
+  # test for HDFFV-10256 issue
+  ADD_XML_H5_TEST (test35.nc 0 test35.nc)
+
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index bca81ed..a48e5ba 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -613,6 +613,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index ced5b36..80e653a 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -10,8 +10,6 @@
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "h5dump.h"
 #include "h5dump_ddl.h"
@@ -719,93 +717,100 @@ parse_mask_list(const char *h_list)
     const char        *ptr = NULL;
 
     /* sanity check */
-    HDassert(h_list);
+    if(h_list) {
+        HDmemset(packed_mask,0,sizeof(packed_mask));
+
+        packed_bits_num = 0;
+        /* scan in pair of offset,length separated by commas. */
+        ptr = h_list;
+        while (*ptr) {
+            /* scan for an offset which is an unsigned int */
+            if (!HDisdigit(*ptr)) {
+                error_msg("Bad mask list(%s)\n", h_list);
+                return FAIL;
+            }
+            soffset_value = HDatoi(ptr);
+            offset_value = (unsigned)soffset_value;
+            if (soffset_value < 0 || offset_value >= PACKED_BITS_SIZE_MAX) {
+                error_msg("Packed Bit offset value(%d) must be between 0 and %u\n",
+                        soffset_value, (unsigned)(PACKED_BITS_SIZE_MAX - 1));
+                return FAIL;
+            }
 
-    HDmemset(packed_mask,0,sizeof(packed_mask));
+            /* skip to end of integer */
+            while (HDisdigit(*++ptr))
+                ;
+            /* Look for the common separator */
+            if (*ptr++ != ',') {
+                error_msg("Bad mask list(%s), missing expected comma separator.\n", h_list);
+                return FAIL;
+            }
 
-    packed_bits_num = 0;
-    /* scan in pair of offset,length separated by commas. */
-    ptr = h_list;
-    while (*ptr) {
-        /* scan for an offset which is an unsigned int */
-        if (!HDisdigit(*ptr)) {
-            error_msg("Bad mask list(%s)\n", h_list);
-            return FAIL;
-        }
-        soffset_value = HDatoi(ptr);
-        offset_value = (unsigned)soffset_value;
-        if (soffset_value < 0 || offset_value >= PACKED_BITS_SIZE_MAX) {
-            error_msg("Packed Bit offset value(%d) must be between 0 and %u\n",
-                    soffset_value, (unsigned)(PACKED_BITS_SIZE_MAX - 1));
-            return FAIL;
-        }
+            /* scan for a length which is a positive int */
+            if (!HDisdigit(*ptr)) {
+                error_msg("Bad mask list(%s)\n", h_list);
+                return FAIL;
+            }
+            slength_value = HDatoi(ptr);
+            if (slength_value <= 0) {
+                error_msg("Packed Bit length value(%d) must be positive.\n", slength_value);
+                return FAIL;
+            }
+            length_value = (unsigned)slength_value;
+            if ((offset_value + length_value) > PACKED_BITS_SIZE_MAX) {
+                error_msg("Packed Bit offset+length value(%u) too large. Max is %u\n",
+                        offset_value+length_value, (unsigned)PACKED_BITS_SIZE_MAX);
+                return FAIL;
+            }
 
-        /* skip to end of integer */
-        while (HDisdigit(*++ptr))
-            ;
-        /* Look for the common separator */
-        if (*ptr++ != ',') {
-            error_msg("Bad mask list(%s), missing expected comma separator.\n", h_list);
-            return FAIL;
-        }
+            /* skip to end of int */
+            while (HDisdigit(*++ptr))
+                ;
 
-        /* scan for a length which is a positive int */
-        if (!HDisdigit(*ptr)) {
-            error_msg("Bad mask list(%s)\n", h_list);
-            return FAIL;
-        }
-        slength_value = HDatoi(ptr);
-        if (slength_value <= 0) {
-            error_msg("Packed Bit length value(%d) must be positive.\n", slength_value);
-            return FAIL;
+            /* store the offset,length pair */
+            if (packed_bits_num >= PACKED_BITS_MAX) {
+                /* too many requests */
+                error_msg("Too many masks requested (max. %d). Mask list(%s)\n", PACKED_BITS_MAX, h_list);
+                return FAIL;
+            }
+            packed_offset[packed_bits_num] = offset_value;
+            packed_length[packed_bits_num] = length_value;
+            /* create the bit mask by left shift 1's by length, then negate it. */
+            /* After packed_mask is calculated, packed_length is not needed but  */
+            /* keep it for debug purpose. */
+            temp_mask = ~0ULL;
+            if(length_value < (int)(8 *sizeof(unsigned long long))) {
+                temp_mask = temp_mask << length_value;
+                packed_mask[packed_bits_num] = ~temp_mask;
+            }
+            else
+                packed_mask[packed_bits_num] = temp_mask;
+            packed_bits_num++;
+
+            /* skip a possible comma separator */
+            if (*ptr == ',') {
+                if (!(*++ptr)) {
+                    /* unexpected end of string */
+                    error_msg("Bad mask list(%s), unexpected end of string.\n", h_list);
+                    return FAIL;
+                }
+            }
         }
-        length_value = (unsigned)slength_value;
-        if ((offset_value + length_value) > PACKED_BITS_SIZE_MAX) {
-            error_msg("Packed Bit offset+length value(%u) too large. Max is %u\n",
-                       offset_value+length_value, (unsigned)PACKED_BITS_SIZE_MAX);
+        if(packed_bits_num > PACKED_BITS_MAX) {
+            error_msg("Maximum number of packed bits exceeded\n");
             return FAIL;
         }
-
-        /* skip to end of int */
-        while (HDisdigit(*++ptr))
-            ;
-
-        /* store the offset,length pair */
-        if (packed_bits_num >= PACKED_BITS_MAX) {
-            /* too many requests */
-            error_msg("Too many masks requested (max. %d). Mask list(%s)\n", PACKED_BITS_MAX, h_list);
+        if (packed_bits_num == 0) {
+            /* got no masks! */
+            error_msg("Bad mask list(%s)\n", h_list);
             return FAIL;
         }
-        packed_offset[packed_bits_num] = offset_value;
-        packed_length[packed_bits_num] = length_value;
-        /* create the bit mask by left shift 1's by length, then negate it. */
-        /* After packed_mask is calculated, packed_length is not needed but  */
-        /* keep it for debug purpose. */
-        temp_mask = ~0ULL;
-        if(length_value < (int)(8 *sizeof(unsigned long long))) {
-            temp_mask = temp_mask << length_value;
-            packed_mask[packed_bits_num] = ~temp_mask;
-        }
-        else
-            packed_mask[packed_bits_num] = temp_mask;
-        packed_bits_num++;
-
-        /* skip a possible comma separator */
-        if (*ptr == ',') {
-            if (!(*++ptr)) {
-                /* unexpected end of string */
-                error_msg("Bad mask list(%s), unexpected end of string.\n", h_list);
-                return FAIL;
-            }
-        }
+        return SUCCEED;
     }
-    HDassert(packed_bits_num <= PACKED_BITS_MAX);
-    if (packed_bits_num == 0) {
-        /* got no masks! */
-        error_msg("Bad mask list(%s)\n", h_list);
+    else  {
+        error_msg("Bad mask list argument\n");
         return FAIL;
     }
-    return SUCCEED;
 }
 
 
@@ -1696,13 +1701,18 @@ h5_fileaccess(void)
         HDmemset(memb_name, 0, sizeof memb_name);
         HDmemset(memb_addr, 0, sizeof memb_addr);
 
-        HDassert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES);
-        for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) {
-            memb_fapl[mt] = H5P_DEFAULT;
-            memb_map[mt] = mt;
-            sprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
-            memb_name[mt] = sv[mt];
-            memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10);
+        if(HDstrlen(multi_letters)==H5FD_MEM_NTYPES) {
+            for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) {
+                memb_fapl[mt] = H5P_DEFAULT;
+                memb_map[mt] = mt;
+                sprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
+                memb_name[mt] = sv[mt];
+                memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10);
+            }
+        }
+        else {
+            error_msg("Bad multi_letters list\n");
+            return FAIL;
         }
 
         if (H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, FALSE) < 0)
@@ -1755,8 +1765,10 @@ h5_fileaccess(void)
 static void
 init_prefix(char **prfx, size_t prfx_len)
 {
-    HDassert(prfx_len > 0);
-    *prfx = (char *)HDcalloc(prfx_len, 1);
+    if(prfx_len > 0)
+        *prfx = (char *)HDcalloc(prfx_len, 1);
+    else
+        error_msg("unable to allocate prefix buffer\n");
 }
 
 
diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c
index ecfd82a..8dc96ce 100644
--- a/tools/h5dump/h5dump_ddl.c
+++ b/tools/h5dump/h5dump_ddl.c
@@ -10,8 +10,6 @@
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "H5private.h"
 #include "h5tools.h"
@@ -249,17 +247,19 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
 
                 /* Keep copy of prefix before iterating into group */
                 old_prefix = HDstrdup(prefix);
-                HDassert(old_prefix);
+                if (old_prefix) {
+                    /* Append group name to prefix */
+                    add_prefix(&prefix, &prefix_len, name);
 
-                /* Append group name to prefix */
-                add_prefix(&prefix, &prefix_len, name);
+                    /* Iterate into group */
+                    dump_function_table->dump_group_function(obj, name);
 
-                /* Iterate into group */
-                dump_function_table->dump_group_function(obj, name);
-
-                /* Restore old prefix name */
-                HDstrcpy(prefix, old_prefix);
-                HDfree(old_prefix);
+                    /* Restore old prefix name */
+                    HDstrcpy(prefix, old_prefix);
+                    HDfree(old_prefix);
+                }
+                else
+                    error_msg("warning: null prefix\n");
 
                 /* Close group */
                 H5Gclose(obj);
@@ -388,131 +388,137 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
 
         switch(linfo->type) {
         case H5L_TYPE_SOFT:
-            targbuf = (char *)HDmalloc(linfo->u.val_size);
-            HDassert(targbuf);
-
-            ctx.need_prefix = TRUE;
-
-            /* Render the element */
-            h5tools_str_reset(&buffer);
-            h5tools_str_append(&buffer, "%s \"%s\" %s",
-                    h5tools_dump_header_format->softlinkbegin, name,
-                    h5tools_dump_header_format->softlinkblockbegin);
-            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-
-            ctx.indent_level++;
-
-            if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
-                error_msg("unable to get link value\n");
+            if((targbuf = (char *)HDmalloc(linfo->u.val_size)) == NULL) {
+                error_msg("unable to allocate buffer\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
             }
             else {
-                /* print the value of a soft link */
-                /* Standard DDL: no modification */
                 ctx.need_prefix = TRUE;
-                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
-                h5tools_str_append(&buffer, "LINKTARGET \"%s\"", targbuf);
+                h5tools_str_append(&buffer, "%s \"%s\" %s",
+                        h5tools_dump_header_format->softlinkbegin, name,
+                        h5tools_dump_header_format->softlinkblockbegin);
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-            }
 
-            ctx.indent_level--;
+                ctx.indent_level++;
 
-            ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
+                    error_msg("unable to get link value\n");
+                    h5tools_setstatus(EXIT_FAILURE);
+                    ret = FAIL;
+                }
+                else {
+                    /* print the value of a soft link */
+                    /* Standard DDL: no modification */
+                    ctx.need_prefix = TRUE;
+                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-            /* Render the element */
-            h5tools_str_reset(&buffer);
-            if(HDstrlen(h5tools_dump_header_format->softlinkblockend)) {
-                h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->softlinkblockend);
-                if(HDstrlen(h5tools_dump_header_format->softlinkend))
-                    h5tools_str_append(&buffer, " ");
-            }
-            if(HDstrlen(h5tools_dump_header_format->softlinkend))
-                h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->softlinkend);
-            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                    /* Render the element */
+                    h5tools_str_reset(&buffer);
+                    h5tools_str_append(&buffer, "LINKTARGET \"%s\"", targbuf);
+                    h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                }
 
-            HDfree(targbuf);
-            break;
+                ctx.indent_level--;
 
-        case H5L_TYPE_EXTERNAL:
-            targbuf = (char *)HDmalloc(linfo->u.val_size);
-            HDassert(targbuf);
+                ctx.need_prefix = TRUE;
+                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-            ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                /* Render the element */
+                h5tools_str_reset(&buffer);
+                if(HDstrlen(h5tools_dump_header_format->softlinkblockend)) {
+                    h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->softlinkblockend);
+                    if(HDstrlen(h5tools_dump_header_format->softlinkend))
+                        h5tools_str_append(&buffer, " ");
+                }
+                if(HDstrlen(h5tools_dump_header_format->softlinkend))
+                    h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->softlinkend);
+                h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-            /* Render the element */
-            h5tools_str_reset(&buffer);
-            h5tools_str_append(&buffer, "%s \"%s\" %s",
-                    h5tools_dump_header_format->extlinkbegin, name,
-                    h5tools_dump_header_format->extlinkblockbegin);
-            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                HDfree(targbuf);
+            }
+            break;
 
-            if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
-                indentation(dump_indent);
-                error_msg("unable to get external link value\n");
+        case H5L_TYPE_EXTERNAL:
+            if((targbuf = (char *)HDmalloc(linfo->u.val_size)) == NULL) {
+                error_msg("unable to allocate buffer\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
-            } /* end if */
+            }
             else {
-                const char *filename;
-                const char *targname;
+                ctx.need_prefix = TRUE;
+                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-                if(H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &targname) < 0) {
+                /* Render the element */
+                h5tools_str_reset(&buffer);
+                h5tools_str_append(&buffer, "%s \"%s\" %s",
+                        h5tools_dump_header_format->extlinkbegin, name,
+                        h5tools_dump_header_format->extlinkblockbegin);
+                h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+
+                if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
                     indentation(dump_indent);
-                    error_msg("unable to unpack external link value\n");
+                    error_msg("unable to get external link value\n");
                     h5tools_setstatus(EXIT_FAILURE);
                     ret = FAIL;
                 } /* end if */
                 else {
-                    ctx.indent_level++;
+                    const char *filename;
+                    const char *targname;
 
-                    ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                    if(H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &targname) < 0) {
+                        indentation(dump_indent);
+                        error_msg("unable to unpack external link value\n");
+                        h5tools_setstatus(EXIT_FAILURE);
+                        ret = FAIL;
+                    } /* end if */
+                    else {
+                        ctx.indent_level++;
 
-                    /* Render the element */
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "TARGETFILE \"%s\"", filename);
-                    h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                        ctx.need_prefix = TRUE;
+                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-                    ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                        /* Render the element */
+                        h5tools_str_reset(&buffer);
+                        h5tools_str_append(&buffer, "TARGETFILE \"%s\"", filename);
+                        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                    /* Render the element */
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "TARGETPATH \"%s\"", targname);
-                    h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                        ctx.need_prefix = TRUE;
+                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-                    /* dump the external link */
-                    dump_extlink(group, name, targname);
-                    ctx.indent_level--;
+                        /* Render the element */
+                        h5tools_str_reset(&buffer);
+                        h5tools_str_append(&buffer, "TARGETPATH \"%s\"", targname);
+                        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+
+                        /* dump the external link */
+                        dump_extlink(group, name, targname);
+                        ctx.indent_level--;
+                    } /* end else */
                 } /* end else */
-            } /* end else */
-            ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                ctx.need_prefix = TRUE;
+                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-            /* Render the element */
-            h5tools_str_reset(&buffer);
-            if(HDstrlen(h5tools_dump_header_format->extlinkblockend)) {
-                h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->extlinkblockend);
+                /* Render the element */
+                h5tools_str_reset(&buffer);
+                if(HDstrlen(h5tools_dump_header_format->extlinkblockend)) {
+                    h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->extlinkblockend);
+                    if(HDstrlen(h5tools_dump_header_format->extlinkend))
+                        h5tools_str_append(&buffer, " ");
+                }
                 if(HDstrlen(h5tools_dump_header_format->extlinkend))
-                    h5tools_str_append(&buffer, " ");
-            }
-            if(HDstrlen(h5tools_dump_header_format->extlinkend))
-                h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->extlinkend);
-            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                    h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->extlinkend);
+                h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-            HDfree(targbuf);
+                HDfree(targbuf);
+            }
             break;
 
         case H5L_TYPE_ERROR:
         case H5L_TYPE_MAX:
-            HDassert(0);
-            /* fall through */
         case H5L_TYPE_HARD:
         default:
             ctx.need_prefix = TRUE;
@@ -1062,7 +1068,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
             case H5T_NO_CLASS:
             case H5T_NCLASSES:
             default:
-                HDassert(0);
+                error_msg("invalid H5TCLASS type\n");
                 break;
             } /* end switch */
         } /* for(u=0; u<data_loop; u++) */
@@ -1924,8 +1930,6 @@ handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_AT
 
         case H5L_TYPE_ERROR:
         case H5L_TYPE_MAX:
-            HDassert(0);
-            /* fall through */
         case H5L_TYPE_HARD:
         default:
             begin_obj(h5tools_dump_header_format->udlinkbegin, links, h5tools_dump_header_format->udlinkblockbegin);
diff --git a/tools/h5dump/h5dump_xml.c b/tools/h5dump/h5dump_xml.c
index 8f6dd86..76819f0 100644
--- a/tools/h5dump/h5dump_xml.c
+++ b/tools/h5dump/h5dump_xml.c
@@ -10,8 +10,6 @@
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "H5private.h"
 #include "h5tools.h"
@@ -199,18 +197,22 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                 char *old_prefix; /* Pointer to previous prefix */
 
                 /* Keep copy of prefix before iterating into group */
-                old_prefix = HDstrdup(prefix);
-                HDassert(old_prefix);
-
-                /* Append group name to prefix */
-                add_prefix(&prefix, &prefix_len, name);
+                if((old_prefix = HDstrdup(prefix)) == NULL)  {
+                    error_msg("unable to allocate buffer\n");
+                    h5tools_setstatus(EXIT_FAILURE);
+                    ret = FAIL;
+                }
+                else {
+                    /* Append group name to prefix */
+                    add_prefix(&prefix, &prefix_len, name);
 
-                /* Iterate into group */
-                dump_function_table->dump_group_function(obj, name);
+                    /* Iterate into group */
+                    dump_function_table->dump_group_function(obj, name);
 
-                /* Restore old prefix name */
-                HDstrcpy(prefix, old_prefix);
-                HDfree(old_prefix);
+                    /* Restore old prefix name */
+                    HDstrcpy(prefix, old_prefix);
+                    HDfree(old_prefix);
+                }
 
                 /* Close group */
                 H5Gclose(obj);
@@ -361,161 +363,167 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
 
         switch(linfo->type) {
         case H5L_TYPE_SOFT:
-            targbuf = (char *)HDmalloc(linfo->u.val_size);
-            HDassert(targbuf);
-
-            if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
-                error_msg("unable to get link value\n");
+            if((targbuf = (char *)HDmalloc(linfo->u.val_size)) == NULL)  {
+                error_msg("unable to allocate buffer\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
             }
             else {
-                /* print the value of a soft link */
-                /* XML */
-                char linkxid[100];
-                char parentxid[100];
-                char targetxid[100];
-                char *t_prefix = xml_escape_the_name(HDstrcmp(prefix,"") ? prefix : "/");
-                char *t_name = xml_escape_the_name(name);
-                char *t_targbuf = xml_escape_the_name(targbuf);
-                char *t_obj_path = xml_escape_the_name(obj_path);
-                char *t_link_path;
-                int res;
-
-                t_link_path = (char *)HDmalloc(HDstrlen(prefix) + linfo->u.val_size + 1);
-                if(targbuf[0] == '/')
-                    HDstrcpy(t_link_path, targbuf);
+                if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
+                    error_msg("unable to get link value\n");
+                    h5tools_setstatus(EXIT_FAILURE);
+                    ret = FAIL;
+                }
                 else {
-                    HDstrcpy(t_link_path, prefix);
-                    HDstrcat(HDstrcat(t_link_path, "/"), targbuf);
-                } /* end else */
+                    /* print the value of a soft link */
+                    /* XML */
+                    char linkxid[100];
+                    char parentxid[100];
+                    char targetxid[100];
+                    char *t_prefix = xml_escape_the_name(HDstrcmp(prefix,"") ? prefix : "/");
+                    char *t_name = xml_escape_the_name(name);
+                    char *t_targbuf = xml_escape_the_name(targbuf);
+                    char *t_obj_path = xml_escape_the_name(obj_path);
+                    char *t_link_path;
+                    int res;
 
-                /* Create OBJ-XIDs for the parent and object */
-                xml_name_to_XID(t_obj_path, linkxid, (int)sizeof(linkxid), 1);
-                xml_name_to_XID(prefix, parentxid, (int)sizeof(parentxid), 1);
+                    t_link_path = (char *)HDmalloc(HDstrlen(prefix) + linfo->u.val_size + 1);
+                    if(targbuf[0] == '/')
+                        HDstrcpy(t_link_path, targbuf);
+                    else {
+                        HDstrcpy(t_link_path, prefix);
+                        HDstrcat(HDstrcat(t_link_path, "/"), targbuf);
+                    } /* end else */
 
-                /* Try to create an OBJ-XID for the object pointed to */
-                res = xml_name_to_XID(t_link_path, targetxid, (int)sizeof(targetxid), 0);
-                if (res == 0) {
-                    /* target obj found */
-                    ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                    /* Create OBJ-XIDs for the parent and object */
+                    xml_name_to_XID(t_obj_path, linkxid, (int)sizeof(linkxid), 1);
+                    xml_name_to_XID(prefix, parentxid, (int)sizeof(parentxid), 1);
 
-                    /* Render the element */
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "<%sSoftLink LinkName=\"%s\" "
-                            "OBJ-XID=\"%s\" "
-                            "H5SourcePath=\"%s\" "
-                            "TargetPath=\"%s\" TargetObj=\"%s\" "
-                            "Parents=\"%s\" H5ParentPaths=\"%s\" />",
-                            xmlnsprefix,
-                            t_name,         /* LinkName */
-                            linkxid,        /* OBJ-XID */
-                            t_obj_path,     /* H5SourcePath */
-                            t_targbuf,      /* TargetPath */
-                            targetxid,      /* TargetObj */
-                            parentxid,      /* Parents */
-                            t_prefix);      /* H5ParentPaths */
-                    h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-                }
-                else {
-                    /* dangling link -- omit from xml attributes */
-                    ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                    /* Try to create an OBJ-XID for the object pointed to */
+                    res = xml_name_to_XID(t_link_path, targetxid, (int)sizeof(targetxid), 0);
+                    if (res == 0) {
+                        /* target obj found */
+                        ctx.need_prefix = TRUE;
+                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-                    /* Render the element */
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "<%sSoftLink LinkName=\"%s\" "
-                            "OBJ-XID=\"%s\" "
-                            "H5SourcePath=\"%s\" "
-                            "TargetPath=\"%s\"  "
-                            "Parents=\"%s\" H5ParentPaths=\"%s\" />",
-                            xmlnsprefix,
-                            t_name,         /* LinkName */
-                            linkxid,        /* OBJ-XID */
-                            t_obj_path,     /* H5SourcePath */
-                            t_targbuf,      /* TargetPath */
-                            parentxid,      /* Parents */
-                            t_prefix);      /* H5ParentPaths */
-                    h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                        /* Render the element */
+                        h5tools_str_reset(&buffer);
+                        h5tools_str_append(&buffer, "<%sSoftLink LinkName=\"%s\" "
+                                "OBJ-XID=\"%s\" "
+                                "H5SourcePath=\"%s\" "
+                                "TargetPath=\"%s\" TargetObj=\"%s\" "
+                                "Parents=\"%s\" H5ParentPaths=\"%s\" />",
+                                xmlnsprefix,
+                                t_name,         /* LinkName */
+                                linkxid,        /* OBJ-XID */
+                                t_obj_path,     /* H5SourcePath */
+                                t_targbuf,      /* TargetPath */
+                                targetxid,      /* TargetObj */
+                                parentxid,      /* Parents */
+                                t_prefix);      /* H5ParentPaths */
+                        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                    }
+                    else {
+                        /* dangling link -- omit from xml attributes */
+                        ctx.need_prefix = TRUE;
+                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+
+                        /* Render the element */
+                        h5tools_str_reset(&buffer);
+                        h5tools_str_append(&buffer, "<%sSoftLink LinkName=\"%s\" "
+                                "OBJ-XID=\"%s\" "
+                                "H5SourcePath=\"%s\" "
+                                "TargetPath=\"%s\"  "
+                                "Parents=\"%s\" H5ParentPaths=\"%s\" />",
+                                xmlnsprefix,
+                                t_name,         /* LinkName */
+                                linkxid,        /* OBJ-XID */
+                                t_obj_path,     /* H5SourcePath */
+                                t_targbuf,      /* TargetPath */
+                                parentxid,      /* Parents */
+                                t_prefix);      /* H5ParentPaths */
+                        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                    }
+
+                    HDfree(t_prefix);
+                    HDfree(t_name);
+                    HDfree(t_targbuf);
+                    HDfree(t_obj_path);
+                    HDfree(t_link_path);
                 }
 
-                HDfree(t_prefix);
-                HDfree(t_name);
-                HDfree(t_targbuf);
-                HDfree(t_obj_path);
-                HDfree(t_link_path);
+                HDfree(targbuf);
             }
-
-            HDfree(targbuf);
             break;
 
         case H5L_TYPE_EXTERNAL:
-            targbuf = (char *)HDmalloc(linfo->u.val_size);
-            HDassert(targbuf);
-
-            if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
-                error_msg("unable to get external link value\n");
+            if((targbuf = (char *)HDmalloc(linfo->u.val_size)) == NULL)  {
+                error_msg("unable to allocate buffer\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
-            } /* end if */
+            }
             else {
-                const char *filename;
-                const char *targname;
-
-                if(H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &targname) < 0) {
-                    error_msg("unable to unpack external link value\n");
+                if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
+                    error_msg("unable to get external link value\n");
                     h5tools_setstatus(EXIT_FAILURE);
                     ret = FAIL;
                 } /* end if */
                 else {
-                    char linkxid[100];
-                    char parentxid[100];
-                    char *t_name = xml_escape_the_name(name);
-                    char *t_prefix = xml_escape_the_name(HDstrcmp(prefix,"") ? prefix : "/");
-                    char *t_obj_path = xml_escape_the_name(obj_path);
-                    char *t_filename = xml_escape_the_name(filename);
-                    char *t_targname = xml_escape_the_name(targname);
+                    const char *filename;
+                    const char *targname;
 
-                    /* Create OBJ-XIDs for the parent and object */
-                    xml_name_to_XID(t_obj_path, linkxid, (int)sizeof(linkxid), 1);
-                    xml_name_to_XID(prefix, parentxid, (int)sizeof(parentxid), 1);
+                    if(H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &targname) < 0) {
+                        error_msg("unable to unpack external link value\n");
+                        h5tools_setstatus(EXIT_FAILURE);
+                        ret = FAIL;
+                    } /* end if */
+                    else {
+                        char linkxid[100];
+                        char parentxid[100];
+                        char *t_name = xml_escape_the_name(name);
+                        char *t_prefix = xml_escape_the_name(HDstrcmp(prefix,"") ? prefix : "/");
+                        char *t_obj_path = xml_escape_the_name(obj_path);
+                        char *t_filename = xml_escape_the_name(filename);
+                        char *t_targname = xml_escape_the_name(targname);
 
-                    ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                        /* Create OBJ-XIDs for the parent and object */
+                        xml_name_to_XID(t_obj_path, linkxid, (int)sizeof(linkxid), 1);
+                        xml_name_to_XID(prefix, parentxid, (int)sizeof(parentxid), 1);
 
-                    /* Render the element */
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "<%sExternalLink LinkName=\"%s\" "
-                            "OBJ-XID=\"%s\" "
-                            "H5SourcePath=\"%s\" "
-                            "TargetFilename=\"%s\"  "
-                            "TargetPath=\"%s\"  "
-                            "Parents=\"%s\" H5ParentPaths=\"%s\" />",
-                            xmlnsprefix,
-                            t_name,         /* LinkName */
-                            linkxid,        /* OBJ-XID */
-                            t_obj_path,     /* H5SourcePath */
-                            filename,       /* TargetFilename */
-                            targname,       /* TargetPath*/
-                            parentxid,      /* Parents */
-                            t_prefix);      /* H5ParentPaths */
-                    h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                        ctx.need_prefix = TRUE;
+                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-                    HDfree(t_prefix);
-                    HDfree(t_name);
-                    HDfree(t_filename);
-                    HDfree(t_targname);
-                    HDfree(t_obj_path);
+                        /* Render the element */
+                        h5tools_str_reset(&buffer);
+                        h5tools_str_append(&buffer, "<%sExternalLink LinkName=\"%s\" "
+                                "OBJ-XID=\"%s\" "
+                                "H5SourcePath=\"%s\" "
+                                "TargetFilename=\"%s\"  "
+                                "TargetPath=\"%s\"  "
+                                "Parents=\"%s\" H5ParentPaths=\"%s\" />",
+                                xmlnsprefix,
+                                t_name,         /* LinkName */
+                                linkxid,        /* OBJ-XID */
+                                t_obj_path,     /* H5SourcePath */
+                                filename,       /* TargetFilename */
+                                targname,       /* TargetPath*/
+                                parentxid,      /* Parents */
+                                t_prefix);      /* H5ParentPaths */
+                        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+
+                        HDfree(t_prefix);
+                        HDfree(t_name);
+                        HDfree(t_filename);
+                        HDfree(t_targname);
+                        HDfree(t_obj_path);
+                    } /* end else */
                 } /* end else */
-            } /* end else */
-            HDfree(targbuf);
+                HDfree(targbuf);
+            }
             break;
 
         case H5L_TYPE_ERROR:
         case H5L_TYPE_MAX:
-            HDassert(0);
-            /* fall through */
         case H5L_TYPE_HARD:
         default:
             {
@@ -675,7 +683,6 @@ xml_escape_the_name(const char *str)
     for (i = 0; i < len; i++) {
         size_t esc_len;
 
-        HDassert(ncp_len);
         if (*cp == '\'') {
             HDstrncpy(ncp, apos, ncp_len);
             esc_len = HDstrlen(apos);
@@ -769,7 +776,6 @@ xml_escape_the_string(const char *str, int slen)
     for (i = 0; i < len; i++) {
         size_t esc_len;
 
-        HDassert(ncp_len);
         if (*cp == '\\') {
             *ncp++ = '\\';
             *ncp = *cp;
@@ -781,20 +787,20 @@ xml_escape_the_string(const char *str, int slen)
             esc_len = 1;
         }
         else if (*cp == '\'') {
-            HDstrncpy(ncp, apos, ncp_len);
             esc_len = HDstrlen(apos);
+            HDstrncpy(ncp, apos, esc_len);
         }
         else if (*cp == '<') {
-            HDstrncpy(ncp, lt, ncp_len);
             esc_len = HDstrlen(lt);
+            HDstrncpy(ncp, lt, esc_len);
         }
         else if (*cp == '>') {
-            HDstrncpy(ncp, gt, ncp_len);
             esc_len = HDstrlen(gt);
+            HDstrncpy(ncp, gt, esc_len);
         }
         else if (*cp == '&') {
-            HDstrncpy(ncp, amp, ncp_len);
             esc_len = HDstrlen(amp);
+            HDstrncpy(ncp, amp, esc_len);
         }
         else {
             *ncp = *cp;
@@ -1515,8 +1521,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
 
             case H5T_NO_CLASS:
             case H5T_NCLASSES:
-                HDassert(0);
-                /* fall through */
             default:
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
@@ -1960,28 +1964,36 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
             H5Tclose(type);
 
             space = H5Aget_space(obj_id);
+            if(space == H5S_NULL || space == H5S_NO_CLASS) {
+                status = SUCCEED;
+            }
+            else {
+                ndims = H5Sget_simple_extent_dims(space, size, NULL);
 
-            ndims = H5Sget_simple_extent_dims(space, size, NULL);
-
-            for (i = 0; i < ndims; i++)
-                nelmts *= size[i];
+                for (i = 0; i < ndims; i++)
+                    nelmts *= size[i];
 
-            buf = HDmalloc((size_t)(nelmts * MAX(H5Tget_size(type), H5Tget_size(p_type))));
-            HDassert(buf);
+                if((buf = HDmalloc((size_t)(nelmts * MAX(H5Tget_size(type), H5Tget_size(p_type))))) == NULL)  {
+                    error_msg("unable to allocate buffer\n");
+                    h5tools_setstatus(EXIT_FAILURE);
+                    status = FAIL;
+                }
+                else {
+                    if (H5Aread(obj_id, p_type, buf) >= 0) {
+                        h5tools_context_t datactx;
+                        HDmemset(&datactx, 0, sizeof(datactx));
+                        datactx.need_prefix = TRUE;
+                        datactx.indent_level = ctx.indent_level;
+                        datactx.cur_column = ctx.cur_column;
+                        status = h5tools_dump_mem(rawoutstream, outputformat, &datactx, obj_id, p_type, space, buf);
+                    }
+                    /* Reclaim any VL memory, if necessary */
+                    if (vl_data)
+                        H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
 
-            if (H5Aread(obj_id, p_type, buf) >= 0) {
-                h5tools_context_t datactx;
-                HDmemset(&datactx, 0, sizeof(datactx));
-                datactx.need_prefix = TRUE;
-                datactx.indent_level = ctx.indent_level;
-                datactx.cur_column = ctx.cur_column;
-                status = h5tools_dump_mem(rawoutstream, outputformat, &datactx, obj_id, p_type, space, buf);
+                    HDfree(buf);
+                }
             }
-            /* Reclaim any VL memory, if necessary */
-            if (vl_data)
-                H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
-
-            HDfree(buf);
             H5Tclose(p_type);
             H5Sclose(space);
             H5Tclose(type);
@@ -2236,8 +2248,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 break;
             case H5T_NO_CLASS:
             case H5T_NCLASSES:
-                HDassert(0);
-                /* fall through */
             default:
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
@@ -3669,8 +3679,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             break;
         case H5T_NO_CLASS:
         case H5T_NCLASSES:
-            HDassert(0);
-            /* fall through */
         case H5T_STRING:
         case H5T_REFERENCE:
         default:
@@ -3809,91 +3817,95 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
 
     /* Print information about storage layout */
     if (H5D_CHUNKED == H5Pget_layout(dcpl)) {
-        maxdims = H5Sget_simple_extent_ndims(space);
-        HDassert(maxdims >= 0);
-        chsize = (hsize_t *)HDmalloc((size_t)maxdims * sizeof(hsize_t));
-        ctx.indent_level++;
-        dump_indent += COL;
+        if((maxdims = H5Sget_simple_extent_ndims(space)) < 0)  {
+            error_msg("unable to get maxdims\n");
+            h5tools_setstatus(EXIT_FAILURE);
+        }
+        else {
+            chsize = (hsize_t *)HDmalloc((size_t)maxdims * sizeof(hsize_t));
+            ctx.indent_level++;
+            dump_indent += COL;
 
-        ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+            ctx.need_prefix = TRUE;
+            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-        /* Render the element */
-        h5tools_str_reset(&buffer);
-        h5tools_str_append(&buffer, "<%sStorageLayout>", xmlnsprefix);
-        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-        ctx.indent_level++;
-        dump_indent += COL;
+            /* Render the element */
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "<%sStorageLayout>", xmlnsprefix);
+            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+            ctx.indent_level++;
+            dump_indent += COL;
 
-        ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+            ctx.need_prefix = TRUE;
+            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-        /* Render the element */
-        h5tools_str_reset(&buffer);
-        h5tools_str_append(&buffer, "<%sChunkedLayout ", xmlnsprefix);
-        ndims = H5Pget_chunk(dcpl, maxdims, chsize);
-        h5tools_str_append(&buffer, "Ndims=\"%d\">", ndims);
-        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+            /* Render the element */
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "<%sChunkedLayout ", xmlnsprefix);
+            ndims = H5Pget_chunk(dcpl, maxdims, chsize);
+            h5tools_str_append(&buffer, "Ndims=\"%d\">", ndims);
+            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-        ctx.indent_level++;
-        dump_indent += COL;
+            ctx.indent_level++;
+            dump_indent += COL;
 
-        for (i = 0; i < ndims; i++) {
+            for (i = 0; i < ndims; i++) {
+
+                ctx.need_prefix = TRUE;
+                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+
+                /* Render the element */
+                h5tools_str_reset(&buffer);
+                h5tools_str_append(&buffer, "<%sChunkDimension DimSize=\"%" H5_PRINTF_LL_WIDTH "u\" />", xmlnsprefix, chsize[i]);
+                h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+            }
 
             ctx.need_prefix = TRUE;
             h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
             /* Render the element */
             h5tools_str_reset(&buffer);
-            h5tools_str_append(&buffer, "<%sChunkDimension DimSize=\"%" H5_PRINTF_LL_WIDTH "u\" />", xmlnsprefix, chsize[i]);
+            h5tools_str_append(&buffer, "<%sRequiredFilter>", xmlnsprefix);
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-        }
-
-        ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-
-        /* Render the element */
-        h5tools_str_reset(&buffer);
-        h5tools_str_append(&buffer, "<%sRequiredFilter>", xmlnsprefix);
-        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-        ctx.indent_level++;
-        dump_indent += COL;
-        check_filters(dcpl);
-        ctx.indent_level--;
-        dump_indent -= COL;
+            ctx.indent_level++;
+            dump_indent += COL;
+            check_filters(dcpl);
+            ctx.indent_level--;
+            dump_indent -= COL;
 
-        ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+            ctx.need_prefix = TRUE;
+            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-        /* Render the element */
-        h5tools_str_reset(&buffer);
-        h5tools_str_append(&buffer, "</%sRequiredFilter>", xmlnsprefix);
-        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+            /* Render the element */
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "</%sRequiredFilter>", xmlnsprefix);
+            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-        ctx.indent_level--;
-        dump_indent -= COL;
+            ctx.indent_level--;
+            dump_indent -= COL;
 
-        ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+            ctx.need_prefix = TRUE;
+            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-        /* Render the element */
-        h5tools_str_reset(&buffer);
-        h5tools_str_append(&buffer, "</%sChunkedLayout>", xmlnsprefix);
-        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-        ctx.indent_level--;
-        dump_indent -= COL;
+            /* Render the element */
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "</%sChunkedLayout>", xmlnsprefix);
+            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+            ctx.indent_level--;
+            dump_indent -= COL;
 
-        ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+            ctx.need_prefix = TRUE;
+            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-        /* Render the element */
-        h5tools_str_reset(&buffer);
-        h5tools_str_append(&buffer, "</%sStorageLayout>", xmlnsprefix);
-        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-        ctx.indent_level--;
-        dump_indent -= COL;
-        HDfree(chsize);
+            /* Render the element */
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "</%sStorageLayout>", xmlnsprefix);
+            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+            ctx.indent_level--;
+            dump_indent -= COL;
+            HDfree(chsize);
+        }
     }
     else if (H5D_CONTIGUOUS == H5Pget_layout(dcpl)) {
         ctx.indent_level++;
@@ -3981,8 +3993,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             h5tools_str_append(&buffer, "FillIfSet");
             break;
         case H5D_FILL_TIME_ERROR:
-            HDassert(0);
-            /* fall through */
         default:
             h5tools_str_append(&buffer, "?");
             break;
@@ -4002,8 +4012,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             break;
         case H5D_ALLOC_TIME_DEFAULT:
         case H5D_ALLOC_TIME_ERROR:
-            HDassert(0);
-            /* fall through */
         default:
             h5tools_str_append(&buffer, "?");
             break;
@@ -4230,9 +4238,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             break;
         case H5T_NO_CLASS:
         case H5T_NCLASSES:
-            HDassert(0);
-            /* fall through */
-
         default:
             ctx.need_prefix = TRUE;
             h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index c74e800..a2f4036 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -112,6 +112,7 @@
 #define FILE82  "tcompound_complex2.h5"
 #define FILE83  "tvlenstr_array.h5"
 #define FILE84  "tudfilter.h5"
+#define FILE85  "tgrpnullspace.h5"
 
 /*-------------------------------------------------------------------------
  * prototypes
@@ -9810,9 +9811,16 @@ static void gent_compound_complex2(void)
 
     compound        buf[F82_DIM32];        /* compound */
 
-    hid_t file, grp=-1, type=-1, space=-1, dset=-1;
-    hid_t dset_array_a, dset_array_b, dset_array_c;
-    hid_t cmpd_tid1, cmpd_tid2, cmpd_tid3;
+    hid_t file = -1, 
+          type = -1, 
+          space = -1, 
+          dset = -1;
+    hid_t dset_array_a, 
+          dset_array_b, 
+          dset_array_c;
+    hid_t cmpd_tid1 = -1, 
+          cmpd_tid2 = -1, 
+          cmpd_tid3 = -1;
     size_t  i;
     size_t j, k;
     unsigned dset_array_ndims;
@@ -9824,6 +9832,10 @@ static void gent_compound_complex2(void)
     if ((space = H5Screate_simple(F82_RANK, &nelmts, NULL)) >= 0) {
         /* CompoundComplex1D */
         if ((type = H5Tcreate(H5T_COMPOUND, sizeof(compound))) >= 0) {
+            hid_t str_type, array;
+            hsize_t dims[1];
+            hid_t nest1, nest2;
+
             /* Insert top-level array members */
             dset_array_ndims = 1; dset_array_a_dims[0] = 4;
             dset_array_a = H5Tarray_create2(H5T_STD_U32LE, dset_array_ndims, dset_array_a_dims);
@@ -9841,8 +9853,6 @@ static void gent_compound_complex2(void)
             H5Tclose(dset_array_c);
 
             /* Insert first nested compound */
-            hid_t str_type, array;
-            hsize_t dims[1];
             cmpd_tid1 = H5Tcreate(H5T_COMPOUND, sizeof(nested_compound));
 
             H5Tinsert(cmpd_tid1, "nested_double", HOFFSET(nested_compound, nested_a), H5T_IEEE_F64LE);
@@ -9864,7 +9874,6 @@ static void gent_compound_complex2(void)
             H5Tinsert(type, "nested_compound", HOFFSET(compound, d), cmpd_tid1);
 
             /* Insert second nested compound */
-            hid_t nest1, nest2;
             cmpd_tid2 = H5Tcreate(H5T_COMPOUND, sizeof(multiple_nested_compound));
 
             H5Tinsert(cmpd_tid2, "nested_float", HOFFSET(multiple_nested_compound, a), H5T_IEEE_F32LE);
@@ -9954,10 +9963,10 @@ static void gent_compound_complex2(void)
                     /* Set up first nested compound */
                     buf[i].d.nested_a = (double) i;
 
-                    strcpy(buf[i].d.nested_string, "This is a test string.");
+                    HDstrcpy(buf[i].d.nested_string, "This is a test string.");
 
                     for (j = 0; j < 4; j++)
-                        strcpy(buf[i].d.nested_string_array[j], "String test");
+                        HDstrcpy(buf[i].d.nested_string_array[j], "String test");
 
                     /* Set up multiple nested compound */
                     buf[i].e.a = (float) i;
@@ -9969,9 +9978,9 @@ static void gent_compound_complex2(void)
                         buf[i].e.b.multiple_nested_d[j] = (long)(j - i*10);
                     }
 
-                    strcpy(buf[i].e.c.further_nested_string, "1234567890");
+                    HDstrcpy(buf[i].e.c.further_nested_string, "1234567890");
                     for (j = 0; j < 4; j++)
-                        strcpy(buf[i].e.c.further_nested_string_array[j], "STRING ARRAY");
+                        HDstrcpy(buf[i].e.c.further_nested_string_array[j], "STRING ARRAY");
 
                     for (j = 0; j < 10; j++) {
                         buf[i].e.c.deep_nest.deep_nested_short[j] = (short)(j + i*10);
@@ -9983,7 +9992,7 @@ static void gent_compound_complex2(void)
                 }
 
                 if (H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-                    fprintf(stderr, "gent_tcompound_complex2 H5Dwrite failed\n");
+                    HDfprintf(stderr, "gent_tcompound_complex2 H5Dwrite failed\n");
 
                 H5Dclose(dset);
             }
@@ -10069,7 +10078,6 @@ static void gent_compound_complex2(void)
         H5Tclose(type);
     }
 */
-
     H5Fclose(file);
 }
 
@@ -10122,7 +10130,7 @@ static void gent_vlenstr_array(void)
         if ((type = H5Tarray_create2(array_tid, F83_RANK, arraydim)) >= 0) {
             if ((dset = H5Dcreate2(file, F83_DATASETNAME, type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                 if (H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer) < 0)
-                    fprintf(stderr, "gent_vlenstr_array H5Dwrite failed\n");
+                    HDfprintf(stderr, "gent_vlenstr_array H5Dwrite failed\n");
 
                 H5Dclose(dset);
             }
@@ -10168,7 +10176,6 @@ static void gent_udfilter(void)
     hid_t    dcpl; /* dataset creation property list */
     hid_t    dsid;  /* dataset ID */
     hid_t    sid;  /* dataspace ID */
-    hid_t    tid;  /* datatype ID */
 
     hsize_t  dims1[RANK]      = {DIM1,DIM2};
     hsize_t  chunk_dims[RANK] = {CDIM1,CDIM2};
@@ -10289,6 +10296,43 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
  *-------------------------------------------------------------------------
  */
 
+/*-------------------------------------------------------------------------
+ * Function: gent_null_space_group
+ *
+ * Purpose: generates dataset and attribute of null dataspace in a group
+ *-------------------------------------------------------------------------
+ */
+static void gent_null_space_group(void)
+{
+    hid_t fid, root, group, dataset, space, attr;
+    int dset_buf = 10;
+    int point = 4;
+
+    fid = H5Fcreate(FILE85, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    root = H5Gopen2(fid, "/", H5P_DEFAULT);
+
+    group = H5Gcreate2(fid, "/g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* null space */
+    space = H5Screate(H5S_NULL);
+
+    /* dataset */
+    dataset = H5Dcreate2(group, "dset", H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    /* nothing should be written */
+    H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &dset_buf);
+
+    /* attribute */
+    attr = H5Acreate2(group, "attr", H5T_NATIVE_UINT, space, H5P_DEFAULT, H5P_DEFAULT);
+    H5Awrite(attr, H5T_NATIVE_INT, &point); /* Nothing can be written */
+
+    H5Dclose(dataset);
+    H5Aclose(attr);
+    H5Gclose(group);
+    H5Gclose(root);
+    H5Sclose(space);
+    H5Fclose(fid);
+}
+
 int main(void)
 {
     gent_group();
@@ -10376,6 +10420,7 @@ int main(void)
     gent_bitnopaquefields();
 
     gent_intsfourdims();
+    gent_null_space_group();
 
     gent_udfilter();
 
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index f941afc..9ceffa5 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -131,6 +131,7 @@ $SRC_H5DUMP_TESTFILES/tfpformat.h5
 $SRC_H5DUMP_TESTFILES/tfvalues.h5
 $SRC_H5DUMP_TESTFILES/tgroup.h5
 $SRC_H5DUMP_TESTFILES/tgrp_comments.h5
+$SRC_H5DUMP_TESTFILES/tgrpnullspace.h5
 $SRC_H5DUMP_TESTFILES/thlink.h5
 $SRC_H5DUMP_TESTFILES/thyperslab.h5
 $SRC_H5DUMP_TESTFILES/tintsattrs.h5
@@ -258,6 +259,7 @@ $SRC_H5DUMP_TESTFILES/tfpformat.ddl
 $SRC_H5DUMP_TESTFILES/tgroup-1.ddl
 $SRC_H5DUMP_TESTFILES/tgroup-2.ddl
 $SRC_H5DUMP_TESTFILES/tgrp_comments.ddl
+$SRC_H5DUMP_TESTFILES/tgrpnullspace.ddl
 $SRC_H5DUMP_TESTFILES/thlink-1.ddl
 $SRC_H5DUMP_TESTFILES/thlink-2.ddl
 $SRC_H5DUMP_TESTFILES/thlink-3.ddl
@@ -1265,6 +1267,7 @@ TOOLTEST thyperslab.ddl --enable-error-stack thyperslab.h5
 
 # test for displaying dataset and attribute of null space
 TOOLTEST tnullspace.ddl --enable-error-stack tnullspace.h5
+TOOLTEST tgrpnullspace.ddl -p --enable-error-stack tgrpnullspace.h5
 
 # test for displaying dataset and attribute of space with 0 dimension size
 TOOLTEST zerodim.ddl --enable-error-stack zerodim.h5
diff --git a/tools/h5dump/testh5dumpxml.sh.in b/tools/h5dump/testh5dumpxml.sh.in
index 81201b7..8aa8811 100644
--- a/tools/h5dump/testh5dumpxml.sh.in
+++ b/tools/h5dump/testh5dumpxml.sh.in
@@ -80,6 +80,7 @@ $SRC_H5DUMP_TESTFILES/tdset.h5
 $SRC_H5DUMP_TESTFILES/tdset2.h5
 $SRC_H5DUMP_TESTFILES/tempty.h5
 $SRC_H5DUMP_TESTFILES/tenum.h5
+$SRC_H5DUMP_TESTFILES/test35.nc
 $SRC_H5DUMP_TESTFILES/textlink.h5
 $SRC_H5DUMP_TESTFILES/tfpformat.h5
 $SRC_H5DUMP_TESTFILES/tgroup.h5
@@ -96,6 +97,7 @@ $SRC_H5DUMP_TESTFILES/tname-sp.h5
 $SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.h5
 $SRC_H5DUMP_TESTFILES/tnestedcomp.h5
 $SRC_H5DUMP_TESTFILES/tnodata.h5
+$SRC_H5DUMP_TESTFILES/tnullspace.h5
 $SRC_H5DUMP_TESTFILES/tobjref.h5
 $SRC_H5DUMP_TESTFILES/topaque.h5
 $SRC_H5DUMP_TESTFILES/torderattr.h5
@@ -144,6 +146,7 @@ $SRC_H5DUMP_TESTFILES/tempty-nons-uri.h5.xml
 $SRC_H5DUMP_TESTFILES/tempty-ns.h5.xml
 $SRC_H5DUMP_TESTFILES/tempty-ns-2.h5.xml
 $SRC_H5DUMP_TESTFILES/tenum.h5.xml
+$SRC_H5DUMP_TESTFILES/test35.nc.xml
 $SRC_H5DUMP_TESTFILES/textlink.h5.xml
 $SRC_H5DUMP_TESTFILES/tfpformat.h5.xml
 $SRC_H5DUMP_TESTFILES/tgroup.h5.xml
@@ -160,6 +163,7 @@ $SRC_H5DUMP_TESTFILES/tname-quot.h5.xml
 $SRC_H5DUMP_TESTFILES/tname-sp.h5.xml
 $SRC_H5DUMP_TESTFILES/tnestedcomp.h5.xml
 $SRC_H5DUMP_TESTFILES/tnodata.h5.xml
+$SRC_H5DUMP_TESTFILES/tnullspace.h5.xml
 $SRC_H5DUMP_TESTFILES/tobjref.h5.xml
 $SRC_H5DUMP_TESTFILES/topaque.h5.xml
 $SRC_H5DUMP_TESTFILES/torderattr1.h5.xml
@@ -353,9 +357,7 @@ TOOLTEST tvlstr.h5.xml --xml tvlstr.h5
 TOOLTEST tsaf.h5.xml --xml tsaf.h5
 TOOLTEST tempty.h5.xml --xml tempty.h5
 TOOLTEST tnamed_dtype_attr.h5.xml --xml tnamed_dtype_attr.h5
-##Test dataset and attribute of null space.  Commented out:
-## wait until the XML schema is updated for null space.
-##TOOLTEST tnullspace.h5.xml --xml tnulspace.h5
+TOOLTEST tnullspace.h5.xml --xml tnullspace.h5
 
 # other options for xml
 
@@ -383,6 +385,9 @@ TOOLTEST torderattr4.h5.xml --xml -H --sort_by=creation_order --sort_order=desce
 # tests for floating point user defined printf format
 TOOLTEST tfpformat.h5.xml -u -m %.7f tfpformat.h5
 
+# test for HDFFV-10256 issue
+TOOLTEST test35.nc.xml --xml test35.nc
+
 # Clean up temporary files/directories
 CLEAN_TESTFILES_AND_TESTDIR
 
diff --git a/tools/h5import/CMakeTests.cmake b/tools/h5import/CMakeTests.cmake
index 84d1190..bfe54f9 100644
--- a/tools/h5import/CMakeTests.cmake
+++ b/tools/h5import/CMakeTests.cmake
@@ -17,13 +17,6 @@
 ##############################################################################
 
   set (HDF5_REFERENCE_CONF_FILES
-      binfp64.conf
-      binin8.conf
-      binin8w.conf
-      binin16.conf
-      binin32.conf
-      binuin16.conf
-      binuin32.conf
       txtfp32.conf
       txtfp64.conf
       txtin8.conf
@@ -52,6 +45,9 @@
       dbinuin16.h5.txt
       dbinuin32.h5.txt
       dtxtstr.h5.txt
+      tall_fp32.ddl
+      tall_i32.ddl
+      tintsattrs_u32.ddl
   )
   set (HDF5_REFERENCE_TEST_FILES
       binfp64.h5
@@ -71,6 +67,10 @@
       txtstr.h5
       textpfe.h5
   )
+  set (HDF5_TOOLS_TEST_FILES
+      tall.h5
+      tintsattrs.h5
+  )
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
   foreach (conf_file ${HDF5_REFERENCE_CONF_FILES})
@@ -84,6 +84,10 @@
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
     HDFTEST_COPY_FILE("${HDF5_TOOLS_H5IMPORT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
   endforeach ()
+
+  foreach (h5_file ${HDF5_TOOLS_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
+  endforeach ()
   add_custom_target(h5import_files ALL COMMENT "Copying files needed by h5import tests" DEPENDS ${h5import_files_list})
 
 ##############################################################################
@@ -104,6 +108,11 @@
           COMMAND    ${CMAKE_COMMAND}
               -E remove
               ${testfile}
+              ${testfile}.new
+              ${testfile}.new.err
+              ${testfile}.out
+              ${testfile}.out.err
+              ${testfile}
       )
       set_tests_properties (H5IMPORT-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
 
@@ -148,6 +157,12 @@
               -E remove
               d${testfile}
               d${testfile}.bin
+              d${testfile}.dmp
+              d${testfile}.dmp.err
+              d${testfile}.imp
+              d${testfile}.imp.err
+              d${testfile}.dff
+              d${testfile}.dff.err
       )
       set_tests_properties (H5IMPORT-DUMP-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
 
@@ -156,7 +171,7 @@
             NAME H5IMPORT-DUMP-${testname}-H5DMP
             COMMAND "${CMAKE_COMMAND}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-                -D "TEST_ARGS:STRING=-p;-d;${datasetname};-o;d${testfile}.bin;-b;testfiles/${testfile}"
+                -D "TEST_ARGS:STRING=-p;-d;${datasetname};-o;d${testfile}.bin;-b;NATIVE;testfiles/${testfile}"
                 -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
                 -D "TEST_OUTPUT=d${testfile}.dmp"
                 -D "TEST_EXPECT=0"
@@ -207,6 +222,64 @@
     endif ()
   endmacro ()
 
+  macro (ADD_H5_DUMPSUBTEST testname testfile datasetname)
+    # If using memchecker skip tests
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (
+          NAME H5IMPORT_SUB-DUMP-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              d-${testname}.dmp
+              d-${testname}.dmp.err
+              d-${testname}.h5
+              ${testname}.dmp
+              ${testname}.dmp.err
+              ${testname}.imp
+              ${testname}.imp.err
+              ${testname}.bin
+      )
+      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-clear-objects PROPERTIES DEPENDS H5IMPORT-h5importtest)
+
+      add_test (
+          NAME H5IMPORT_SUB-DUMP-${testname}-H5DMP
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+              -D "TEST_ARGS:STRING=-p;-d;${datasetname};${ARGN};-o;${testname}.bin;-b;NATIVE;testfiles/${testfile}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+              -D "TEST_OUTPUT=${testname}.dmp"
+              -D "TEST_EXPECT=0"
+              -D "TEST_SKIP_COMPARE=TRUE"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5DMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-clear-objects")
+
+      add_test (
+          NAME H5IMPORT_SUB-DUMP-${testname}-H5IMP
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5import>"
+              -D "TEST_ARGS:STRING=${testname}.bin;-c;${testname}.dmp;-o;d-${testname}.h5"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+              -D "TEST_OUTPUT=${testname}.imp"
+              -D "TEST_EXPECT=0"
+              -D "TEST_SKIP_COMPARE=TRUE"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-H5IMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5DMP")
+      add_test (
+          NAME H5IMPORT_SUB-DUMP-${testname}-CMP
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+              -D "TEST_ARGS:STRING=-p;d-${testname}.h5"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+              -D "TEST_OUTPUT=d-${testname}.dmp"
+              -D "TEST_EXPECT=0"
+              -D "TEST_REFERENCE=testfiles/${testname}.ddl"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5IMPORT_SUB-DUMP-${testname}-CMP PROPERTIES DEPENDS "H5IMPORT_SUB-DUMP-${testname}-H5IMP")
+    endif ()
+  endmacro ()
+
   macro (ADD_H5_SKIP_DUMPTEST testname datasetname testfile)
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
@@ -386,6 +459,22 @@
             dtxtstr.h5.dmp.err
             dtxtstr.h5.dff
             dtxtstr.h5.dff.err
+            tall_fp32.dmp
+            tall_fp32.dmp.err
+            tall_fp32.bin
+            tall_fp32.imp
+            tall_fp32.imp.err
+            d-tall_fp32.dmp
+            d-tall_fp32.dmp.err
+            d-tall_fp32.h5
+            tall_i32.dmp
+            tall_i32.dmp.err
+            tall_i32.bin
+            tall_i32.imp
+            tall_i32.imp.err
+            d-tall_i32.dmp
+            d-tall_i32.dmp.err
+            d-tall_i32.h5
     )
     set (last_test "H5IMPORT-clear-objects")
   endif ()
@@ -395,12 +484,19 @@
       COMMAND    ${CMAKE_COMMAND}
           -E remove
           binfp64.bin
+          binfp64.conf
           binin8.bin
+          binin8.conf
           binin8w.bin
+          binin8w.conf
           binin16.bin
+          binin16.conf
           binin32.bin
+          binin32.conf
           binuin16.bin
+          binuin16.conf
           binuin32.bin
+          binuin32.conf
   )
   if (NOT "${last_test}" STREQUAL "")
     set_tests_properties (H5IMPORT-h5importtest-clear-objects PROPERTIES DEPENDS ${last_test})
@@ -432,7 +528,7 @@
   ADD_H5_TEST (ASCII_F64 testfiles/txtfp64.txt testfiles/txtfp64.conf txtfp64.h5)
 
   # ----- TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
-  ADD_H5_TEST (BINARY_F64 binfp64.bin testfiles/binfp64.conf binfp64.h5)
+  ADD_H5_TEST (BINARY_F64 binfp64.bin binfp64.conf binfp64.h5)
   if (NOT USE_FILTER_DEFLATE)
     ADD_H5_SKIP_DUMPTEST (BINARY_F64 "/fp/bin/64-bit" binfp64.h5 BINARY)
   else ()
@@ -440,7 +536,7 @@
   endif ()
 
   # ----- TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
-  ADD_H5_TEST (BINARY_I8 binin8.bin testfiles/binin8.conf binin8.h5)
+  ADD_H5_TEST (BINARY_I8 binin8.bin binin8.conf binin8.h5)
   if (NOT USE_FILTER_DEFLATE)
     ADD_H5_SKIP_DUMPTEST (BINARY_I8 "/int/bin/8-bit" binin8.h5 BINARY)
   else ()
@@ -448,19 +544,19 @@
   endif ()
 
   # ----- TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
-  ADD_H5_TEST (BINARY_I16 binin16.bin testfiles/binin16.conf binin16.h5)
+  ADD_H5_TEST (BINARY_I16 binin16.bin binin16.conf binin16.h5)
   ADD_H5_DUMPTEST (BINARY_I16 "/int/bin/16-bit" binin16.h5 BINARY)
 
   # ----- TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED "
-  ADD_H5_TEST (BINARY_I32 binin32.bin testfiles/binin32.conf binin32.h5)
+  ADD_H5_TEST (BINARY_I32 binin32.bin binin32.conf binin32.h5)
   ADD_H5_DUMPTEST (BINARY_I32 "/int/bin/32-bit" binin32.h5 BINARY)
 
   # ----- TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
-  ADD_H5_TEST (BINARY_UI16 binuin16.bin testfiles/binuin16.conf binuin16.h5)
+  ADD_H5_TEST (BINARY_UI16 binuin16.bin binuin16.conf binuin16.h5)
   ADD_H5_DUMPTEST (BINARY_UI16 "/int/buin/16-bit" binuin16.h5 BINARY)
 
   # ----- TESTING "BINARY UI32 - rank 3 - Output LE "
-  ADD_H5_TEST (BINARY_UI32 binuin32.bin testfiles/binuin32.conf binuin32.h5)
+  ADD_H5_TEST (BINARY_UI32 binuin32.bin binuin32.conf binuin32.h5)
   ADD_H5_DUMPTEST (BINARY_UI32 "/int/buin/32-bit" binuin32.h5 BINARY)
 
   # ----- TESTING "STR"
@@ -468,9 +564,14 @@
   ADD_H5_DUMPTEST (STR "/mytext/data" txtstr.h5)
 
   # ----- TESTING "BINARY I8 CR LF EOF"
-  ADD_H5_TEST (BINARY_I8_EOF binin8w.bin testfiles/binin8w.conf binin8w.h5)
+  ADD_H5_TEST (BINARY_I8_EOF binin8w.bin binin8w.conf binin8w.h5)
   ADD_H5_DUMPTEST (BINARY_I8_EOF "/dataset0" binin8w.h5 BINARY)
 
   # ----- TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE "
   ADD_H5_TEST (ASCII_F64_R1 testfiles/textpfe64.txt testfiles/textpfe.conf textpfe.h5)
 
+  # ----- TESTING "Binary Subset "
+  ADD_H5_DUMPSUBTEST (tall_fp32 tall.h5 /g2/dset2.2 --start=1,1 --stride=2,3 --count=1,2 --block=1,1)
+  ADD_H5_DUMPSUBTEST (tall_i32 tall.h5 /g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1)
+  ADD_H5_DUMPSUBTEST (tintsattrs_u32 tintsattrs.h5 /DU32BITS --start=1,1 --stride=2,3 --count=3,2 --block=1,1)
+
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 866cc76..fa4dceb 100644
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -592,6 +592,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index c71aeef..36a8c21 100644
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -13,10 +13,6 @@
 
 #include "hdf5.h"
 #include "H5private.h"
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-#include <ctype.h>
 #include "h5import.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
@@ -40,6 +36,7 @@ static int  parseDimensions(struct Input *in, char *strm);
 static int  getInputSize(struct Input *in, int ival);
 static int  getInputClass(struct Input *in, char * strm);
 static int  getInputClassType(struct Input *in, char * strm);
+static int  getInputByteOrder(struct Input *in, FILE *strm);
 static int  InputClassStrToInt(char *temp);
 static int  getRank(struct Input *in, FILE *strm);
 static int  getDimensionSizes(struct Input *in, FILE *strm);
@@ -66,6 +63,12 @@ static int  allocateUIntegerStorage(struct Input *in);
 static int  validateConfigurationParameters(struct Input *in);
 static int  processStrData(FILE *strm, struct Input *in, hid_t file_id);
 static int  processStrHDFData(FILE *strm, struct Input *in, hid_t file_id);
+uint16_t    swap_uint16(uint16_t val);
+int16_t     swap_int16(int16_t val);
+uint32_t    swap_uint32(uint32_t val);
+int32_t     swap_int32(int32_t val);
+int64_t     swap_int64(int64_t val);
+uint64_t    swap_uint64(uint64_t val);
 
 int main(int argc, char *argv[])
 {
@@ -226,7 +229,7 @@ int main(int argc, char *argv[])
 
     if (process(&opt) == -1)
         goto err;
-    
+
     for (i = 0; i < opt.fcount; i++) {
         in = &(opt.infiles[i].in);
         if (in->sizeOfDimension)
@@ -242,7 +245,7 @@ int main(int argc, char *argv[])
     }
 
     return (EXIT_SUCCESS);
-err: 
+err:
     (void) HDfprintf(stderr, "%s", err4);
     for (i = 0; i < opt.fcount; i++) {
         in = &(opt.infiles[i].in);
@@ -450,10 +453,12 @@ static int readIntegerData(FILE *strm, struct Input *in)
 {
     H5DT_INT8  *in08;
     H5DT_INT16 *in16;
-    H5DT_INT16  temp;
+    H5DT_INT16  temp16;
     H5DT_INT32 *in32;
+    H5DT_INT32  temp32;
 #ifdef H5_SIZEOF_LONG_LONG
     H5DT_INT64 *in64;
+    H5DT_INT64  temp64;
     char        buffer[256];
 #endif
     hsize_t     len = 1;
@@ -473,11 +478,11 @@ static int readIntegerData(FILE *strm, struct Input *in)
         case 0: /* TEXTIN */
             in08 = (H5DT_INT8 *) in->data;
             for (i = 0; i < len; i++, in08++) {
-                if (fscanf(strm, "%hd", &temp) != 1) {
+                if (fscanf(strm, "%hd", &temp16) != 1) {
                     (void) HDfprintf(stderr, "%s", err1);
                     return (-1);
                 }
-                (*in08) = (H5DT_INT8) temp;
+                (*in08) = (H5DT_INT8) temp16;
             }
             break;
 
@@ -488,6 +493,9 @@ static int readIntegerData(FILE *strm, struct Input *in)
                     (void) HDfprintf(stderr, "%s", err1);
                     return (-1);
                 }
+#ifdef H5DEBUGIMPORT
+                printf("readIntegerData %d (0x%.8X)\n", *in08, *in08);
+#endif
             }
             break;
 
@@ -512,10 +520,19 @@ static int readIntegerData(FILE *strm, struct Input *in)
 
         case 4: /* IN */
             for (i = 0; i < len; i++, in16++) {
-                if (HDfread((char *) in16, sizeof(H5DT_INT16), 1, strm) != 1) {
+                if (HDfread((char *)&temp16, sizeof(H5DT_INT16), 1, strm) != 1) {
                     (void) HDfprintf(stderr, "%s", err1);
                     return (-1);
                 }
+/*
+                if (in-> h5dumpInput && (in->inputByteOrder != in->outputByteOrder))
+                    *in16 = swap_int16(temp16);
+                else
+*/
+                    *in16 = temp16;
+#ifdef H5DEBUGIMPORT
+                printf("readIntegerData %d (0x%.8X)\n", *in16, temp16);
+#endif
             }
             break;
 
@@ -539,10 +556,19 @@ static int readIntegerData(FILE *strm, struct Input *in)
 
         case 4: /* IN */
             for (i = 0; i < len; i++, in32++) {
-                if (HDfread((char *) in32, sizeof(H5DT_INT32), 1, strm) != 1) {
+                if (HDfread((char *)&temp32, sizeof(H5DT_INT32), 1, strm) != 1) {
                     (void) HDfprintf(stderr, "%s", err1);
                     return (-1);
                 }
+/*
+                if (in-> h5dumpInput && (in->inputByteOrder != in->outputByteOrder))
+                    *in32 = swap_int32(temp32);
+                else
+*/
+                    *in32 = temp32;
+#ifdef H5DEBUGIMPORT
+                printf("readIntegerData %d (0x%.8X = 0x%.8X)\n", *in32, *in32, temp32);
+#endif
             }
             break;
 
@@ -568,10 +594,19 @@ static int readIntegerData(FILE *strm, struct Input *in)
 
         case 4: /* IN */
             for (i = 0; i < len; i++, in64++) {
-                if (HDfread((char *) in64, sizeof(H5DT_INT64), 1, strm) != 1) {
+                if (HDfread((char *)&temp64, sizeof(H5DT_INT64), 1, strm) != 1) {
                     (void) HDfprintf(stderr, "%s", err1);
                     return (-1);
                 }
+/*
+                if (in-> h5dumpInput && (in->inputByteOrder != in->outputByteOrder))
+                    *in64 = swap_int64(temp64);
+                else
+*/
+                    *in64 = temp64;
+#ifdef H5DEBUGIMPORT
+                printf("readIntegerData %d (0x%.8X)\n", *in64, temp64);
+#endif
             }
             break;
 
@@ -593,10 +628,12 @@ static int readUIntegerData(FILE *strm, struct Input *in)
 {
     H5DT_UINT8  *in08;
     H5DT_UINT16 *in16;
-    H5DT_UINT16  temp;
+    H5DT_UINT16  temp16;
     H5DT_UINT32 *in32;
+    H5DT_UINT32  temp32;
 #ifdef H5_SIZEOF_LONG_LONG
     H5DT_UINT64 *in64;
+    H5DT_UINT64  temp64;
     char        buffer[256];
 #endif
     hsize_t     len = 1;
@@ -615,11 +652,11 @@ static int readUIntegerData(FILE *strm, struct Input *in)
         case 6: /* TEXTUIN */
             in08 = (H5DT_UINT8 *) in->data;
             for (i = 0; i < len; i++, in08++) {
-                if (fscanf(strm, "%hu", &temp) != 1) {
+                if (fscanf(strm, "%hu", &temp16) != 1) {
                     (void) HDfprintf(stderr, "%s", err1);
                     return (-1);
                 }
-                (*in08) = (H5DT_UINT8) temp;
+                (*in08) = (H5DT_UINT8) temp16;
             }
             break;
 
@@ -653,10 +690,19 @@ static int readUIntegerData(FILE *strm, struct Input *in)
 
         case 7: /* UIN */
             for (i = 0; i < len; i++, in16++) {
-                if (HDfread((char *) in16, sizeof(H5DT_UINT16), 1, strm) != 1) {
+                if (HDfread((char *)&temp16, sizeof(H5DT_UINT16), 1, strm) != 1) {
                     (void) HDfprintf(stderr, "%s", err1);
                     return (-1);
                 }
+/*
+                if (in-> h5dumpInput && (in->inputByteOrder != in->outputByteOrder))
+                    *in16 = swap_uint16(temp16);
+                else
+*/
+                    *in16 = temp16;
+#ifdef H5DEBUGIMPORT
+                printf("readUIntegerData %d (0x%.4X = 0x%.4X)\n", *in16, *in16, temp16);
+#endif
             }
             break;
 
@@ -680,10 +726,19 @@ static int readUIntegerData(FILE *strm, struct Input *in)
 
         case 7: /* UIN */
             for (i = 0; i < len; i++, in32++) {
-                if (HDfread((char *) in32, sizeof(H5DT_UINT32), 1, strm) != 1) {
+                if (HDfread((char *)&temp32, sizeof(H5DT_UINT32), 1, strm) != 1) {
                     (void) HDfprintf(stderr, "%s", err1);
                     return (-1);
                 }
+/*
+                if (in-> h5dumpInput && (in->inputByteOrder != in->outputByteOrder))
+                    *in32 = swap_uint32(temp32);
+                else
+*/
+                    *in32 = temp32;
+#ifdef H5DEBUGIMPORT
+                printf("readUIntegerData %d (0x%.8X = 0x%.8X)\n", *in32, *in32, temp32);
+#endif
             }
             break;
 
@@ -709,10 +764,19 @@ static int readUIntegerData(FILE *strm, struct Input *in)
 
         case 7: /* UIN */
             for (i = 0; i < len; i++, in64++) {
-                if (HDfread((char *) in64, sizeof(H5DT_UINT64), 1, strm) != 1) {
+                if (HDfread((char *)&temp64, sizeof(H5DT_UINT64), 1, strm) != 1) {
                     (void) HDfprintf(stderr, "%s", err1);
                     return (-1);
                 }
+/*
+                if (in-> h5dumpInput && (in->inputByteOrder != in->outputByteOrder))
+                    *in64 = swap_uint64(temp64);
+                else
+*/
+                    *in64 = temp64;
+#ifdef H5DEBUGIMPORT
+                printf("readUIntegerData %ld (0x%.8X = 0x%.8X)\n", *in64, *in64, temp64);
+#endif
             }
             break;
 
@@ -733,12 +797,16 @@ static int readUIntegerData(FILE *strm, struct Input *in)
 static int readFloatData(FILE *strm, struct Input *in)
 {
     H5DT_FLOAT32 *fp32;
+    uint32_t  *bfp32;
+    uint32_t  temp32;
     H5DT_FLOAT64 *fp64;
+    uint64_t  *bfp64;
+    uint64_t  temp64;
 
     hsize_t     len = 1;
     hsize_t     i;
     int         j;
-    const char *err1 = "Unable to get integer value from file.\n";
+    const char *err1 = "Unable to get float value from file.\n";
     const char *err2 = "Unrecognized input class type.\n";
     const char *err3 = "Invalid input size type.\n";
 
@@ -774,11 +842,21 @@ static int readFloatData(FILE *strm, struct Input *in)
             break;
 
         case 3: /* FP */
-            for (i = 0; i < len; i++, fp32++) {
-                if (HDfread((char *) fp32, sizeof(H5DT_FLOAT32), 1, strm) != 1) {
+            bfp32 = (uint32_t *) in->data;
+            for (i = 0; i < len; i++, bfp32++) {
+                if (HDfread((char *)&temp32, sizeof(uint32_t), 1, strm) != 1) {
                     (void) HDfprintf(stderr, "%s", err1);
                     return (-1);
                 }
+/*
+                if (in-> h5dumpInput && (in->inputByteOrder != in->outputByteOrder))
+                    *bfp32 = swap_uint32(temp32);
+                else
+*/
+                    *bfp32 = temp32;
+#ifdef H5DEBUGIMPORT
+                printf("readFloatData %ld (0x%.8X = 0x%.8X)\n", *bfp32, *bfp32, temp32);
+#endif
             }
             break;
 
@@ -816,11 +894,21 @@ static int readFloatData(FILE *strm, struct Input *in)
             break;
 
         case 3: /* FP */
-            for (i = 0; i < len; i++, fp64++) {
-                if (HDfread((char *) fp64, sizeof(H5DT_FLOAT64), 1, strm) != 1) {
+            bfp64 = (uint64_t *) in->data;
+            for (i = 0; i < len; i++, bfp64++) {
+                if (HDfread((char *)&temp64, sizeof(uint64_t), 1, strm) != 1) {
                     (void) HDfprintf(stderr, "%s", err1);
                     return (-1);
                 }
+/*
+                if (in-> h5dumpInput && (in->inputByteOrder != in->outputByteOrder))
+                    *bfp64 = swap_uint64(temp64);
+                else
+*/
+                    *bfp64 = temp64;
+#ifdef H5DEBUGIMPORT
+                printf("readFloatData %ld (0x%.16lX)\n", *bfp64, temp64);
+#endif
             }
             break;
 
@@ -897,7 +985,7 @@ static int processStrData(FILE *strm, struct Input *in, hid_t file_id)
         goto out;
 
     /* disable error reporting */
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
         /* create parent groups */
         if (in->path.count > 1) {
@@ -1286,7 +1374,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
     int         retval = -1;
 
     const char *err1 = "Unable to open the configuration file:  %s for reading.\n";
-    const char *err2 = "Unknown keyword in configuration file: %s\n";
+    const char *err2 = "Unknown keyword: %s in configuration file: %s\n";
     const char *err3a = "PATH keyword appears twice in %s.\n";
     const char *err3b = "Error in parsing the path information from %s.\n";
     const char *err4a = "INPUT-CLASS keyword appears twice in %s.\n";
@@ -1306,6 +1394,9 @@ static int processConfigurationFile(char *infile, struct Input *in)
     const char *err10b = "Error in retrieving the output architecture from %s.\n";
     const char *err11a = "OUTPUT-BYTE-ORDER keyword appears twice in %s.\n";
     const char *err11b = "Error in retrieving the output byte order from %s.\n";
+    const char *err11c = "INPUT-BYTE-ORDER keyword appears twice in %s.\n";
+    const char *err11d = "Error in retrieving the input byte order from %s.\n";
+    const char *err11e = "Invalid value for output byte-order.\n";
     const char *err12a = "CHUNKED-DIMENSION-SIZES keyword appears twice in %s.\n";
     const char *err12b = "CHUNKED-DIMENSION-SIZES cannot appear before DIMENSION-SIZES are provided.\n";
     const char *err12c = "Error in retrieving the chunked dimension sizes from %s.\n";
@@ -1321,6 +1412,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
     const char *err17 = "Configuration parameters are invalid in %s.\n";
     const char *err18 = "Unable to get string value.\n";
     const char *err19 = "Unable to get integer value.\n";
+    const char *err20 = "Unable to get subset values.\n";
 
     /* create vector to map which keywords have been found
      check vector after each keyword to check for violation
@@ -1328,6 +1420,27 @@ static int processConfigurationFile(char *infile, struct Input *in)
      process the output file according to the options
      */
 
+    /* Initialize machine endian */
+    volatile uint32_t ibyte=0x01234567;
+    /* 0 for big endian, 1 for little endian. */
+    if ((*((uint8_t*)(&ibyte))) == 0x67) {
+        if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
+            (void) HDfprintf(stderr, "%s", err11e);
+            return (-1);
+        }
+    }
+    else {
+        if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
+            (void) HDfprintf(stderr, "%s", err11e);
+            return (-1);
+        }
+    }
+    in->inputByteOrder = kindex;
+#ifdef H5DEBUGIMPORT
+    printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+#endif
+    in->inputArchitecture = 0; /* default to NATIVE */
+
     if ((strm = HDfopen(infile, "r")) == NULL) {
         (void) HDfprintf(stderr, err1, infile);
         goto error;
@@ -1563,15 +1676,15 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
-                        printf("h5dump DATASPACE SIMPLE %d rank\n", in->rank);
+                        printf("h5dump DATASPACE SIMPLE %ld rank\n", in->rank);
 #endif
                         for (i = 0; i < in->rank; i++) {
                             in->sizeOfDimension[i] = temp_dims[i];
                         }
 #ifdef H5DEBUGIMPORT
-                        printf("h5dump DATASPACE SIMPLE dims:", in->rank);
+                        printf("h5dump DATASPACE SIMPLE dims[%ld]:", in->rank);
                         for (pndx = 0; pndx < in->rank; pndx++) {
-                            printf(" %d", in->sizeOfDimension[pndx]);
+                            printf(" %ld", in->sizeOfDimension[pndx]);
                         }
                         printf("\n");
 #endif
@@ -1644,9 +1757,9 @@ static int processConfigurationFile(char *infile, struct Input *in)
                                 }
                             } /* while (get_next_dim) */
 #ifdef H5DEBUGIMPORT
-                            printf("h5dump DATASPACE SIMPLE maxdims:", in->rank);
+                            printf("h5dump DATASPACE SIMPLE maxdims[%ld]:", in->rank);
                             for (pndx = 0; pndx < in->rank; pndx++) {
-                                printf(" %d", in->maxsizeOfDimension[pndx]);
+                                printf(" %ld", in->maxsizeOfDimension[pndx]);
                             }
                             printf("\n");
                             printf("h5dump DATASPACE SIMPLE get max dim finished\n");
@@ -1731,9 +1844,9 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             }
                         } /* while (get_next_dim) */
 #ifdef H5DEBUGIMPORT
-                        printf("h5dump STORAGE_LAYOUT CHUNKED dims:", in->rank);
+                        printf("h5dump STORAGE_LAYOUT CHUNKED dims [%ld]:", in->rank);
                         for (pndx = 0; pndx < in->rank; pndx++) {
-                            printf(" %d", in->sizeOfChunk[pndx]);
+                            printf(" %ld", in->sizeOfChunk[pndx]);
                         }
                         printf("\n");
 #endif
@@ -1852,6 +1965,151 @@ static int processConfigurationFile(char *infile, struct Input *in)
                 printf("h5dump FILTERS %s found\n", temp);
 #endif
             }
+            else if(!HDstrcmp("SUBSET", key)) { /* reduce dimensions */
+                hsize_t     temp_dims[MAX_NUM_DIMENSION];
+                int get_next_prop = 1;
+#ifdef H5DEBUGIMPORT
+                printf("h5dump SUBSET key\n");
+#endif
+                if (fscanf(strm, "%s", temp) != 1) { /* start bracket */
+                    (void) HDfprintf(stderr, err20, infile);
+                    goto error;
+                }
+#ifdef H5DEBUGIMPORT
+                printf("h5dump SUBSET %s found\n", temp);
+#endif
+                if (fscanf(strm, "%s", temp) != 1) { /* SUBSET keyword */
+                    (void) HDfprintf(stderr, "%s", err18);
+                    goto error;
+                }
+#ifdef H5DEBUGIMPORT
+                printf("h5dump SUBSET %s found\n", temp);
+#endif
+                while (get_next_prop) {
+                    if(!HDstrcmp("COUNT", temp)) { /* COUNT */
+                        int icount = 0;
+                        if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                            (void) HDfprintf(stderr, err6b, infile);
+                            goto error;
+                        }
+#ifdef H5DEBUGIMPORT
+                        printf("h5dump SUBSET %s found\n", temp);
+#endif
+                        if(!HDstrcmp("(", temp)) { /* start paren */
+                            int get_next_dim = 1;
+                            int i = 0;
+
+                            if (fscanf(strm, "%s", temp) != 1) { /* Dimension with optional comma */
+                                (void) HDfprintf(stderr, err16c, infile);
+                                goto error;
+                            }
+#ifdef H5DEBUGIMPORT
+                            printf("h5dump SUBSET COUNT [%s] found\n", temp);
+#endif
+                            while (get_next_dim) {
+                                char *more = temp;
+                                temp_dims[icount] = HDstrtoull(more, &more, 10);
+                                if (fscanf(strm, "%s", temp) != 1) { /* Dimension or end paren */
+                                    (void) HDfprintf(stderr, err6b, infile);
+                                    goto error;
+                                }
+#ifdef H5DEBUGIMPORT
+                                printf("h5dump SUBSET COUNT %s found\n", temp);
+#endif
+                                if(!HDstrcmp(");", temp)) { /* end paren */
+                                    in->rank = ++icount;
+                                    in->configOptionVector[RANK] = 1;
+                                    get_next_dim = 0;
+                                }
+                                else { /* Dimension */
+                                    icount++;
+                                    if (icount > MAX_NUM_DIMENSION) {
+                                        (void) HDfprintf(stderr, "Invalid value for rank.\n");
+                                        goto error;
+                                    }
+                                }
+                            } /* while (get_next_dim) */
+                            for (i = 0; i < in->rank; i++) {
+                                in->sizeOfDimension[i] = temp_dims[i];
+                            }
+#ifdef H5DEBUGIMPORT
+                            printf("h5dump SUBSET COUNT dims: [%d]", in->rank);
+                            for (pndx = 0; pndx < in->rank; pndx++) {
+                                printf(" %ld", in->sizeOfDimension[pndx]);
+                            }
+                            printf("\n");
+#endif
+                            in->configOptionVector[DIM] = 1;
+                        } /* if(!HDstrcmp("(", key))  start paren */
+                    } /* if(!HDstrcmp("COUNT", temp))  COUNT */
+                    if(!HDstrcmp("BLOCK", temp)) { /* BLOCK */
+                        int icount = 0;
+                        if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                            (void) HDfprintf(stderr, err6b, infile);
+                            goto error;
+                        }
+#ifdef H5DEBUGIMPORT
+                        printf("h5dump SUBSET %s found\n", temp);
+#endif
+                        if(!HDstrcmp("(", temp)) { /* start paren */
+                            int get_next_dim = 1;
+                            int i = 0;
+
+                            if (fscanf(strm, "%s", temp) != 1) { /* Dimension with optional comma */
+                                (void) HDfprintf(stderr, err16c, infile);
+                                goto error;
+                            }
+#ifdef H5DEBUGIMPORT
+                        printf("h5dump SUBSET BLOCK [%s] found\n", temp);
+#endif
+                            while (get_next_dim) {
+                                char *more = temp;
+                                temp_dims[icount] = HDstrtoull(more, &more, 10);
+                                if (fscanf(strm, "%s", temp) != 1) { /* Dimension or end paren */
+                                    (void) HDfprintf(stderr, err6b, infile);
+                                    goto error;
+                                }
+#ifdef H5DEBUGIMPORT
+                                printf("h5dump SUBSET BLOCK %s found\n", temp);
+#endif
+                                if(!HDstrcmp(");", temp)) { /* end paren */
+                                    in->rank = ++icount;
+                                    in->configOptionVector[RANK] = 1;
+                                    get_next_dim = 0;
+                                }
+                                else { /* Dimension */
+                                    icount++;
+                                    if (icount > MAX_NUM_DIMENSION) {
+                                        (void) HDfprintf(stderr, "Invalid value for rank.\n");
+                                        goto error;
+                                    }
+                                }
+                            } /* while (get_next_dim) */
+                            for (i = 0; i < in->rank; i++) {
+                                in->sizeOfDimension[i] = in->sizeOfDimension[i] * temp_dims[i];
+                            }
+#ifdef H5DEBUGIMPORT
+                            printf("h5dump SUBSET BLOCK dims: [%d]", in->rank);
+                            for (pndx = 0; pndx < in->rank; pndx++) {
+                                printf(" %ld", in->sizeOfDimension[pndx]);
+                            }
+                            printf("\n");
+#endif
+                            in->configOptionVector[DIM] = 1;
+                        } /* if(!HDstrcmp("(", key))  start paren */
+                    } /* if(!HDstrcmp("BLOCK", temp))  BLOCK */
+                    if (fscanf(strm, "%s", temp) != 1) {
+                        (void) HDfprintf(stderr, "%s", err18);
+                        goto error;
+                    }
+#ifdef H5DEBUGIMPORT
+                    printf("h5dump SUBSET %s found\n", temp);
+#endif
+                    if(!HDstrcmp("}", temp)) { /* end bracket */
+                        get_next_prop = 0;
+                    }
+                } /* while (get_next_prop) */
+            } /* else if(!HDstrcmp("SUBSET", key)) */
             else if(!HDstrcmp("DATA", key)) { /* FINSHED */
 #ifdef H5DEBUGIMPORT
                 printf("h5dump DATA key\n");
@@ -1869,6 +2127,8 @@ static int processConfigurationFile(char *infile, struct Input *in)
         printf("\n");
         printf("h5dump inputClass=%d\n", in->inputClass);
         printf("h5dump inputSize=%d\n", in->inputSize);
+        printf("h5dump inputArchitecture=%d\n", in->inputArchitecture);
+        printf("h5dump inputByteOrder=%d\n", in->inputByteOrder);
         printf("h5dump rank=%d\n", in->rank);
         printf("h5dump outputClass=%d\n", in->outputClass);
         printf("h5dump outputSize=%d\n", in->outputSize);
@@ -1877,16 +2137,19 @@ static int processConfigurationFile(char *infile, struct Input *in)
         printf("h5dump compressionType=%d\n", in->compressionType);
         printf("h5dump compressionParam=%d\n", in->compressionParam);
         printf("h5dump externFilename=%s\n", in->externFilename);
-        printf("h5dump configOptionVector:\n");
-        for (pndx = 0; pndx < NUM_KEYS; pndx++) {
-            printf("    %s=%d\n", keytable[pndx], in->configOptionVector[pndx]);
+        printf("h5dump sizeOfDimensions:\n");
+        for (pndx = 0; pndx < in->rank; pndx++) {
+            printf("  %ld\n", in->sizeOfDimension[pndx]);
         }
 #endif
     }
     else {
+#ifdef H5DEBUGIMPORT
+        printf("original option keyword parsing\n");
+#endif
         while (scanret == 1) {
             if ((kindex = mapKeywordToIndex(key)) == -1) {
-                (void) HDfprintf(stderr, err2, infile);
+                (void) HDfprintf(stderr, err2, key, infile);
                 goto error;
             }
             switch (kindex) {
@@ -2121,21 +2384,34 @@ static int processConfigurationFile(char *infile, struct Input *in)
                 in->configOptionVector[EXTEND] = 1;
                 break;
 
+            case 14: /* INPUT-BYTE-ORDER */
+                if (in->configOptionVector[INPUT_B_ORDER] == 1) {
+                    (void) HDfprintf(stderr, err11c, infile);
+                    goto error;
+                }
+
+                if (getInputByteOrder(in, strm) == -1) {
+                    (void) HDfprintf(stderr, err11d, infile);
+                    goto error;
+                }
+                in->configOptionVector[INPUT_B_ORDER] = 1;
+                break;
+
             default:
                 break;
             }
             scanret = fscanf(strm, "%s", key);
         }
-    }
 
-    /*
-         check if keywords obtained are valid
-         if yes, return 0 else error
-     */
+        /*
+            check if keywords obtained are valid
+            if yes, return 0 else error
+        */
 
-    if (validateConfigurationParameters(in) == -1) {
-        (void) HDfprintf(stderr, err17, infile);
-        goto error;
+        if (validateConfigurationParameters(in) == -1) {
+            (void) HDfprintf(stderr, err17, infile);
+            goto error;
+        }
     }
 
     /* Set success return value */
@@ -2361,7 +2637,7 @@ static int getInputClassType(struct Input *in, char * buffer)
     int         kindex = -1;
     const char *err1 = "Invalid value for input class.\n";
     const char *err2 = "Invalid value for output architecture.\n";
-    const char *err3 = "Invalid value for output byte-order.\n";
+    const char *err3 = "Invalid value for input byte-order.\n";
 
     if (!HDstrcmp(buffer, "H5T_STD_I8BE")) {
         in->inputSize = 8;
@@ -2378,6 +2654,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 4;
     }
@@ -2396,6 +2675,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 4;
     }
@@ -2414,6 +2696,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 4;
     }
@@ -2432,6 +2717,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 4;
     }
@@ -2450,6 +2738,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 4;
     }
@@ -2468,6 +2759,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 4;
     }
@@ -2486,6 +2780,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 4;
     }
@@ -2504,6 +2801,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 4;
     }
@@ -2522,6 +2822,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 7;
     }
@@ -2540,6 +2843,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 7;
     }
@@ -2558,6 +2864,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 7;
     }
@@ -2576,6 +2885,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 7;
     }
@@ -2594,6 +2906,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 7;
     }
@@ -2612,6 +2927,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 7;
     }
@@ -2630,6 +2948,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 7;
     }
@@ -2648,6 +2969,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 7;
     }
@@ -2786,6 +3110,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 3;
     }
@@ -2804,6 +3131,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 3;
     }
@@ -2822,6 +3152,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 3;
     }
@@ -2840,6 +3173,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = 3;
     }
@@ -2913,6 +3249,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = -1;
     }
@@ -2929,6 +3268,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = -1;
     }
@@ -2945,6 +3287,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = -1;
     }
@@ -2961,6 +3306,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = -1;
     }
@@ -2977,6 +3325,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = -1;
     }
@@ -2993,6 +3344,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = -1;
     }
@@ -3009,6 +3363,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = -1;
     }
@@ -3025,6 +3382,9 @@ static int getInputClassType(struct Input *in, char * buffer)
             return (-1);
         }
         in->outputByteOrder = kindex;
+    #ifdef H5DEBUGIMPORT
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    #endif
 
         kindex = -1;
     }
@@ -3062,8 +3422,9 @@ static int getInputClassType(struct Input *in, char * buffer)
     if (in->configOptionVector[OUTPUT_SIZE] == 0)
         in->outputSize = in->inputSize;
 #ifdef H5DEBUGIMPORT
-    printf("h5dump DATATYPE STRING %d inputSize\n", in->inputSize);
-    printf("h5dump DATATYPE STRING %d outputSize\n", in->outputSize);
+    printf("h5dump DATATYPE InClass %d inputSize\n", in->inputSize);
+    printf("h5dump DATATYPE InClass %d outputSize\n", in->outputSize);
+    printf("h5dump DATATYPE InClass %d outputArchitecture\n", in->outputArchitecture);
 #endif
 
     in->inputClass = kindex;
@@ -3096,6 +3457,27 @@ static int getInputSize(struct Input *in, int ival)
     return (-1);
 }
 
+static int getInputByteOrder(struct Input *in, FILE *strm)
+{
+    char        temp[255];
+    int         kindex;
+    const char *err1 = "Unable to get 'string' value.\n";
+    const char *err2 = "Invalid value for input byte-order.\n";
+
+    if (fscanf(strm, "%s", temp) != 1) {
+        (void) HDfprintf(stderr, "%s", err1);
+        return (-1);
+    }
+
+    if ((kindex = OutputByteOrderStrToInt(temp)) == -1) {
+        (void) HDfprintf(stderr, "%s", err2);
+        return (-1);
+    }
+
+    in->inputByteOrder = kindex;
+    return (0);
+}
+
 static int getRank(struct Input *in, FILE *strm)
 {
     int         ival;
@@ -3361,6 +3743,7 @@ void setDefaultValues(struct Input *in, int count)
     in->inputSize = 32;
     in->outputClass = 1; /* FP */
     in->outputSize = 32;
+    in->inputByteOrder = -1; /* use default    */
     in->rank = 0;
     in->path.count = 1;
 
@@ -3382,7 +3765,7 @@ hid_t createOutputDataType(struct Input *in)
     const char *err1 = "Invalid value for output class.\n";
     const char *err2 = "Invalid value for output size.\n";
     const char *err3 = "Invalid value for output byte order.\n";
-	const char *err4 = "Invalid value for output architecture.\n";
+    const char *err4 = "Invalid value for output architecture.\n";
     const char *err5 = "STD not supported for float.\n";
     const char *err6 = "IEEE not supported for INT.\n";
 
@@ -3504,9 +3887,9 @@ hid_t createOutputDataType(struct Input *in)
             }
             break;
 
-		default:
-			(void) HDfprintf(stderr, "%s", err4);
-			return (-1);
+        default:
+            (void) HDfprintf(stderr, "%s", err4);
+            return (-1);
         }
         break;
 
@@ -3589,9 +3972,9 @@ hid_t createOutputDataType(struct Input *in)
             }
             break;
 
-		default:
-			(void) HDfprintf(stderr, "%s", err4);
-			return (-1);
+        default:
+            (void) HDfprintf(stderr, "%s", err4);
+            return (-1);
         }
         break;
 
@@ -3733,85 +4116,433 @@ hid_t createInputDataType(struct Input *in)
 {
     hid_t       new_type = (-1);
     const char *err1 = "Invalid value for input class.\n";
-    const char *err2 = "Invalid value for output size.\n";
+    const char *err2 = "Invalid value for input size.\n";
+    const char *err3 = "Invalid value for input byte order.\n";
+    const char *err4 = "Invalid value for output architecture.\n";
+    const char *err5 = "STD not supported for float.\n";
+    const char *err6 = "IEEE not supported for INT.\n";
 
-    switch (in->inputClass) {
-    case 0:
-    case 4:
-        switch (in->inputSize) {
-        case 8:
-            new_type = H5Tcopy(H5T_NATIVE_CHAR);
-            break;
+    if (in->h5dumpInput) {
+        switch (in->inputClass) {
+        case 4:
+            switch (in->inputArchitecture) {
+            case 0:  /*NATIVE*/
+                switch (in->inputSize) {
+                case 8:
+                    new_type = H5Tcopy(H5T_NATIVE_CHAR);
+                    break;
 
-        case 16:
-            new_type = H5Tcopy(H5T_NATIVE_SHORT);
-            break;
+                case 16:
+                    new_type = H5Tcopy(H5T_NATIVE_SHORT);
+                    break;
 
-        case 32:
-            new_type = H5Tcopy(H5T_NATIVE_INT);
-            break;
+                case 32:
+                    new_type = H5Tcopy(H5T_NATIVE_INT);
+                    break;
+
+                case 64:
+                    new_type = H5Tcopy(H5T_NATIVE_LLONG);
+                    break;
+
+                default:
+                    (void) HDfprintf(stderr, "%s", err2);
+                    return (-1);
+                }
+                switch (in->inputByteOrder) {
+                case -1: /* default */
+                    break;
+                case 0:
+                    H5Tset_order(new_type, H5T_ORDER_BE);
+                    break;
+
+                case 1:
+                    H5Tset_order(new_type, H5T_ORDER_LE);
+                    break;
+
+                default:
+                    (void) HDfprintf(stderr, "%s", err3);
+                    return (-1);
+                }
+                break;
+
+            case 1:  /*STD*/
+                switch (in->inputSize) {
+                case 8:
+                    switch (in->inputByteOrder) {
+                    case -1:
+                    case 0:
+                        new_type = H5Tcopy(H5T_STD_I8BE);
+                        break;
+
+                    case 1:
+                        new_type = H5Tcopy(H5T_STD_I8LE);
+                        break;
+
+                    default:
+                        (void) HDfprintf(stderr, "%s", err3);
+                        return (-1);
+                    }
+                    break;
+
+                case 16:
+                    switch (in->inputByteOrder) {
+                    case -1:
+                    case 0:
+                        new_type = H5Tcopy(H5T_STD_I16BE);
+                        break;
+
+                    case 1:
+                        new_type = H5Tcopy(H5T_STD_I16LE);
+                        break;
+
+                    default:
+                        (void) HDfprintf(stderr, "%s", err3);
+                        return (-1);
+                    }
+                    break;
+
+                case 32:
+                    switch (in->inputByteOrder) {
+                    case -1:
+                    case 0:
+                        new_type = H5Tcopy(H5T_STD_I32BE);
+                        break;
+
+                    case 1:
+                        new_type = H5Tcopy(H5T_STD_I32LE);
+                        break;
+
+                    default:
+                        (void) HDfprintf(stderr, "%s", err3);
+                        return (-1);
+                    }
+                    break;
 
-        case 64:
-            new_type = H5Tcopy(H5T_NATIVE_LLONG);
+                case 64:
+                    switch (in->inputByteOrder) {
+                    case -1:
+                    case 0:
+                        new_type = H5Tcopy(H5T_STD_I64BE);
+                        break;
+
+                    case 1:
+                        new_type = H5Tcopy(H5T_STD_I64LE);
+                        break;
+
+                    default:
+                        (void) HDfprintf(stderr, "%s", err3);
+                        return (-1);
+                    }
+                    break;
+
+                default:
+                    (void) HDfprintf(stderr, "%s", err2);
+                    return (-1);
+                }
+                break;
+
+            default:
+                (void) HDfprintf(stderr, "%s", err4);
+                return (-1);
+            }
             break;
 
-        default:
-            (void) HDfprintf(stderr, "%s", err2);
-            return (-1);
-        }
-        break;
+        case 3:
+            switch (in->inputArchitecture) {
+            case 0:
+                switch (in->inputSize) {
+                case 32:
+                    new_type = H5Tcopy(H5T_NATIVE_FLOAT);
+                    break;
 
-    case 1:
-    case 2:
-    case 3:
-        switch (in->inputSize) {
-        case 32:
-            new_type = H5Tcopy(H5T_NATIVE_FLOAT);
+                case 64:
+                    new_type = H5Tcopy(H5T_NATIVE_DOUBLE);
+                    break;
+
+                default:
+                    (void) HDfprintf(stderr, "%s", err2);
+                    return (-1);
+                }
+                switch (in->inputByteOrder) {
+                case -1: /* DEFAULT */
+                    break;
+                case 0:
+                    H5Tset_order(new_type, H5T_ORDER_BE);
+                    break;
+
+                case 1:
+                    H5Tset_order(new_type, H5T_ORDER_LE);
+                    break;
+
+                default:
+                    (void) HDfprintf(stderr, "%s", err3);
+                    return (-1);
+                }
+                break;
+
+            case 1:
+                (void) HDfprintf(stderr, "%s", err5);
+                return (-1);
+
+            case 2:
+                switch (in->inputSize) {
+                case 32:
+                    switch (in->inputByteOrder) {
+                    case -1:
+                    case 0:
+                        new_type = H5Tcopy(H5T_IEEE_F32BE);
+                        break;
+
+                    case 1:
+                        new_type = H5Tcopy(H5T_IEEE_F32LE);
+                        break;
+
+                    default:
+                        (void) HDfprintf(stderr, "%s", err3);
+                        return (-1);
+                    }
+                    break;
+
+                case 64:
+                    switch (in->inputByteOrder) {
+                    case -1:
+                    case 0:
+                        new_type = H5Tcopy(H5T_IEEE_F64BE);
+                        break;
+
+                    case 1:
+                        new_type = H5Tcopy(H5T_IEEE_F64LE);
+                        break;
+
+                    default:
+                        (void) HDfprintf(stderr, "%s", err3);
+                        return (-1);
+                    }
+                    break;
+
+                default:
+                    (void) HDfprintf(stderr, "%s", err2);
+                    return (-1);
+                }
+                break;
+
+            default:
+                (void) HDfprintf(stderr, "%s", err4);
+                return (-1);
+            }
             break;
 
-        case 64:
-            new_type = H5Tcopy(H5T_NATIVE_DOUBLE);
+        case 7:
+            switch (in->inputArchitecture) {
+            case 0:
+                switch (in->inputSize) {
+                case 8:
+                    new_type = H5Tcopy(H5T_NATIVE_UCHAR);
+                    break;
+
+                case 16:
+                    new_type = H5Tcopy(H5T_NATIVE_USHORT);
+                    break;
+
+                case 32:
+                    new_type = H5Tcopy(H5T_NATIVE_UINT);
+                    break;
+
+                case 64:
+                    new_type = H5Tcopy(H5T_NATIVE_ULLONG);
+                    break;
+
+                default:
+                    (void) HDfprintf(stderr, "%s", err2);
+                    return (-1);
+                }
+                switch (in->inputByteOrder) {
+                case -1: /* Default */
+                    break;
+                case 0:
+                    H5Tset_order(new_type, H5T_ORDER_BE);
+                    break;
+
+                case 1:
+                    H5Tset_order(new_type, H5T_ORDER_LE);
+                    break;
+
+                default:
+                    (void) HDfprintf(stderr, "%s", err3);
+                    return (-1);
+                }
+                break;
+
+            case 1:
+                switch (in->inputSize) {
+                case 8:
+                    switch (in->inputByteOrder) {
+                    case -1:
+                    case 0:
+                        new_type = H5Tcopy(H5T_STD_U8BE);
+                        break;
+
+                    case 1:
+                        new_type = H5Tcopy(H5T_STD_U8LE);
+                        break;
+
+                    default:
+                        (void) HDfprintf(stderr, "%s", err3);
+                        return (-1);
+                    }
+                    break;
+
+                case 16:
+                    switch (in->inputByteOrder) {
+                    case -1:
+                    case 0:
+                        new_type = H5Tcopy(H5T_STD_U16BE);
+                        break;
+
+                    case 1:
+                        new_type = H5Tcopy(H5T_STD_U16LE);
+                        break;
+
+                    default:
+                        (void) HDfprintf(stderr, "%s", err3);
+                        return (-1);
+                    }
+                    break;
+
+                case 32:
+                    switch (in->inputByteOrder) {
+                    case -1:
+                    case 0:
+                        new_type = H5Tcopy(H5T_STD_U32BE);
+                        break;
+
+                    case 1:
+                        new_type = H5Tcopy(H5T_STD_U32LE);
+                        break;
+
+                    default:
+                        (void) HDfprintf(stderr, "%s", err3);
+                        return (-1);
+                    }
+                    break;
+
+                case 64:
+                    switch (in->inputByteOrder) {
+                    case -1:
+                    case 0:
+                        new_type = H5Tcopy(H5T_STD_U64BE);
+                        break;
+
+                    case 1:
+                        new_type = H5Tcopy(H5T_STD_U64LE);
+                        break;
+
+                    default:
+                        (void) HDfprintf(stderr, "%s", err3);
+                        return (-1);
+                    }
+                    break;
+
+                default:
+                    (void) HDfprintf(stderr, "%s", err2);
+                    return (-1);
+                }
+                break;
+
+            case 2:
+                (void) HDfprintf(stderr, "%s", err6);
+                return (-1);
+
+            default:
+                (void) HDfprintf(stderr, "%s", err4);
+                return (-1);
+            }
             break;
 
         default:
-            (void) HDfprintf(stderr, "%s", err2);
+            (void) HDfprintf(stderr, "%s", err1);
             return (-1);
         }
-        break;
+    }
+    else {
+        switch (in->inputClass) {
+        case 0:
+        case 4:
+            switch (in->inputSize) {
+            case 8:
+                new_type = H5Tcopy(H5T_NATIVE_CHAR);
+                break;
 
-    case 5:
-        (void) HDfprintf(stderr, "%s", err1);
-        return (-1);
-        break;
+            case 16:
+                new_type = H5Tcopy(H5T_NATIVE_SHORT);
+                break;
+
+            case 32:
+                new_type = H5Tcopy(H5T_NATIVE_INT);
+                break;
+
+            case 64:
+                new_type = H5Tcopy(H5T_NATIVE_LLONG);
+                break;
 
-    case 6:
-    case 7:
-        switch (in->inputSize) {
-        case 8:
-            new_type = H5Tcopy(H5T_NATIVE_UCHAR);
+            default:
+                (void) HDfprintf(stderr, "%s", err2);
+                return (-1);
+            }
             break;
 
-        case 16:
-            new_type = H5Tcopy(H5T_NATIVE_USHORT);
+        case 1:
+        case 2:
+        case 3:
+            switch (in->inputSize) {
+            case 32:
+                new_type = H5Tcopy(H5T_NATIVE_FLOAT);
+                break;
+
+            case 64:
+                new_type = H5Tcopy(H5T_NATIVE_DOUBLE);
+                break;
+
+            default:
+                (void) HDfprintf(stderr, "%s", err2);
+                return (-1);
+            }
             break;
 
-        case 32:
-            new_type = H5Tcopy(H5T_NATIVE_UINT);
+        case 5:
+            (void) HDfprintf(stderr, "%s", err1);
+            return (-1);
             break;
 
-        case 64:
-            new_type = H5Tcopy(H5T_NATIVE_ULLONG);
+        case 6:
+        case 7:
+            switch (in->inputSize) {
+            case 8:
+                new_type = H5Tcopy(H5T_NATIVE_UCHAR);
+                break;
+
+            case 16:
+                new_type = H5Tcopy(H5T_NATIVE_USHORT);
+                break;
+
+            case 32:
+                new_type = H5Tcopy(H5T_NATIVE_UINT);
+                break;
+
+            case 64:
+                new_type = H5Tcopy(H5T_NATIVE_ULLONG);
+                break;
+
+            default:
+                (void) HDfprintf(stderr, "%s", err2);
+                return (-1);
+            }
             break;
 
         default:
-            (void) HDfprintf(stderr, "%s", err2);
+            (void) HDfprintf(stderr, "%s", err1);
             return (-1);
         }
-        break;
-
-    default:
-        (void) HDfprintf(stderr, "%s", err1);
-        return (-1);
     }
     return new_type;
 }
@@ -3900,7 +4631,7 @@ static int process(struct Options *opt)
             intype = createInputDataType(in);
             outtype = createOutputDataType(in);
 #ifdef H5DEBUGIMPORT
-            printf("process intype %d outtype %d\n", intype, outtype);
+            printf("process intype %ld outtype %ld\n", intype, outtype);
 #endif
 
             /* create property list */
@@ -3971,6 +4702,42 @@ static int process(struct Options *opt)
     return (0);
 }
 
+uint16_t swap_uint16( uint16_t val)
+{
+    return (val << 8) | (val >> 8);
+}
+
+int16_t swap_int16(int16_t val)
+{
+    return (val << 8) | ((val >> 8) & 0xFF);
+}
+
+uint32_t swap_uint32(uint32_t val)
+{
+    val = ((val << 8) & 0xFF00FF00) | ((val >> 8) & 0xFF00FF);
+    return (val << 16) | (val >> 16);
+}
+
+int32_t swap_int32(int32_t val)
+{
+    val = ((val << 8) & 0xFF00FF00) | ((val >> 8) & 0xFF00FF);
+    return (val << 16) | ((val >> 16) & 0xFFFF);
+}
+
+int64_t swap_int64(int64_t val)
+{
+    val = ((val << 8) & 0xFF00FF00FF00FF00ULL) | ((val >> 8) & 0x00FF00FF00FF00FFULL);
+    val = ((val << 16) & 0xFFFF0000FFFF0000ULL) | ((val >> 16) & 0x0000FFFF0000FFFFULL);
+    return (val << 32) | ((val >> 32) & 0xFFFFFFFFULL);
+}
+
+uint64_t swap_uint64(uint64_t val)
+{
+    val = ((val << 8) & 0xFF00FF00FF00FF00ULL) | ((val >> 8) & 0x00FF00FF00FF00FFULL);
+    val = ((val << 16) & 0xFFFF0000FFFF0000ULL) | ((val >> 16) & 0x0000FFFF0000FFFFULL);
+    return (val << 32) | (val >> 32);
+}
+
 /*
  * Name:
  *      help
@@ -4163,6 +4930,7 @@ void help(char *name)
     (void) HDfprintf(stdout, "\t    PATH\n");
     (void) HDfprintf(stdout, "\t    INPUT-CLASS\n");
     (void) HDfprintf(stdout, "\t    INPUT-SIZE\n");
+    (void) HDfprintf(stdout, "\t    INPUT-BYTE-ORDER\n");
     (void) HDfprintf(stdout, "\t    RANK\n");
     (void) HDfprintf(stdout, "\t    DIMENSION-SIZES\n");
     (void) HDfprintf(stdout, "\t    OUTPUT-CLASS\n");
diff --git a/tools/h5import/h5import.h b/tools/h5import/h5import.h
index c69a542..c55717d 100644
--- a/tools/h5import/h5import.h
+++ b/tools/h5import/h5import.h
@@ -37,7 +37,7 @@
 
 #define MAX_GROUPS_IN_PATH  20
 #define MAX_PATH_NAME_LENGTH 255
-#define NUM_KEYS 14
+#define NUM_KEYS 15
 #define MIN_NUM_DIMENSION  1
 #define MAX_NUM_DIMENSION  32
 #define BASE_10 10
@@ -56,6 +56,7 @@
 #define COMPRESS_PARAM   11
 #define EXTERNALSTORE    12
 #define EXTEND           13
+#define INPUT_B_ORDER    14
 
 /* data types */
 #define H5DT_INT8      signed char
@@ -82,6 +83,8 @@ struct Input
     struct path_info path;
     int inputClass;
     int inputSize;
+    int inputArchitecture;
+    int inputByteOrder;
     int rank;
     hsize_t* sizeOfDimension;
     int outputClass;
@@ -126,7 +129,8 @@ char keytable[NUM_KEYS][30] = {
         "COMPRESSION-TYPE",
         "COMPRESSION-PARAM",
         "EXTERNAL-STORAGE",
-        "MAXIMUM-DIMENSIONS"
+        "MAXIMUM-DIMENSIONS",
+        "INPUT-BYTE-ORDER"
 };
 
 static int  state_table[15][8] =
diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c
index 135b8e4..489bc01 100644
--- a/tools/h5import/h5importtest.c
+++ b/tools/h5import/h5importtest.c
@@ -11,7 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdio.h>
 #include "H5private.h"
 
 #ifdef H5_HAVE_WIN32_API
@@ -25,7 +24,7 @@
  *      h5importtest
  *
  * Description:
- *      This program creates that can be
+ *      This program creates files that can be
  *      used to test the h5import program.
  *
  */
@@ -36,6 +35,7 @@ main(void)
     int       nrow = 3, ncol = 4, npln = 5;
     int       i, j, k;
     FILE      *sp;
+    char      machine_order[3] = {0, 0, 0};
 
     float     row4[3], col4[4], pln4[5];
     float     rowo4 = 11.0F, colo4 = 21.0F, plno4 = 51.0F;
@@ -67,6 +67,14 @@ main(void)
     double    rowo8 = 11.0F, colo8 = 21.0F, plno8 = 51.0F;
     double    rowi8 = 1.0F, coli8 = 2.0F, plni8 = 5.0F;
 
+    /* Initialize machine endian */
+    volatile uint32_t ibyte=0x01234567;
+    /* 0 for big endian, 1 for little endian. */
+    if ((*((uint8_t*)(&ibyte))) == 0x67)
+        strncpy(machine_order, "LE", 2);
+    else
+        strncpy(machine_order, "BE", 2);
+
 
     /*
     * initialize the row, column, and plane vectors
@@ -217,7 +225,7 @@ main(void)
 #endif
 
  /*-------------------------------------------------------------------------
-  * TOOLTEST binin32.bin -c $srcdir/testfiles/binin32.conf -o binin32.h5
+  * TOOLTEST binin32.bin -c binin32.conf -o binin32.h5
   *-------------------------------------------------------------------------
   */
 
@@ -234,8 +242,21 @@ main(void)
     }
     (void) HDfclose(sp);
 
+    sp = HDfopen("binin32.conf", "w");
+    (void) fprintf(sp, "PATH /int/bin/32-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS IN\n");
+    (void) fprintf(sp, "INPUT-SIZE    32\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 1 2 1\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
+
  /*-------------------------------------------------------------------------
-  * TOOLTEST binuin32.bin -c $srcdir/testfiles/binuin32.conf -o binuin32.h5
+  * TOOLTEST binuin32.bin -c binuin32.conf -o binuin32.h5
   *-------------------------------------------------------------------------
   */
 
@@ -252,11 +273,20 @@ main(void)
     }
     (void) HDfclose(sp);
 
-
-
+    sp = HDfopen("binuin32.conf", "w");
+    (void) fprintf(sp, "PATH /int/buin/32-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS UIN\n");
+    (void) fprintf(sp, "INPUT-SIZE    32\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
 
  /*-------------------------------------------------------------------------
-  * TOOLTEST binin16.bin -c $srcdir/testfiles/binin16.conf -o binin16.h5
+  * TOOLTEST binin16.bin -c binin16.conf -o binin16.h5
   *-------------------------------------------------------------------------
   */
 
@@ -273,8 +303,22 @@ main(void)
     }
     (void) HDfclose(sp);
 
+    sp = HDfopen("binin16.conf", "w");
+    (void) fprintf(sp, "PATH /int/bin/16-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS IN\n");
+    (void) fprintf(sp, "INPUT-SIZE    16\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 2 3 4\n");
+    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
+
  /*-------------------------------------------------------------------------
-  * TOOLTEST binuin16.bin -c $srcdir/testfiles/binuin16.conf -o binuin16.h5
+  * TOOLTEST binuin16.bin -c binuin16.conf -o binuin16.h5
   *-------------------------------------------------------------------------
   */
     sp = HDfopen("binuin16.bin", OPEN_FLAGS);
@@ -290,10 +334,22 @@ main(void)
     }
     (void) HDfclose(sp);
 
-
+    sp = HDfopen("binuin16.conf", "w");
+    (void) fprintf(sp, "PATH /int/buin/16-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS UIN\n");
+    (void) fprintf(sp, "INPUT-SIZE    16\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 2 3 4\n");
+    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
 
  /*-------------------------------------------------------------------------
-  * TOOLTEST binin8.bin -c $srcdir/testfiles/binin8.conf  -o binin8.h5
+  * TOOLTEST binin8.bin -c binin8.conf  -o binin8.h5
   *-------------------------------------------------------------------------
   */
 
@@ -310,13 +366,27 @@ main(void)
     }
     (void) HDfclose(sp);
 
-#endif /* UNICOS */
-
-
+    sp = HDfopen("binin8.conf", "w");
+    (void) fprintf(sp, "PATH /int/bin/8-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS IN\n");
+    (void) fprintf(sp, "INPUT-SIZE    8\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-CLASS IN\n");
+    (void) fprintf(sp, "OUTPUT-SIZE    16\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 -1\n");
+    (void) fprintf(sp, "COMPRESSION-PARAM 3\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
 
+#endif /* UNICOS */
 
  /*-------------------------------------------------------------------------
-  * TOOLTEST binfp64.bin -c $srcdir/testfiles/binfp64.conf -o binfp64.h5
+  * TOOLTEST binfp64.bin -c binfp64.conf -o binfp64.h5
   *-------------------------------------------------------------------------
   */
 
@@ -337,10 +407,23 @@ main(void)
     }
     (void) HDfclose(sp);
 
-
+    sp = HDfopen("binfp64.conf", "w");
+    (void) fprintf(sp, "PATH /fp/bin/64-bit\n");
+    (void) fprintf(sp, "INPUT-CLASS FP\n");
+    (void) fprintf(sp, "INPUT-SIZE    64\n");
+    (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void) fprintf(sp, "RANK 3\n");
+    (void) fprintf(sp, "OUTPUT-ARCHITECTURE IEEE\n");
+    (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void) fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void) fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void) fprintf(sp, "MAXIMUM-DIMENSIONS -1 6 7\n");
+    (void) fprintf(sp, "COMPRESSION-PARAM 8\n");
+    (void) fprintf(sp, "\n");
+    (void) HDfclose(sp);
 
  /*-------------------------------------------------------------------------
-  * TOOLTEST binin8w.bin -c $srcdir/testfiles/binin8w.conf -o binin8w.h5
+  * TOOLTEST binin8w.bin -c binin8w.conf -o binin8w.h5
   *-------------------------------------------------------------------------
   */
 
@@ -357,13 +440,20 @@ main(void)
         }
         HDfclose(sp);
 
+        sp = HDfopen("binin8w.conf", "w");
+        (void) fprintf(sp, "INPUT-CLASS IN\n");
+        (void) fprintf(sp, "INPUT-SIZE    8\n");
+        (void) fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+        (void) fprintf(sp, "RANK 1\n");
+        (void) fprintf(sp, "OUTPUT-CLASS IN\n");
+        (void) fprintf(sp, "OUTPUT-SIZE    8\n");
+        (void) fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+        (void) fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+        (void) fprintf(sp, "DIMENSION-SIZES 4\n");
+        (void) fprintf(sp, "\n");
+        (void) HDfclose(sp);
 
     }
-
-
-
-
-
     return (EXIT_SUCCESS);
 }
 
diff --git a/tools/h5import/h5importtestutil.sh.in b/tools/h5import/h5importtestutil.sh.in
index b724957..2ad7866 100644
--- a/tools/h5import/h5importtestutil.sh.in
+++ b/tools/h5import/h5importtestutil.sh.in
@@ -22,6 +22,15 @@ TESTNAME=h5import
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
 
+DUMPER=../h5dump/h5dump                     # The tool name
+DUMPER_BIN=`pwd`/$DUMPER          # The path of the tool binary
+
+H5DIFF=../h5diff/h5diff           # The h5diff tool name
+H5DIFF_BIN=`pwd`/$H5DIFF          # The path of the h5diff  tool binary
+
+H5IMPORT=./h5import     # The h5import tool name
+H5IMPORT_BIN=`pwd`/$H5IMPORT      # The path of the h5import  tool binary
+
 RM='rm -rf'
 CP='cp'
 DIRNAME='dirname'
@@ -74,16 +83,11 @@ $SRC_H5IMPORT_TESTFILES/txtuin16.h5
 $SRC_H5IMPORT_TESTFILES/txtuin32.h5
 $SRC_H5IMPORT_TESTFILES/txtstr.h5
 $SRC_H5IMPORT_TESTFILES/textpfe.h5
+$SRC_TOOLS_TESTFILES/tall.h5
+$SRC_TOOLS_TESTFILES/tintsattrs.h5
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5IMPORT_TESTFILES/binfp64.conf
-$SRC_H5IMPORT_TESTFILES/binin8.conf
-$SRC_H5IMPORT_TESTFILES/binin8w.conf
-$SRC_H5IMPORT_TESTFILES/binin16.conf
-$SRC_H5IMPORT_TESTFILES/binin32.conf
-$SRC_H5IMPORT_TESTFILES/binuin16.conf
-$SRC_H5IMPORT_TESTFILES/binuin32.conf
 $SRC_H5IMPORT_TESTFILES/txtfp32.conf
 $SRC_H5IMPORT_TESTFILES/txtfp64.conf
 $SRC_H5IMPORT_TESTFILES/txtin8.conf
@@ -110,6 +114,9 @@ $SRC_H5IMPORT_TESTFILES/dbinin32.h5.txt
 $SRC_H5IMPORT_TESTFILES/dbinuin16.h5.txt
 $SRC_H5IMPORT_TESTFILES/dbinuin32.h5.txt
 $SRC_H5IMPORT_TESTFILES/dtxtstr.h5.txt
+$SRC_H5IMPORT_TESTFILES/tall_fp32.ddl
+$SRC_H5IMPORT_TESTFILES/tall_i32.ddl
+$SRC_H5IMPORT_TESTFILES/tintsattrs_u32.ddl
 "
 
 #
@@ -133,10 +140,10 @@ COPY_TESTFILES_TO_TESTDIR()
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
             INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-    	        $CP -f $tstfile $TESTDIR
+                $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
-                
+
                     # Comment out this to CREATE expected file
                     exit $EXIT_FAILURE
                 fi
@@ -175,11 +182,11 @@ SKIP() {
 TOOLTEST()
 {
 err=0
-$RUNSERIAL ./h5import $*
-$RUNSERIAL ../h5dump/h5dump $5 >log2
+$RUNSERIAL $H5IMPORT_BIN $*
+$RUNSERIAL $DUMPER_BIN $5 >log2
 
 cd tmp_testfiles
-$RUNSERIAL ../../h5dump/h5dump $5 >log1
+$RUNSERIAL $DUMPER_BIN $5 >log1
 cd ..
 
 cmp -s tmp_testfiles/log1 log2 || err=1
@@ -197,9 +204,9 @@ fi
 TOOLTEST2()
 {
 err=0
-$RUNSERIAL ../h5dump/h5dump -p -d $1 -o d$2.bin -b tmp_testfiles/$2 > d$2.dmp
-$RUNSERIAL ./h5import d$2.bin -c d$2.dmp -o d$2 > d$2.imp
-$RUNSERIAL ../h5diff/h5diff -v d$2 tmp_testfiles/$2 $1 $1 > log2
+$RUNSERIAL $DUMPER_BIN -p -d $1 -o d$2.bin -b NATIVE tmp_testfiles/$2 > d$2.dmp
+$RUNSERIAL $H5IMPORT_BIN d$2.bin -c d$2.dmp -o d$2 > d$2.imp
+$RUNSERIAL $H5DIFF_BIN -v d$2 tmp_testfiles/$2 $1 $1 > log2
 $CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1
 
 cmp -s log1 log2 || err=1
@@ -218,9 +225,9 @@ fi
 TOOLTEST3()
 {
 err=0
-$RUNSERIAL ../h5dump/h5dump -p -d $1 -o d$2.bin -y --width=1 tmp_testfiles/$2 > d$2.dmp
-$RUNSERIAL ./h5import d$2.bin -c d$2.dmp -o d$2 > d$2.imp
-$RUNSERIAL ../h5diff/h5diff -v d$2 tmp_testfiles/$2 $1 $1 > log2
+$RUNSERIAL $DUMPER_BIN -p -d $1 -o d$2.bin -y --width=1 tmp_testfiles/$2 > d$2.dmp
+$RUNSERIAL $H5IMPORT_BIN d$2.bin -c d$2.dmp -o d$2 > d$2.imp
+$RUNSERIAL $H5DIFF_BIN -v d$2 tmp_testfiles/$2 $1 $1 > log2
 $CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1
 
 cmp -s log1 log2 || err=1
@@ -239,9 +246,9 @@ fi
 TOOLTEST4()
 {
 err=0
-$RUNSERIAL ../h5dump/h5dump -p -d $1 -o d$2.bin -y --width=1 tmp_testfiles/$2 > d$2.dmp
-$RUNSERIAL ./h5import d$2.bin -c d$2.dmp -o d$2 > d$2.imp
-$RUNSERIAL ../h5diff/h5diff -r d$2 tmp_testfiles/$2 $1 $1 > log2
+$RUNSERIAL $DUMPER_BIN -p -d $1 -o d$2.bin -y --width=1 tmp_testfiles/$2 > d$2.dmp
+$RUNSERIAL $H5IMPORT_BIN d$2.bin -c d$2.dmp -o d$2 > d$2.imp
+$RUNSERIAL $H5DIFF_BIN -r d$2 tmp_testfiles/$2 $1 $1 > log2
 $CP -f $SRC_H5IMPORT_TESTFILES/d$2.txt log1
 
 
@@ -255,12 +262,32 @@ else
 fi
 }
 
-echo "" 
+# Same as TOOLTEST2 except for subsets
+# Use h5dump output as input to h5import for binary numbers
+# Use h5dump to verify results
+TOOLTEST5()
+{
+err=0
+$RUNSERIAL $DUMPER_BIN -p -d $3 $4 -o d-$1.bin -b NATIVE tmp_testfiles/$2 > d-$1.dmp
+$RUNSERIAL $H5IMPORT_BIN d-$1.bin -c d-$1.dmp -o d-$1.h5 > d-$1.imp
+$RUNSERIAL $DUMPER_BIN -p d-$1.h5 > log2
+$CP -f $SRC_H5IMPORT_TESTFILES/$1.ddl log1
+
+cmp -s log1 log2 || err=1
+rm -f log1 log2
+if [ $err -eq 1 ]; then
+nerrors="` expr $nerrors + 1 `";
+  echo "*FAILED*"
+else
+  echo " PASSED"
+fi
+}
+
+echo ""
 echo "=============================="
 echo "H5IMPORT tests started"
 echo "=============================="
 
-if [ -f h5import -a -f h5importtest ]; then
 #echo "** Testing h5import  ***"
 
 rm -f  output.h5 log1 tx* b* *.dat
@@ -280,30 +307,30 @@ $RUNSERIAL ./h5importtest
 TESTING "ASCII I32 rank 3 - Output BE " ;
 TOOLTEST $TESTDIR/txtin32.txt -c $TESTDIR/txtin32.conf -o txtin32.h5
 
-TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" 
+TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended"
 TOOLTEST $TESTDIR/txtin16.txt -c $TESTDIR/txtin16.conf -o txtin16.h5
 
-TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed " 
+TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed "
 TOOLTEST $TESTDIR/txtin8.txt -c $TESTDIR/txtin8.conf  -o txtin8.h5
 
 
-TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " 
+TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed "
 TOOLTEST $TESTDIR/txtuin16.txt -c $TESTDIR/txtuin16.conf -o txtuin16.h5
 
-TESTING "ASCII UI32 - rank 3 - Output BE" 
+TESTING "ASCII UI32 - rank 3 - Output BE"
 TOOLTEST $TESTDIR/txtuin32.txt -c $TESTDIR/txtuin32.conf -o txtuin32.h5
 
 
-TESTING "ASCII F32 - rank 3 - Output LE " 
+TESTING "ASCII F32 - rank 3 - Output LE "
 TOOLTEST $TESTDIR/txtfp32.txt -c $TESTDIR/txtfp32.conf -o txtfp32.h5
 
-TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed " 
+TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed "
 TOOLTEST $TESTDIR/txtfp64.txt -c $TESTDIR/txtfp64.conf -o txtfp64.h5
 
 
-TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
-TOOLTEST binfp64.bin -c $TESTDIR/binfp64.conf -o binfp64.h5
-TESTING "H5DUMP-BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
+TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
+TOOLTEST binfp64.bin -c binfp64.conf -o binfp64.h5
+TESTING "H5DUMP-BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
 if test $USE_FILTER_DEFLATE != "yes"; then
  SKIP "/fp/bin/64-bit" binfp64.h5
 else
@@ -311,58 +338,61 @@ else
 fi
 
 
-TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
-TOOLTEST binin8.bin -c $TESTDIR/binin8.conf -o binin8.h5
-TESTING "H5DUMP-BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
+TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
+TOOLTEST binin8.bin -c binin8.conf -o binin8.h5
+TESTING "H5DUMP-BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
 if test $USE_FILTER_DEFLATE != "yes"; then
  SKIP "/int/bin/8-bit" binin8.h5
 else
  TOOLTEST2 "/int/bin/8-bit" binin8.h5
 fi
 
-TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
-TOOLTEST binin16.bin -c $TESTDIR/binin16.conf -o binin16.h5
-TESTING "H5DUMP-BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
+TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
+TOOLTEST binin16.bin -c binin16.conf -o binin16.h5
+TESTING "H5DUMP-BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
 TOOLTEST2 "/int/bin/16-bit" binin16.h5
 
-TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED " 
-TOOLTEST binin32.bin -c $TESTDIR/binin32.conf -o binin32.h5
-TESTING "H5DUMP-BINARY I32 - rank 3 - Output BE + CHUNKED " 
+TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED "
+TOOLTEST binin32.bin -c binin32.conf -o binin32.h5
+TESTING "H5DUMP-BINARY I32 - rank 3 - Output BE + CHUNKED "
 TOOLTEST2 "/int/bin/32-bit" binin32.h5
 
 
-TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
-TOOLTEST binuin16.bin -c $TESTDIR/binuin16.conf -o binuin16.h5
-TESTING "H5DUMP-BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
+TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
+TOOLTEST binuin16.bin -c binuin16.conf -o binuin16.h5
+TESTING "H5DUMP-BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
 TOOLTEST2 "/int/buin/16-bit" binuin16.h5
 
-TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED " 
-TOOLTEST binuin32.bin -c $TESTDIR/binuin32.conf -o binuin32.h5
-TESTING "H5DUMP-BINARY UI32 - rank 3 - Output LE + CHUNKED " 
+TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED "
+TOOLTEST binuin32.bin -c binuin32.conf -o binuin32.h5
+TESTING "H5DUMP-BINARY UI32 - rank 3 - Output LE + CHUNKED "
 TOOLTEST2 "/int/buin/32-bit" binuin32.h5
 
 
-TESTING "STR" 
+TESTING "STR"
 TOOLTEST $TESTDIR/txtstr.txt -c $TESTDIR/txtstr.conf -o txtstr.h5
-TESTING "H5DUMP-STR" 
+TESTING "H5DUMP-STR"
 TOOLTEST4 "/mytext/data" txtstr.h5
 
 
-TESTING "BINARY I8 CR LF EOF" 
-TOOLTEST binin8w.bin -c $TESTDIR/binin8w.conf -o binin8w.h5
-TESTING "H5DUMP-BINARY I8 CR LF EOF" 
+TESTING "BINARY I8 CR LF EOF"
+TOOLTEST binin8w.bin -c binin8w.conf -o binin8w.h5
+TESTING "H5DUMP-BINARY I8 CR LF EOF"
 TOOLTEST2 "/dataset0" binin8w.h5
 
-TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE " 
+TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE "
 TOOLTEST $TESTDIR/textpfe64.txt -c $TESTDIR/textpfe.conf -o textpfe.h5
 
+TESTING "Binary Subset FP"
+TOOLTEST5 tall_fp32 tall.h5 "/g2/dset2.2" "--start=1,1 --stride=2,3 --count=1,2 --block=1,1"
+TESTING "Binary Subset INT"
+TOOLTEST5 tall_i32 tall.h5 "/g1/g1.1/dset1.1.1" "--start=1,1 --stride=2,3 --count=3,2 --block=1,1"
+TESTING "Binary Subset UINT"
+TOOLTEST5 tintsattrs_u32 tintsattrs.h5 "/DU32BITS" "--start=1,1 --stride=2,3 --count=3,2 --block=1,1"
+
 
-rm -f  txtin32.txt txtin16.txt txtin8.txt txtuin32.txt txtuin16.txt *.bin *.dmp *.imp *.h5
+rm -f  txtin32.txt txtin16.txt txtin8.txt txtuin32.txt txtuin16.txt *.bin *.dmp *.conf *.imp *.h5
 rm -rf tmp_testfiles
-else
-  echo "** h5import or h5importtest not available ***"
-  nerrors="` expr $nerrors + 1 `";
-fi
 
 # Clean up temporary files/directories
 CLEAN_TESTFILES_AND_TESTDIR
diff --git a/tools/h5import/testfiles/binfp64.conf b/tools/h5import/testfiles/binfp64.conf
deleted file mode 100644
index 6b4c361..0000000
--- a/tools/h5import/testfiles/binfp64.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-PATH /fp/bin/64-bit
-INPUT-CLASS FP
-INPUT-SIZE	64
-RANK 3
-DIMENSION-SIZES 5 3 4
-OUTPUT-ARCHITECTURE IEEE
-OUTPUT-BYTE-ORDER LE
-CHUNKED-DIMENSION-SIZES 2 2 2
-COMPRESSION-PARAM 8
-MAXIMUM-DIMENSIONS -1 6 7
-
-
-
diff --git a/tools/h5import/testfiles/binin16.conf b/tools/h5import/testfiles/binin16.conf
deleted file mode 100644
index 06869cb..0000000
--- a/tools/h5import/testfiles/binin16.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-PATH /int/bin/16-bit
-INPUT-CLASS IN
-INPUT-SIZE	16
-RANK 3
-DIMENSION-SIZES 2 3 4
-CHUNKED-DIMENSION-SIZES 2 2 2
-MAXIMUM-DIMENSIONS -1 -1 8
-OUTPUT-ARCHITECTURE STD
-OUTPUT-BYTE-ORDER LE
-
-
-
diff --git a/tools/h5import/testfiles/binin32.conf b/tools/h5import/testfiles/binin32.conf
deleted file mode 100644
index 11996ef..0000000
--- a/tools/h5import/testfiles/binin32.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-PATH /int/bin/32-bit
-INPUT-CLASS IN
-INPUT-SIZE	32
-RANK 3
-DIMENSION-SIZES 5 3 4
-OUTPUT-ARCHITECTURE STD
-OUTPUT-BYTE-ORDER BE
-CHUNKED-DIMENSION-SIZES 1 2 1
-
-
-
-
diff --git a/tools/h5import/testfiles/binin8.conf b/tools/h5import/testfiles/binin8.conf
deleted file mode 100644
index 1edd80a..0000000
--- a/tools/h5import/testfiles/binin8.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-PATH /int/bin/8-bit
-INPUT-CLASS IN
-INPUT-SIZE	8
-OUTPUT-CLASS IN
-OUTPUT-SIZE 16
-RANK 3
-OUTPUT-ARCHITECTURE STD
-OUTPUT-BYTE-ORDER LE
-DIMENSION-SIZES 5 3 4
-CHUNKED-DIMENSION-SIZES 2 2 2
-MAXIMUM-DIMENSIONS -1 -1 -1
-COMPRESSION-PARAM 3
-
-
-
-
diff --git a/tools/h5import/testfiles/binin8w.conf b/tools/h5import/testfiles/binin8w.conf
deleted file mode 100644
index fccb4ac..0000000
--- a/tools/h5import/testfiles/binin8w.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-
-INPUT-CLASS IN
-INPUT-SIZE  8
-RANK 1
-DIMENSION-SIZES 4
-OUTPUT-BYTE-ORDER LE
-OUTPUT-CLASS IN
-OUTPUT-SIZE 8
-OUTPUT-ARCHITECTURE STD
diff --git a/tools/h5import/testfiles/binuin16.conf b/tools/h5import/testfiles/binuin16.conf
deleted file mode 100644
index a4603df..0000000
--- a/tools/h5import/testfiles/binuin16.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-PATH /int/buin/16-bit
-INPUT-CLASS UIN
-INPUT-SIZE	16
-RANK 3
-DIMENSION-SIZES 2 3 4
-CHUNKED-DIMENSION-SIZES 2 2 2
-MAXIMUM-DIMENSIONS -1 -1 8
-OUTPUT-ARCHITECTURE STD
-OUTPUT-BYTE-ORDER BE
-
-
-
diff --git a/tools/h5import/testfiles/binuin32.conf b/tools/h5import/testfiles/binuin32.conf
deleted file mode 100644
index a649e97..0000000
--- a/tools/h5import/testfiles/binuin32.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-PATH /int/buin/32-bit
-INPUT-CLASS UIN
-INPUT-SIZE	32
-RANK 3
-DIMENSION-SIZES 5 3 4
-OUTPUT-ARCHITECTURE STD
-OUTPUT-BYTE-ORDER LE
-
-
-
-
-
diff --git a/tools/h5import/testfiles/tall_fp32.ddl b/tools/h5import/testfiles/tall_fp32.ddl
new file mode 100644
index 0000000..2a0dc1b
--- /dev/null
+++ b/tools/h5import/testfiles/tall_fp32.ddl
@@ -0,0 +1,28 @@
+HDF5 "d-tall_fp32.h5" {
+GROUP "/" {
+   GROUP "g2" {
+      DATASET "dset2.2" {
+         DATATYPE  H5T_IEEE_F32BE
+         DATASPACE  SIMPLE { ( 1, 2 ) / ( 1, 2 ) }
+         STORAGE_LAYOUT {
+            CONTIGUOUS
+            SIZE 8
+            OFFSET 2432
+         }
+         FILTERS {
+            NONE
+         }
+         FILLVALUE {
+            FILL_TIME H5D_FILL_TIME_IFSET
+            VALUE  H5D_FILL_VALUE_DEFAULT
+         }
+         ALLOCATION_TIME {
+            H5D_ALLOC_TIME_LATE
+         }
+         DATA {
+         (0,0): 0.2, 0.8
+         }
+      }
+   }
+}
+}
diff --git a/tools/h5import/testfiles/tall_i32.ddl b/tools/h5import/testfiles/tall_i32.ddl
new file mode 100644
index 0000000..d9280bc
--- /dev/null
+++ b/tools/h5import/testfiles/tall_i32.ddl
@@ -0,0 +1,32 @@
+HDF5 "d-tall_i32.h5" {
+GROUP "/" {
+   GROUP "g1" {
+      GROUP "g1.1" {
+         DATASET "dset1.1.1" {
+            DATATYPE  H5T_STD_I32BE
+            DATASPACE  SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
+            STORAGE_LAYOUT {
+               CONTIGUOUS
+               SIZE 24
+               OFFSET 3464
+            }
+            FILTERS {
+               NONE
+            }
+            FILLVALUE {
+               FILL_TIME H5D_FILL_TIME_IFSET
+               VALUE  H5D_FILL_VALUE_DEFAULT
+            }
+            ALLOCATION_TIME {
+               H5D_ALLOC_TIME_LATE
+            }
+            DATA {
+            (0,0): 1, 4,
+            (1,0): 3, 12,
+            (2,0): 5, 20
+            }
+         }
+      }
+   }
+}
+}
diff --git a/tools/h5import/testfiles/tintsattrs_u32.ddl b/tools/h5import/testfiles/tintsattrs_u32.ddl
new file mode 100644
index 0000000..37ef8b9
--- /dev/null
+++ b/tools/h5import/testfiles/tintsattrs_u32.ddl
@@ -0,0 +1,28 @@
+HDF5 "d-tintsattrs_u32.h5" {
+GROUP "/" {
+   DATASET "DU32BITS" {
+      DATATYPE  H5T_STD_U32LE
+      DATASPACE  SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
+      STORAGE_LAYOUT {
+         CONTIGUOUS
+         SIZE 24
+         OFFSET 2144
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_LATE
+      }
+      DATA {
+      (0,0): 4294967292, 4294967264,
+      (1,0): 4294967280, 4294967168,
+      (2,0): 4294967232, 4294966784
+      }
+   }
+}
+}
diff --git a/tools/h5jam/CMakeTests.cmake b/tools/h5jam/CMakeTests.cmake
index 47276eb..646ae06 100644
--- a/tools/h5jam/CMakeTests.cmake
+++ b/tools/h5jam/CMakeTests.cmake
@@ -60,6 +60,13 @@
       endif ()
     else ()
       add_test (
+          NAME H5JAM-${expectfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${expectfile}.out
+              ${expectfile}.out.err
+      )
+      add_test (
           NAME H5JAM-${expectfile}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5jam>"
@@ -70,6 +77,7 @@
               -D "TEST_REFERENCE=testfiles/${expectfile}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5JAM-${expectfile} PROPERTIES DEPENDS "H5JAM-${expectfile}-clear-objects")
     endif ()
   endmacro ()
 
@@ -86,6 +94,13 @@
       endif ()
     else ()
       add_test (
+          NAME H5JAM-UNJAM-${expectfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${expectfile}.out
+              ${expectfile}.out.err
+      )
+      add_test (
           NAME H5JAM-UNJAM-${expectfile}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5unjam>"
@@ -96,6 +111,7 @@
               -D "TEST_REFERENCE=testfiles/${expectfile}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5JAM-UNJAM-${expectfile} PROPERTIES DEPENDS "H5JAM-UNJAM-${expectfile}-clear-objects")
     endif ()
   endmacro ()
 
@@ -103,6 +119,16 @@
     # If using memchecker add tests without using scripts
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
+          NAME H5JAM-${testname}-CHECKFILE-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${actual}.new
+              ${actual}.new.err
+              ${actual}.out
+              ${actual}.out.err
+      )
+      set_tests_properties (H5JAM-${testname}-CHECKFILE-clear-objects PROPERTIES DEPENDS ${testdepends})
+      add_test (
           NAME H5JAM-${testname}-CHECKFILE-H5DMP
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
@@ -114,7 +140,7 @@
               -D "TEST_SKIP_COMPARE=TRUE"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DEPENDS ${testdepends})
+      set_tests_properties (H5JAM-${testname}-CHECKFILE-H5DMP PROPERTIES DEPENDS H5JAM-${testname}-CHECKFILE-clear-objects)
       add_test (
           NAME H5JAM-${testname}-CHECKFILE-H5DMP_CMP
           COMMAND "${CMAKE_COMMAND}"
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 5613fa0..0939991 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -603,6 +603,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c
index b15a18f..269ca89 100644
--- a/tools/h5jam/h5jam.c
+++ b/tools/h5jam/h5jam.c
@@ -76,13 +76,13 @@ usage (const char *prog)
     HDfprintf (stdout,
     "Adds user block to front of an HDF5 file and creates a new concatenated file.\n");
     HDfprintf (stdout, "\n");
-    HDfprintf (stdout, 
+    HDfprintf (stdout,
     "OPTIONS\n");
-    HDfprintf (stdout, 
+    HDfprintf (stdout,
     "  -i in_file.h5    Specifies the input HDF5 file.\n");
-    HDfprintf (stdout, 
+    HDfprintf (stdout,
     "  -u in_user_file  Specifies the file to be inserted into the user block.\n");
-    HDfprintf (stdout, 
+    HDfprintf (stdout,
     "                   Can be any file format except an HDF5 format.\n");
     HDfprintf (stdout,
     "  -o out_file.h5   Specifies the output HDF5 file.\n");
@@ -389,7 +389,7 @@ main (int argc, const char *argv[])
         HDfree (input_file);
     if(output_file)
         HDfree (output_file);
-    
+
     if(ufid >= 0)
         HDclose (ufid);
     if(h5fid >= 0)
diff --git a/tools/h5jam/h5jamgentest.c b/tools/h5jam/h5jamgentest.c
index fa8bd4e..12ea6b8 100644
--- a/tools/h5jam/h5jamgentest.c
+++ b/tools/h5jam/h5jamgentest.c
@@ -20,8 +20,6 @@
  * trying it on a new platform, ...), you need to verify the correctness
  * of the expected output and update the corresponding *.ddl files.
  */
-#include <assert.h>
-#include <limits.h>
 
 #include "hdf5.h"
 #include "H5private.h"
diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c
index 8f6b686..9c83740 100644
--- a/tools/h5jam/h5unjam.c
+++ b/tools/h5jam/h5unjam.c
@@ -135,28 +135,28 @@ static int
 parse_command_line(int argc, const char *argv[])
 {
     int opt = FALSE;
-	
+
    /* parse command line options */
     while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch((char)opt) {
             case 'o':
                 output_file = HDstrdup(opt_arg);
-				if (output_file)
-				    h5tools_set_data_output_file(output_file, 1);
-	            break;
+                if (output_file)
+                    h5tools_set_data_output_file(output_file, 1);
+                break;
 
             case 'i':
                 input_file = HDstrdup(opt_arg);
-				if (input_file)
-   				    h5tools_set_input_file(input_file, 1);
-	            break;;
+                if (input_file)
+                    h5tools_set_input_file(input_file, 1);
+                break;;
 
             case 'u':
                 ub_file = HDstrdup(opt_arg);
-				if (ub_file)
-				    h5tools_set_output_file(ub_file, 1);
-				else 
-				    rawoutstream = stdout;			
+                if (ub_file)
+                    h5tools_set_output_file(ub_file, 1);
+                else
+                    rawoutstream = stdout;
                 break;
 
             case 'd':
@@ -182,7 +182,7 @@ parse_command_line(int argc, const char *argv[])
     }
 
     return EXIT_SUCCESS;
-    
+
 done:
     if(input_file)
         HDfree(input_file);
@@ -242,7 +242,7 @@ main(int argc, const char *argv[])
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
-  
+
     testval = H5Fis_hdf5(input_file);
 
     if (testval <= 0) {
@@ -274,10 +274,8 @@ main(int argc, const char *argv[])
         goto done;
     }
 
-    status = H5Pclose(plist);
-    HDassert(status >= 0);
-    status = H5Fclose(ifile);
-    HDassert(status >= 0);
+    H5Pclose(plist);
+    H5Fclose(ifile);
 
     if (usize == 0) {
   /* no user block to remove: message? */
@@ -305,7 +303,7 @@ main(int argc, const char *argv[])
             error_msg("unable to open output HDF5 file \"%s\"\n", input_file);
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
-    } 
+    }
 
     /* copy from 0 to 'usize - 1' into ufid  */
     if (!do_delete) {
@@ -323,18 +321,18 @@ main(int argc, const char *argv[])
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
- 
+
 done:
     if(input_file)
         HDfree(input_file);
-		
+
     if(output_file)
         HDfree(output_file);
-		
+
     if(ub_file) {
         HDfree(ub_file);
     }
-	   
+
     h5tools_close();
 
     return h5tools_getstatus();
@@ -374,7 +372,7 @@ copy_to_file( FILE *infid, FILE *ofid, ssize_t _where, ssize_t how_much )
         else
             bytes_in = how_much;
 
-			/* Seek to correct position in input file */
+            /* Seek to correct position in input file */
         HDfseek(infid, from, SEEK_SET);
 
         /* Read data to buffer */
@@ -396,11 +394,11 @@ copy_to_file( FILE *infid, FILE *ofid, ssize_t _where, ssize_t how_much )
         to += bytes_read;
 
        /* Write nchars bytes to output file */
-		bytes_wrote = HDfwrite(buf, (size_t)1, bytes_read, ofid);
-		if(bytes_wrote != bytes_read || (0 == bytes_wrote && HDferror(ofid))) { /* error */
-			ret_value = -1;
-			goto done;
-		} /* end if */
+        bytes_wrote = HDfwrite(buf, (size_t)1, bytes_read, ofid);
+        if(bytes_wrote != bytes_read || (0 == bytes_wrote && HDferror(ofid))) { /* error */
+            ret_value = -1;
+            goto done;
+        } /* end if */
     } /* end while */
 
 done:
diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index fad14b7..8e4b3ac 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -11,12 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdio.h>
-
-#ifdef H5_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "hdf5.h"
 #include "H5private.h"
 #include "h5tools.h"
diff --git a/tools/h5jam/testh5jam.sh.in b/tools/h5jam/testh5jam.sh.in
index d28db72..187054b 100644
--- a/tools/h5jam/testh5jam.sh.in
+++ b/tools/h5jam/testh5jam.sh.in
@@ -603,7 +603,7 @@ CLEANUP taz3.h5
 JAMTEST $TESTDIR/u512.txt $TESTDIR/twithub.h5 --clobber taz4.h5
 CHECKFILE $TESTDIR/tall.h5 taz4.h5
 CLEANUP taz4.h5
-JAMTEST $TESTDIR/u513.txt $TESTDIR/twithub.h5 --clobber taz5.h5 
+JAMTEST $TESTDIR/u513.txt $TESTDIR/twithub.h5 --clobber taz5.h5
 CHECKFILE $TESTDIR/tall.h5 taz5.h5
 CLEANUP taz5.h5
 
diff --git a/tools/h5ls/CMakeTests.cmake b/tools/h5ls/CMakeTests.cmake
index 343949a..6c9f118 100644
--- a/tools/h5ls/CMakeTests.cmake
+++ b/tools/h5ls/CMakeTests.cmake
@@ -33,6 +33,7 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/textlinktar.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrp_comments.h5
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrpnullspace.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop.h5
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tnestedcomp.h5
@@ -88,6 +89,7 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-1.ls
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-2.ls
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-3.ls
+      ${HDF5_TOOLS_SRC_DIR}/testfiles/tgrpnullspace.ls
       ${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-1.ls
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tloop-1.ls
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tmultifile.ls
@@ -125,13 +127,21 @@
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5LS-${resultfile} COMMAND $<TARGET_FILE:h5ls> ${ARGN})
       set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
-      if (${resultcode} STREQUAL "1")
+      if ("${resultcode}" STREQUAL "1")
         set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
       if (NOT "${last_test}" STREQUAL "")
         set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
       endif ()
     else ()
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5LS-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/${resultfile}.out
+              testfiles/${resultfile}.out.err
+      )
       add_test (
           NAME H5LS-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
@@ -143,6 +153,7 @@
               -D "TEST_REFERENCE=${resultfile}.ls"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5LS-${resultfile} PROPERTIES DEPENDS H5LS-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
@@ -150,7 +161,7 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       # Remove any output file left over from previous test run
       add_test (
-          NAME H5LS_UD-${testname}-clearall-objects
+          NAME H5LS_UD-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove
               testfiles/${resultfile}.out
@@ -169,7 +180,7 @@
               -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5LS_UD-${testname} PROPERTIES DEPENDS H5LS_UD-${testname}-clearall-objects)
+      set_tests_properties (H5LS_UD-${testname} PROPERTIES DEPENDS H5LS_UD-${testname}-clear-objects)
     endif ()
   endmacro ()
 
@@ -239,6 +250,8 @@
           textlinksrc-7-old.out.err
           tgrp_comments.out
           tgrp_comments.out.err
+          tgrpnullspace.out
+          tgrpnullspace.out.err
           tsoftlinks-1.out
           tsoftlinks-1.out.err
           tsoftlinks-2.out
@@ -413,6 +426,9 @@
   # test for empty data
   ADD_H5_TEST (tempty 0 -w80 -d tempty.h5)
 
+ # test for displaying dataset and attribute of null space
+  ADD_H5_TEST (tgrpnullspace 0 -w80 -v -S tgrpnullspace.h5)
+
   # test for all dataset types written to attributes
   # enable -S for avoiding printing NATIVE types
   ADD_H5_TEST (tattr2 0 -w80 -v -S tattr2.h5)
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index b9dbcf4..1ea9bb3 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -596,6 +596,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 7daf7e3..583f8bf 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -1616,38 +1616,39 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
 
         info = &outputformat;
 
-        if(hexdump_g)
-           p_type = H5Tcopy(type);
-        else
-           p_type = H5Tget_native_type(type, H5T_DIR_DEFAULT);
-
-        if(p_type >= 0) {
-            /* VL data special information */
-            unsigned int        vl_data = 0; /* contains VL datatypes */
-
-            /* Check if we have VL data in the dataset's datatype */
-            if (h5tools_detect_vlen(p_type) == TRUE)
-                vl_data = TRUE;
-
-            temp_need= nelmts * MAX(H5Tget_size(type), H5Tget_size(p_type));
-            HDassert(temp_need == (hsize_t)((size_t)temp_need));
-            need = (size_t)temp_need;
-            buf = HDmalloc(need);
-            HDassert(buf);
-            if(H5Aread(attr, p_type, buf) >= 0) {
-                ctx.need_prefix = TRUE;
-                ctx.indent_level = 2;
-                ctx.cur_column = (size_t)curr_pos;
-                h5tools_dump_mem(rawoutstream, info, &ctx, attr, p_type, space, buf);
-            }
+        if(space_type != H5S_NULL && space_type != H5S_NO_CLASS) {
+            if(hexdump_g)
+                p_type = H5Tcopy(type);
+            else
+                p_type = H5Tget_native_type(type, H5T_DIR_DEFAULT);
+
+            if(p_type >= 0) {
+                /* VL data special information */
+                unsigned int        vl_data = 0; /* contains VL datatypes */
+
+                /* Check if we have VL data in the dataset's datatype */
+                if (h5tools_detect_vlen(p_type) == TRUE)
+                    vl_data = TRUE;
+
+                temp_need = nelmts * MAX(H5Tget_size(type), H5Tget_size(p_type));
+                need = (size_t)temp_need;
+                if((buf = HDmalloc(need)) != NULL) {
+                    if(H5Aread(attr, p_type, buf) >= 0) {
+                        ctx.need_prefix = TRUE;
+                        ctx.indent_level = 2;
+                        ctx.cur_column = (size_t)curr_pos;
+                        h5tools_dump_mem(rawoutstream, info, &ctx, attr, p_type, space, buf);
+                    }
 
-            /* Reclaim any VL memory, if necessary */
-            if (vl_data)
-                H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
+                    /* Reclaim any VL memory, if necessary */
+                    if (vl_data)
+                        H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
 
-            HDfree(buf);
-            H5Tclose(p_type);
-        } /* end if */
+                    HDfree(buf);
+                }
+                H5Tclose(p_type);
+            } /* end if */
+        }
 
         H5Sclose(space);
         H5Tclose(type);
@@ -1756,7 +1757,6 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
     size_t      cd_nelmts;      /* filter client number of values */
     size_t      cd_num;         /* filter client data counter */
     char        f_name[256];    /* filter/file name */
-    char        dset_name[256];    /* filter/file name */
     char        s[64];          /* temporary string buffer */
     off_t       f_offset;       /* offset in external file */
     hsize_t     f_size;         /* bytes used in external file */
@@ -1845,7 +1845,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                 } /* end if */
                 break;
             default:
-                HDassert(0);
+                h5tools_str_append(&buffer, "layout information not available");
                 break;
         }
         /* Print total raw storage size */
diff --git a/tools/h5ls/h5ls_plugin.sh.in b/tools/h5ls/h5ls_plugin.sh.in
index d7351c1..5fae0c3 100644
--- a/tools/h5ls/h5ls_plugin.sh.in
+++ b/tools/h5ls/h5ls_plugin.sh.in
@@ -135,12 +135,26 @@ CLEAN_TESTFILES_AND_TESTDIR()
     fi
 }
 
+# Print a $* message left justified in a field of 70 characters
+#
+MESSAGE() {
+   SPACES="                                                               "
+   echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
+}
+
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
 #
 TESTING() {
     SPACES="                                                               "
-    echo "Testing $* $SPACES" |cut -c1-70 |tr -d '\012'
+    echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
+}
+
+# Print a line-line message left justified in a field of 70 characters
+# beginning with the word "Verifying".
+#
+VERIFY() {
+    MESSAGE "Verifying $*"
 }
 
 # Source in the output filter function definitions.
diff --git a/tools/h5ls/testh5ls.sh.in b/tools/h5ls/testh5ls.sh.in
index 4b57acc..40bb529 100644
--- a/tools/h5ls/testh5ls.sh.in
+++ b/tools/h5ls/testh5ls.sh.in
@@ -80,6 +80,7 @@ $SRC_H5LS_TESTFILES/textlinksrc.h5
 $SRC_H5LS_TESTFILES/textlinktar.h5
 $SRC_H5LS_TESTFILES/tgroup.h5
 $SRC_H5LS_TESTFILES/tgrp_comments.h5
+$SRC_H5LS_TESTFILES/tgrpnullspace.h5
 $SRC_H5LS_TESTFILES/thlink.h5
 $SRC_H5LS_TESTFILES/tloop.h5
 $SRC_H5LS_TESTFILES/tnestedcomp.h5
@@ -134,6 +135,7 @@ $SRC_H5LS_TESTFILES/tgroup.ls
 $SRC_H5LS_TESTFILES/tgroup-1.ls
 $SRC_H5LS_TESTFILES/tgroup-2.ls
 $SRC_H5LS_TESTFILES/tgroup-3.ls
+$SRC_H5LS_TESTFILES/tgrpnullspace.ls
 $SRC_H5LS_TESTFILES/thlink-1.ls
 $SRC_H5LS_TESTFILES/tloop-1.ls
 $SRC_H5LS_TESTFILES/tmultifile.ls
@@ -390,6 +392,9 @@ TOOLTEST tarray1.ls 0 -w80 -r -d tarray1.h5
 # test for empty data
 TOOLTEST tempty.ls 0 -w80 -d tempty.h5
 
+# test for displaying dataset and attribute of null space
+TOOLTEST tgrpnullspace.ls 0 -w80 -v -S tgrpnullspace.h5
+
 # test for all dataset types written to attributes
 # enable -S for avoiding printing NATIVE types
 TOOLTEST tattr2.ls 0 -w80 -v -S tattr2.h5
diff --git a/tools/h5repack/CMakeTests.cmake b/tools/h5repack/CMakeTests.cmake
index dafed86..b6ec914 100644
--- a/tools/h5repack/CMakeTests.cmake
+++ b/tools/h5repack/CMakeTests.cmake
@@ -92,28 +92,49 @@
   )
 
   set (LIST_OTHER_TEST_FILES
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack-help.txt
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_ext.bin
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/ublock.bin
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack.info
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/deflate_limit.h5repack_layout.h5.ddl
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5.ddl
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5.tst
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_test.ddl
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/plugin_test.h5repack_layout.h5.tst
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/plugin_none.h5repack_layout.UD.h5.tst
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_version_test.ddl
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/plugin_version_test.h5repack_layout.h5.tst
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_zero.tst
-      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/crtorder.tordergr.h5.ddl
+      h5repack-help.txt
+      h5repack_ext.bin
+      h5repack.info
+      ublock.bin
   )
 
-  foreach (h5_file ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
+  set (LIST_TST_TEST_FILES
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5-gzip_verbose_filters
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/plugin_test.h5repack_layout.h5
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/plugin_version_test.h5repack_layout.h5
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/plugin_zero.h5repack_layout.h5
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/plugin_none.h5repack_layout.UD.h5
+  )
+
+  set (LIST_DDL_TEST_FILES
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/crtorder.tordergr.h5
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/deflate_limit.h5repack_layout.h5
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_test
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_version_test
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_zero
+      ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5-plugin_none
+  )
+
+  foreach (h5_file ${LIST_HDF5_TEST_FILES})
     get_filename_component(fname "${h5_file}" NAME)
     HDFTEST_COPY_FILE("${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5repack_files")
   endforeach ()
+
+  foreach (h5_file ${LIST_OTHER_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
+  foreach (h5_file ${LIST_TST_TEST_FILES})
+    get_filename_component(fname "${h5_file}" NAME)
+    HDFTEST_COPY_FILE("${h5_file}.tst" "${PROJECT_BINARY_DIR}/testfiles/${fname}.tst" "h5repack_files")
+  endforeach ()
+
+  foreach (h5_file ${LIST_DDL_TEST_FILES})
+    get_filename_component(fname "${h5_file}" NAME)
+    HDFTEST_COPY_FILE("${h5_file}.ddl" "${PROJECT_BINARY_DIR}/testfiles/${fname}.ddl" "h5repack_files")
+  endforeach ()
   add_custom_target(h5repack_files ALL COMMENT "Copying files needed by h5repack tests" DEPENDS ${h5repack_files_list})
 
 ##############################################################################
@@ -125,14 +146,24 @@
   macro (ADD_HELP_TEST testname resultcode)
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5REPACK-${testname} COMMAND $<TARGET_FILE:h5repack> ${ARGN})
-      set_tests_properties (H5REPACK-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+      add_test (NAME H5REPACK-h5repack-${testname} COMMAND $<TARGET_FILE:h5repack> ${ARGN})
+      set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
       if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (H5REPACK-${testname} PROPERTIES DEPENDS ${last_test})
+        set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES DEPENDS ${last_test})
       endif ()
-      set (last_test "H5REPACK-${testname}")
+      set (last_test "H5REPACK-h5repack-${testname}")
     else ()
       add_test (
+          NAME H5REPACK-h5repack-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/h5repack-${testname}.out
+              testfiles/h5repack-${testname}.out.err
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5REPACK-h5repack-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
+      add_test (
           NAME H5REPACK-h5repack-${testname}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
@@ -143,6 +174,7 @@
               -D "TEST_REFERENCE=h5repack-${testname}.txt"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5REPACK-h5repack-${testname} PROPERTIES DEPENDS H5REPACK-h5repack-${testname}-clear-objects)
     endif ()
   endmacro ()
 
@@ -156,13 +188,20 @@
       endif ()
     else ()
       add_test (
-          NAME H5REPACK_OLD-${testname}
-          COMMAND $<TARGET_FILE:h5repack> ${ARGN} -i ${PROJECT_BINARY_DIR}/testfiles/${testfile} -o ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+          NAME H5REPACK_OLD-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/out-${testname}.${testfile}
       )
       if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (H5REPACK_OLD-${testname} PROPERTIES DEPENDS ${last_test})
+        set_tests_properties (H5REPACK_OLD-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
       endif ()
       add_test (
+          NAME H5REPACK_OLD-${testname}
+          COMMAND $<TARGET_FILE:h5repack> ${ARGN} -i ${PROJECT_BINARY_DIR}/testfiles/${testfile} -o ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+      )
+      set_tests_properties (H5REPACK_OLD-${testname} PROPERTIES DEPENDS H5REPACK_OLD-${testname}-clear-objects)
+      add_test (
           NAME H5REPACK_OLD-${testname}_DFF
           COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
       )
@@ -180,15 +219,22 @@
       endif ()
     else ()
       add_test (
-          NAME H5REPACK-${testname}
-          COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+          NAME H5REPACK-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/out-${testname}.${testfile}
       )
       if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (H5REPACK-${testname} PROPERTIES DEPENDS ${last_test})
+        set_tests_properties (H5REPACK-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
       endif ()
       add_test (
+          NAME H5REPACK-${testname}
+          COMMAND $<TARGET_FILE:h5repack> --enable-error-stack ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+      )
+      set_tests_properties (H5REPACK-${testname} PROPERTIES DEPENDS H5REPACK-${testname}-clear-objects)
+      add_test (
           NAME H5REPACK-${testname}_DFF
-          COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+          COMMAND $<TARGET_FILE:h5diff> --enable-error-stack ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
       )
       set_tests_properties (H5REPACK-${testname}_DFF PROPERTIES DEPENDS H5REPACK-${testname})
     endif ()
@@ -207,9 +253,24 @@
       if (HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
             NAME H5REPACK_CMP-${testname}
-            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile})
+            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
+        )
+        if (NOT "${last_test}" STREQUAL "")
+          set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DEPENDS ${last_test})
+        endif ()
       else ()
         add_test (
+            NAME H5REPACK_CMP-${testname}-clear-objects
+            COMMAND    ${CMAKE_COMMAND}
+                -E remove
+                testfiles/out-${testname}.${resultfile}
+                testfiles/${resultfile}-${testname}.out
+                testfiles/${resultfile}-${testname}.out.err
+        )
+        if (NOT "${last_test}" STREQUAL "")
+          set_tests_properties (H5REPACK_CMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
+        endif ()
+        add_test (
             NAME H5REPACK_CMP-${testname}
             COMMAND "${CMAKE_COMMAND}"
                 -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
@@ -221,9 +282,54 @@
                 -D "TEST_REFERENCE=${resultfile}-${testname}.tst"
                 -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
         )
+        set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DEPENDS H5REPACK_CMP-${testname}-clear-objects)
       endif ()
-      if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DEPENDS ${last_test})
+    endif ()
+  endmacro ()
+
+  macro (ADD_H5_MASK_TEST testname testtype resultcode resultfile)
+    if ("${testtype}" STREQUAL "SKIP")
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_MASK-${testname}-SKIPPED
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
+        )
+      endif ()
+    else ()
+      # If using memchecker add tests without using scripts
+      if (HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_MASK-${testname}
+            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
+        )
+        if (NOT "${last_test}" STREQUAL "")
+          set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DEPENDS ${last_test})
+        endif ()
+      else (HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_MASK-${testname}-clear-objects
+            COMMAND    ${CMAKE_COMMAND}
+                -E remove
+                testfiles/out-${testname}.${resultfile}
+                testfiles/${resultfile}-${testname}.out
+                testfiles/${resultfile}-${testname}.out.err
+        )
+        if (NOT "${last_test}" STREQUAL "")
+          set_tests_properties (H5REPACK_MASK-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
+        endif ()
+        add_test (
+            NAME H5REPACK_MASK-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
+                -D "TEST_ARGS:STRING=${ARGN};${resultfile};out-${testname}.${resultfile}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${resultfile}-${testname}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_MASK_ERROR=true"
+                -D "TEST_REFERENCE=${resultfile}-${testname}.tst"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+        set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DEPENDS H5REPACK_MASK-${testname}-clear-objects)
       endif ()
     endif ()
   endmacro ()
@@ -237,13 +343,22 @@
         )
       endif ()
     else ()
-      # If using memchecker add tests without using scripts
       add_test (
-          NAME H5REPACK_DMP-${testname}
-          COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile})
+          NAME H5REPACK_DMP-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/out-${testname}.${resultfile}
+              testfiles/${resultfile}-${testname}.out
+              testfiles/${resultfile}-${testname}.out.err
+      )
       if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DEPENDS ${last_test})
+        set_tests_properties (H5REPACK_DMP-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
       endif ()
+      add_test (
+          NAME H5REPACK_DMP-${testname}
+          COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}
+      )
+      set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DEPENDS H5REPACK_DMP-${testname}-clear-objects)
       if (NOT HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
             NAME H5REPACK_DMP-h5dump-${testname}
@@ -261,6 +376,48 @@
     endif ()
   endmacro ()
 
+  macro (ADD_H5_STAT_TEST testname testtype resultcode statarg resultfile)
+    if ("${testtype}" STREQUAL "SKIP")
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_STAT-${testname}-SKIPPED
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${statarg}.${resultfile}"
+        )
+      endif ()
+    else ()
+      add_test (
+          NAME H5REPACK_STAT-${testname}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/out-${statarg}.${resultfile}
+              testfiles/${resultfile}-${testname}.out
+              testfiles/${resultfile}-${testname}.out.err
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5REPACK_STAT-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
+      add_test (
+          NAME H5REPACK_STAT-${testname}
+          COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${statarg}.${resultfile}
+      )
+      set_tests_properties (H5REPACK_STAT-${testname} PROPERTIES DEPENDS H5REPACK_STAT-${testname}-clear-objects)
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_STAT-h5stat-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5stat>"
+                -D "TEST_ARGS:STRING=-S;-s;out-${statarg}.${resultfile}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${resultfile}-${testname}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${statarg}.${resultfile}.ddl"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+        set_tests_properties (H5REPACK_STAT-h5stat-${testname} PROPERTIES DEPENDS "H5REPACK_STAT-${testname}")
+      endif ()
+    endif ()
+  endmacro ()
+
   macro (ADD_H5_VERIFY_TEST testname testtype resultcode testfile testdset testfilter)
     if ("${testtype}" STREQUAL "SKIP")
       if (NOT HDF5_ENABLE_USING_MEMCHECKER)
@@ -272,13 +429,22 @@
     else ()
       if (NOT HDF5_ENABLE_USING_MEMCHECKER)
         add_test (
-            NAME H5REPACK_VERIFY_LAYOUT-${testname}
-            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+            NAME H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects
+            COMMAND    ${CMAKE_COMMAND}
+                -E remove
+                testfiles/out-${testname}.${testfile}
+                testfiles/${testfile}-${testname}-v.out
+                testfiles/${testfile}-${testname}-v.out.err
         )
         if (NOT "${last_test}" STREQUAL "")
-          set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS ${last_test})
+          set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
         endif ()
         add_test (
+            NAME H5REPACK_VERIFY_LAYOUT-${testname}
+            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+        )
+        set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}-clear-objects)
+        add_test (
             NAME H5REPACK_VERIFY_LAYOUT-${testname}_DFF
             COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
         )
@@ -326,14 +492,23 @@
   endmacro ()
 
   macro (ADD_H5_TEST_META testname testfile)
+      # Remove any output file left over from previous test run
       add_test (
-          NAME H5REPACK_META-${testname}_N
-          COMMAND $<TARGET_FILE:h5repack> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_N.${testname}.h5
+          NAME H5REPACK_META-${testname}_N-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/out-${testname}_N.${testname}.h5
+              testfiles/out-${testname}_M.${testname}.h5
       )
       if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES DEPENDS ${last_test})
+        set_tests_properties (H5REPACK_META-${testname}_N-clear-objects PROPERTIES DEPENDS ${last_test})
       endif ()
       add_test (
+          NAME H5REPACK_META-${testname}_N
+          COMMAND $<TARGET_FILE:h5repack> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_N.${testname}.h5
+      )
+      set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES DEPENDS H5REPACK_META-${testname}_N-clear-objects)
+      add_test (
           NAME H5REPACK_META-${testname}_M
           COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5
       )
@@ -348,11 +523,18 @@
     if (NOT HDF5_ENABLE_USING_MEMCHECKER)
       # Remove any output file left over from previous test run
       add_test (
-          NAME H5REPACK_UD-${testname}-clearall-objects
+          NAME H5REPACK_UD-${testname}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove
               testfiles/out-${testname}.${resultfile}
+              testfiles/${testname}.${resultfile}.out
+              testfiles/${testname}.${resultfile}.out.err
+              testfiles/${resultfile}-${testname}.out
+              testfiles/${resultfile}-${testname}.out.err
       )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5REPACK_UD-${testname}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
       add_test (
           NAME H5REPACK_UD-${testname}
           COMMAND "${CMAKE_COMMAND}"
@@ -367,21 +549,21 @@
               -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5REPACK_UD-${testname} PROPERTIES DEPENDS H5REPACK_UD-${testname}-clearall-objects)
+      set_tests_properties (H5REPACK_UD-${testname} PROPERTIES DEPENDS H5REPACK_UD-${testname}-clear-objects)
       add_test (
-          NAME H5REPACK_UD-h5dump-${testname}
+          NAME H5REPACK_UD-${testname}-h5dump
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
               -D "TEST_ARGS:STRING=-pH;out-${testname}.${resultfile}"
               -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
               -D "TEST_OUTPUT=${resultfile}-${testname}.out"
-              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_EXPECT=0"
               -D "TEST_REFERENCE=${resultfile}-${testname}.ddl"
               -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
               -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
-      set_tests_properties (H5REPACK_UD-h5dump-${testname} PROPERTIES DEPENDS "H5REPACK_UD-${testname}")
+      set_tests_properties (H5REPACK_UD-${testname}-h5dump PROPERTIES DEPENDS "H5REPACK_UD-${testname}")
     endif ()
   endmacro ()
 
@@ -416,189 +598,177 @@
   set (FILE_REF h5repack_refs.h5)
   set (FILE_ATTR_REF h5repack_attr_refs.h5)
 
-  # Remove any output file left over from previous test run
-  add_test (
-      NAME H5REPACK-clearall-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-         ./testfiles/h5dump-help.out
-         ./testfiles/h5repack_filters.h5-gzip_verbose_filters.out
-         ./testfiles/h5repack_filters.h5-gzip_verbose_filters.out.err
-         ./testfiles/h5repack_layout.h5-chunk_18x13-v.out
-         ./testfiles/h5repack_layout.h5-chunk_18x13-v.out.err
-         ./testfiles/h5repack_layout.h5-chunk_20x10-v.out
-         ./testfiles/h5repack_layout.h5-chunk_20x10-v.out.err
-         ./testfiles/h5repack_layout.h5-chunk_compa-v.out
-         ./testfiles/h5repack_layout.h5-chunk_compa-v.out.err
-         ./testfiles/h5repack_layout.h5-chunk_conti-v.out
-         ./testfiles/h5repack_layout.h5-chunk_conti-v.out.err
-         ./testfiles/h5repack_layout.h5-compa-v.out
-         ./testfiles/h5repack_layout.h5-compa-v.out.err
-         ./testfiles/h5repack_layout.h5-conti-v.out
-         ./testfiles/h5repack_layout.h5-conti-v.out.err
-         ./testfiles/h5repack_layout.h5-deflate_limit.out
-         ./testfiles/h5repack_layout.h5-deflate_limit.out.err
-         ./testfiles/h5repack_layout.h5-dset2_chunk_20x10-v.out
-         ./testfiles/h5repack_layout.h5-dset2_chunk_20x10-v.out.err
-         ./testfiles/h5repack_layout.h5-dset2_compa-v.out
-         ./testfiles/h5repack_layout.h5-dset2_compa-v.out.err
-         ./testfiles/h5repack_layout.h5-dset2_conti-v.out
-         ./testfiles/h5repack_layout.h5-dset2_conti-v.out.err
-         ./testfiles/h5repack_layout.h5-dset_compa_chunk-v.out
-         ./testfiles/h5repack_layout.h5-dset_compa_chunk-v.out.err
-         ./testfiles/h5repack_layout.h5-dset_compa_compa-v.out
-         ./testfiles/h5repack_layout.h5-dset_compa_compa-v.out.err
-         ./testfiles/h5repack_layout.h5-dset_compa_conti-v.out
-         ./testfiles/h5repack_layout.h5-dset_compa_conti-v.out.err
-         ./testfiles/h5repack_layout.h5-dset_conti_chunk-v.out
-         ./testfiles/h5repack_layout.h5-dset_conti_chunk-v.out.err
-         ./testfiles/h5repack_layout.h5-dset_conti_compa-v.out
-         ./testfiles/h5repack_layout.h5-dset_conti_compa-v.out.err
-         ./testfiles/h5repack_layout.h5-dset_conti_conti-v.out
-         ./testfiles/h5repack_layout.h5-dset_conti_conti-v.out.err
-         ./testfiles/h5repack_layout.h5-layout_long_switches-v.out
-         ./testfiles/h5repack_layout.h5-layout_long_switches-v.out.err
-         ./testfiles/h5repack_layout.h5-layout_short_switches-v.out
-         ./testfiles/h5repack_layout.h5-layout_short_switches-v.out.err
-         ./testfiles/h5repack_layout.h5-plugin_test.out
-         ./testfiles/h5repack_layout.h5-plugin_test.out.err
-         ./testfiles/h5repack_layout2.h5-contig_small_compa-v.out
-         ./testfiles/h5repack_layout2.h5-contig_small_compa-v.out.err
-         ./testfiles/h5repack_layout2.h5-contig_small_fixed_compa-v.out
-         ./testfiles/h5repack_layout2.h5-contig_small_fixed_compa-v.out.err
-         ./testfiles/h5repack_layout3.h5-ckdim_biger-v.out
-         ./testfiles/h5repack_layout3.h5-ckdim_biger-v.out.err
-         ./testfiles/h5repack_layout3.h5-ckdim_smaller-v.out
-         ./testfiles/h5repack_layout3.h5-ckdim_smaller-v.out.err
-         ./testfiles/h5repack_layout3.h5-chunk2chunk-v.out
-         ./testfiles/h5repack_layout3.h5-chunk2chunk-v.out.err
-         ./testfiles/h5repack_layout3.h5-chunk2compa-v.out
-         ./testfiles/h5repack_layout3.h5-chunk2compa-v.out.err
-         ./testfiles/h5repack_layout3.h5-chunk2conti-v.out
-         ./testfiles/h5repack_layout3.h5-chunk2conti-v.out.err
-         ./testfiles/h5repack_layout3.h5-error1-v.out
-         ./testfiles/h5repack_layout3.h5-error1-v.out.err
-         ./testfiles/h5repack_layout3.h5-error2-v.out
-         ./testfiles/h5repack_layout3.h5-error2-v.out.err
-         ./testfiles/h5repack_layout3.h5-error3-v.out
-         ./testfiles/h5repack_layout3.h5-error3-v.out.err
-         ./testfiles/out-family.tfamily%05d.h5
-         ./testfiles/out-HDFFV-7840.h5diff_attr1.h5
-         ./testfiles/out-attr.h5repack_attr.h5
-         ./testfiles/out-native_attr.h5repack_attr.h5
-         ./testfiles/out-HDFFV-5932.h5repack_attr_refs.h5
-         ./testfiles/out-deflate_copy.h5repack_deflate.h5
-         ./testfiles/out-deflate_remove.h5repack_deflate.h5
-         ./testfiles/out-early.h5repack_early.h5
-         ./testfiles/out-fill.h5repack_fill.h5
-         ./testfiles/out-native_fill.h5repack_fill.h5
-         ./testfiles/out-gzip_verbose_filters.h5repack_filters.h5
-         ./testfiles/out-fletcher_copy.h5repack_fletcher.h5
-         ./testfiles/out-fletcher_remove.h5repack_fletcher.h5
-         ./testfiles/out-hlink.h5repack_hlink.h5
-         ./testfiles/out-chunk_18x13.h5repack_layout.h5
-         ./testfiles/out-chunk_20x10.h5repack_layout.h5
-         ./testfiles/out-chunk_compa.h5repack_layout.h5
-         ./testfiles/out-chunk_conti.h5repack_layout.h5
-         ./testfiles/out-compa.h5repack_layout.h5
-         ./testfiles/out-conti.h5repack_layout.h5
-         ./testfiles/out-deflate_file.h5repack_layout.h5
-         ./testfiles/out-deflate_limit.h5repack_layout.h5
-         ./testfiles/out-dset2_chunk_20x10.h5repack_layout.h5
-         ./testfiles/out-dset2_compa.h5repack_layout.h5
-         ./testfiles/out-dset2_conti.h5repack_layout.h5
-         ./testfiles/out-dset_compa_chunk.h5repack_layout.h5
-         ./testfiles/out-dset_compa_compa.h5repack_layout.h5
-         ./testfiles/out-dset_compa_conti.h5repack_layout.h5
-         ./testfiles/out-dset_conti_chunk.h5repack_layout.h5
-         ./testfiles/out-dset_conti_compa.h5repack_layout.h5
-         ./testfiles/out-dset_conti_conti.h5repack_layout.h5
-         ./testfiles/out-fletcher_all.h5repack_layout.h5
-         ./testfiles/out-fletcher_individual.h5repack_layout.h5
-         ./testfiles/out-global_filters.h5repack_layout.h5
-         ./testfiles/out-gzip_all.h5repack_layout.h5
-         ./testfiles/out-gzip_individual.h5repack_layout.h5
-         ./testfiles/out-layout.h5repack_layout.h5
-         ./testfiles/out-layout_long_switches.h5repack_layout.h5
-         ./testfiles/out-layout_short_switches.h5repack_layout.h5
-         ./testfiles/out-old_style_layout_short_switches.h5repack_layout.h5
-         ./testfiles/out-plugin_test.h5repack_layout.h5
-         ./testfiles/out-shuffle_all.h5repack_layout.h5
-         ./testfiles/out-shuffle_individual.h5repack_layout.h5
-         ./testfiles/out-upgrade_layout.h5repack_layouto.h5
-         ./testfiles/out-contig_small_compa.h5repack_layout2.h5
-         ./testfiles/out-contig_small_fixed_compa.h5repack_layout2.h5
-         ./testfiles/out-ckdim_biger.h5repack_layout3.h5
-         ./testfiles/out-ckdim_smaller.h5repack_layout3.h5
-         ./testfiles/out-chunk2chunk.h5repack_layout3.h5
-         ./testfiles/out-chunk2compa.h5repack_layout3.h5
-         ./testfiles/out-chunk2conti.h5repack_layout3.h5
-         ./testfiles/out-error1.h5repack_layout3.h5
-         ./testfiles/out-error2.h5repack_layout3.h5
-         ./testfiles/out-error3.h5repack_layout3.h5
-         ./testfiles/out-error4.h5repack_layout3.h5
-         ./testfiles/out-committed_dt.h5repack_named_dtypes.h5
-         ./testfiles/out-nbit_add.h5repack_nbit.h5
-         ./testfiles/out-nbit_copy.h5repack_nbit.h5
-         ./testfiles/out-nbit_remove.h5repack_nbit.h5
-         ./testfiles/out-add_alignment.h5repack_objs.h5
-         ./testfiles/out-add_userblock.h5repack_objs.h5
-         ./testfiles/out-objs.h5repack_objs.h5
-         ./testfiles/out-gt_mallocsize.h5repack_objs.h5
-         ./testfiles/out-bug1814.h5repack_refs.h5
-         ./testfiles/out-shuffle_copy.h5repack_shuffle.h5
-         ./testfiles/out-shuffle_remove.h5repack_shuffle.h5
-         ./testfiles/out-scale_add.h5repack_soffset.h5
-         ./testfiles/out-scale_copy.h5repack_soffset.h5
-         ./testfiles/out-scale_remove.h5repack_soffset.h5
-         ./testfiles/out-meta_short_M.meta_short.h5
-         ./testfiles/out-meta_short_N.meta_short.h5
-         ./testfiles/out-meta_long_M.meta_long.h5
-         ./testfiles/out-meta_long_N.meta_long.h5
-         # from the h5repacktst
-         h5repack_attr.h5
-         h5repack_attr_out.h5
-         h5repack_attr_refs.h5
-         h5repack_big.h5
-         h5repack_deflate.h5
-         h5repack_deflate_out.h5
-         h5repack_early2.h5
-         h5repack_early.h5
-         h5repack_early_out.h5
-         h5repack_ext.h5
-         h5repack_ext_out.h5
-         h5repack_fill.h5
-         h5repack_fill_out.h5
-         h5repack_filters.h5
-         h5repack_filters_out.h5
-         h5repack_fletcher.h5
-         h5repack_fletcher_out.h5
-         h5repack_hlink.h5
-         h5repack_hlink_out.h5
-         h5repack_layout.h5
-         h5repack_layout_out.h5
-         h5repack_layout2.h5
-         h5repack_layout3.h5
-         h5repack_named_dtypes.h5
-         h5repack_named_dtypes_out.h5
-         h5repack_nbit.h5
-         h5repack_nbit_out.h5
-         h5repack_objs.h5
-         h5repack_objs_out.h5
-         h5repack_refs.h5
-         h5repack_shuffle.h5
-         h5repack_shuffle_out.h5
-         h5repack_soffset.h5
-         h5repack_soffset_out.h5
-         h5repack_szip.h5
-         h5repack_szip_out.h5
-         h5repack_ub.h5
-         h5repack_ub_out.h5
-         h5repack_ext.bin
-         ublock.bin
-  )
-  if (NOT "${last_test}" STREQUAL "")
-    set_tests_properties (H5REPACK-clearall-objects PROPERTIES DEPENDS ${last_test})
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    # Remove any output file left over from previous test run
+    set (LIST_TO_CLEAR
+        h5dump-help.out
+        h5repack_layout.h5-chunk_18x13-v.out
+        h5repack_layout.h5-chunk_18x13-v.out.err
+        h5repack_layout.h5-chunk_20x10-v.out
+        h5repack_layout.h5-chunk_20x10-v.out.err
+        h5repack_layout.h5-chunk_compa-v.out
+        h5repack_layout.h5-chunk_compa-v.out.err
+        h5repack_layout.h5-chunk_conti-v.out
+        h5repack_layout.h5-chunk_conti-v.out.err
+        h5repack_layout.h5-compa-v.out
+        h5repack_layout.h5-compa-v.out.err
+        h5repack_layout.h5-conti-v.out
+        h5repack_layout.h5-conti-v.out.err
+        h5repack_layout.h5-deflate_limit.out
+        h5repack_layout.h5-deflate_limit.out.err
+        h5repack_layout.h5-dset2_chunk_20x10-v.out
+        h5repack_layout.h5-dset2_chunk_20x10-v.out.err
+        h5repack_layout.h5-dset2_chunk_20x10-errstk.out
+        h5repack_layout.h5-dset2_chunk_20x10-errstk.out.err
+        h5repack_layout.h5-dset2_compa-v.out
+        h5repack_layout.h5-dset2_compa-v.out.err
+        h5repack_layout.h5-dset2_conti-v.out
+        h5repack_layout.h5-dset2_conti-v.out.err
+        h5repack_layout.h5-dset_compa_chunk-v.out
+        h5repack_layout.h5-dset_compa_chunk-v.out.err
+        h5repack_layout.h5-dset_compa_compa-v.out
+        h5repack_layout.h5-dset_compa_compa-v.out.err
+        h5repack_layout.h5-dset_compa_conti-v.out
+        h5repack_layout.h5-dset_compa_conti-v.out.err
+        h5repack_layout.h5-dset_conti_chunk-v.out
+        h5repack_layout.h5-dset_conti_chunk-v.out.err
+        h5repack_layout.h5-dset_conti_compa-v.out
+        h5repack_layout.h5-dset_conti_compa-v.out.err
+        h5repack_layout.h5-dset_conti_conti-v.out
+        h5repack_layout.h5-dset_conti_conti-v.out.err
+        h5repack_layout.h5-layout_long_switches-v.out
+        h5repack_layout.h5-layout_long_switches-v.out.err
+        h5repack_layout.h5-layout_short_switches-v.out
+        h5repack_layout.h5-layout_short_switches-v.out.err
+        h5repack_layout.h5-plugin_test.out
+        h5repack_layout.h5-plugin_test.out.err
+        h5repack_layout2.h5-contig_small_compa-v.out
+        h5repack_layout2.h5-contig_small_compa-v.out.err
+        h5repack_layout2.h5-contig_small_fixed_compa-v.out
+        h5repack_layout2.h5-contig_small_fixed_compa-v.out.err
+        h5repack_layout3.h5-ckdim_biger-v.out
+        h5repack_layout3.h5-ckdim_biger-v.out.err
+        h5repack_layout3.h5-ckdim_smaller-v.out
+        h5repack_layout3.h5-ckdim_smaller-v.out.err
+        h5repack_layout3.h5-chunk2chunk-v.out
+        h5repack_layout3.h5-chunk2chunk-v.out.err
+        h5repack_layout3.h5-chunk2compa-v.out
+        h5repack_layout3.h5-chunk2compa-v.out.err
+        h5repack_layout3.h5-chunk2conti-v.out
+        h5repack_layout3.h5-chunk2conti-v.out.err
+        h5repack_layout3.h5-error1-v.out
+        h5repack_layout3.h5-error1-v.out.err
+        h5repack_layout3.h5-error2-v.out
+        h5repack_layout3.h5-error2-v.out.err
+        h5repack_layout3.h5-error3-v.out
+        h5repack_layout3.h5-error3-v.out.err
+        out-family.tfamily%05d.h5
+        out-HDFFV-7840.h5diff_attr1.h5
+        out-attr.h5repack_attr.h5
+        out-native_attr.h5repack_attr.h5
+        out-HDFFV-5932.h5repack_attr_refs.h5
+        out-deflate_copy.h5repack_deflate.h5
+        out-deflate_remove.h5repack_deflate.h5
+        out-early.h5repack_early.h5
+        out-fill.h5repack_fill.h5
+        out-native_fill.h5repack_fill.h5
+        out-gzip_verbose_filters.h5repack_filters.h5
+        out-fletcher_copy.h5repack_fletcher.h5
+        out-fletcher_remove.h5repack_fletcher.h5
+        out-hlink.h5repack_hlink.h5
+        out-chunk_18x13.h5repack_layout.h5
+        out-chunk_20x10.h5repack_layout.h5
+        out-chunk_compa.h5repack_layout.h5
+        out-chunk_conti.h5repack_layout.h5
+        out-compa.h5repack_layout.h5
+        out-conti.h5repack_layout.h5
+        out-deflate_file.h5repack_layout.h5
+        out-deflate_limit.h5repack_layout.h5
+        out-dset2_chunk_20x10.h5repack_layout.h5
+        out-dset2_compa.h5repack_layout.h5
+        out-dset2_conti.h5repack_layout.h5
+        out-dset_compa_chunk.h5repack_layout.h5
+        out-dset_compa_compa.h5repack_layout.h5
+        out-dset_compa_conti.h5repack_layout.h5
+        out-dset_conti_chunk.h5repack_layout.h5
+        out-dset_conti_compa.h5repack_layout.h5
+        out-dset_conti_conti.h5repack_layout.h5
+        out-fletcher_all.h5repack_layout.h5
+        out-fletcher_individual.h5repack_layout.h5
+        out-global_filters.h5repack_layout.h5
+        out-gzip_all.h5repack_layout.h5
+        out-gzip_individual.h5repack_layout.h5
+        out-layout.h5repack_layout.h5
+        out-layout_long_switches.h5repack_layout.h5
+        out-layout_short_switches.h5repack_layout.h5
+        out-old_style_layout_short_switches.h5repack_layout.h5
+        out-plugin_test.h5repack_layout.h5
+        out-shuffle_all.h5repack_layout.h5
+        out-shuffle_individual.h5repack_layout.h5
+        out-upgrade_layout.h5repack_layouto.h5
+        out-contig_small_compa.h5repack_layout2.h5
+        out-contig_small_fixed_compa.h5repack_layout2.h5
+        out-ckdim_biger.h5repack_layout3.h5
+        out-ckdim_smaller.h5repack_layout3.h5
+        out-chunk2chunk.h5repack_layout3.h5
+        out-chunk2compa.h5repack_layout3.h5
+        out-chunk2conti.h5repack_layout3.h5
+        out-error1.h5repack_layout3.h5
+        out-error2.h5repack_layout3.h5
+        out-error3.h5repack_layout3.h5
+        out-error4.h5repack_layout3.h5
+        out-committed_dt.h5repack_named_dtypes.h5
+        out-nbit_add.h5repack_nbit.h5
+        out-nbit_copy.h5repack_nbit.h5
+        out-nbit_remove.h5repack_nbit.h5
+        out-add_alignment.h5repack_objs.h5
+        out-add_userblock.h5repack_objs.h5
+        out-objs.h5repack_objs.h5
+        out-gt_mallocsize.h5repack_objs.h5
+        out-bug1814.h5repack_refs.h5
+        out-shuffle_copy.h5repack_shuffle.h5
+        out-shuffle_remove.h5repack_shuffle.h5
+        out-scale_add.h5repack_soffset.h5
+        out-scale_copy.h5repack_soffset.h5
+        out-scale_remove.h5repack_soffset.h5
+        out-meta_short_M.meta_short.h5
+        out-meta_short_N.meta_short.h5
+        out-meta_long_M.meta_long.h5
+        out-meta_long_N.meta_long.h5
+    )
+
+    set (LIST_TO_CLEAR ${LIST_TO_CLEAR} ${LIST_OTHER_TEST_FILES})
+
+    foreach (h5_file ${LIST_HDF5_TEST_FILES})
+      get_filename_component(fname "${h5_file}" NAME)
+      set (LIST_TO_CLEAR ${LIST_TO_CLEAR}
+           ${h5_file}.h5
+      )
+    endforeach ()
+
+    foreach (h5_file ${LIST_TST_TEST_FILES})
+      get_filename_component(fname "${h5_file}" NAME)
+      set (LIST_TO_CLEAR ${LIST_TO_CLEAR}
+           ${h5_file}.tst.out
+           ${h5_file}.tst.out.err
+      )
+    endforeach ()
+
+    foreach (h5_file ${LIST_DDL_TEST_FILES})
+      get_filename_component(fname "${h5_file}" NAME)
+      set (LIST_TO_CLEAR ${LIST_TO_CLEAR}
+           ${h5_file}.ddl.out
+           ${h5_file}.ddl.out.err
+      )
+    endforeach ()
+    add_test (
+        NAME H5REPACK-clearall-objects
+        COMMAND ${CMAKE_COMMAND} -E remove ${LIST_TO_CLEAR}
+    )
+    set_tests_properties (H5REPACK-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+    if (NOT "${last_test}" STREQUAL "")
+      set_tests_properties (H5REPACK-clearall-objects PROPERTIES DEPENDS ${last_test})
+    endif ()
   endif ()
 
   ADD_HELP_TEST(help 0 -h)
@@ -636,17 +806,17 @@
 # filters are defined.
 
 # detect whether the encoder is present.
-  set (USE_FILTER_SZIP_ENCODER "no")
+#  set (USE_FILTER_SZIP_ENCODER 0)
   if (HDF5_ENABLE_SZIP_ENCODING)
     set (USE_FILTER_SZIP_ENCODER ${testh5repack_detect_szip})
   endif ()
 
   if (H5_HAVE_FILTER_DEFLATE)
-    set (USE_FILTER_DEFLATE "true")
+    set (USE_FILTER_DEFLATE 1)
   endif ()
 
   if (H5_HAVE_FILTER_SZIP)
-    set (USE_FILTER_SZIP "true")
+    set (USE_FILTER_SZIP 1)
   endif ()
 
 # copy files (these files have no filters)
@@ -678,16 +848,20 @@
 # szip with individual object
   set (arg ${FILE4} -f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10)
   set (TESTTYPE "TEST")
-  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
-    set (TESTTYPE "SKIP")
+  if (NOT USE_FILTER_SZIP_ENCODER)
+    if (NOT USE_FILTER_SZIP)
+      set (TESTTYPE "SKIP")
+    endif ()
   endif ()
   ADD_H5_TEST (szip_individual ${TESTTYPE} ${arg})
 
 # szip for all
   set (arg ${FILE4} -f SZIP=8,NN)
   set (TESTTYPE "TEST")
-  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
-    set (TESTTYPE "SKIP")
+  if (NOT USE_FILTER_SZIP_ENCODER)
+    if (NOT USE_FILTER_SZIP)
+      set (TESTTYPE "SKIP")
+    endif ()
   endif ()
   ADD_H5_TEST (szip_all ${TESTTYPE} ${arg})
 
@@ -710,8 +884,10 @@
 # all filters
   set (arg ${FILE4} -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8,NN -f dset2:GZIP=1 -l dset2:CHUNK=20x10)
   set (TESTTYPE "TEST")
-  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP OR NOT USE_FILTER_DEFLATE)
-    set (TESTTYPE "SKIP")
+  if (NOT USE_FILTER_SZIP_ENCODER)
+    if (NOT USE_FILTER_SZIP OR NOT USE_FILTER_DEFLATE)
+      set (TESTTYPE "SKIP")
+    endif ()
   endif ()
   ADD_H5_TEST (all_filters ${TESTTYPE} ${arg})
 
@@ -730,16 +906,20 @@
 # szip copy
   set (arg ${FILE7})
   set (TESTTYPE "TEST")
-  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
-    set (TESTTYPE "SKIP")
+  if (NOT USE_FILTER_SZIP_ENCODER)
+    if (NOT USE_FILTER_SZIP)
+      set (TESTTYPE "SKIP")
+    endif ()
   endif ()
   ADD_H5_TEST (szip_copy ${TESTTYPE} ${arg})
 
 # szip remove
   set (arg ${FILE7} --filter=dset_szip:NONE)
   set (TESTTYPE "TEST")
-  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
-    set (TESTTYPE "SKIP")
+  if (NOT USE_FILTER_SZIP_ENCODER)
+    if (NOT USE_FILTER_SZIP)
+      set (TESTTYPE "SKIP")
+    endif ()
   endif ()
   ADD_H5_TEST (szip_remove ${TESTTYPE} ${arg})
 
@@ -802,23 +982,29 @@
 # remove all  filters
   set (arg ${FILE11} -f NONE)
   set (TESTTYPE "TEST")
-  if (NOT USE_FILTER_DEFLATE OR NOT USE_FILTER_SZIP OR NOT USE_FILTER_SZIP_ENCODER)
-    set (TESTTYPE "SKIP")
+  if (NOT USE_FILTER_SZIP_ENCODER)
+    if (NOT USE_FILTER_SZIP OR NOT USE_FILTER_DEFLATE)
+      set (TESTTYPE "SKIP")
+    endif ()
   endif ()
   ADD_H5_TEST (remove_all ${TESTTYPE} ${arg})
 
 #filter conversions
   set (arg ${FILE8} -f dset_deflate:SZIP=8,NN)
   set (TESTTYPE "TEST")
-  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP OR NOT USE_FILTER_DEFLATE)
-    set (TESTTYPE "SKIP")
+  if (NOT USE_FILTER_SZIP_ENCODER)
+    if (NOT USE_FILTER_SZIP OR NOT USE_FILTER_DEFLATE)
+      set (TESTTYPE "SKIP")
+    endif ()
   endif ()
   ADD_H5_TEST (deflate_convert ${TESTTYPE} ${arg})
 
   set (arg ${FILE7} -f dset_szip:GZIP=1)
   set (TESTTYPE "TEST")
-  if (NOT USE_FILTER_SZIP OR NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_DEFLATE)
-    set (TESTTYPE "SKIP")
+  if (NOT USE_FILTER_SZIP_ENCODER)
+    if (NOT USE_FILTER_SZIP OR NOT USE_FILTER_DEFLATE)
+      set (TESTTYPE "SKIP")
+    endif ()
   endif ()
   ADD_H5_TEST (szip_convert ${TESTTYPE} ${arg})
 
@@ -852,6 +1038,7 @@
   ADD_H5_VERIFY_TEST (conti "TEST" 1 ${FILE4} null CONTIGUOUS -l CONTI)
   ADD_H5_VERIFY_TEST (dset2_compa "TEST" 0 ${FILE4} dset2 COMPACT -l dset2:COMPA)
   ADD_H5_VERIFY_TEST (compa "TEST" 1 ${FILE4} null COMPACT -l COMPA)
+  ADD_H5_MASK_TEST (dset2_chunk_20x10-errstk "TEST" 0 ${FILE4} --layout=dset2:CHUNK=20x10x5 --enable-error-stack)
 
 ################################################################
 # layout conversions (file has no filters)
@@ -1000,15 +1187,11 @@
 ##############################################################################
 ###    P L U G I N  T E S T S
 ##############################################################################
-  ADD_H5_UD_TEST (plugin_version_test 0 h5repack_layout.h5 -v -f UD=260,4,9,${H5_VERS_MAJOR},${H5_VERS_MINOR},${H5_VERS_RELEASE})
-  ADD_H5_UD_TEST (plugin_test 0 h5repack_layout.h5 -v -f UD=257,1,9)
+  ADD_H5_UD_TEST (plugin_version_test 0 h5repack_layout.h5 -v -f UD=260,0,4,9,${H5_VERS_MAJOR},${H5_VERS_MINOR},${H5_VERS_RELEASE})
+  ADD_H5_UD_TEST (plugin_test 0 h5repack_layout.h5 -v -f UD=257,0,1,9)
   ADD_H5_UD_TEST (plugin_none 0 h5repack_layout.UD.h5 -v -f NONE)
   # check for no parameters
-  set (TESTRETVAL 255)
-  if (WIN32)
-    set (TESTRETVAL -1)
-  endif ()
-  ADD_H5_CMP_TEST (plugin_zero "" "TEST" ${TESTRETVAL} h5repack_layout.h5 -v -f UD=250,0)
+  ADD_H5_UD_TEST (plugin_zero 0 h5repack_layout.h5 -v -f UD=250,0,0)
 
   if (HDF5_TEST_VFD)
     # Run test with different Virtual File Driver
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index f2518f0..2031191 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -629,6 +629,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index 0ab5404..e8c3409 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -11,10 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
 #include "H5private.h"
 #include "h5repack.h"
 #include "h5tools.h"
@@ -43,11 +39,6 @@ static int have_request(pack_opt_t *options);
  *  object name requests
  *
  * Return: 0, ok, -1, fail
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: September, 22, 2003
- *
  *-------------------------------------------------------------------------
  */
 int h5repack(const char* infile, const char* outfile, pack_opt_t *options) {
@@ -72,17 +63,17 @@ int h5repack(const char* infile, const char* outfile, pack_opt_t *options) {
  * Purpose: initialize options
  *
  * Return: 0, ok, -1, fail
- *
  *-------------------------------------------------------------------------
  */
-
-h5repack_init(pack_opt_t *options, int verbose)
+int
+h5repack_init(pack_opt_t *options, int verbose, hbool_t latest)
 {
     int k, n;
 
     HDmemset(options, 0, sizeof(pack_opt_t));
     options->min_comp = 0;
     options->verbose = verbose;
+    options->latest = latest;
     options->layout_g = H5D_LAYOUT_ERROR;
 
     for (n = 0; n < H5_REPACK_MAX_NFILTERS; n++) {
@@ -99,7 +90,6 @@ h5repack_init(pack_opt_t *options, int verbose)
  * Function: h5repack_end
  *
  * Purpose: free options table
- *
  *-------------------------------------------------------------------------
  */
 
@@ -114,18 +104,17 @@ int h5repack_end(pack_opt_t *options) {
  *   Example: -f dset:GZIP=6
  *
  * Return: 0, ok, -1, fail
- *
  *-------------------------------------------------------------------------
  */
 int
-h5repack_addfilter(const char* str, pack_opt_t *options)
+h5repack_addfilter(const char *str, pack_opt_t *options)
 {
     obj_list_t   *obj_list = NULL; /* one object list for the -f and -l option entry */
     filter_info_t filter;          /* filter info for the current -f option entry */
     unsigned      n_objs;          /* number of objects in the current -f or -l option entry */
     int           is_glb;          /* is the filter global */
 
-    /* parse the -f option */
+    /* parse the -f (--filter) option */
     if (NULL == (obj_list = parse_filter(str, &n_objs, &filter, options, &is_glb)))
         return -1;
 
@@ -155,11 +144,10 @@ h5repack_addfilter(const char* str, pack_opt_t *options)
  * Purpose: add a layout option
  *
  * Return: 0, ok, -1, fail
- *
  *-------------------------------------------------------------------------
  */
 int
-h5repack_addlayout(const char* str, pack_opt_t *options)
+h5repack_addlayout(const char *str, pack_opt_t *options)
 {
     obj_list_t *obj_list = NULL; /*one object list for the -t and -c option entry */
     unsigned    n_objs;          /*number of objects in the current -t or -c option entry */
@@ -223,11 +211,6 @@ h5repack_addlayout(const char* str, pack_opt_t *options)
  *          returned must be closed after it is no longer needed.
  *          named_datatype_free must be called before the program exits
  *          to free the stack.
- *
- * Programmer: Neil Fortner
- *
- * Date: April 14, 2009
- *
  *-------------------------------------------------------------------------
  */
 hid_t copy_named_datatype(hid_t type_in, hid_t fidout,
@@ -238,13 +221,12 @@ hid_t copy_named_datatype(hid_t type_in, hid_t fidout,
     hid_t       ret_value = -1;        /* The identifier of the named dtype in the out file */
 
     if (H5Oget_info(type_in, &oinfo) < 0)
-        goto done;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Oget_info failed");
 
     if (*named_dt_head_p) {
         /* Stack already exists, search for the datatype */
         while (dt && dt->addr_in != oinfo.addr)
             dt = dt->next;
-
         dt_ret = dt;
     }
     else {
@@ -255,7 +237,7 @@ hid_t copy_named_datatype(hid_t type_in, hid_t fidout,
             if (travt->objs[i].type == H5TRAV_TYPE_NAMED_DATATYPE) {
                 /* Push onto the stack */
                 if (NULL == (dt = (named_dt_t *)HDmalloc(sizeof(named_dt_t))))
-                    goto done;
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "buffer allocation failed failed");
                 dt->next = *named_dt_head_p;
                 *named_dt_head_p = dt;
 
@@ -265,7 +247,6 @@ hid_t copy_named_datatype(hid_t type_in, hid_t fidout,
 
                 /* Check if this type is the one requested */
                 if (oinfo.addr == dt->addr_in) {
-                    HDassert(!dt_ret);
                     dt_ret = dt;
                 } /* end if */
             } /* end if */
@@ -277,7 +258,7 @@ hid_t copy_named_datatype(hid_t type_in, hid_t fidout,
     if (!dt_ret) {
         /* Push the new datatype onto the stack */
         if (NULL == (dt_ret = (named_dt_t *)HDmalloc(sizeof(named_dt_t))))
-            goto done;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "buffer allocation failed failed");
         dt_ret->next = *named_dt_head_p;
         *named_dt_head_p = dt_ret;
 
@@ -294,32 +275,26 @@ hid_t copy_named_datatype(hid_t type_in, hid_t fidout,
         else
             dt_ret->id_out = H5Tcopy(type_in);
         if (dt_ret->id_out < 0)
-            goto done;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_native_type-H5Tcopy failed");
         if (H5Tcommit_anon(fidout, dt_ret->id_out, H5P_DEFAULT, H5P_DEFAULT) < 0)
-            goto done;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tcommit_anon failed");
     } /* end if */
 
     /* Set return value */
     ret_value = dt_ret->id_out;
 
-    /* Increment the ref count on id_out, because the calling function will try
-    * to close it */
+    /* Increment the ref count on id_out, because the calling function will try to close it */
     if(H5Iinc_ref(ret_value) < 0)
-        ret_value = -1;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Iinc_ref failed");
 
 done:
-    return (ret_value);
+    return ret_value;
 } /* end copy_named_datatype */
 
 /*-------------------------------------------------------------------------
  * Function: named_datatype_free
  *
  * Purpose: Frees the stack of named datatypes.
- *
- * Programmer: Neil Fortner
- *
- * Date: April 14, 2009
- *
  *-------------------------------------------------------------------------
  */
 int named_datatype_free(named_dt_t **named_dt_head_p, int ignore_err) {
@@ -329,7 +304,7 @@ int named_datatype_free(named_dt_t **named_dt_head_p, int ignore_err) {
     while (dt) {
         /* Pop the datatype off the stack and free it */
         if (H5Tclose(dt->id_out) < 0 && !ignore_err)
-            goto done;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tclose failed");
         dt = dt->next;
         HDfree(*named_dt_head_p);
         *named_dt_head_p = dt;
@@ -350,18 +325,13 @@ done:
  * loc_id = H5Topen2( fid, name);
  *
  * Return: 0, ok, -1 no
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: October, 28, 2003
- *
  *-------------------------------------------------------------------------
  */
 int
 copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
         trav_table_t *travt, pack_opt_t *options)
 {
-    int         ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    int         ret_value = 0;
     hid_t       attr_id = -1;  /* attr ID */
     hid_t       attr_out = -1; /* attr ID */
     hid_t       space_id = -1; /* space ID */
@@ -404,7 +374,7 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
         if ((is_named = H5Tcommitted(ftype_id)) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tcommitted failed");
         if (is_named && travt) {
-            hid_t fidout;
+            hid_t fidout = -1;
 
             /* Create out file id */
             if ((fidout = H5Iget_file_id(loc_out)) < 0)
@@ -455,7 +425,8 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
 
             base_type = H5Tget_super(ftype_id);
             is_ref = (is_ref || (H5Tget_class(base_type) == H5T_REFERENCE));
-            H5Tclose(base_type);
+            if (H5Tclose(base_type) < 0)
+                H5TOOLS_INFO(H5E_tools_min_id_g, "H5Tclose base_type failed");
         }
 
         if (type_class == H5T_COMPOUND) {
@@ -464,7 +435,8 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
             for (j = 0; j < nmembers; j++) {
                 hid_t mtid = H5Tget_member_type(wtype_id, (unsigned)j);
                 H5T_class_t mtclass = H5Tget_class(mtid);
-                H5Tclose(mtid);
+                if (H5Tclose(mtid) < 0)
+                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Tclose mtid failed");
 
                 if (mtclass == H5T_REFERENCE) {
                     is_ref = 1;
@@ -481,7 +453,6 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
 
             buf = (void *)HDmalloc((size_t)(nelmts * msize));
             if (buf == NULL) {
-                error_msg("h5repack", "cannot read into memory\n");
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
             } /* end if */
             if (H5Aread(attr_id, wtype_id, buf) < 0)
@@ -493,7 +464,7 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
              */
 
             if ((attr_out = H5Acreate2(loc_out, name, wtype_id, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Acreate2 failed");
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Acreate2 failed on ,%s>", name);
             if (H5Awrite(attr_out, wtype_id, buf) < 0)
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Awrite failed");
 
@@ -516,18 +487,19 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
          * close
          *-------------------------------------------------------------------------
          */
-
-        if (H5Tclose(ftype_id) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tclose failed");
-        if (H5Tclose(wtype_id) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tclose failed");
         if (H5Sclose(space_id) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sclose failed");
+        space_id = -1;
+        if (H5Tclose(wtype_id) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tclose failed");
+        wtype_id = -1;
+        if (H5Tclose(ftype_id) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tclose failed");
+        ftype_id = -1;
         if (H5Aclose(attr_id) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aclose failed");
-    } /* u */
-
-    return 0;
+        attr_id = -1;
+    } /* for u */
 
 done:
     H5E_BEGIN_TRY {
@@ -541,11 +513,11 @@ done:
             HDfree(buf);
         } /* end if */
 
-        H5Tclose(ftype_id);
-        H5Tclose(wtype_id);
+        H5Aclose(attr_out);
         H5Sclose(space_id);
+        H5Tclose(wtype_id);
+        H5Tclose(ftype_id);
         H5Aclose(attr_id);
-        H5Aclose(attr_out);
     } H5E_END_TRY;
 
     return ret_value;
@@ -557,13 +529,10 @@ done:
  * Purpose: print options, checks for invalid options
  *
  * Return: void, return -1 on error
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: September, 22, 2003
  *-------------------------------------------------------------------------
  */
 static int check_options(pack_opt_t *options) {
+    int          ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
     unsigned int i;
     int          k, j, has_cp = 0, has_ck = 0;
     char         slayout[30];
@@ -573,8 +542,8 @@ static int check_options(pack_opt_t *options) {
     *-------------------------------------------------------------------------
     */
     if (options->verbose && have_request(options) /* only print if requested */) {
-        printf("Objects to modify layout are...\n");
         if (options->all_layout == 1) {
+            printf("All objects to modify layout are...\n");
             switch (options->layout_g) {
             case H5D_COMPACT:
                 strcpy(slayout, "compact");
@@ -587,20 +556,22 @@ static int check_options(pack_opt_t *options) {
                 break;
             case H5D_LAYOUT_ERROR:
             case H5D_NLAYOUTS:
-                error_msg("invalid layout\n");
-                return -1;
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "invalid layout");
             default:
                 strcpy(slayout, "invalid layout\n");
-                return -1;
+                HGOTO_DONE(FAIL);
             }
-            printf(" Apply %s layout to all\n", slayout);
+            printf(" Apply %s layout to all", slayout);
             if (H5D_CHUNKED == options->layout_g) {
-                printf("with dimension [");
+                printf("with dimension [ ");
                 for (j = 0; j < options->chunk_g.rank; j++)
                     printf("%d ", (int) options->chunk_g.chunk_lengths[j]);
-                printf("]\n");
+                printf("]");
             }
+            printf("\n");
         }
+        else
+            printf("No all objects to modify layout\n");
     }/* verbose */
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
@@ -610,25 +581,20 @@ static int check_options(pack_opt_t *options) {
             if (options->verbose) {
                 printf(" <%s> with chunk size ", name);
                 for (k = 0; k < options->op_tbl->objs[i].chunk.rank; k++)
-                    printf("%d ",
-                            (int) options->op_tbl->objs[i].chunk.chunk_lengths[k]);
+                    printf("%d ", (int) options->op_tbl->objs[i].chunk.chunk_lengths[k]);
                 printf("\n");
             }
             has_ck = 1;
         }
         else if (options->op_tbl->objs[i].chunk.rank == -2) {
             if (options->verbose)
-                printf(" <%s> %s\n", name, "NONE (contigous)");
+                printf(" <%s> %s\n", name, "NONE (contiguous)");
             has_ck = 1;
         }
     }
 
-    if (options->all_layout == 1 && has_ck) {
-        error_msg(
-                "invalid chunking input: 'all' option\
-                            is present with other objects\n");
-        return -1;
-    }
+    if (options->all_layout == 1 && has_ck)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "invalid chunking input: 'all' option is present with other objects");
 
     /*-------------------------------------------------------------------------
     * objects to filter
@@ -636,10 +602,14 @@ static int check_options(pack_opt_t *options) {
     */
 
     if (options->verbose && have_request(options) /* only print if requested */) {
-        printf("Objects to apply filter are...\n");
         if (options->all_filter == 1) {
+            printf("All objects to apply filter are...\n");
             for (k = 0; k < options->n_filter_g; k++) {
                 H5Z_filter_t filtn = options->filter_g[k].filtn;
+                if (filtn < 0) {
+                    printf(" Unknown\n");
+                    continue;
+                }
                 switch (filtn) {
                 case H5Z_FILTER_NONE:
                     printf(" Uncompress all\n");
@@ -650,8 +620,7 @@ static int check_options(pack_opt_t *options) {
                     break;
                 case H5Z_FILTER_SZIP:
                 case H5Z_FILTER_DEFLATE:
-                    printf(" All with %s, parameter %d\n", get_sfilter(filtn),
-                            options->filter_g[k].cd_values[0]);
+                    printf(" All with %s, parameter %d\n", get_sfilter(filtn), options->filter_g[k].cd_values[0]);
                     break;
                 default:
                     printf(" User Defined %d\n", filtn);
@@ -659,6 +628,8 @@ static int check_options(pack_opt_t *options) {
                 } /* k */
             };
         }
+        else
+            printf("No all objects to apply filter\n");
     } /* verbose */
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
@@ -667,48 +638,34 @@ static int check_options(pack_opt_t *options) {
 
         for (j = 0; j < pack.nfilters; j++) {
             if (options->verbose) {
-                printf(" <%s> with %s filter\n", name,
-                        get_sfilter(pack.filter[j].filtn));
+                if(pack.filter[j].filtn >= 0) {
+                    if(pack.filter[j].filtn > H5Z_FILTER_SCALEOFFSET)
+                        printf(" <%s> with %s filter %d\n", name, get_sfilter(pack.filter[j].filtn), pack.filter[j].filtn);
+                    else
+                        printf(" <%s> with %s filter\n", name, get_sfilter(pack.filter[j].filtn));
+                }
             }
-
             has_cp = 1;
-
         } /* j */
     } /* i */
 
-    if (options->all_filter == 1 && has_cp) {
-        error_msg(
-                "invalid compression input: 'all' option\
-                            is present with other objects\n");
-        return -1;
-    }
+    if (options->all_filter == 1 && has_cp)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "invalid compression input: 'all' option is present with other objects");
 
     /*-------------------------------------------------------------------------
     * check options for the latest format
     *-------------------------------------------------------------------------
     */
 
-    if (options->grp_compact < 0) {
-        error_msg(
-                "invalid maximum number of links to store as header messages\n");
-        return -1;
-    }
-    if (options->grp_indexed < 0) {
-        error_msg(
-                "invalid minimum number of links to store in the indexed format\n");
-        return -1;
-    }
-    if (options->grp_indexed > options->grp_compact) {
-        error_msg(
-                "minimum indexed size is greater than the maximum compact size\n");
-        return -1;
-    }
-    for (i = 0; i < 8; i++) {
-        if (options->msg_size[i] < 0) {
-            error_msg("invalid shared message size\n");
-            return -1;
-        }
-    }
+    if (options->grp_compact < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "invalid maximum number of links to store as header messages");
+    if (options->grp_indexed < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "invalid minimum number of links to store in the indexed format");
+    if (options->grp_indexed > options->grp_compact)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "minimum indexed size is greater than the maximum compact size");
+    for (i = 0; i < 8; i++)
+        if (options->msg_size[i] < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "invalid shared message size");
 
     /*--------------------------------------------------------------------------------
     * verify new user userblock options; file name must be present
@@ -716,30 +673,24 @@ static int check_options(pack_opt_t *options) {
     */
     if (options->ublock_filename != NULL && options->ublock_size == 0) {
         if (options->verbose) {
-            printf(
-                    "Warning: user block size missing for file %s. Assigning a default size of 1024...\n",
-                    options->ublock_filename);
+            printf("Warning: user block size missing for file %s. Assigning a default size of 1024...\n", options->ublock_filename);
             options->ublock_size = 1024;
         }
     }
 
-    if (options->ublock_filename == NULL && options->ublock_size != 0) {
-        error_msg("file name missing for user block\n",
-                options->ublock_filename);
-        return -1;
-    }
+    if (options->ublock_filename == NULL && options->ublock_size != 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "file name missing for user block", options->ublock_filename);
 
     /*--------------------------------------------------------------------------------
     * verify alignment options; threshold is zero default but alignment not
     *---------------------------------------------------------------------------------
     */
 
-    if (options->alignment == 0 && options->threshold != 0) {
-        error_msg("alignment for H5Pset_alignment missing\n");
-        return -1;
-    }
+    if (options->alignment == 0 && options->threshold != 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "alignment for H5Pset_alignment missing");
 
-    return 0;
+done:
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
@@ -749,36 +700,32 @@ static int check_options(pack_opt_t *options) {
  *  supplied list
  *
  * Return: 0, ok, -1 no
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: September, 23, 2003
- *
  *-------------------------------------------------------------------------
  */
 static int check_objects(const char* fname, pack_opt_t *options) {
-    hid_t         fid;
+    int           ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    hid_t         fid = -1;
+    hid_t         did = -1;
+    hid_t         sid = -1;
     unsigned int  i;
+    unsigned int  uf;
     trav_table_t *travt = NULL;
 
     /* nothing to do */
     if (options->op_tbl->nelems == 0)
-        return 0;
+        HGOTO_DONE(0);
 
     /*-------------------------------------------------------------------------
-    * open the file
-    *-------------------------------------------------------------------------
-    */
-    if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, 0))
-            < 0) {
-        printf("<%s>: %s\n", fname, H5FOPENERROR);
-        return -1;
-    }
+     * open the file
+     *-------------------------------------------------------------------------
+     */
+    if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, 0)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "h5tools_fopen failed <%s>: %s", fname, H5FOPENERROR);
 
     /*-------------------------------------------------------------------------
-    * get the list of objects in the file
-    *-------------------------------------------------------------------------
-    */
+     * get the list of objects in the file
+     *-------------------------------------------------------------------------
+     */
 
     /* Initialize indexing options */
     h5trav_set_index(sort_by, sort_order);
@@ -787,16 +734,15 @@ static int check_objects(const char* fname, pack_opt_t *options) {
 
     /* get the list of objects in the file */
     if (h5trav_gettable(fid, travt) < 0)
-        goto out;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "h5trav_gettable failed");
 
     /*-------------------------------------------------------------------------
-    * compare with user supplied list
-    *-------------------------------------------------------------------------
-    */
+     * compare with user supplied list
+     *-------------------------------------------------------------------------
+     */
 
     if (options->verbose)
-        printf("Opening file <%s>. Searching for objects to modify...\n",
-                fname);
+        printf("Opening file. Searching %d objects to modify ...\n", travt->nobjs);
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
         char* name = options->op_tbl->objs[i].path;
@@ -804,74 +750,70 @@ static int check_objects(const char* fname, pack_opt_t *options) {
             printf(" <%s>", name);
 
         /* the input object names are present in the file and are valid */
-        if (h5trav_getindext(name, travt) < 0) {
-            error_msg("%s Could not find <%s> in file <%s>. Exiting...\n",
+        if (h5trav_getindext(name, travt) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "%s Could not find <%s> in file <%s>. Exiting...\n",
                     (options->verbose ? "\n" : ""), name, fname);
-            goto out;
-        }
         if (options->verbose)
             printf("...Found\n");
 
-        /* check for extra filter conditions */
-        switch (options->op_tbl->objs[i].filter->filtn) {
-        /* chunk size must be smaller than pixels per block */
-        case H5Z_FILTER_SZIP:
-            {
-                int j;
-                hsize_t csize = 1;
-                unsigned ppb = options->op_tbl->objs[i].filter->cd_values[0];
-                hsize_t dims[H5S_MAX_RANK];
-                int rank;
-                hid_t did;
-                hid_t sid;
-
-                if (options->op_tbl->objs[i].chunk.rank > 0) {
-                    rank = options->op_tbl->objs[i].chunk.rank;
-                    for (j = 0; j < rank; j++)
-                        csize *= options->op_tbl->objs[i].chunk.chunk_lengths[j];
-                }
-                else {
-                    if ((did = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
-                        goto out;
-                    if ((sid = H5Dget_space(did)) < 0)
-                        goto out;
-                    if ((rank = H5Sget_simple_extent_ndims(sid)) < 0)
-                        goto out;
-                    HDmemset(dims, 0, sizeof dims);
-                    if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
-                        goto out;
-                    for (j = 0; j < rank; j++)
-                        csize *= dims[j];
-                    if (H5Sclose(sid) < 0)
-                        goto out;
-                    if (H5Dclose(did) < 0)
-                        goto out;
-                }
-
-                if (csize < ppb) {
-                    printf(
-                            " <warning: SZIP settins, chunk size is smaller than pixels per block>\n");
-                    goto out;
+        for (uf = 0; uf < options->op_tbl->objs[i].nfilters; uf++) {
+            if (options->op_tbl->objs[i].filter[uf].filtn < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "invalid filter");
+            /* check for extra filter conditions */
+            switch (options->op_tbl->objs[i].filter[uf].filtn) {
+            /* chunk size must be smaller than pixels per block */
+            case H5Z_FILTER_SZIP:
+                {
+                    int j;
+                    hsize_t csize = 1;
+                    unsigned ppb = options->op_tbl->objs[i].filter[uf].cd_values[0];
+                    hsize_t dims[H5S_MAX_RANK];
+                    int rank;
+
+                    if (options->op_tbl->objs[i].chunk.rank > 0) {
+                        rank = options->op_tbl->objs[i].chunk.rank;
+                        for (j = 0; j < rank; j++)
+                            csize *= options->op_tbl->objs[i].chunk.chunk_lengths[j];
+                    }
+                    else {
+                        if ((did = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
+                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen2 failed");
+                        if ((sid = H5Dget_space(did)) < 0)
+                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_space failed");
+                        if ((rank = H5Sget_simple_extent_ndims(sid)) < 0)
+                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sget_simple_extent_ndims failed");
+                        HDmemset(dims, 0, sizeof dims);
+                        if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
+                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sget_simple_extent_dims failed");
+                        for (j = 0; j < rank; j++)
+                            csize *= dims[j];
+                        if (H5Sclose(sid) < 0)
+                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sclose failed");
+                        if (H5Dclose(did) < 0)
+                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dclose failed");
+                    }
+
+                    if (csize < ppb) {
+                        printf(" <warning: SZIP settings, chunk size is smaller than pixels per block>\n");
+                        HGOTO_DONE(0);
+                    }
                 }
+                break;
+            default:
+                break;
             }
-            break;
-        default:
-            break;
-        }
-    } /* i */
+        } /* for uf */
+    } /* for i */
 
-    /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-    H5Fclose(fid);
-    trav_table_free(travt);
-    return 0;
-
-out:
-    H5Fclose(fid);
-    trav_table_free(travt);
-    return -1;
+done:
+    H5E_BEGIN_TRY {
+        H5Sclose(sid);
+        H5Dclose(did);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    if (travt)
+        trav_table_free(travt);
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
@@ -880,9 +822,6 @@ out:
  * Purpose: check if a filter or layout was requested
  *
  * Return: 1 yes, 0 no
- *
- * Date: May, 24, 2007
- *
  *-------------------------------------------------------------------------
  */
 static int have_request(pack_opt_t *options) {
@@ -900,12 +839,13 @@ static int have_request(pack_opt_t *options) {
  * Purpose: return the filter as a string name
  *
  * Return: name of filter, exit on error
- *
  *-------------------------------------------------------------------------
  */
 
 static const char* get_sfilter(H5Z_filter_t filtn) {
-    if (filtn == H5Z_FILTER_NONE)
+    if (filtn < 0)
+        return NULL;
+    else if (filtn == H5Z_FILTER_NONE)
         return "NONE";
     else if (filtn == H5Z_FILTER_DEFLATE)
         return "GZIP";
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index 9049472..5b7bb0b 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -35,7 +35,7 @@
 
 /* a list of names */
 typedef struct {
- char obj[MAX_NC_NAME];
+    char         obj[MAX_NC_NAME];
 } obj_list_t;
 
 /*
@@ -53,15 +53,16 @@ typedef struct {
 #define CD_VALUES 20
 
 typedef struct {
- H5Z_filter_t filtn;                           /* filter identification number */
- unsigned     cd_values[CD_VALUES];            /* filter client data values */
- size_t       cd_nelmts;                       /* filter client number of values */
+    H5Z_filter_t filtn;                           /* filter identification number */
+    unsigned     filt_flag;                       /* filter definition flag */
+    unsigned     cd_values[CD_VALUES];            /* filter client data values */
+    size_t       cd_nelmts;                       /* filter client number of values */
 } filter_info_t;
 
 /* chunk lengths along each dimension and rank */
 typedef struct {
- hsize_t chunk_lengths[MAX_VAR_DIMS];
- int     rank;
+    hsize_t      chunk_lengths[MAX_VAR_DIMS];
+    int          rank;
 } chunk_info_t;
 
 /* we currently define a maximum value for the filters array,
@@ -70,19 +71,19 @@ typedef struct {
 
 /* information for one object, contains PATH, CHUNK info and FILTER info */
 typedef struct {
- char          path[MAX_NC_NAME];               /* name of object */
- filter_info_t filter[H5_REPACK_MAX_NFILTERS];  /* filter array */
- int           nfilters;                        /* current number of filters */
- H5D_layout_t  layout;                          /* layout information */
- chunk_info_t  chunk;                           /* chunk information */
- hid_t         refobj_id;                       /* object ID, references */
+    char          path[MAX_NC_NAME];               /* name of object */
+    filter_info_t filter[H5_REPACK_MAX_NFILTERS];  /* filter array */
+    int           nfilters;                        /* current number of filters */
+    H5D_layout_t  layout;                          /* layout information */
+    chunk_info_t  chunk;                           /* chunk information */
+    hid_t         refobj_id;                       /* object ID, references */
 } pack_info_t;
 
 /* store a table of all objects */
 typedef struct {
-    unsigned int size;
-    unsigned int nelems;
-    pack_info_t  *objs;
+    unsigned int  size;
+    unsigned int  nelems;
+    pack_info_t   *objs;
 } pack_opttbl_t;
 
 
@@ -93,26 +94,26 @@ typedef struct {
 
 /* all the above, ready to go to the hrepack call */
 typedef struct {
- pack_opttbl_t   *op_tbl;     /*table with all -c and -f options */
- int             all_layout;  /*apply the layout to all objects */
- int             all_filter;  /*apply the filter to all objects */
- filter_info_t   filter_g[H5_REPACK_MAX_NFILTERS];    /*global filter array for the ALL case */
- int             n_filter_g;  /*number of global filters */
- chunk_info_t    chunk_g;     /*global chunk INFO for the ALL case */
- H5D_layout_t    layout_g;    /*global layout information for the ALL case */
- int             verbose;     /*verbose mode */
- hsize_t         min_comp;    /*minimum size to compress, in bytes */
- int             use_native;  /*use a native type in write */
- int             latest;      /*pack file with the latest file format */
- int             grp_compact; /* Set the maximum number of links to store as header messages in the group */
- int             grp_indexed; /* Set the minimum number of links to store in the indexed format */
- int             msg_size[8]; /* Minimum size of shared messages: dataspace,
-                                 datatype, fill value, filter pipleline, attribute */
- const char      *ublock_filename; /* user block file name */
- hsize_t         ublock_size;      /* user block size */
- hsize_t         meta_block_size;  /* metadata aggregation block size (for H5Pset_meta_block_size) */
- hsize_t         threshold;        /* alignment threshold for H5Pset_alignment */
- hsize_t         alignment ;       /* alignment for H5Pset_alignment */
+    pack_opttbl_t   *op_tbl;     /*table with all -c and -f options */
+    int             all_layout;  /*apply the layout to all objects */
+    int             all_filter;  /*apply the filter to all objects */
+    filter_info_t   filter_g[H5_REPACK_MAX_NFILTERS];    /*global filter array for the ALL case */
+    int             n_filter_g;  /*number of global filters */
+    chunk_info_t    chunk_g;     /*global chunk INFO for the ALL case */
+    H5D_layout_t    layout_g;    /*global layout information for the ALL case */
+    int             verbose;     /*verbose mode */
+    hsize_t         min_comp;    /*minimum size to compress, in bytes */
+    int             use_native;  /*use a native type in write */
+    int             latest;      /*pack file with the latest file format */
+    int             grp_compact; /* Set the maximum number of links to store as header messages in the group */
+    int             grp_indexed; /* Set the minimum number of links to store in the indexed format */
+    int             msg_size[8]; /* Minimum size of shared messages: dataspace,
+                                    datatype, fill value, filter pipleline, attribute */
+    const char      *ublock_filename;  /* user block file name */
+    hsize_t         ublock_size;       /* user block size */
+    hsize_t         meta_block_size;   /* metadata aggregation block size (for H5Pset_meta_block_size) */
+    hsize_t         threshold;         /* alignment threshold for H5Pset_alignment */
+    hsize_t         alignment;         /* alignment for H5Pset_alignment */
 } pack_opt_t;
 
 
@@ -134,15 +135,15 @@ extern "C" {
 int h5repack(const char* infile, const char* outfile, pack_opt_t *options);
 int h5repack_addfilter(const char* str, pack_opt_t *options);
 int h5repack_addlayout(const char* str, pack_opt_t *options);
-int h5repack_init(pack_opt_t *options, int verbose);
+int h5repack_init(pack_opt_t *options, int verbose, hbool_t latest);
 int h5repack_end(pack_opt_t *options);
-int h5repack_verify(const char *out_fname, pack_opt_t *options);
+int h5repack_verify(const char *in_fname, const char *out_fname, pack_opt_t *options);
 int h5repack_cmp_pl(const char *fname1, const char *fname2);
 
-/* Note: The below copy_named_datatype(), named_datatype_free(), copy_attr() 
- * and struct named_dt_t were located in h5repack_copy.c as static prior to 
- * bugfix1726. 
- * Made shared functions as copy_attr() was needed in h5repack_refs.c. 
+/* Note: The below copy_named_datatype(), named_datatype_free(), copy_attr()
+ * and struct named_dt_t were located in h5repack_copy.c as static prior to
+ * bugfix1726.
+ * Made shared functions as copy_attr() was needed in h5repack_refs.c.
  * However copy_attr() may be obsoleted when H5Acopy is available and put back
  * others to static in h5repack_copy.c.
  */
@@ -202,18 +203,18 @@ int apply_filters(const char* name,    /* object name from traverse list */
  * options table
  *-------------------------------------------------------------------------
  */
-int          options_table_init( pack_opttbl_t **tbl );
-int          options_table_free( pack_opttbl_t *table );
-int          options_add_layout( obj_list_t *obj_list,
-                                 unsigned n_objs,
-                                 pack_info_t *pack,
-                                 pack_opttbl_t *table );
-int          options_add_filter ( obj_list_t *obj_list,
-                                 unsigned n_objs,
-                                 filter_info_t filt,
-                                 pack_opttbl_t *table );
-pack_info_t* options_get_object( const char *path,
-                                 pack_opttbl_t *table);
+int          options_table_init(pack_opttbl_t **tbl);
+int          options_table_free(pack_opttbl_t *table);
+int          options_add_layout(obj_list_t *obj_list,
+                                unsigned n_objs,
+                                pack_info_t *pack,
+                                pack_opttbl_t *table);
+int          options_add_filter(obj_list_t *obj_list,
+                                unsigned n_objs,
+                                filter_info_t filt,
+                                pack_opttbl_t *table);
+pack_info_t* options_get_object(const char *path,
+                                pack_opttbl_t *table);
 
 /*-------------------------------------------------------------------------
  * parse functions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index b41f7be..63233b8 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -78,49 +78,37 @@ static herr_t walk_error_callback(H5_ATTR_UNUSED unsigned n, const H5E_error2_t
  *
  * Return:   0, ok,
  *          -1 no
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: October, 23, 2003
- *
  *-------------------------------------------------------------------------
  */
 
 int copy_objects(const char* fnamein, const char* fnameout, pack_opt_t *options)
 {
-    int           ret_value = 0;          /* no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
-    hid_t         fidin;
+    int           ret_value = 0;
+    hid_t         fidin = -1;
     hid_t         fidout = -1;
-    trav_table_t  *travt = NULL;
-    hsize_t       ub_size = 0;            /* size of user block */
+    hid_t         fcpl_in = -1;  /* file creation property list ID for input file */
+    hid_t         grp_in = -1;   /* group ID */
+    hid_t         gcpl_in = -1;  /* group creation property list */
     hid_t         fcpl = H5P_DEFAULT;     /* file creation property list ID */
     hid_t         fapl = H5P_DEFAULT;     /* file access property list ID */
+    trav_table_t *travt = NULL;
+    hsize_t       ub_size = 0;            /* size of user block */
     unsigned      crt_order_flags;        /* group creation order flag */
 
     /*-------------------------------------------------------------------------
      * open input file
      *-------------------------------------------------------------------------
      */
-    if ((fidin = h5tools_fopen(fnamein, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t) 0)) < 0) {
-        error_msg("<%s>: %s\n", fnamein, H5FOPENERROR);
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-    }
+    if ((fidin = h5tools_fopen(fnamein, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t) 0)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "h5tools_fopen failed <%s>: %s", fnamein, H5FOPENERROR);
 
     /* get user block size and file space strategy/threshold */
     {
-        hid_t fcpl_in; /* file creation property list ID for input file */
-        hid_t grp_in = -1;   /* group ID */
-        hid_t gcpl_in = -1;  /* group creation property list */
+        if ((fcpl_in = H5Fget_create_plist(fidin)) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Fget_create_plist failed to retrieve file creation property list");
 
-        if ((fcpl_in = H5Fget_create_plist(fidin)) < 0) {
-            error_msg("failed to retrieve file creation property list\n");
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-        }
-
-        if (H5Pget_userblock(fcpl_in, &ub_size) < 0) {
-            error_msg("failed to retrieve userblock size\n");
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-        }
+        if (H5Pget_userblock(fcpl_in, &ub_size) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_userblock failed to retrieve userblock size");
 
         /* open root group */
         if ((grp_in = H5Gopen2(fidin, "/", H5P_DEFAULT)) < 0)
@@ -134,26 +122,19 @@ int copy_objects(const char* fnamein, const char* fnameout, pack_opt_t *options)
         if (H5Pget_link_creation_order(gcpl_in, &crt_order_flags) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_link_creation_order failed");
 
-        if (H5Pclose(fcpl_in) < 0) {
-            error_msg("failed to close property list\n");
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-        }
+        if (H5Pclose(fcpl_in) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed to close property list");
     }
 
     /* Check if we need to create a non-default file creation property list */
     if (options->latest || ub_size > 0) {
         /* Create file creation property list */
-        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
-            error_msg("fail to create a file creation property list\n");
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-        }
+        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcreate failed to create a file creation property list");
 
-        if (ub_size > 0) {
-            if (H5Pset_userblock(fcpl, ub_size) < 0) {
-                error_msg("failed to set non-default userblock size\n");
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-            }
-        }
+        if (ub_size > 0)
+            if (H5Pset_userblock(fcpl, ub_size) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_userblock failed to set non-default userblock size");
 
         if (options->latest) {
             unsigned i = 0, nindex = 0, mesg_type_flags[5], min_mesg_sizes[5];
@@ -161,10 +142,8 @@ int copy_objects(const char* fnamein, const char* fnameout, pack_opt_t *options)
             /* Adjust group creation parameters for root group */
             /* (So that it is created in "dense storage" form) */
             if (H5Pset_link_phase_change(fcpl, (unsigned) options->grp_compact,
-                        (unsigned) options->grp_indexed) < 0) {
-                error_msg("fail to adjust group creation parameters for root group\n");
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-            }
+                        (unsigned) options->grp_indexed) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_link_phase_change failed to adjust group creation parameters for root group");
 
             for (i = 0; i < 5; i++) {
                 if (options->msg_size[i] > 0) {
@@ -199,30 +178,21 @@ int copy_objects(const char* fnamein, const char* fnameout, pack_opt_t *options)
             } /* end for */
 
             if (nindex > 0) {
-                if (H5Pset_shared_mesg_nindexes(fcpl, nindex) < 0) {
-                    error_msg("fail to set the number of shared object header message indexes\n");
-                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-                }
+                if (H5Pset_shared_mesg_nindexes(fcpl, nindex) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_shared_mesg_nindexes failed to set the number of shared object header message indexes");
 
                 /* msg_size[0]=dataspace, 1=datatype, 2=file value, 3=filter pipleline, 4=attribute */
-                for (i = 0; i < (nindex - 1); i++) {
-                    if (H5Pset_shared_mesg_index(fcpl, i, mesg_type_flags[i], min_mesg_sizes[i]) < 0) {
-                        error_msg("fail to configure the specified shared object header message index\n");
-                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-                    } /* end if */
-                } /* end for */
+                for (i = 0; i < (nindex - 1); i++)
+                    if (H5Pset_shared_mesg_index(fcpl, i, mesg_type_flags[i], min_mesg_sizes[i]) < 0)
+                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_shared_mesg_index failed to configure the specified shared object header message index");
             } /* if (nindex>0) */
 
             /* Create file access property list */
-            if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-                error_msg("Could not create file access property list\n");
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-            } /* end if */
-
-            if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
-                error_msg("Could not set property for using latest version of the format\n");
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-            } /* end if */
+            if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcreate failed to create file access property list");
+
+            if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_libver_bounds failed to set property for using latest version of the format");
         } /* end if */
     } /* end if */
 #if defined (H5REPACK_DEBUG_USER_BLOCK)
@@ -235,19 +205,14 @@ print_user_block(fnamein, fidin);
      */
     if (options->ublock_size > 0) {
         /* either use the FCPL already created or create a new one */
-        if (fcpl == H5P_DEFAULT) {
+        if (fcpl == H5P_DEFAULT)
             /* create a file creation property list */
-            if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
-                error_msg("fail to create a file creation property list\n");
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-            }
-        }
+            if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcreate failed to create a file creation property list");
 
         /* set user block size */
-        if (H5Pset_userblock(fcpl, options->ublock_size) < 0) {
-            error_msg("failed to set userblock size\n");
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-        }
+        if (H5Pset_userblock(fcpl, options->ublock_size) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_userblock failed to set userblock size");
     }
 
     /*-------------------------------------------------------------------------
@@ -256,18 +221,13 @@ print_user_block(fnamein, fidin);
      */
     if (options->alignment > 0) {
         /* either use the FAPL already created or create a new one */
-        if (fapl == H5P_DEFAULT) {
+        if (fapl == H5P_DEFAULT)
             /* create a file access property list */
-            if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-                error_msg("Could not create file access property list\n");
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-            }
-        }
+            if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcreate failed to create file access property list");
 
-        if (H5Pset_alignment(fapl, options->threshold, options->alignment) < 0) {
-            error_msg("failed to set alignment\n");
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-        }
+        if (H5Pset_alignment(fapl, options->threshold, options->alignment) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_alignment failed to set alignment");
     }
 
     /*-------------------------------------------------------------------------
@@ -276,18 +236,13 @@ print_user_block(fnamein, fidin);
      */
     if (options->meta_block_size > 0) {
         /* either use the FAPL already created or create a new one */
-        if (fapl == H5P_DEFAULT) {
+        if (fapl == H5P_DEFAULT)
             /* create a file access property list */
-            if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-                error_msg("Could not create file access property list\n");
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-            }
-        }
+            if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcreate failed to create file access property list");
 
-        if (H5Pset_meta_block_size(fapl, options->meta_block_size) < 0) {
-            error_msg("failed to set metadata block size\n");
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-        }
+        if (H5Pset_meta_block_size(fapl, options->meta_block_size) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_meta_block_size failed to set metadata block size");
     }
 
     /*-------------------------------------------------------------------------
@@ -296,13 +251,10 @@ print_user_block(fnamein, fidin);
      */
 
     /* either use the FCPL already created or create a new one */
-    if (fcpl == H5P_DEFAULT) {
+    if (fcpl == H5P_DEFAULT)
         /* create a file creation property list */
-        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
-            error_msg("fail to create a file creation property list\n");
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-        }
-    }
+        if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcreate failed to create a file creation property list");
 
     if(H5Pset_link_creation_order(fcpl, crt_order_flags ) < 0)
         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_link_creation_order failed");
@@ -312,23 +264,18 @@ print_user_block(fnamein, fidin);
      *-------------------------------------------------------------------------
      */
     if (options->verbose)
-        printf("Making file <%s>...\n", fnameout);
+        printf("Making new file ...\n");
 
-    if ((fidout = H5Fcreate(fnameout, H5F_ACC_TRUNC, fcpl, fapl)) < 0) {
-        error_msg("<%s>: Could not create file\n", fnameout);
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-    }
+    if ((fidout = H5Fcreate(fnameout, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Fcreate could not create file <%s>:", fnameout);
 
     /*-------------------------------------------------------------------------
      * write a new user block if requested
      *-------------------------------------------------------------------------
      */
-    if (options->ublock_size > 0) {
-        if (copy_user_block(options->ublock_filename, fnameout, options->ublock_size) < 0) {
-            error_msg("Could not copy user block. Exiting...\n");
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-        }
-    }
+    if (options->ublock_size > 0)
+        if (copy_user_block(options->ublock_filename, fnameout, options->ublock_size) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not copy user block. Exiting...");
 
     /*-------------------------------------------------------------------------
      * get list of objects
@@ -340,70 +287,45 @@ print_user_block(fnamein, fidin);
     /* init table */
     trav_table_init(&travt);
 
-    /* get the list of objects in the file */
-    if (h5trav_gettable(fidin, travt) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-
-    /*-------------------------------------------------------------------------
-     * do the copy
-     *-------------------------------------------------------------------------
-     */
-    if (do_copy_objects(fidin, fidout, travt, options) < 0) {
-        error_msg("<%s>: Could not copy data to: %s\n", fnamein, fnameout);
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-    } /* end if */
-
-    /*-------------------------------------------------------------------------
-     * do the copy of referenced objects
-     * and create hard links
-     *-------------------------------------------------------------------------
-     */
-    if (do_copy_refobjs(fidin, fidout, travt, options) < 0) {
-        printf("h5repack: <%s>: Could not copy data to: %s\n", fnamein, fnameout);
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
+    if (travt) {
+        /* get the list of objects in the file */
+        if (h5trav_gettable(fidin, travt) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "h5trav_gettable failed");
+
+        /*-------------------------------------------------------------------------
+        * do the copy
+        *-------------------------------------------------------------------------
+        */
+        if (do_copy_objects(fidin, fidout, travt, options) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "do_copy_objects from <%s> could not copy data to <%s>", fnamein, fnameout);
+
+        /*-------------------------------------------------------------------------
+        * do the copy of referenced objects
+        * and create hard links
+        *-------------------------------------------------------------------------
+        */
+        if (do_copy_refobjs(fidin, fidout, travt, options) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "do_copy_refobjs from <%s> could not copy data to <%s>", fnamein, fnameout);
     }
 
     /*-------------------------------------------------------------------------
-     * close
-     *-------------------------------------------------------------------------
-     */
-
-    if (fapl > 0)
-        H5Pclose(fapl);
-
-    if (fcpl > 0)
-        H5Pclose(fcpl);
-
-    H5Fclose(fidin);
-    H5Fclose(fidout);
-
-    /* free table */
-    trav_table_free(travt);
-    travt = NULL;
-
-    /*-------------------------------------------------------------------------
      * write only the input file user block if there is no user block file input
      *-------------------------------------------------------------------------
      */
 
-    if (ub_size > 0 && options->ublock_size == 0) {
-        if (copy_user_block(fnamein, fnameout, ub_size) < 0) {
-            error_msg("Could not copy user block. Exiting...\n");
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
-        }
-    }
-
-    return 0;
-
-    /*-------------------------------------------------------------------------
-     * out
-     *-------------------------------------------------------------------------
-     */
+    if (ub_size > 0 && options->ublock_size == 0)
+        if (copy_user_block(fnamein, fnameout, ub_size) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not copy user block. Exiting...");
 
 done:
     H5E_BEGIN_TRY {
+        H5Pclose(fcpl_in);
+        H5Pclose(gcpl_in);
         H5Pclose(fapl);
         H5Pclose(fcpl);
+        H5Gclose(grp_in);
+        H5Fclose(fidin);
+        H5Fclose(fidout);
         H5Fclose(fidin);
         H5Fclose(fidout);
     } H5E_END_TRY;
@@ -420,7 +342,7 @@ done:
  *          The size of hyperslab is limitted by H5TOOLS_BUFSIZE.
  *          Return the hyperslab dimentions and size in byte.
  *
- * Return: 0 - SUCCEED, -1 FAILED
+ * Return:  0 - SUCCEED, -1 FAILED
  *
  * Parameters:
  *   dcpl_id : [IN] dataset creation property.
@@ -430,8 +352,6 @@ done:
  *   dims_hslab[] : [OUT] calculated hyperslab dimentions
  *   * hslab_nbytes_p : [OUT] total byte of the hyperslab
  *
- * Programmer: Jonathan Kim
- * Date: Feburary, 2012
  * Update:
  *   The hyperslab calucation would be depend on if the dataset is chunked
  *   or not.
@@ -445,25 +365,23 @@ done:
  *      the boundary would be dataset's dims.
  *
  *   The calulation starts from the last dimention (h5dump dims output).
- *
- * Note:
- *   Added for JIRA HDFFV-7862.
  *-----------------------------------------*/
 
-int Get_hyperslab(hid_t dcpl_id, int rank_dset, hsize_t dims_dset[],
+int
+Get_hyperslab(hid_t dcpl_id, int rank_dset, hsize_t dims_dset[],
         size_t size_datum, hsize_t dims_hslab[], hsize_t * hslab_nbytes_p)
 {
-    int     ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    int     ret_value = 0;
     int     k;
     H5D_layout_t dset_layout;
     int     rank_chunk;
     hsize_t dims_chunk[H5S_MAX_RANK];
     hsize_t size_chunk = 1;
-    hsize_t nchunk_fit; /* number of chunks that fits in hyperslab buffer (H5TOOLS_BUFSIZE) */
-    hsize_t ndatum_fit; /* number of dataum that fits in hyperslab buffer (H5TOOLS_BUFSIZE) */
+    hsize_t nchunk_fit;                   /* number of chunks that fits in hyperslab buffer (H5TOOLS_BUFSIZE) */
+    hsize_t ndatum_fit;                   /* number of dataum that fits in hyperslab buffer (H5TOOLS_BUFSIZE) */
     hsize_t chunk_dims_map[H5S_MAX_RANK]; /* mapped chunk dimentions */
-    hsize_t hs_dims_map[H5S_MAX_RANK]; /* mapped hyperslab dimentions */
-    hsize_t hslab_nbytes; /* size of hyperslab in byte */
+    hsize_t hs_dims_map[H5S_MAX_RANK];    /* mapped hyperslab dimentions */
+    hsize_t hslab_nbytes;                 /* size of hyperslab in byte */
 
     /* init to set as size of a data element */
     hslab_nbytes = size_datum;
@@ -476,7 +394,7 @@ int Get_hyperslab(hid_t dcpl_id, int rank_dset, hsize_t dims_dset[],
         /* get chunk dims */
         rank_chunk = H5Pget_chunk(dcpl_id, rank_dset, dims_chunk);
         if (rank_chunk < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_chunk failed");
 
         for (k = rank_dset; k > 0; --k)
             size_chunk *= dims_chunk[k - 1];
@@ -538,7 +456,7 @@ int Get_hyperslab(hid_t dcpl_id, int rank_dset, hsize_t dims_dset[],
                 hslab_nbytes *= dims_hslab[k - 1];
 
                 if (hslab_nbytes <= 0)
-                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "calculate total size for the hyperslab failed");
             }
         }
     }
@@ -562,7 +480,7 @@ int Get_hyperslab(hid_t dcpl_id, int rank_dset, hsize_t dims_dset[],
             hslab_nbytes *= dims_hslab[k - 1];
 
             if (hslab_nbytes <= 0)
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "calculate total size for the hyperslab failed");
         }
     }
 
@@ -576,24 +494,9 @@ done:
 /*-------------------------------------------------------------------------
  * Function: do_copy_objects
  *
- * Purpose: duplicate all HDF5 objects in the file
- *
- * Return: 0, ok, -1 no
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: October, 23, 2003
- *
- * Modifications:
- *
- *  July 2004:     Introduced the extra EC or NN option for SZIP
- *
- *  December 2004: Added a check for H5Dcreate; if the dataset cannot be created
- *                  with the requested filter, use the input one
- *
- *  October 2006:  Read/write using the file type by default.
+ * Purpose:  duplicate all HDF5 objects in the file
  *
- *  October 2006:  Read by hyperslabs for big datasets.
+ * Return:   0, ok, -1 no
  *
  *  A threshold of H5TOOLS_MALLOCSIZE (128 MB) is the limit upon which I/O hyperslab is done
  *  i.e., if the memory needed to read a dataset is greater than this limit,
@@ -634,31 +537,6 @@ done:
  *  in (2) is that, when using the strip mine size, it assures that the "remaining" part
  *  of the dataset that does not fill an entire strip mine is processed.
  *
- *  November 2006:  Use H5Ocopy in the copy of objects. The logic for using
- *   H5Ocopy or not is if a change of filters or layout is requested by the user
- *   then use read/write else use H5Ocopy.
- *
- * May, 1, 2008: Add a printing of the compression ratio of old size / new size
- *
- * Feburary 2012:  improve Read/Write by hyperslabs for big datasets.
- * Programmer: Jonathan Kim
- *
- *  A threshold of H5TOOLS_MALLOCSIZE is the limit upon which I/O hyperslab is done
- *  i.e., if the memory needed to read a dataset is greater than this limit,
- *  then hyperslab I/O is done instead of one operation I/O
- *  For each dataset, the memory needed is calculated according to
- *
- *  memory needed = number of elements * size of each element
- *
- *  if the memory needed is lower than H5TOOLS_MALLOCSIZE, then the following operations
- *  are done
- *
- *  H5Dread( input_dataset )
- *  H5Dwrite( output_dataset )
- *
- *  with all elements in the datasets selected. If the memory needed is greater than
- *  H5TOOLS_MALLOCSIZE, then the following operations are done instead:
- *
  *  1. figure out a hyperslab (dimentions) and size  (refer to Get_hyperslab()).
  *  2. Calculate the hyperslab selections as the selection is moving forward.
  *     Selection would be same as the hyperslab except for the remaining edge portion
@@ -670,7 +548,7 @@ done:
 int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
         pack_opt_t *options) /* repack options */
 {
-    int   ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    int   ret_value = 0;
     hid_t grp_in = -1;   /* group ID */
     hid_t grp_out = -1;  /* group ID */
     hid_t dset_in = -1;  /* read dataset ID */
@@ -702,13 +580,14 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
     unsigned crt_order_flags; /* group creation order flag */
     unsigned i;
     unsigned u;
+    unsigned uf;
     int is_ref = 0;
     htri_t is_named;
     hbool_t limit_maxdims;
     hsize_t size_dset;
 
     /*-------------------------------------------------------------------------
-     * copy the suppplied object list
+     * copy the supplied object list
      *-------------------------------------------------------------------------
      */
 
@@ -718,14 +597,14 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
         printf("-----------------------------------------\n");
     }
 
-    for (i = 0; i < travt->nobjs; i++) {
-        /* init variables per obj */
-        buf = NULL;
-        limit_maxdims = FALSE;
+    if (travt->objs) {
+        for (i = 0; i < travt->nobjs; i++) {
+            /* init variables per obj */
+            buf = NULL;
+            limit_maxdims = FALSE;
 
-        switch (travt->objs[i].type) {
+            switch (travt->objs[i].type) {
             case H5TRAV_TYPE_UNKNOWN:
-                HDassert(0);
                 break;
 
                 /*-------------------------------------------------------------------------
@@ -804,10 +683,15 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                     req_filter = 1;
 
                 /* check if filters were requested for individual objects */
-                for (u = 0; u < options->op_tbl->nelems; u++)
-                    if (HDstrcmp(travt->objs[i].name, options->op_tbl->objs[u].path) == 0)
-                        if (options->op_tbl->objs[u].filter->filtn > 0)
-                            req_filter = 1;
+                if (options->op_tbl->objs) {
+                    for (u = 0; u < options->op_tbl->nelems; u++) {
+                        if (HDstrcmp(travt->objs[i].name, options->op_tbl->objs[u].path) == 0)
+                            for (uf = 0; uf < options->op_tbl->objs[uf].nfilters; uf++) {
+                                if (options->op_tbl->objs[u].filter[uf].filtn > 0)
+                                    req_filter = 1;
+                            }
+                    }
+                }
 
                 /* check if layout change requested individual object */
                 if (options->layout_g != H5D_LAYOUT_ERROR) {
@@ -983,16 +867,22 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                     buf = HDmalloc(need);
 
                                 if (buf != NULL) {
-                                    /* read/write: use the macro to check error, e.g. memory allocation error inside the library. */
-                                    CHECK_H5DRW_ERROR(H5Dread, FAIL, dset_in, wtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
-                                    CHECK_H5DRW_ERROR(H5Dwrite, FAIL, dset_out, wtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
+                                    if(H5Dread(dset_in, wtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dread failed");
+                                    if(H5Dwrite(dset_out, wtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+                                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dwrite failed");
 
                                     /* Check if we have VL data in the dataset's
                                      * datatype that must be reclaimed */
                                     if (TRUE == H5Tdetect_class(wtype_id, H5T_VLEN))
                                         if (H5Dvlen_reclaim(wtype_id, f_space_id, H5P_DEFAULT, buf) < 0)
                                             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dvlen_reclaim failed");
-                                }
+                                    /* free */
+                                    if (buf != NULL) {
+                                        HDfree(buf);
+                                        buf = NULL;
+                                    }
+                                 }
                                 else { /* possibly not enough memory, read/write by hyperslabs */
                                     size_t p_type_nbytes = msize; /*size of memory type */
                                     hsize_t p_nelmts = nelmts; /*total elements */
@@ -1068,9 +958,10 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                             hs_select_nelmts = 1;
                                         } /* rank */
 
-                                        /* read/write: use the macro to check error, e.g. memory allocation error inside the library. */
-                                        CHECK_H5DRW_ERROR(H5Dread, FAIL, dset_in, wtype_id, hslab_space, f_space_id, H5P_DEFAULT, hslab_buf);
-                                        CHECK_H5DRW_ERROR(H5Dwrite, FAIL, dset_out, wtype_id, hslab_space, f_space_id, H5P_DEFAULT, hslab_buf);
+                                        if(H5Dread(dset_in, wtype_id, hslab_space, f_space_id, H5P_DEFAULT, hslab_buf) < 0)
+                                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dread failed");
+                                        if(H5Dwrite(dset_out, wtype_id,  hslab_space, f_space_id, H5P_DEFAULT, hslab_buf) < 0)
+                                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dwrite failed");
 
                                         /* reclaim any VL memory, if necessary */
                                         if (vl_data)
@@ -1161,7 +1052,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                  *-------------------------------------------------------------------------
                  */
                 else {
-                    hid_t pid;
+                    hid_t pid = -1;
 
                     /* create property to pass copy options */
                     if ((pid = H5Pcreate(H5P_OBJECT_COPY)) < 0)
@@ -1239,6 +1130,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tclose failed");
                 if (H5Tclose(type_out) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tclose failed");
+                type_out = -1; /* named datatypes stack, named_dt_head, manages allocation */
 
                 break;
 
@@ -1264,21 +1156,23 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
 
             default:
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Object type not found");
-        } /* switch */
-
-        /* free */
-        if (buf != NULL) {
-            HDfree(buf);
-            buf = NULL;
-        }
-    } /* i */
+            } /* switch */
+        } /* end for */
+    } /* end if */
 
-    /* Finalize (link) the stack of named datatypes (if any) */
-    named_datatype_free(&named_dt_head, 0);
+done:
 
-    return ret_value;
+    /* Finalize (link) the stack of named datatypes (if any) first
+     * because of reference counting */
+    if (0 == ret_value && named_dt_head != NULL) {
+        if (named_datatype_free(&named_dt_head, 0) < 0)
+            H5TOOLS_INFO(H5E_tools_min_id_g, "named_datatype_free failed");
+    }
+    else
+        H5E_BEGIN_TRY {
+            named_datatype_free(&named_dt_head, 1);
+        } H5E_END_TRY;
 
-done:
     H5E_BEGIN_TRY
     {
         H5Gclose(grp_in);
@@ -1293,8 +1187,7 @@ done:
         H5Tclose(wtype_id);
         H5Tclose(type_in);
         H5Tclose(type_out);
-        named_datatype_free(&named_dt_head, 1);
-    }H5E_END_TRY;
+    } H5E_END_TRY;
 
     /* free */
     if (buf != NULL)
@@ -1309,10 +1202,10 @@ done:
  * Function: print_dataset_info
  *
  * Purpose: print name, filters, percentage compression of a dataset
- *
  *-------------------------------------------------------------------------
  */
-static void print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
+static void
+print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
 {
     char     strfilter[255];
 #if defined (PRINT_DEBUG )
@@ -1324,7 +1217,7 @@ static void print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int p
     unsigned cd_values[20];  /* filter client data values */
     size_t   cd_nelmts;      /* filter client number of values */
     char     f_objname[256]; /* filter objname */
-    int     i;
+    int      i;
 
     HDstrcpy(strfilter, "\0");
 
@@ -1335,8 +1228,11 @@ static void print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int p
     for (i = 0; i < nfilters; i++) {
         cd_nelmts = NELMTS(cd_values);
 
-        filtn = H5Pget_filter2(dcpl_id, (unsigned) i, &filt_flags, &cd_nelmts,
-                        cd_values, sizeof(f_objname), f_objname, NULL);
+        if ((filtn = H5Pget_filter2(dcpl_id, (unsigned) i, &filt_flags, &cd_nelmts,
+                        cd_values, sizeof(f_objname), f_objname, NULL)) < 0) {
+            HDstrcat(strfilter, "ERROR ");
+            continue;
+        }
 
         switch (filtn) {
             case H5Z_FILTER_NONE:
@@ -1413,29 +1309,24 @@ static void print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int p
 /*-------------------------------------------------------------------------
  * Function: copy_user_block
  *
- * Purpose: copy user block from one file to another
- *
- * Return: 0, ok, -1 no
- *
- * Programmer: Peter Cao
- *
- * Date: October, 25, 2007
+ * Purpose:  copy user block from one file to another
  *
+ * Return:   0, ok, -1 no
  *-------------------------------------------------------------------------
  */
-static int copy_user_block(const char *infile, const char *outfile, hsize_t size)
+static int
+copy_user_block(const char *infile, const char *outfile, hsize_t size)
 {
-    int ret_value = 0;           /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    int ret_value = 0;
     int infid = -1, outfid = -1; /* File descriptors */
 
     /* User block must be any power of 2 equal to 512 or greater (512, 1024, 2048, etc.) */
-    HDassert(size > 0);
 
     /* Open files */
     if ((infid = HDopen(infile, O_RDONLY, 0)) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDopen failed");
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDopen failed input file <%s>", infile);
     if ((outfid = HDopen(outfile, O_WRONLY, 0644)) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDopen failed");
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDopen failed output file <%s>", outfile);
 
     /* Copy the userblock from the input file to the output file */
     while (size > 0) {
@@ -1449,7 +1340,7 @@ static int copy_user_block(const char *infile, const char *outfile, hsize_t size
         else
             nread = HDread(infid, rbuf, (size_t)size);
         if (nread < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDread failed");
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDread failed to read userblock");
 
         /* Write buffer to destination file */
         /* (compensating for interrupted writes & checking for errors, etc.) */
@@ -1488,69 +1379,62 @@ done:
 /*-------------------------------------------------------------------------
  * Function: print_user_block
  *
- * Purpose: print user block
- *
- * Return: 0, ok, -1 no
- *
- * Programmer: Pedro Vicente
- *
- * Date: August, 20, 2008
+ * Purpose:  print user block
  *
+ * Return:   0, ok, -1 no
  *-------------------------------------------------------------------------
  */
 #if defined (H5REPACK_DEBUG_USER_BLOCK)
 static
-void print_user_block(const char *filename, hid_t fid)
+void
+print_user_block(const char *filename, hid_t fid)
 {
-    int     ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
-    int     fh;   /* file handle  */
-    hsize_t ub_size; /* user block size */
-    hsize_t size; /* size read */
-    hid_t   fcpl; /* file creation property list ID for HDF5 file */
+    int     ret_value = 0;
+    int     fh = -1;   /* file handle */
+    hsize_t ub_size;   /* user block size */
+    hsize_t size;      /* size read */
+    hid_t   fcpl = -1; /* file creation property list ID for HDF5 file */
     int     i;
 
     /* get user block size */
-    if(( fcpl = H5Fget_create_plist(fid)) < 0) {
-        error_msg("failed to retrieve file creation property list\n");
-        HGOTO_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Fget_create_plist failed");
+    if ((fcpl = H5Fget_create_plist(fid)) < 0) {
+        HGOTO_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Fget_create_plist failed to retrieve file creation property list");
     }
 
-    if(H5Pget_userblock(fcpl, &ub_size) < 0) {
-        error_msg("failed to retrieve userblock size\n");
-        HGOTO_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Pget_userblock failed");
+    if (H5Pget_userblock(fcpl, &ub_size) < 0) {
+        HGOTO_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Pget_userblock failed to retrieve userblock size");
     }
 
-    if(H5Pclose(fcpl) < 0) {
-        error_msg("failed to close property list\n");
-        HGOTO_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Pclose failed");
+    if (H5Pclose(fcpl) < 0) {
+        HGOTO_ERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Pclose failed to close property list");
     }
 
     /* open file */
-    if((fh = HDopen(filename, O_RDONLY, 0)) < 0) {
-        HGOTO_ERROR(H5E_tools_g, H5E_tools_min_id_g, "HDopen failed");
+    if ((fh = HDopen(filename, O_RDONLY)) < 0) {
+        HGOTO_ERROR(H5E_tools_g, H5E_tools_min_id_g, "HDopen failed to open file <%s>", filename);
     }
 
     size = ub_size;
 
     /* read file */
-    while(size > 0) {
+    while (size > 0) {
         ssize_t nread; /* # of bytes read */
         char rbuf[USERBLOCK_XFER_SIZE]; /* buffer for reading */
 
         /* read buffer */
-        if(size > USERBLOCK_XFER_SIZE)
+        if (size > USERBLOCK_XFER_SIZE)
             nread = HDread(fh, rbuf, (size_t)USERBLOCK_XFER_SIZE);
         else
             nread = HDread(fh, rbuf, (size_t)size);
 
-        for(i = 0; i < nread; i++) {
+        for (i = 0; i < nread; i++) {
 
             printf("%c ", rbuf[i]);
 
         }
         printf("\n");
 
-        if(nread < 0) {
+        if (nread < 0) {
             HGOTO_ERROR(H5E_tools_g, H5E_tools_min_id_g, "nread < 0");
         }
 
@@ -1559,7 +1443,7 @@ void print_user_block(const char *filename, hid_t fid)
     }
 
 done:
-    if(fh > 0)
+    if (fh > 0)
         HDclose(fh);
 
     return;
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index fc8859d..523f81a 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -25,44 +25,87 @@
 #define MIN(a,b)    (((a)<(b)) ? (a) : (b))
 
 /*-------------------------------------------------------------------------
+ * Function: aux_copy_obj
+ *
+ * Purpose: copy the object filters for object copy
+ *
+ * Return: 0 success, -1 failure
+ *-------------------------------------------------------------------------
+ */
+static int aux_copy_obj(hid_t dcpl_id, /* dataset creation property list */
+        const char* name,              /* object name from traverse list */
+        pack_info_t *objout /*OUT*/)   /* info about object to filter */
+{
+    int          ret_value = 0;  /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    int          nfilters;       /* number of filters in DCPL */
+    char         f_objname[256]; /* filter objname */
+    H5D_layout_t layout;
+    int          rank;           /* rank of dataset */
+    hsize_t      chsize[64];     /* chunk size in elements */
+    unsigned int i, j;
+
+    /* get information about input filters */
+    if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_nfilters failed");
+    /* copy filter_info_t structure */
+    for (i = 0; i < nfilters; i++) {
+        if ((objout->filter[i].filtn = H5Pget_filter2(dcpl_id, (unsigned) i, &objout->filter[i].filt_flag, &objout->filter[i].cd_nelmts,
+                objout->filter[i].cd_values, sizeof(f_objname), f_objname, NULL)) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_filter2 failed");
+    }
+
+    objout->nfilters = nfilters;
+    HDstrcpy(objout->path, name);
+
+    if ((layout = H5Pget_layout(dcpl_id)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_layout failed");
+    objout->layout = layout;
+
+    if (layout == H5D_CHUNKED) {
+        if ((rank = H5Pget_chunk(dcpl_id, NELMTS(chsize), chsize/*out*/)) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_chunk failed");
+        objout->chunk.rank = rank;
+        for (i = 0; i < rank; i++)
+            objout->chunk.chunk_lengths[i] = chsize[i];
+    }
+
+done:
+    return ret_value;
+}
+
+/*-------------------------------------------------------------------------
  * Function: aux_find_obj
  *
  * Purpose: find the object name NAME (got from the traverse list)
  *  in the repack options list
- *
  *-------------------------------------------------------------------------
  */
-static int
-aux_find_obj(const char* name,          /* object name from traverse list */
-                 pack_opt_t *options,       /* repack options */
-                 pack_info_t *obj /*OUT*/)  /* info about object to filter */
+static int aux_find_obj(const char* name, /* object name from traverse list */
+        pack_opt_t *options,              /* repack options */
+        pack_info_t *obj                  /*OUT*/) /* info about object to filter */
 {
- char *pdest;
- int  result;
- unsigned int  i;
-
- for ( i=0; i<options->op_tbl->nelems; i++)
- {
-     if (HDstrcmp(options->op_tbl->objs[i].path,name)==0)
-     {
-         *obj =  options->op_tbl->objs[i];
-         return (int)i;
-     }
-
-     pdest  = HDstrstr(name,options->op_tbl->objs[i].path);
-     result = (int)(pdest - name);
-
-     /* found at position 1, meaning without '/' */
-     if( pdest != NULL && result==1 )
-     {
-         *obj =  options->op_tbl->objs[i];
-         return (int)i;
-     }
- }/*i*/
-
- return -1;
-}
+    char         *pdest;
+    int          result;
+    unsigned int i;
+
+    for (i = 0; i < options->op_tbl->nelems; i++) {
+        if (HDstrcmp(options->op_tbl->objs[i].path, name) == 0) {
+            *obj = options->op_tbl->objs[i];
+            return (int) i;
+        }
 
+        pdest = HDstrstr(name, options->op_tbl->objs[i].path);
+        result = (int) (pdest - name);
+
+        /* found at position 1, meaning without '/' */
+        if (pdest != NULL && result == 1) {
+            *obj = options->op_tbl->objs[i];
+            return (int) i;
+        }
+    }/*i*/
+
+    return -1;
+}
 
 /*-------------------------------------------------------------------------
  * Function: aux_assign_obj
@@ -71,38 +114,30 @@ aux_find_obj(const char* name,          /* object name from traverse list */
  *  in the repack options list; assign the filter information OBJ
  *
  * Return: 0 not found, 1 found
- *
  *-------------------------------------------------------------------------
  */
-static int
-aux_assign_obj(const char* name,            /* object name from traverse list */
-                   pack_opt_t *options,         /* repack options */
-                   pack_info_t *obj /*OUT*/)    /* info about object to filter */
+static int aux_assign_obj(const char* name, /* object name from traverse list */
+        pack_opt_t *options,                /* repack options */
+        pack_info_t *obj /*OUT*/)           /* info about object to filter */
 {
-
-    int  idx, i;
+    int         idx, i;
     pack_info_t tmp;
 
     init_packobject(&tmp);
 
-    idx = aux_find_obj(name,options,&tmp);
+    idx = aux_find_obj(name, options, &tmp);
 
     /* name was on input */
-    if (idx>=0)
-    {
-
-
+    if (idx >= 0) {
         /* applying to all objects */
-        if (options->all_layout)
-        {
+        if (options->all_layout) {
             /* assign the global layout info to the OBJ info */
-            tmp.layout=options->layout_g;
-            switch (options->layout_g)
-            {
+            tmp.layout = options->layout_g;
+            switch (options->layout_g) {
             case H5D_CHUNKED:
-                tmp.chunk.rank=options->chunk_g.rank;
-                for ( i=0; i<tmp.chunk.rank; i++)
-                    tmp.chunk.chunk_lengths[i]=options->chunk_g.chunk_lengths[i];
+                tmp.chunk.rank = options->chunk_g.rank;
+                for (i = 0; i < tmp.chunk.rank; i++)
+                    tmp.chunk.chunk_lengths[i] = options->chunk_g.chunk_lengths[i];
                 break;
             case H5D_LAYOUT_ERROR:
             case H5D_COMPACT:
@@ -113,15 +148,13 @@ aux_assign_obj(const char* name,            /* object name from traverse list */
                 break;
             }/*switch*/
         }
-        else
-        {
+        else {
             tmp.layout = options->op_tbl->objs[idx].layout;
-            switch (tmp.layout)
-            {
+            switch (tmp.layout) {
             case H5D_CHUNKED:
                 tmp.chunk.rank = options->op_tbl->objs[idx].chunk.rank;
-                for ( i=0; i<tmp.chunk.rank; i++)
-                    tmp.chunk.chunk_lengths[i]=options->op_tbl->objs[idx].chunk.chunk_lengths[i];
+                for (i = 0; i < tmp.chunk.rank; i++)
+                    tmp.chunk.chunk_lengths[i] = options->op_tbl->objs[idx].chunk.chunk_lengths[i];
                 break;
             case H5D_LAYOUT_ERROR:
             case H5D_COMPACT:
@@ -131,53 +164,40 @@ aux_assign_obj(const char* name,            /* object name from traverse list */
             default:
                 break;
             }/*switch*/
-
         }
 
         /* applying to all objects */
-        if (options->all_filter)
-        {
+        if (options->all_filter) {
             /* assign the global filter */
-            tmp.nfilters=1;
-            tmp.filter[0]=options->filter_g[0];
+            tmp.nfilters = 1;
+            tmp.filter[0] = options->filter_g[0];
         } /* if all */
-        else
-        {
-            tmp.nfilters=options->op_tbl->objs[idx].nfilters;
-            for ( i=0; i<tmp.nfilters; i++)
-            {
+        else {
+            tmp.nfilters = options->op_tbl->objs[idx].nfilters;
+            for (i = 0; i < tmp.nfilters; i++) {
                 tmp.filter[i] = options->op_tbl->objs[idx].filter[i];
             }
         }
-
-
     } /* if idx */
-
-
     /* no input name */
-
-    else
-    {
-
-        if (options->all_filter)
-        {
+    else {
+        if (options->all_filter) {
             int k;
 
             /* assign the global filters */
-            tmp.nfilters=options->n_filter_g;
-            for ( k = 0; k < options->n_filter_g; k++)
-                tmp.filter[k]=options->filter_g[k];
+            tmp.nfilters = options->n_filter_g;
+            for (k = 0; k < options->n_filter_g; k++)
+                tmp.filter[k] = options->filter_g[k];
         }
-        if (options->all_layout)
-        {
+        if (options->all_layout) {
             /* assign the global layout info to the OBJ info */
-            tmp.layout=options->layout_g;
-            switch (options->layout_g)
-            {
+            tmp.layout = options->layout_g;
+            switch (options->layout_g) {
             case H5D_CHUNKED:
-                tmp.chunk.rank=options->chunk_g.rank;
-                for ( i=0; i<tmp.chunk.rank; i++)
-                    tmp.chunk.chunk_lengths[i]=options->chunk_g.chunk_lengths[i];
+                tmp.chunk.rank = options->chunk_g.rank;
+                for (i = 0; i < tmp.chunk.rank; i++)
+                    tmp.chunk.chunk_lengths[i] =
+                            options->chunk_g.chunk_lengths[i];
                 break;
             case H5D_LAYOUT_ERROR:
             case H5D_COMPACT:
@@ -192,10 +212,8 @@ aux_assign_obj(const char* name,            /* object name from traverse list */
 
     *obj = tmp;
     return 1;
-
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: apply_filters
  *
@@ -204,285 +222,279 @@ aux_assign_obj(const char* name,            /* object name from traverse list */
  *  of H5Z_FILTER_NONE present in the PACK_INFO_T filter array
  *
  * Return: 0 success, -1 an error occured
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: December 19, 2003
- *
  *-------------------------------------------------------------------------
  */
 
-int apply_filters(const char* name,    /* object name from traverse list */
-                  int rank,            /* rank of dataset */
-                  hsize_t *dims,       /* dimensions of dataset */
-                  size_t msize,        /* size of type */
-                  hid_t dcpl_id,       /* dataset creation property list */
-                  pack_opt_t *options, /* repack options */
-                  int *has_filter)     /* (OUT) object NAME has a filter */
-
-
+int apply_filters(const char* name, /* object name from traverse list */
+        int rank,                   /* rank of dataset */
+        hsize_t *dims,              /* dimensions of dataset */
+        size_t msize,               /* size of type */
+        hid_t dcpl_id,              /* dataset creation property list */
+        pack_opt_t *options,        /* repack options */
+        int *has_filter)            /* (OUT) object NAME has a filter */
 {
-    int          nfilters;       /* number of filters in DCPL */
-    hsize_t      chsize[64];     /* chunk size in elements */
+    int         ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    int         nfilters;      /* number of filters in DCPL */
+    hsize_t     chsize[64];    /* chunk size in elements */
     H5D_layout_t layout;
-    int          i;
-    pack_info_t  obj;
+    int         i, j;
+    pack_info_t obj;
+    pack_info_t filtobj;
 
     *has_filter = 0;
 
-    if (rank==0) /* scalar dataset, do not apply */
-        return 0;
+    if (rank == 0) /* scalar dataset, do not apply */
+        HGOTO_DONE(0);
 
-   /*-------------------------------------------------------------------------
-    * initialize the assigment object
-    *-------------------------------------------------------------------------
-    */
+    /*-------------------------------------------------------------------------
+     * initialize the assigment object
+     *-------------------------------------------------------------------------
+     */
     init_packobject(&obj);
+    init_packobject(&filtobj);
 
-   /*-------------------------------------------------------------------------
-    * find options
-    *-------------------------------------------------------------------------
-    */
-    if (aux_assign_obj(name,options,&obj)==0)
-        return 0;
+    /*-------------------------------------------------------------------------
+     * find options
+     *-------------------------------------------------------------------------
+     */
+    if (aux_assign_obj(name, options, &obj) == 0)
+        HGOTO_DONE(0);
 
     /* get information about input filters */
-    if ((nfilters = H5Pget_nfilters(dcpl_id))<0)
-        return -1;
-
-   /*-------------------------------------------------------------------------
-    * check if we have filters in the pipeline
-    * we want to replace them with the input filters
-    * only remove if we are inserting new ones
-    *-------------------------------------------------------------------------
-    */
-    if (nfilters && obj.nfilters )
-    {
-        *has_filter = 1;
-        if (H5Premove_filter(dcpl_id,H5Z_FILTER_ALL)<0)
-            return -1;
-    }
+    if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_nfilters failed");
 
-   /*-------------------------------------------------------------------------
-    * check if there is an existent chunk
-    * read it only if there is not a requested layout
-    *-------------------------------------------------------------------------
-    */
-    if (obj.layout == -1 )
-    {
-        if ((layout = H5Pget_layout(dcpl_id))<0)
-            return -1;
-
-        if (layout == H5D_CHUNKED)
-        {
-            if ((rank = H5Pget_chunk(dcpl_id,NELMTS(chsize),chsize/*out*/))<0)
-                return -1;
-            obj.layout = H5D_CHUNKED;
-            obj.chunk.rank = rank;
-            for ( i = 0; i < rank; i++)
-                obj.chunk.chunk_lengths[i] = chsize[i];
+
+    /*-------------------------------------------------------------------------
+     * check if we have filters in the pipeline
+     * we want to replace them with the input filters
+     * only remove if we are inserting new ones
+     *-------------------------------------------------------------------------
+     */
+    if (nfilters && obj.nfilters) {
+        *has_filter = 1;
+        if (H5Premove_filter(dcpl_id, H5Z_FILTER_ALL) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Premove_filter failed");
+
+        /*-------------------------------------------------------------------------
+         * check if there is an existent chunk
+         * read it only if there is not a requested layout
+         *-------------------------------------------------------------------------
+         */
+        if (obj.layout == -1) {
+            if ((layout = H5Pget_layout(dcpl_id)) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_layout failed");
+
+            if (layout == H5D_CHUNKED) {
+                if ((rank = H5Pget_chunk(dcpl_id, NELMTS(chsize), chsize/*out*/)) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_chunk failed");
+                obj.layout = H5D_CHUNKED;
+                obj.chunk.rank = rank;
+                for (i = 0; i < rank; i++)
+                    obj.chunk.chunk_lengths[i] = chsize[i];
+            }
         }
     }
+    else if(nfilters) {
+        *has_filter = 1;
+        if (aux_copy_obj(dcpl_id, name, &filtobj) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "aux_copy_obj failed");
+    }
 
     /*-------------------------------------------------------------------------
-    * the type of filter and additional parameter
-    * type can be one of the filters
-    * H5Z_FILTER_NONE        0 , uncompress if compressed
-    * H5Z_FILTER_DEFLATE     1 , deflation like gzip
-    * H5Z_FILTER_SHUFFLE     2 , shuffle the data
-    * H5Z_FILTER_FLETCHER32  3 , fletcher32 checksum of EDC
-    * H5Z_FILTER_SZIP        4 , szip compression
-    * H5Z_FILTER_NBIT        5 , nbit compression
-    * H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression
-    *-------------------------------------------------------------------------
-    */
-
-    if (obj.nfilters)
-    {
-
-   /*-------------------------------------------------------------------------
-    * filters require CHUNK layout; if we do not have one define a default
-    *-------------------------------------------------------------------------
-    */
-        if (obj.layout==-1)
-        {
-
+     * the type of filter and additional parameter
+     * type can be one of the filters
+     * H5Z_FILTER_NONE        0 , uncompress if compressed
+     * H5Z_FILTER_DEFLATE     1 , deflation like gzip
+     * H5Z_FILTER_SHUFFLE     2 , shuffle the data
+     * H5Z_FILTER_FLETCHER32  3 , fletcher32 checksum of EDC
+     * H5Z_FILTER_SZIP        4 , szip compression
+     * H5Z_FILTER_NBIT        5 , nbit compression
+     * H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression
+     *-------------------------------------------------------------------------
+     */
+
+    if (obj.nfilters) {
+        /*-------------------------------------------------------------------------
+         * filters require CHUNK layout; if we do not have one define a default
+         *-------------------------------------------------------------------------
+         */
+        if (obj.layout == -1) {
             /* stripmine info */
             hsize_t sm_size[H5S_MAX_RANK]; /*stripmine size */
-            hsize_t sm_nbytes;             /*bytes per stripmine */
+            hsize_t sm_nbytes; /*bytes per stripmine */
 
             obj.chunk.rank = rank;
 
             /*
-            * determine the strip mine size. The strip mine is
-            * a hyperslab whose size is manageable.
-            */
-
-
+             * determine the strip mine size. The strip mine is
+             * a hyperslab whose size is manageable.
+             */
 
             sm_nbytes = msize;
-            for ( i = rank; i > 0; --i)
-            {
+            for (i = rank; i > 0; --i) {
                 hsize_t size = H5TOOLS_BUFSIZE / sm_nbytes;
-                if ( size == 0) /* datum size > H5TOOLS_BUFSIZE */
+                if (size == 0) /* datum size > H5TOOLS_BUFSIZE */
                     size = 1;
                 sm_size[i - 1] = MIN(dims[i - 1], size);
                 sm_nbytes *= sm_size[i - 1];
                 HDassert(sm_nbytes > 0);
-
             }
 
-            for ( i = 0; i < rank; i++)
-            {
+            for (i = 0; i < rank; i++) {
                 obj.chunk.chunk_lengths[i] = sm_size[i];
             }
-
         }
 
-        for ( i=0; i<obj.nfilters; i++)
-        {
-            switch (obj.filter[i].filtn)
-            {
+        for (i = 0; i < obj.nfilters; i++) {
+            if (obj.filter[i].filtn < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "invalid filter");
 
+            switch (obj.filter[i].filtn) {
             /*-------------------------------------------------------------------------
              * H5Z_FILTER_NONE       0 , uncompress if compressed
              *-------------------------------------------------------------------------
              */
             case H5Z_FILTER_NONE:
-            	break;
+                break;
 
-           /*-------------------------------------------------------------------------
-            * H5Z_FILTER_DEFLATE       1 , deflation like gzip
-            *-------------------------------------------------------------------------
-            */
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_DEFLATE       1 , deflation like gzip
+             *-------------------------------------------------------------------------
+             */
             case H5Z_FILTER_DEFLATE:
                 {
-                    unsigned     aggression;     /* the deflate level */
+                    unsigned aggression; /* the deflate level */
 
                     aggression = obj.filter[i].cd_values[0];
                     /* set up for deflated data */
-                    if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
-                        return -1;
-                    if(H5Pset_deflate(dcpl_id,aggression)<0)
-                        return -1;
+                    if (H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths) < 0)
+                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_chunk failed");
+                    if (H5Pset_deflate(dcpl_id, aggression) < 0)
+                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_deflate failed");
                 }
                 break;
 
-           /*-------------------------------------------------------------------------
-            * H5Z_FILTER_SZIP       4 , szip compression
-            *-------------------------------------------------------------------------
-            */
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_SZIP       4 , szip compression
+             *-------------------------------------------------------------------------
+             */
             case H5Z_FILTER_SZIP:
                 {
-                    unsigned  options_mask;
-                    unsigned  pixels_per_block;
+                    unsigned options_mask;
+                    unsigned pixels_per_block;
 
-                    options_mask     = obj.filter[i].cd_values[0];
+                    options_mask = obj.filter[i].cd_values[0];
                     pixels_per_block = obj.filter[i].cd_values[1];
 
                     /* set up for szip data */
-                    if(H5Pset_chunk(dcpl_id,obj.chunk.rank,obj.chunk.chunk_lengths)<0)
-                        return -1;
-                    if (H5Pset_szip(dcpl_id,options_mask,pixels_per_block)<0)
-                        return -1;
-
+                    if (H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths) < 0)
+                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_chunk failed");
+                    if (H5Pset_szip(dcpl_id, options_mask, pixels_per_block) < 0)
+                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_szip failed");
                 }
                 break;
 
-           /*-------------------------------------------------------------------------
-            * H5Z_FILTER_SHUFFLE    2 , shuffle the data
-            *-------------------------------------------------------------------------
-            */
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_SHUFFLE    2 , shuffle the data
+             *-------------------------------------------------------------------------
+             */
             case H5Z_FILTER_SHUFFLE:
-                if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
-                    return -1;
-                if (H5Pset_shuffle(dcpl_id)<0)
-                    return -1;
+                if (H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_chunk failed");
+                if (H5Pset_shuffle(dcpl_id) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_shuffle failed");
                 break;
 
-           /*-------------------------------------------------------------------------
-            * H5Z_FILTER_FLETCHER32 3 , fletcher32 checksum of EDC
-            *-------------------------------------------------------------------------
-            */
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_FLETCHER32 3 , fletcher32 checksum of EDC
+             *-------------------------------------------------------------------------
+             */
             case H5Z_FILTER_FLETCHER32:
-                if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
-                    return -1;
-                if (H5Pset_fletcher32(dcpl_id)<0)
-                    return -1;
+                if (H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_chunk failed");
+                if (H5Pset_fletcher32(dcpl_id) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fletcher32 failed");
                 break;
-           /*----------- -------------------------------------------------------------
-            * H5Z_FILTER_NBIT , NBIT compression
-            *-------------------------------------------------------------------------
-            */
+            /*----------- -------------------------------------------------------------
+             * H5Z_FILTER_NBIT , NBIT compression
+             *-------------------------------------------------------------------------
+             */
             case H5Z_FILTER_NBIT:
-                if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
-                    return -1;
-                if (H5Pset_nbit(dcpl_id)<0)
-                    return -1;
+                if (H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_chunk failed");
+                if (H5Pset_nbit(dcpl_id) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_nbit failed");
                 break;
             /*----------- -------------------------------------------------------------
              * H5Z_FILTER_SCALEOFFSET , scale+offset compression
              *-------------------------------------------------------------------------
              */
-
             case H5Z_FILTER_SCALEOFFSET:
                 {
                     H5Z_SO_scale_type_t scale_type;
-                    int                 scale_factor;
+                    int scale_factor;
 
-                    scale_type   = (H5Z_SO_scale_type_t)obj.filter[i].cd_values[0];
-                    scale_factor = (int)obj.filter[i].cd_values[1];
+                    scale_type = (H5Z_SO_scale_type_t) obj.filter[i].cd_values[0];
+                    scale_factor = (int) obj.filter[i].cd_values[1];
 
-                    if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
-                        return -1;
-                    if (H5Pset_scaleoffset(dcpl_id,scale_type,scale_factor)<0)
-                        return -1;
+                    if (H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths) < 0)
+                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_chunk failed");
+                    if (H5Pset_scaleoffset(dcpl_id, scale_type, scale_factor) < 0)
+                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_scaleoffset failed");
                 }
                 break;
             default:
-            	{
-            		if (H5Pset_filter (dcpl_id, obj.filter[i].filtn, H5Z_FLAG_MANDATORY, obj.filter[i].cd_nelmts, obj.filter[i].cd_values)<0)
-                		return -1;
-            		if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
-            			return -1;
-            	}
+                {
+                    if (H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths) < 0)
+                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_chunk failed");
+                    if (H5Pset_filter(dcpl_id, obj.filter[i].filtn,
+                            obj.filter[i].filt_flag, obj.filter[i].cd_nelmts,
+                            obj.filter[i].cd_values) < 0)
+                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_filter failed");
+                }
                 break;
             } /* switch */
         }/*i*/
-
     }
     /*obj.nfilters*/
 
+    if (filtobj.nfilters) {
+        for (i = 0; i < filtobj.nfilters; i++) {
+            if (filtobj.filter[i].filtn < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "invalid filter");
+
+            if (H5Zfilter_avail(filtobj.filter[i].filtn) <= 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "%d filter unavailable", filtobj.filter[i].filtn);
+        } /* for */
+    } /* nfilters */
+
     /*-------------------------------------------------------------------------
-    * layout
-    *-------------------------------------------------------------------------
-    */
+     * layout
+     *-------------------------------------------------------------------------
+     */
 
-    if (obj.layout>=0)
-    {
+    if (obj.layout >= 0) {
         /* a layout was defined */
-        if (H5Pset_layout(dcpl_id, obj.layout)<0)
-            return -1;
+        if (H5Pset_layout(dcpl_id, obj.layout) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_layout failed");
 
-        if (H5D_CHUNKED == obj.layout)
-        {
-            if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
-                return -1;
+        if (H5D_CHUNKED == obj.layout) {
+            if (H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_chunk failed");
         }
-        else if (H5D_COMPACT == obj.layout)
-        {
-            if (H5Pset_alloc_time(dcpl_id, H5D_ALLOC_TIME_EARLY)<0)
-                return -1;
+        else if (H5D_COMPACT == obj.layout) {
+            if (H5Pset_alloc_time(dcpl_id, H5D_ALLOC_TIME_EARLY) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_alloc_time failed");
         }
         /* remove filters for the H5D_CONTIGUOUS case */
-        else if (H5D_CONTIGUOUS == obj.layout)
-        {
-            if (H5Premove_filter(dcpl_id,H5Z_FILTER_ALL)<0)
-                return -1;
+        else if (H5D_CONTIGUOUS == obj.layout) {
+            if (H5Premove_filter(dcpl_id, H5Z_FILTER_ALL) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Premove_filter failed");
         }
-
     }
 
- return 0;
+done:
+    return ret_value;
 }
 
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index e1f13fd..0c5aac6 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -50,8 +50,8 @@ static struct long_options l_opts[] = {
     { "metadata_block_size", require_arg, 'M' },
     { "threshold", require_arg, 't' },
     { "alignment", require_arg, 'a' },
-    { "infile", require_arg, 'i' }, /* -i for backward compability */
-    { "outfile", require_arg, 'o' }, /* -o for backward compability */
+    { "infile", require_arg, 'i' },   /* -i for backward compability */
+    { "outfile", require_arg, 'o' },  /* -o for backward compability */
     { "sort_by", require_arg, 'q' },
     { "sort_order", require_arg, 'z' },
     { "enable-error-stack", no_arg, 'E' },
@@ -93,7 +93,7 @@ static void usage(const char *prog) {
     PRINTVALSTREAM(rawoutstream, "   -f FILT, --filter=FILT  Filter type\n");
     PRINTVALSTREAM(rawoutstream, "   -l LAYT, --layout=LAYT  Layout type\n");
     PRINTVALSTREAM(rawoutstream, "\n");
-    PRINTVALSTREAM(rawoutstream, "    M - is an integer greater than 1, size of dataset in bytes (default is 0) \n");
+    PRINTVALSTREAM(rawoutstream, "    M - is an integer greater than 1, size of dataset in bytes (default is 0)\n");
     PRINTVALSTREAM(rawoutstream, "    E - is a filename.\n");
     PRINTVALSTREAM(rawoutstream, "    S - is an integer\n");
     PRINTVALSTREAM(rawoutstream, "    U - is a filename.\n");
@@ -134,8 +134,8 @@ static void usage(const char *prog) {
     PRINTVALSTREAM(rawoutstream, "        NBIT (no parameter)\n");
     PRINTVALSTREAM(rawoutstream, "        SOFF=<scale_factor,scale_type> scale_factor is an integer and scale_type\n");
     PRINTVALSTREAM(rawoutstream, "            is either IN or DS\n");
-    PRINTVALSTREAM(rawoutstream, "        UD=<filter_number,cd_value_count,value_1[,value_2,...,value_N]>\n");
-    PRINTVALSTREAM(rawoutstream, "            required values for filter_number,cd_value_count,value_1\n");
+    PRINTVALSTREAM(rawoutstream, "        UD=<filter_number,filter_flag,cd_value_count,value_1[,value_2,...,value_N]>\n");
+    PRINTVALSTREAM(rawoutstream, "            required values for filter_number,filter_flag,cd_value_count,value_1\n");
     PRINTVALSTREAM(rawoutstream, "            optional values for value_2 to value_N\n");
     PRINTVALSTREAM(rawoutstream, "        NONE (no parameter)\n");
     PRINTVALSTREAM(rawoutstream, "\n");
@@ -170,16 +170,16 @@ static void usage(const char *prog) {
     PRINTVALSTREAM(rawoutstream, "   Chunked layout, with a layout size of 20x10, to objects dset1 and dset2\n");
     PRINTVALSTREAM(rawoutstream, "   and remove filters to objects dset3, dset4, dset5\n");
     PRINTVALSTREAM(rawoutstream, "\n");
-    PRINTVALSTREAM(rawoutstream, "4) h5repack -L -c 10 -s 20:dtype file1 file2 \n");
+    PRINTVALSTREAM(rawoutstream, "4) h5repack -L -c 10 -s 20:dtype file1 file2\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "   Using latest file format with maximum compact group size of 10 and\n");
     PRINTVALSTREAM(rawoutstream, "   and minimum shared datatype size of 20\n");
     PRINTVALSTREAM(rawoutstream, "\n");
-    PRINTVALSTREAM(rawoutstream, "5) h5repack -f SHUF -f GZIP=1 file1 file2 \n");
+    PRINTVALSTREAM(rawoutstream, "5) h5repack -f SHUF -f GZIP=1 file1 file2\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "   Add both filters SHUF and GZIP in this order to all datasets\n");
     PRINTVALSTREAM(rawoutstream, "\n");
-    PRINTVALSTREAM(rawoutstream, "6) h5repack -f UD=307,1,9 file1 file2 \n");
+    PRINTVALSTREAM(rawoutstream, "6) h5repack -f UD=307,0,1,9 file1 file2\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "   Add bzip2 filter to all datasets\n");
     PRINTVALSTREAM(rawoutstream, "\n");
@@ -191,10 +191,6 @@ static void usage(const char *prog) {
  * Purpose:     Shutdown MPI & HDF5 and call exit()
  *
  * Return:      Does not return
- *
- * Programmer:  Quincey Koziol
- *              Saturday, 31. January 2004
- *
  *-------------------------------------------------------------------------
  */
 static void leave(int ret)
@@ -209,11 +205,6 @@ static void leave(int ret)
  * Purpose: read comp and chunk options from a file
  *
  * Return: void, exit on error
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: September, 22, 2003
- *
  *-------------------------------------------------------------------------
  */
 static
@@ -395,7 +386,6 @@ set_sort_order(const char *form)
  * Function: parse_command_line
  *
  * Purpose: parse command line input
- *
  *-------------------------------------------------------------------------
  */
 static
@@ -408,13 +398,13 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
     while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char) opt) {
 
-            /* -i for backward compability */
+            /* -i for backward compatibility */
             case 'i':
                 infile = opt_arg;
                 has_i_o = 1;
                 break;
 
-            /* -o for backward compability */
+            /* -o for backward compatibility */
             case 'o':
                 outfile = opt_arg;
                 has_i_o = 1;
@@ -598,13 +588,6 @@ done:
  * Return: Success: EXIT_SUCCESS(0)
  *
  * Failure: EXIT_FAILURE(1)
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
  *-------------------------------------------------------------------------
  */
 int main(int argc, const char **argv)
@@ -636,8 +619,10 @@ int main(int argc, const char **argv)
     }
 
     /* initialize options  */
-    h5repack_init(&options, 0);
-
+    if (h5repack_init(&options, 0, FALSE) < 0) {
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
+    }
     /* Initialize default indexing options */
     sort_by = H5_INDEX_CRT_ORDER;
 
diff --git a/tools/h5repack/h5repack_opttable.c b/tools/h5repack/h5repack_opttable.c
index e24d479..b816176 100644
--- a/tools/h5repack/h5repack_opttable.c
+++ b/tools/h5repack/h5repack_opttable.c
@@ -21,23 +21,23 @@
  * Purpose: initialize a pack_info_t structure
  *
  * Return: void
- *
- *-------------------------------------------------------------------------
+  *-------------------------------------------------------------------------
  */
 
 void init_packobject(pack_info_t *obj) {
-	int j, k;
-
-	HDstrcpy(obj->path, "\0");
-	for (j = 0; j < H5_REPACK_MAX_NFILTERS; j++) {
-		obj->filter[j].filtn = -1;
-		for (k = 0; k < CD_VALUES; k++)
-			obj->filter[j].cd_values[k] = 0;
-	}
-	obj->chunk.rank = -1;
-	obj->refobj_id = -1;
-	obj->layout = H5D_LAYOUT_ERROR;
-	obj->nfilters = 0;
+    int j, k;
+
+    HDstrcpy(obj->path, "\0");
+    for (j = 0; j < H5_REPACK_MAX_NFILTERS; j++) {
+        obj->filter[j].filtn = -1;
+        obj->filter[j].cd_nelmts = CD_VALUES;
+        for (k = 0; k < CD_VALUES; k++)
+            obj->filter[j].cd_values[k] = 0;
+    }
+    obj->chunk.rank = -1;
+    obj->refobj_id = -1;
+    obj->layout = H5D_LAYOUT_ERROR;
+    obj->nfilters = 0;
 }
 
 /*-------------------------------------------------------------------------
@@ -46,20 +46,14 @@ void init_packobject(pack_info_t *obj) {
  * Purpose: auxiliary function, inserts the filter in object OBJS[ I ]
  *
  * Return: void
- *
  *-------------------------------------------------------------------------
  */
 
-static void aux_tblinsert_filter(pack_opttbl_t *table, unsigned int I,
-		filter_info_t filt) {
-	if (table->objs[I].nfilters < H5_REPACK_MAX_NFILTERS) {
-		table->objs[I].filter[table->objs[I].nfilters++] = filt;
-	}
-	else {
-		error_msg(
-				"cannot insert the filter in this object.\
-        Maximum capacity exceeded\n");
-	}
+static void aux_tblinsert_filter(pack_opttbl_t *table, unsigned int I, filter_info_t filt) {
+    if (table->objs[I].nfilters < H5_REPACK_MAX_NFILTERS)
+        table->objs[I].filter[table->objs[I].nfilters++] = filt;
+    else
+        H5TOOLS_INFO(H5E_tools_min_id_g, "cannot insert the filter in this object. Maximum capacity exceeded");
 }
 
 /*-------------------------------------------------------------------------
@@ -68,30 +62,27 @@ static void aux_tblinsert_filter(pack_opttbl_t *table, unsigned int I,
  * Purpose: auxiliary function, inserts the layout in object OBJS[ I ]
  *
  * Return: void
- *
  *-------------------------------------------------------------------------
  */
-
-static void aux_tblinsert_layout(pack_opttbl_t *table, unsigned int I,
-		pack_info_t *pack) {
-	int k;
-
-	table->objs[I].layout = pack->layout;
-	if (H5D_CHUNKED == pack->layout) {
-		/* -2 means the NONE option, remove chunking
-		 and set the layout to contiguous */
-		if (pack->chunk.rank == -2) {
-			table->objs[I].layout = H5D_CONTIGUOUS;
-			table->objs[I].chunk.rank = -2;
-		}
-		/* otherwise set the chunking type */
-		else {
-			table->objs[I].chunk.rank = pack->chunk.rank;
-			for (k = 0; k < pack->chunk.rank; k++)
-				table->objs[I].chunk.chunk_lengths[k] =
-						pack->chunk.chunk_lengths[k];
-		}
-	}
+static void aux_tblinsert_layout(pack_opttbl_t *table, unsigned int I, pack_info_t *pack) {
+    int k;
+
+    table->objs[I].layout = pack->layout;
+    if (H5D_CHUNKED == pack->layout) {
+        /* -2 means the NONE option, remove chunking
+        and set the layout to contiguous */
+        if (pack->chunk.rank == -2) {
+            table->objs[I].layout = H5D_CONTIGUOUS;
+            table->objs[I].chunk.rank = -2;
+        }
+        /* otherwise set the chunking type */
+        else {
+            table->objs[I].chunk.rank = pack->chunk.rank;
+            for (k = 0; k < pack->chunk.rank; k++)
+                table->objs[I].chunk.chunk_lengths[k] =
+                        pack->chunk.chunk_lengths[k];
+        }
+    }
 }
 
 /*-------------------------------------------------------------------------
@@ -100,7 +91,6 @@ static void aux_tblinsert_layout(pack_opttbl_t *table, unsigned int I,
  * Purpose: auxiliary function, increases the size of the collection by N_OBJS
  *
  * Return: 0, ok, -1, fail
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -111,7 +101,7 @@ aux_inctable(pack_opttbl_t *table, unsigned n_objs)
     table->size += n_objs;
     table->objs = (pack_info_t*) HDrealloc(table->objs, table->size * sizeof(pack_info_t));
     if (table->objs == NULL) {
-        error_msg("not enough memory for options table\n");
+        H5TOOLS_INFO(H5E_tools_min_id_g, "not enough memory for options table");
         return -1;
     }
 
@@ -128,32 +118,30 @@ aux_inctable(pack_opttbl_t *table, unsigned n_objs)
  * Purpose: init options table
  *
  * Return: 0, ok, -1, fail
- *
- *-------------------------------------------------------------------------
+  *-------------------------------------------------------------------------
  */
 int options_table_init(pack_opttbl_t **tbl) {
-	unsigned int i;
-	pack_opttbl_t *table;
-
-	if (NULL == (table = (pack_opttbl_t *) HDmalloc(sizeof(pack_opttbl_t)))) {
-		error_msg("not enough memory for options table\n");
-		return -1;
-	}
-
-	table->size = 30;
-	table->nelems = 0;
-	if (NULL == (table->objs =
-			(pack_info_t*) HDmalloc(table->size * sizeof(pack_info_t)))) {
-		error_msg("not enough memory for options table\n");
-		HDfree(table);
-		return -1;
-	}
-
-	for (i = 0; i < table->size; i++)
-		init_packobject(&table->objs[i]);
-
-	*tbl = table;
-	return 0;
+    unsigned int i;
+    pack_opttbl_t *table;
+
+    if (NULL == (table = (pack_opttbl_t *) HDmalloc(sizeof(pack_opttbl_t)))) {
+        H5TOOLS_INFO(H5E_tools_min_id_g, "not enough memory for options table");
+        return -1;
+    }
+
+    table->size = 30;
+    table->nelems = 0;
+    if (NULL == (table->objs = (pack_info_t*) HDmalloc(table->size * sizeof(pack_info_t)))) {
+        H5TOOLS_INFO(H5E_tools_min_id_g, "not enough memory for options table");
+        HDfree(table);
+        return -1;
+    }
+
+    for (i = 0; i < table->size; i++)
+        init_packobject(&table->objs[i]);
+
+    *tbl = table;
+    return 0;
 }
 
 
@@ -163,14 +151,13 @@ int options_table_init(pack_opttbl_t **tbl) {
  * Purpose: free table memory
  *
  * Return: 0
- *
  *-------------------------------------------------------------------------
  */
 
 int options_table_free(pack_opttbl_t *table) {
-	HDfree(table->objs);
-	HDfree(table);
-	return 0;
+    HDfree(table->objs);
+    HDfree(table);
+    return 0;
 }
 
 /*-------------------------------------------------------------------------
@@ -179,12 +166,10 @@ int options_table_free(pack_opttbl_t *table) {
  * Purpose: add a layout option to the option list
  *
  * Return: 0, ok, -1, fail
- *
- *-------------------------------------------------------------------------
+  *-------------------------------------------------------------------------
  */
 int
-options_add_layout(obj_list_t *obj_list, unsigned  n_objs, pack_info_t *pack,
-    pack_opttbl_t *table)
+options_add_layout(obj_list_t *obj_list, unsigned  n_objs, pack_info_t *pack, pack_opttbl_t *table)
 {
     unsigned i, j, I;
     unsigned added = 0;
@@ -205,7 +190,7 @@ options_add_layout(obj_list_t *obj_list, unsigned  n_objs, pack_info_t *pack,
                 if (HDstrcmp(obj_list[j].obj,table->objs[i].path) == 0) {
                     /* already chunk info inserted for this one; exit */
                     if (table->objs[i].chunk.rank > 0) {
-                        error_msg("chunk information already inserted for <%s>\n", obj_list[j].obj);
+                        H5TOOLS_INFO(H5E_tools_min_id_g, "chunk information already inserted for <%s>\n", obj_list[j].obj);
                         HDexit(EXIT_FAILURE);
                     }
                     /* insert the layout info */
@@ -261,12 +246,10 @@ options_add_layout(obj_list_t *obj_list, unsigned  n_objs, pack_info_t *pack,
  * Purpose: add a compression -f option to the option list
  *
  * Return: 0, ok, -1, fail
- *
  *-------------------------------------------------------------------------
  */
 int
-options_add_filter(obj_list_t *obj_list, unsigned n_objs, filter_info_t filt,
-    pack_opttbl_t *table)
+options_add_filter(obj_list_t *obj_list, unsigned n_objs, filter_info_t filt, pack_opttbl_t *table)
 {
     unsigned int i, j, I;
     unsigned added = 0;
@@ -279,7 +262,7 @@ options_add_filter(obj_list_t *obj_list, unsigned n_objs, filter_info_t filt,
 
     /* search if this object is already in the table; "path" is the key */
     if (table->nelems > 0) {
-        /* go tru the supplied list of names */
+        /* go through the supplied list of names */
         for (j = 0; j < n_objs; j++) {
             /* linear table search */
             for (i = 0; i < table->nelems; i++) {
@@ -337,29 +320,26 @@ options_add_filter(obj_list_t *obj_list, unsigned n_objs, filter_info_t filt,
  * Purpose: get object from table; "path" is the key
  *
  * Return: pack_info_t* OBJECT or NULL if not found; PATH is the key
- *
  *-------------------------------------------------------------------------
  */
 
 pack_info_t* options_get_object(const char *path, pack_opttbl_t *table) {
-	unsigned int i;
-	char tbl_path[MAX_NC_NAME + 1]; /* +1 for start with "/" case */
-
-	for (i = 0; i < table->nelems; i++) {
-		/* make full path (start with "/") to compare correctly  */
-		if (HDstrncmp(table->objs[i].path, "/", 1)) {
-			HDstrcpy(tbl_path, "/");
-			HDstrcat(tbl_path, table->objs[i].path);
-		}
-		else
-			HDstrcpy(tbl_path, table->objs[i].path);
-
-		/* found it */
-		if (HDstrcmp(tbl_path, path) == 0) {
-			return (&table->objs[i]);
-		}
-	}
-
-	return NULL;
-}
+    unsigned int i;
+    char tbl_path[MAX_NC_NAME + 1]; /* +1 for start with "/" case */
+
+    for (i = 0; i < table->nelems; i++) {
+        /* make full path (start with "/") to compare correctly  */
+        if (HDstrncmp(table->objs[i].path, "/", 1)) {
+            HDstrcpy(tbl_path, "/");
+            HDstrcat(tbl_path, table->objs[i].path);
+        }
+        else
+            HDstrcpy(tbl_path, table->objs[i].path);
 
+        /* found it */
+        if (HDstrcmp(tbl_path, path) == 0) {
+            return (&table->objs[i]);
+        }
+    }
+    return NULL;
+}
diff --git a/tools/h5repack/h5repack_parse.c b/tools/h5repack/h5repack_parse.c
index a9a890d..05af197 100644
--- a/tools/h5repack/h5repack_parse.c
+++ b/tools/h5repack/h5repack_parse.c
@@ -42,7 +42,7 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
     size_t      i, m, u;
     char        c;
     size_t      len = HDstrlen(str);
-    int         k, l, p, q, end_obj = -1, no_param = 0;
+    int         f, k, l, p, q, end_obj = -1, no_param = 0;
     unsigned    j, n;
     char        sobj[MAX_NC_NAME];
     char        scomp[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -58,26 +58,30 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
     /* check for the end of object list and number of objects */
     for (i = 0, n = 0; i < len; i++) {
         c = str[i];
-        if (c == ':')
+        if (c == ':') {
             end_obj = (int) i;
+            break;
+        }
         if (c == ',')
             n++;
     }
+    n++;
 
     /* Check for missing : */
     if (end_obj == -1) {
         /* apply to all objects */
         options->all_filter = 1;
         *is_glb = 1;
+        *n_objs = 1;
     }
+    else
+        *n_objs = n;
 
-    n++;
     obj_list = (obj_list_t *) HDmalloc(n * sizeof(obj_list_t));
     if (obj_list == NULL) {
         error_msg("could not allocate object list\n");
         return NULL;
     }
-    *n_objs = n;
 
     /* get object list */
     if (end_obj > 0)
@@ -89,6 +93,7 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
                     sobj[k] = '\0';
                 else
                     sobj[k + 1] = '\0';
+
                 HDstrcpy(obj_list[n].obj, sobj);
                 HDmemset(sobj, 0, sizeof(sobj));
                 n++;
@@ -142,7 +147,6 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
                             if (l == 2) {
                                 smask[l] = '\0';
                                 i = len - 1; /* end */
-                                (*n_objs)--; /* we counted an extra ',' */
                                 if (HDstrcmp(smask,"NN") == 0)
                                     filt->cd_values[j++] = H5_SZIP_NN_OPTION_MASK;
                                 else if (HDstrcmp(smask,"EC") == 0)
@@ -193,7 +197,6 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
                             if (l == 2) {
                                 smask[l] = '\0';
                                 i = len - 1; /* end */
-                                (*n_objs)--; /* we counted an extra ',' */
                                 if (HDstrcmp(smask,"IN") == 0)
                                     filt->cd_values[j++] = H5Z_SO_INT;
                                 else if (HDstrcmp(smask, "DS") == H5Z_SO_FLOAT_DSCALE)
@@ -209,13 +212,14 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
 
                 /*-------------------------------------------------------------------------
                 * User Defined
-                *   has the format UD=<filter_number,cd_value_count,value_1[,value_2,...,value_N]>
+                *   has the format UD=<filter_number,filter_flag,cd_value_count,value_1[,value_2,...,value_N]>
                 *  BZIP2 example
-                *  UD=307,1,9
+                *  UD=307,0,1,9
                 *-------------------------------------------------------------------------
                 */
                 else if (HDstrcmp(scomp, "UD") == 0) {
                     l = -1; /* filter number index check */
+                    f = -1; /* filter flag index check */
                     p = -1; /* CD_VAL count check */
                     for (m = 0, q = 0, u = i + 1; u < len; u++, m++, q++) {
                         if (str[u] == ',') {
@@ -224,6 +228,10 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
                                 filt->filtn = HDatoi(stype);
                                 l = 0;
                             }
+                            else if (f == -1) {
+                                filt->filt_flag = HDstrtoul(stype, NULL, 0);
+                                f = 0;
+                            }
                             else if (p == -1) {
                                 filt->cd_nelmts = HDstrtoull(stype, NULL, 0);
                                 p = 0;
@@ -240,6 +248,12 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
                             error_msg("filter number parameter is not a digit in <%s>\n", str);
                             HDexit(EXIT_FAILURE);
                         }
+                        else if (!HDisdigit(c) && f == -1) {
+                            if (obj_list)
+                                HDfree(obj_list);
+                            error_msg("filter flag parameter is not a digit in <%s>\n", str);
+                            HDexit(EXIT_FAILURE);
+                        }
                         stype[q] = c;
                     } /* for u */
                     stype[q] = '\0';
diff --git a/tools/h5repack/h5repack_plugin.sh.in b/tools/h5repack/h5repack_plugin.sh.in
index eaf6917..f21da3d 100644
--- a/tools/h5repack/h5repack_plugin.sh.in
+++ b/tools/h5repack/h5repack_plugin.sh.in
@@ -1,10 +1,10 @@
 #! /bin/sh
 #
-# Copyright by The HDF Group.                                              
-# All rights reserved.                                                     
-#                                                                          
-# This file is part of HDF5. The full HDF5 copyright notice, including     
-# terms governing use, modification, and redistribution, is contained in   
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5. The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
 # distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
 # If you do not have access to either file, you may request a copy from
@@ -247,10 +247,10 @@ COPY_TESTFILES_TO_TESTDIR
 version_str=`echo @H5_VERSION@ | awk -F"-" '{print $1}' | sed 's/\./,/g'`
 
 # Run the test
-arg="h5repack_layout.h5 -v -f UD=260,4,9,$version_str"
+arg="h5repack_layout.h5 -v -f UD=260,0,4,9,$version_str"
 TOOLTEST_DUMP plugin_version_test $arg
 
-arg="h5repack_layout.h5 -v -f UD=257,1,9"
+arg="h5repack_layout.h5 -v -f UD=257,0,1,9"
 TOOLTEST_DUMP plugin_test $arg
 
 #arg="h5repack_layout.UD.h5 -v -f NONE"
diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c
index 89d0f76..59b652c 100644
--- a/tools/h5repack/h5repack_refs.c
+++ b/tools/h5repack/h5repack_refs.c
@@ -30,15 +30,10 @@ static herr_t update_ref_value(hid_t obj_id, H5R_type_t ref_type, void *ref_in,
 /*-------------------------------------------------------------------------
  * Function: do_copy_refobjs
  *
- * Purpose: duplicate all referenced HDF5 objects in the file
- *  and create hard links
- *
- * Return: 0, ok, -1 no
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: December, 10, 2003
+ * Purpose:  duplicate all referenced HDF5 objects in the file
+ *           and create hard links
  *
+ * Return:   0, ok, -1 no
  *-------------------------------------------------------------------------
  */
 
@@ -47,41 +42,39 @@ int do_copy_refobjs(hid_t fidin,
                     trav_table_t *travt,
                     pack_opt_t *options) /* repack options */
 {
-    int       ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
-    hid_t     grp_in = (-1);          /* read group ID */
-    hid_t     grp_out = (-1);         /* write group ID */
-    hid_t     dset_in = (-1);         /* read dataset ID */
-    hid_t     dset_out = (-1);        /* write dataset ID */
-    hid_t     type_in = (-1);         /* named type ID */
-    hid_t     dcpl_id = (-1);         /* dataset creation property list ID */
-    hid_t     space_id = (-1);        /* space ID */
-    hid_t     ftype_id = (-1);        /* file data type ID */
-    hid_t     mtype_id = (-1);        /* memory data type ID */
+    int       ret_value = 0;          /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    hid_t     grp_in = -1;            /* read group ID */
+    hid_t     grp_out = -1;           /* write group ID */
+    hid_t     dset_in = -1;           /* read dataset ID */
+    hid_t     dset_out = -1;          /* write dataset ID */
+    hid_t     type_in = -1;           /* named type ID */
+    hid_t     dcpl_id = -1;           /* dataset creation property list ID */
+    hid_t     space_id = -1;          /* space ID */
+    hid_t     ftype_id = -1;          /* file data type ID */
+    hid_t     mtype_id = -1;          /* memory data type ID */
     size_t    msize;                  /* memory size of memory type */
     hsize_t   nelmts;                 /* number of elements in dataset */
     int       rank;                   /* rank of dataset */
     hsize_t   dims[H5S_MAX_RANK];     /* dimensions of dataset */
     unsigned int i, j;
     int       k;
-    named_dt_t *named_dt_head=NULL;   /* Pointer to the stack of named datatypes
-                                         copied */
+    named_dt_t *named_dt_head = NULL; /* Pointer to the stack of named datatypes copied */
 
     /*-------------------------------------------------------------------------
     * browse
     *-------------------------------------------------------------------------
     */
     for(i = 0; i < travt->nobjs; i++) {
-        switch(travt->objs[i].type)
-        {
+        switch(travt->objs[i].type) {
             /*-------------------------------------------------------------------------
-            * H5TRAV_TYPE_GROUP
-            *-------------------------------------------------------------------------
-            */
+             * H5TRAV_TYPE_GROUP
+             *-------------------------------------------------------------------------
+             */
             case H5TRAV_TYPE_GROUP:
                 /*-------------------------------------------------------------------------
-                * copy referenced objects in attributes
-                *-------------------------------------------------------------------------
-                */
+                 * copy referenced objects in attributes
+                 *-------------------------------------------------------------------------
+                 */
                 if((grp_out = H5Gopen2(fidout, travt->objs[i].name, H5P_DEFAULT)) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gopen2 failed");
 
@@ -97,18 +90,18 @@ int do_copy_refobjs(hid_t fidin,
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gclose failed");
 
                 /*-------------------------------------------------------------------------
-                * check for hard links
-                *-------------------------------------------------------------------------
-                */
+                 * check for hard links
+                 *-------------------------------------------------------------------------
+                 */
                 if(travt->objs[i].nlinks)
                     for(j = 0; j < travt->objs[i].nlinks; j++)
                         H5Lcreate_hard(fidout, travt->objs[i].name, H5L_SAME_LOC, travt->objs[i].links[j].new_name, H5P_DEFAULT, H5P_DEFAULT);
                 break;
 
             /*-------------------------------------------------------------------------
-            * H5TRAV_TYPE_DATASET
-            *-------------------------------------------------------------------------
-            */
+             * H5TRAV_TYPE_DATASET
+             *-------------------------------------------------------------------------
+             */
             case H5TRAV_TYPE_DATASET:
                 if((dset_in = H5Dopen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen2 failed");
@@ -141,27 +134,27 @@ int do_copy_refobjs(hid_t fidin,
                  */
                 if(h5tools_canreadf(NULL, dcpl_id) == 1) {
                     /*-------------------------------------------------------------------------
-                    * test for a valid output dataset
-                    *-------------------------------------------------------------------------
-                    */
+                     * test for a valid output dataset
+                     *-------------------------------------------------------------------------
+                     */
                     dset_out = FAIL;
 
                     /*-------------------------------------------------------------------------
-                    * object references are a special case
-                    * we cannot just copy the buffers, but instead we recreate the reference
-                    *-------------------------------------------------------------------------
-                    */
+                     * object references are a special case
+                     * we cannot just copy the buffers, but instead we recreate the reference
+                     *-------------------------------------------------------------------------
+                     */
                     if(H5Tequal(mtype_id, H5T_STD_REF_OBJ)) {
-                        hid_t            refobj_id;
+                        hid_t            refobj_id = -1;
                         hobj_ref_t       *refbuf = NULL; /* buffer for object references */
                         hobj_ref_t       *buf = NULL;
                         const char*      refname;
                         unsigned         u;
 
                         /*-------------------------------------------------------------------------
-                        * read to memory
-                        *-------------------------------------------------------------------------
-                        */
+                         * read to memory
+                         *-------------------------------------------------------------------------
+                         */
                         if(nelmts) {
                             buf = (hobj_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                             if(buf==NULL) {
@@ -189,22 +182,22 @@ int do_copy_refobjs(hid_t fidin,
                                     /* create the reference, -1 parameter for objects */
                                     if(H5Rcreate(&refbuf[u], fidout, refname, H5R_OBJECT, (hid_t)-1) < 0)
                                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Rcreate failed");
-                                    if(options->verbose)
-                                    {
+                                    if(options->verbose) {
                                         printf(FORMAT_OBJ,"dset",travt->objs[i].name );
                                         printf("object <%s> object reference created to <%s>\n",
                                             travt->objs[i].name,
                                             refname);
                                     }
                                 } /*refname*/
-                                H5Oclose(refobj_id);
+                                if (H5Oclose(refobj_id) < 0)
+                                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Oclose refob failed");
                             } /* u */
                         } /*nelmts*/
 
                         /*-------------------------------------------------------------------------
-                        * create/write dataset/close
-                        *-------------------------------------------------------------------------
-                        */
+                         * create/write dataset/close
+                         *-------------------------------------------------------------------------
+                         */
                         if((dset_out = H5Dcreate2(fidout, travt->objs[i].name, mtype_id, space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0)
                             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dcreate2 failed");
                         if(nelmts)
@@ -224,21 +217,20 @@ int do_copy_refobjs(hid_t fidin,
                     } /*H5T_STD_REF_OBJ*/
 
                     /*-------------------------------------------------------------------------
-                    * dataset region references
-                    *-------------------------------------------------------------------------
-                    */
-                    else if(H5Tequal(mtype_id, H5T_STD_REF_DSETREG))
-                    {
-                        hid_t            refobj_id;
+                     * dataset region references
+                     *-------------------------------------------------------------------------
+                     */
+                    else if(H5Tequal(mtype_id, H5T_STD_REF_DSETREG)) {
+                        hid_t            refobj_id = -1;
                         hdset_reg_ref_t  *refbuf = NULL; /* input buffer for region references */
                         hdset_reg_ref_t  *buf = NULL;    /* output buffer */
                         const char*      refname;
                         unsigned         u;
 
                         /*-------------------------------------------------------------------------
-                        * read input to memory
-                        *-------------------------------------------------------------------------
-                        */
+                         * read input to memory
+                         *-------------------------------------------------------------------------
+                         */
                         if(nelmts) {
                             buf = (hdset_reg_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                             if(buf == NULL) {
@@ -249,9 +241,9 @@ int do_copy_refobjs(hid_t fidin,
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dread failed");
 
                             /*-------------------------------------------------------------------------
-                            * create output
-                            *-------------------------------------------------------------------------
-                            */
+                             * create output
+                             *-------------------------------------------------------------------------
+                             */
                             refbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)nelmts); /*init to zero */
                             if(refbuf == NULL) {
                                 printf("cannot allocate memory\n");
@@ -268,7 +260,7 @@ int do_copy_refobjs(hid_t fidin,
                                  * in the second traversal of the file
                                  */
                                 if((refname = MapIdToName(refobj_id, travt)) != NULL) {
-                                    hid_t region_id;    /* region id of the referenced dataset */
+                                    hid_t region_id = -1;    /* region id of the referenced dataset */
 
                                     if((region_id = H5Rget_region(dset_in, H5R_DATASET_REGION, &buf[u])) < 0)
                                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Rget_region failed");
@@ -278,22 +270,22 @@ int do_copy_refobjs(hid_t fidin,
                                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Rcreate failed");
                                     if(H5Sclose(region_id) < 0)
                                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sclose failed");
-                                    if(options->verbose)
-                                    {
+                                    if(options->verbose) {
                                         printf(FORMAT_OBJ,"dset",travt->objs[i].name );
                                         printf("object <%s> region reference created to <%s>\n",
                                             travt->objs[i].name,
                                             refname);
                                     }
                                 } /*refname*/
-                                H5Oclose(refobj_id);
+                                if (H5Oclose(refobj_id) < 0)
+                                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Oclose refobj_id failed");
                             } /* u */
                         } /*nelmts*/
 
                         /*-------------------------------------------------------------------------
-                        * create/write dataset/close
-                        *-------------------------------------------------------------------------
-                        */
+                         * create/write dataset/close
+                         *-------------------------------------------------------------------------
+                         */
                         if((dset_out = H5Dcreate2(fidout, travt->objs[i].name, mtype_id, space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0)
                             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dcreate2 failed");
                         if(nelmts)
@@ -312,27 +304,25 @@ int do_copy_refobjs(hid_t fidin,
                             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "copy_attr failed");
                     } /* H5T_STD_REF_DSETREG */
                     /*-------------------------------------------------------------------------
-                    * not references, open previously created object in 1st traversal
-                    *-------------------------------------------------------------------------
-                    */
+                     * not references, open previously created object in 1st traversal
+                     *-------------------------------------------------------------------------
+                     */
                     else {
                         if((dset_out = H5Dopen2(fidout, travt->objs[i].name, H5P_DEFAULT)) < 0)
                             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen2 failed");
                     } /* end else */
 
-                    HDassert(dset_out != FAIL);
-
                     /*-------------------------------------------------------------------------
-                    * copy referenced objects in attributes
-                    *-------------------------------------------------------------------------
-                    */
+                     * copy referenced objects in attributes
+                     *-------------------------------------------------------------------------
+                     */
                     if(copy_refs_attr(dset_in, dset_out, options, travt, fidout) < 0)
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "copy_refs_attr failed");
 
                     /*-------------------------------------------------------------------------
-                    * check for hard links
-                    *-------------------------------------------------------------------------
-                    */
+                     * check for hard links
+                     *-------------------------------------------------------------------------
+                     */
                     if(travt->objs[i].nlinks)
                         for(j = 0; j < travt->objs[i].nlinks; j++)
                             H5Lcreate_hard(fidout, travt->objs[i].name, H5L_SAME_LOC, travt->objs[i].links[j].new_name, H5P_DEFAULT, H5P_DEFAULT);
@@ -342,9 +332,9 @@ int do_copy_refobjs(hid_t fidin,
                 } /*can_read*/
 
                 /*-------------------------------------------------------------------------
-                * close
-                *-------------------------------------------------------------------------
-                */
+                 * close
+                 *-------------------------------------------------------------------------
+                 */
                 if(H5Tclose(ftype_id) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tclose failed");
                 if(H5Tclose(mtype_id) < 0)
@@ -358,9 +348,9 @@ int do_copy_refobjs(hid_t fidin,
                 break;
 
             /*-------------------------------------------------------------------------
-            * H5TRAV_TYPE_NAMED_DATATYPE
-            *-------------------------------------------------------------------------
-            */
+             * H5TRAV_TYPE_NAMED_DATATYPE
+             *-------------------------------------------------------------------------
+             */
             case H5TRAV_TYPE_NAMED_DATATYPE:
                 if((type_in = H5Topen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Topen2 failed");
@@ -369,9 +359,9 @@ int do_copy_refobjs(hid_t fidin,
                 break;
 
             /*-------------------------------------------------------------------------
-            * H5TRAV_TYPE_LINK
-            *-------------------------------------------------------------------------
-            */
+             * H5TRAV_TYPE_LINK
+             *-------------------------------------------------------------------------
+             */
             case H5TRAV_TYPE_LINK:
                 /*nothing to do */
                 break;
@@ -389,7 +379,8 @@ int do_copy_refobjs(hid_t fidin,
      * This function is paired with copy_named_datatype() which is called
      * in copy_attr(), so need to free.
      */
-    named_datatype_free(&named_dt_head, 0);
+    if (named_datatype_free(&named_dt_head, 0) < 0)
+        H5TOOLS_INFO(H5E_tools_min_id_g, "named_datatype_free failed");
 
     return ret_value;
 
@@ -404,7 +395,7 @@ done:
         H5Tclose(ftype_id);
         H5Tclose(mtype_id);
         H5Tclose(type_in);
-        named_datatype_free(&named_dt_head, 0);
+        named_datatype_free(&named_dt_head, 1);
     } H5E_END_TRY;
 
     return ret_value;
@@ -414,27 +405,22 @@ done:
 /*-------------------------------------------------------------------------
  * Function: copy_refs_attr
  *
- * Purpose: duplicate all referenced HDF5 located in attributes
- *  relative to LOC_IN, which is obtained either from
- * loc_id = H5Gopen2(fid, name, H5P_DEFAULT);
- * loc_id = H5Dopen2(fid, name, H5P_DEFAULT);
- * loc_id = H5Topen2(fid, name, H5P_DEFAULT);
- *
- * Return: 0, ok, -1 no
+ * Purpose:  duplicate all referenced HDF5 located in attributes
+ *           relative to LOC_IN, which is obtained either from
+ *           loc_id = H5Gopen2(fid, name, H5P_DEFAULT);
+ *           loc_id = H5Dopen2(fid, name, H5P_DEFAULT);
+ *           loc_id = H5Topen2(fid, name, H5P_DEFAULT);
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Return:   0, ok, -1 no
  *
- * Modifier: xcao@hdfgroup.org, 9/12/2011
- *              Update values of references(object and region) for the following types:
+ * Modified:
+ *           Update values of references(object and region) for the following types:
  *               1) References,
  *               2) ARRAY of reference,
  *               3) VLEN of references.
  *               4) COMPOUND of references.
- *          This function does not handle references in other complicated structures,
- *            such as references in nested compound datatypes.
- *
- * Date: October, 28, 2003
- *
+ *           This function does not handle references in other complicated structures,
+ *           such as references in nested compound datatypes.
  *-------------------------------------------------------------------------
  */
 
@@ -442,30 +428,32 @@ static int copy_refs_attr(hid_t loc_in,
                           hid_t loc_out,
                           pack_opt_t *options,
                           trav_table_t *travt,
-                          hid_t fidout         /* for saving references */
-                          )
+                          hid_t fidout)         /* for saving references */
 {
-    int        ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
-    hid_t      attr_id = -1;      /* attr ID */
-    hid_t      attr_out = -1;     /* attr ID */
-    hid_t      space_id = -1;     /* space ID */
-    hid_t      ftype_id = -1;     /* file data type ID */
-    hid_t      mtype_id = -1;     /* memory data type ID */
-    size_t     msize;             /* memory size of type */
-    hsize_t    nelmts;            /* number of elements in dataset */
-    hsize_t    dims[H5S_MAX_RANK];/* dimensions of dataset */
-    char       name[255];
-    H5O_info_t oinfo;           /* Object info */
-    unsigned   u, i, j;
-    int        rank;
+    int         ret_value = 0;     /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    hid_t       attr_id = -1;      /* attr ID */
+    hid_t       attr_out = -1;     /* attr ID */
+    hid_t       space_id = -1;     /* space ID */
+    hid_t       ftype_id = -1;     /* file data type ID */
+    hid_t       mtype_id = -1;     /* memory data type ID */
+    size_t      msize;             /* memory size of type */
+    hsize_t     nelmts;            /* number of elements in dataset */
+    hsize_t     dims[H5S_MAX_RANK];/* dimensions of dataset */
+    char        name[255];
+    H5O_info_t  oinfo;             /* Object info */
+    unsigned    u, i, j;
+    int         rank;
     H5T_class_t type_class = -1;
-    hbool_t    is_ref=0, is_ref_vlen=0, is_ref_array=0, is_ref_comp=0;
-    void  *refbuf = NULL;
-    void  *buf = NULL;
-    const char* refname = NULL;
-    unsigned *ref_comp_index = NULL;
-    size_t *ref_comp_size = NULL;
-    int    ref_comp_field_n = 0;
+    hbool_t     is_ref = 0,
+                is_ref_vlen = 0,
+                is_ref_array = 0,
+                is_ref_comp = 0;
+    void       *refbuf = NULL;
+    void       *buf = NULL;
+    const char *refname = NULL;
+    unsigned   *ref_comp_index = NULL;
+    size_t     *ref_comp_size = NULL;
+    int         ref_comp_field_n = 0;
 
 
     if(H5Oget_info(loc_in, &oinfo) < 0)
@@ -493,20 +481,20 @@ static int copy_refs_attr(hid_t loc_in,
         is_ref = (type_class == H5T_REFERENCE);
 
         if(type_class == H5T_VLEN ) {
-            hid_t base_type;
+            hid_t base_type = H5Tget_super(ftype_id);
 
-            base_type = H5Tget_super(ftype_id);
-            is_ref_vlen = (H5Tget_class(base_type)==H5T_REFERENCE);
+            is_ref_vlen = (H5Tget_class(base_type) == H5T_REFERENCE);
             msize = H5Tget_size(base_type);
-            H5Tclose(base_type);
+            if (H5Tclose(base_type) < 0)
+                H5TOOLS_INFO(H5E_tools_min_id_g, "H5Tclose base_type failed");
         }
         else if(type_class == H5T_ARRAY ) {
-            hid_t base_type;
+            hid_t base_type = H5Tget_super(ftype_id);
 
-            base_type = H5Tget_super(ftype_id);
-            is_ref_array = (H5Tget_class(base_type)==H5T_REFERENCE);
+            is_ref_array = (H5Tget_class(base_type) == H5T_REFERENCE);
             msize = H5Tget_size(base_type);
-            H5Tclose(base_type);
+            if (H5Tclose(base_type) < 0)
+                H5TOOLS_INFO(H5E_tools_min_id_g, "H5Tclose base_type failed");
         }
         else if(type_class == H5T_COMPOUND) {
             int nmembers = H5Tget_nmembers(ftype_id) ;
@@ -519,14 +507,15 @@ static int copy_refs_attr(hid_t loc_in,
             ref_comp_field_n = 0;
 
             for (i=0; i<(unsigned)nmembers; i++) {
-                hid_t mtid = H5Tget_member_type( ftype_id, i );
+                hid_t mtid = H5Tget_member_type(ftype_id, i);
 
-                if ((H5Tget_class(mtid)==H5T_REFERENCE)) {
+                if ((H5Tget_class(mtid) == H5T_REFERENCE)) {
                     ref_comp_index[ref_comp_field_n] = i;
                     ref_comp_size[ref_comp_field_n] = H5Tget_size(mtid);
                     ref_comp_field_n++;
                 }
-                H5Tclose(mtid);
+                if (H5Tclose(mtid) < 0)
+                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Tclose mtid failed");
             }
 
             /* if compound don't contain reference type member, free the above
@@ -548,9 +537,12 @@ static int copy_refs_attr(hid_t loc_in,
         is_ref_comp = (ref_comp_field_n > 0);
 
         if (!(is_ref || is_ref_vlen || is_ref_array || is_ref_comp)) {
-            H5Tclose(mtype_id);
-            H5Tclose(ftype_id);
-            H5Aclose(attr_id);
+            if (H5Tclose(mtype_id) < 0)
+                H5TOOLS_INFO(H5E_tools_min_id_g, "H5Tclose mtype_id failed");
+            if (H5Tclose(ftype_id) < 0)
+                H5TOOLS_INFO(H5E_tools_min_id_g, "H5Tclose ftype_id failed");
+            if (H5Aclose(attr_id) < 0)
+                H5TOOLS_INFO(H5E_tools_min_id_g, "H5Aclose attr_id failed");
             continue;
         }
 
@@ -579,11 +571,11 @@ static int copy_refs_attr(hid_t loc_in,
             unsigned  array_rank = 0;
             hsize_t   array_size = 1;
             hsize_t array_dims[H5S_MAX_RANK];
-            hid_t base_type;
+            hid_t base_type = H5Tget_super(ftype_id);
 
-            base_type = H5Tget_super(ftype_id);
             msize = H5Tget_size(base_type);
-            H5Tclose(base_type);
+            if (H5Tclose(base_type) < 0)
+                H5TOOLS_INFO(H5E_tools_min_id_g, "H5Tclose base_type failed");
 
             array_rank = (unsigned)H5Tget_array_ndims(mtype_id);
             H5Tget_array_dims2(mtype_id, array_dims);
@@ -631,9 +623,9 @@ static int copy_refs_attr(hid_t loc_in,
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aread failed");
 
                 /*-------------------------------------------------------------------------
-                * create output
-                *-------------------------------------------------------------------------
-                */
+                 * create output
+                 *-------------------------------------------------------------------------
+                 */
                 refbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)nelmts); /*init to zero */
                 if(refbuf == NULL) {
                     printf( "cannot allocate memory\n" );
@@ -673,7 +665,8 @@ static int copy_refs_attr(hid_t loc_in,
                             HDmemcpy(&(ptr[j]), &ref_out, msize);
                         }
                     }  /* for (i=0; i<nelems; i++) */
-                } else if (H5R_DSET_REG_REF_BUF_SIZE == msize) {
+                }
+                else if (H5R_DSET_REG_REF_BUF_SIZE == msize) {
                     hdset_reg_ref_t ref_out;
 
                     for (i=0; i<(unsigned)nelmts; i++) {
@@ -693,8 +686,7 @@ static int copy_refs_attr(hid_t loc_in,
                 buf = HDmalloc((unsigned)(nelmts * msize));
                 refbuf = buf; /* reuse the read buffer for write */
 
-                if(buf == NULL)
-                {
+                if(buf == NULL) {
                     printf( "cannot read into memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
@@ -771,8 +763,6 @@ static int copy_refs_attr(hid_t loc_in,
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aclose failed");
     } /* for(u = 0; u < (unsigned)oinfo.num_attrs; u++) */
 
-    return ret_value;
-
 done:
     if(refbuf)
         HDfree(refbuf);
@@ -799,7 +789,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    MapIdToName
  *
- * Purpose:    map a ID from a reference to a dataset name
+ * Purpose:     map a ID from a reference to a dataset name
  *
  *-------------------------------------------------------------------------
  */
@@ -807,7 +797,7 @@ static const char*
 MapIdToName(hid_t refobj_id, trav_table_t *travt)
 {
     unsigned int u;
-    const char* ret = NULL;
+    const char   *ret = NULL;
 
     /* linear search */
     for(u = 0; u < travt->nobjs; u++) {
@@ -834,18 +824,16 @@ out:
 /*-------------------------------------------------------------------------
  * Function:    Update_Ref_value
  *
- * Purpose:    Update a reference value
- *
- * Programmer: xcao@hdfgroup.org 9/12/2011
- *
+ * Purpose:     Update a reference value
  *-------------------------------------------------------------------------
  */
 static herr_t update_ref_value(hid_t obj_id, H5R_type_t ref_type, void *ref_in,
         hid_t fid_out, void *ref_out, trav_table_t *travt)
 {
-    int    ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
-    const char* ref_obj_name;
-    hid_t space_id=-1, ref_obj_id=-1;
+    int         ret_value = 0;   /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    const char *ref_obj_name;
+    hid_t       space_id = -1;
+    hid_t       ref_obj_id = -1;
 
     ref_obj_id = H5Rdereference(obj_id, ref_type, ref_in);
     if (ref_obj_id < 0)
diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
index 003875d..cad92ab 100644
--- a/tools/h5repack/h5repack_verify.c
+++ b/tools/h5repack/h5repack_verify.c
@@ -33,34 +33,29 @@ static int verify_filters(hid_t pid, hid_t tid, int nfilters, filter_info_t *fil
  *  1 match
  *  0 do not match
  * -1 error
- *
- * Programmer: Pedro Vicente, pvn@hdfgroup.org
- *
- * Date: December 19, 2003
- *
  *-------------------------------------------------------------------------
  */
 
 int
-h5repack_verify(const char *out_fname, pack_opt_t *options)
+h5repack_verify(const char *in_fname, const char *out_fname, pack_opt_t *options)
 {
-    int          ret_value = 0;     /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    int          ret_value  = 0;    /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    hid_t        fidin      = -1;   /* file ID for input file*/
     hid_t        fidout     = -1;   /* file ID for output file*/
     hid_t        did        = -1;   /* dataset ID */
     hid_t        pid        = -1;   /* dataset creation property list ID */
     hid_t        sid        = -1;   /* space ID */
     hid_t        tid        = -1;   /* type ID */
+    int          ok         = 1;    /* step results */
     unsigned int i;
     trav_table_t *travt = NULL;
-    int          ok = 1;
 
     /* open the output file */
     if((fidout = H5Fopen(out_fname, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0 )
-        return -1;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Fopen failed on <%s>", out_fname);
 
-    for(i = 0; i < options->op_tbl->nelems; i++)
-    {
-        char* name = options->op_tbl->objs[i].path;
+    for(i = 0; i < options->op_tbl->nelems; i++) {
+        char *name = options->op_tbl->objs[i].path;
         pack_info_t *obj = &options->op_tbl->objs[i];
 
        /*-------------------------------------------------------------------------
@@ -68,7 +63,7 @@ h5repack_verify(const char *out_fname, pack_opt_t *options)
         *-------------------------------------------------------------------------
         */
         if((did = H5Dopen2(fidout, name, H5P_DEFAULT)) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen2 failed");
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen2 failed on <%s>", name);
         if((sid = H5Dget_space(did)) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_space failed");
         if((pid = H5Dget_create_plist(did)) < 0)
@@ -83,7 +78,6 @@ h5repack_verify(const char *out_fname, pack_opt_t *options)
         if(verify_filters(pid, tid, obj->nfilters, obj->filter) <= 0)
             ok = 0;
 
-
        /*-------------------------------------------------------------------------
         * layout check
         *-------------------------------------------------------------------------
@@ -103,18 +97,14 @@ h5repack_verify(const char *out_fname, pack_opt_t *options)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dclose failed");
         if (H5Tclose(tid) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tclose failed");
-
     }
 
-
    /*-------------------------------------------------------------------------
     * check for the "all" objects option
     *-------------------------------------------------------------------------
     */
 
-    if(options->all_filter == 1 || options->all_layout == 1)
-    {
-
+    if(options->all_filter == 1 || options->all_layout == 1) {
         /* Initialize indexing options */
         h5trav_set_index(sort_by, sort_order);
         /* init table */
@@ -124,19 +114,16 @@ h5repack_verify(const char *out_fname, pack_opt_t *options)
         if(h5trav_gettable(fidout, travt) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "h5trav_gettable failed");
 
-        for(i = 0; i < travt->nobjs; i++)
-        {
+        for(i = 0; i < travt->nobjs; i++) {
             char *name = travt->objs[i].name;
 
-            if(travt->objs[i].type == H5TRAV_TYPE_DATASET)
-            {
-
+            if(travt->objs[i].type == H5TRAV_TYPE_DATASET) {
                /*-------------------------------------------------------------------------
                 * open
                 *-------------------------------------------------------------------------
                 */
                 if((did = H5Dopen2(fidout, name, H5P_DEFAULT)) < 0)
-                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen2 failed");
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen2 failed on <%s>", name);
                 if((sid = H5Dget_space(did)) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_space failed");
                 if((pid = H5Dget_create_plist(did)) < 0)
@@ -148,8 +135,7 @@ h5repack_verify(const char *out_fname, pack_opt_t *options)
                 * filter check
                 *-------------------------------------------------------------------------
                 */
-                if(options->all_filter == 1)
-                {
+                if(options->all_filter == 1) {
                     if(verify_filters(pid, tid, options->n_filter_g, options->filter_g) <= 0)
                         ok = 0;
                 }
@@ -158,8 +144,7 @@ h5repack_verify(const char *out_fname, pack_opt_t *options)
                 * layout check
                 *-------------------------------------------------------------------------
                 */
-                if(options->all_layout == 1)
-                {
+                if(options->all_layout == 1) {
                     pack_info_t pack;
 
                     init_packobject(&pack);
@@ -169,7 +154,6 @@ h5repack_verify(const char *out_fname, pack_opt_t *options)
                         ok = 0;
                 }
 
-
                /*-------------------------------------------------------------------------
                 * close
                 *-------------------------------------------------------------------------
@@ -183,28 +167,22 @@ h5repack_verify(const char *out_fname, pack_opt_t *options)
                 if (H5Tclose(tid) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tclose failed");
             } /* if */
-
         } /* i */
 
         /* free table */
         trav_table_free(travt);
+        travt = NULL;
     }
 
-   /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-
-    if (H5Fclose(fidout) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Fclose failed");
-
-    return ok;
+    ret_value = ok;
 
 done:
     H5E_BEGIN_TRY {
         H5Pclose(pid);
         H5Sclose(sid);
         H5Dclose(did);
+        H5Tclose(tid);
+        H5Fclose(fidin);
         H5Fclose(fidout);
         if (travt)
             trav_table_free(travt);
@@ -213,28 +191,22 @@ done:
     return ret_value;
 } /* h5repack_verify() */
 
-
-
 /*-------------------------------------------------------------------------
  * Function: verify_layout
  *
- * Purpose: verify which layout is present in the property list DCPL_ID
- *
- *  H5D_COMPACT      = 0
- *  H5D_CONTIGUOUS  = 1
- *  H5D_CHUNKED    = 2
- *
- * Return: 1 has, 0 does not, -1 error
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: December 30, 2003
+ * Purpose:  verify which layout is present in the property list DCPL_ID
+ *           H5D_COMPACT     = 0
+ *           H5D_CONTIGUOUS  = 1
+ *           H5D_CHUNKED     = 2
  *
+ * Return:
+ *           1 has,
+ *           0 does not,
+ *          -1 error
  *-------------------------------------------------------------------------
  */
 
-int verify_layout(hid_t pid,
-                  pack_info_t *obj)
+int verify_layout(hid_t pid, pack_info_t *obj)
 {
     hsize_t      chsize[64];     /* chunk size in elements */
     H5D_layout_t layout;         /* layout */
@@ -247,7 +219,7 @@ int verify_layout(hid_t pid,
         return -1;
 
     /* a non chunked layout was requested on a filtered object */
-    if (nfilters && obj->layout!=H5D_CHUNKED)
+    if (nfilters && obj->layout != H5D_CHUNKED)
         return 0;
 
     /* get layout */
@@ -257,13 +229,12 @@ int verify_layout(hid_t pid,
     if (obj->layout != layout)
         return 0;
 
-    if (layout==H5D_CHUNKED)
-    {
-        if ((rank = H5Pget_chunk(pid,NELMTS(chsize),chsize/*out*/)) < 0)
+    if (layout==H5D_CHUNKED) {
+        if ((rank = H5Pget_chunk(pid, NELMTS(chsize), chsize/*out*/)) < 0)
             return -1;
         if (obj->chunk.rank != rank)
             return 0;
-        for ( i=0; i<rank; i++)
+        for (i = 0; i < rank; i++)
             if (chsize[i] != obj->chunk.chunk_lengths[i])
                 return 0;
     }
@@ -274,58 +245,40 @@ int verify_layout(hid_t pid,
 /*-------------------------------------------------------------------------
  * Function: h5repack_cmp_pl
  *
- * Purpose: compare 2 files for identical property lists of all objects
- *
- * Return: 1=identical, 0=not identical, -1=error
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: December 31, 2003
+ * Purpose:  compare 2 files for identical property lists of all objects
  *
+ * Return:
+ *           1 = identical,
+ *           0 = not identical,
+ *          -1 = error
  *-------------------------------------------------------------------------
  */
 
-int h5repack_cmp_pl(const char *fname1,
-                     const char *fname2)
+int h5repack_cmp_pl(const char *fname1, const char *fname2)
 {
-    int           ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
-    hid_t         fid1=-1;         /* file ID */
-    hid_t         fid2=-1;         /* file ID */
-    hid_t         dset1=-1;        /* dataset ID */
-    hid_t         dset2=-1;        /* dataset ID */
-    hid_t         gid=-1;          /* group ID */
-    hid_t         dcpl1=-1;        /* dataset creation property list ID */
-    hid_t         dcpl2=-1;        /* dataset creation property list ID */
-    hid_t         gcplid=-1;       /* group creation property list */
-    unsigned      crt_order_flag1; /* group creation order flag */
-    unsigned      crt_order_flag2; /* group creation order flag */
-    trav_table_t  *trav=NULL;
-    int           ret=1;
+    int           ret_value = 1;    /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+    hid_t         fid1 =-1;         /* file ID */
+    hid_t         fid2 =-1;         /* file ID */
+    hid_t         dset1 =-1;        /* dataset ID */
+    hid_t         dset2 =-1;        /* dataset ID */
+    hid_t         gid =-1;          /* group ID */
+    hid_t         dcpl1 =-1;        /* dataset creation property list ID */
+    hid_t         dcpl2 =-1;        /* dataset creation property list ID */
+    hid_t         gcplid =-1;       /* group creation property list */
+    unsigned      crt_order_flag1;  /* group creation order flag */
+    unsigned      crt_order_flag2;  /* group creation order flag */
+    trav_table_t  *trav = NULL;
     unsigned int  i;
 
    /*-------------------------------------------------------------------------
     * open the files
     *-------------------------------------------------------------------------
     */
-
-    /* disable error reporting */
-    H5E_BEGIN_TRY
-    {
-
-        /* Open the files */
-        if ((fid1 = H5Fopen(fname1,H5F_ACC_RDONLY,H5P_DEFAULT)) < 0 )
-        {
-            error_msg("<%s>: %s\n", fname1, H5FOPENERROR );
-            return -1;
-        }
-        if ((fid2 = H5Fopen(fname2,H5F_ACC_RDONLY,H5P_DEFAULT)) < 0 )
-        {
-            error_msg("<%s>: %s\n", fname2, H5FOPENERROR );
-            H5Fclose(fid1);
-            return -1;
-        }
-        /* enable error reporting */
-    } H5E_END_TRY;
+    /* Open the files */
+    if ((fid1 = H5Fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "h5tools_fopen failed <%s>: %s", fname1, H5FOPENERROR);
+    if ((fid2 = H5Fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "h5tools_fopen failed <%s>: %s", fname2, H5FOPENERROR);
 
    /*-------------------------------------------------------------------------
     * get file table list of objects
@@ -342,14 +295,10 @@ int h5repack_cmp_pl(const char *fname1,
     * traverse the suppplied object list
     *-------------------------------------------------------------------------
     */
-    for(i = 0; i < trav->nobjs; i++)
-    {
-
-        if(trav->objs[i].type == H5TRAV_TYPE_GROUP)
-        {
-
+    for(i = 0; i < trav->nobjs; i++) {
+        if(trav->objs[i].type == H5TRAV_TYPE_GROUP) {
             if ((gid = H5Gopen2(fid1, trav->objs[i].name, H5P_DEFAULT)) < 0)
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gopen2 failed");
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gopen2 failed on first <%s>", trav->objs[i].name);
             if ((gcplid = H5Gget_create_plist(gid)) < 0)
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gget_create_plist failed");
             if (H5Pget_link_creation_order(gcplid, &crt_order_flag1) < 0)
@@ -360,7 +309,7 @@ int h5repack_cmp_pl(const char *fname1,
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gclose failed");
 
             if ((gid = H5Gopen2(fid2, trav->objs[i].name, H5P_DEFAULT)) < 0)
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gopen2 failed");
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gopen2 failed on second <%s>", trav->objs[i].name);
             if ((gcplid = H5Gget_create_plist(gid)) < 0)
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gget_create_plist failed");
             if (H5Pget_link_creation_order(gcplid, &crt_order_flag2) < 0)
@@ -370,21 +319,14 @@ int h5repack_cmp_pl(const char *fname1,
             if (H5Gclose(gid) < 0)
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gclose failed");
 
-            if (crt_order_flag1 != crt_order_flag2) {
-                error_msg("property lists for <%s> are different\n",trav->objs[i].name);
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "property lists failed");
-            }
-
+            if (crt_order_flag1 != crt_order_flag2)
+                HGOTO_ERROR(0, H5E_tools_min_id_g, "property lists failed for <%s> are different", trav->objs[i].name);
         }
-
-
-
-        else if(trav->objs[i].type == H5TRAV_TYPE_DATASET)
-        {
+        else if(trav->objs[i].type == H5TRAV_TYPE_DATASET) {
             if((dset1 = H5Dopen2(fid1, trav->objs[i].name, H5P_DEFAULT)) < 0)
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen2 failed");
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen2 failed on first <%s>", trav->objs[i].name);
             if((dset2 = H5Dopen2(fid2, trav->objs[i].name, H5P_DEFAULT)) < 0)
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen2 failed");
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dopen2 failed on second <%s>", trav->objs[i].name);
             if((dcpl1 = H5Dget_create_plist(dset1)) < 0)
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_create_plist failed");
             if((dcpl2 = H5Dget_create_plist(dset2)) < 0)
@@ -394,13 +336,11 @@ int h5repack_cmp_pl(const char *fname1,
             * compare the property lists
             *-------------------------------------------------------------------------
             */
-            if((ret = H5Pequal(dcpl1, dcpl2)) < 0)
+            if((ret_value = H5Pequal(dcpl1, dcpl2)) < 0)
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pequal failed");
 
-            if(ret == 0) {
-                error_msg("property lists for <%s> are different\n",trav->objs[i].name);
-                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "property lists failed");
-            }
+            if(ret_value == 0)
+                HGOTO_ERROR(0, H5E_tools_min_id_g, "property lists failed for <%s> are different", trav->objs[i].name);
 
            /*-------------------------------------------------------------------------
             * close
@@ -415,29 +355,8 @@ int h5repack_cmp_pl(const char *fname1,
             if(H5Dclose(dset2) < 0)
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dclose failed");
         } /*if*/
-    } /*i*/
-
-   /*-------------------------------------------------------------------------
-    * free
-    *-------------------------------------------------------------------------
-    */
-
-    trav_table_free(trav);
+    } /*for*/
 
-   /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-
-    H5Fclose(fid1);
-    H5Fclose(fid2);
-
-    return ret;
-
-/*-------------------------------------------------------------------------
-* error
-*-------------------------------------------------------------------------
-*/
 done:
     H5E_BEGIN_TRY
     {
@@ -449,7 +368,8 @@ done:
         H5Fclose(fid2);
         H5Pclose(gcplid);
         H5Gclose(gid);
-        trav_table_free(trav);
+        if(trav)
+            trav_table_free(trav);
     } H5E_END_TRY;
 
     return ret_value;
@@ -459,19 +379,14 @@ done:
 /*-------------------------------------------------------------------------
  * Function: verify_filters
  *
- * Purpose: verify if all requested filters in the array FILTER obtained
- *  from user input are present in the property list PID obtained from
- *  the output file
+ * Purpose:  verify if all requested filters in the array FILTER obtained
+ *           from user input are present in the property list PID obtained from
+ *           the output file
  *
  * Return:
- *  1 match
- *  0 do not match
- * -1 error
- *
- * Programmer: Pedro Vicente, pvn@hdfgroup.org
- *
- * Date: December 21, 2007
- *
+ *           1 match
+ *           0 do not match
+ *          -1 error
  *-------------------------------------------------------------------------
  */
 
@@ -495,11 +410,11 @@ int verify_filters(hid_t pid, hid_t tid, int nfilters, filter_info_t *filter)
     /* if we do not have filters and the requested filter is NONE, return 1 */
     if(!nfilters_dcpl &&
         nfilters == 1 &&
-        filter[0].filtn == H5Z_FILTER_NONE )
+        filter[0].filtn == H5Z_FILTER_NONE)
         return 1;
 
     /* else the numbers of filters must match */
-    if (nfilters_dcpl != nfilters )
+    if (nfilters_dcpl != nfilters)
         return 0;
 
     /*-------------------------------------------------------------------------
@@ -507,26 +422,25 @@ int verify_filters(hid_t pid, hid_t tid, int nfilters, filter_info_t *filter)
      *-------------------------------------------------------------------------
      */
 
-    for( i = 0; i < nfilters_dcpl; i++)
-    {
+    for (i = 0; i < nfilters_dcpl; i++) {
         cd_nelmts = NELMTS(cd_values);
         filtn = H5Pget_filter2(pid, (unsigned)i, &filt_flags, &cd_nelmts,
             cd_values, sizeof(f_name), f_name, NULL);
 
         /* filter ID */
+        if (filtn < 0)
+            return -1;
         if (filtn != filter[i].filtn)
             return 0;
 
         /* compare client data values. some filters do return local values */
-        switch (filtn)
-        {
-
+        switch (filtn) {
             case H5Z_FILTER_NONE:
             break;
 
             case H5Z_FILTER_SHUFFLE:
                 /* 1 private client value is returned by DCPL */
-                if ( cd_nelmts != H5Z_SHUFFLE_TOTAL_NPARMS && filter[i].cd_nelmts != H5Z_SHUFFLE_USER_NPARMS )
+                if (cd_nelmts != H5Z_SHUFFLE_TOTAL_NPARMS && filter[i].cd_nelmts != H5Z_SHUFFLE_USER_NPARMS)
                     return 0;
 
                 /* get dataset's type size */
@@ -534,31 +448,31 @@ int verify_filters(hid_t pid, hid_t tid, int nfilters, filter_info_t *filter)
                     return -1;
 
                 /* the private client value holds the dataset's type size */
-                if ( size != cd_values[0] )
+                if (size != cd_values[0])
                     return 0;
 
                 break;
 
             case H5Z_FILTER_SZIP:
                 /* 4 private client values are returned by DCPL */
-                if ( cd_nelmts != H5Z_SZIP_TOTAL_NPARMS && filter[i].cd_nelmts != H5Z_SZIP_USER_NPARMS )
+                if (cd_nelmts != H5Z_SZIP_TOTAL_NPARMS && filter[i].cd_nelmts != H5Z_SZIP_USER_NPARMS)
                     return 0;
 
                 /* "User" parameter for pixels-per-block (index 1) */
-                if ( cd_values[H5Z_SZIP_PARM_PPB] != filter[i].cd_values[H5Z_SZIP_PARM_PPB] )
+                if (cd_values[H5Z_SZIP_PARM_PPB] != filter[i].cd_values[H5Z_SZIP_PARM_PPB])
                     return 0;
 
                 break;
 
             case H5Z_FILTER_NBIT:
                 /* only client data values number of values checked */
-                if ( H5Z_NBIT_USER_NPARMS != filter[i].cd_nelmts)
+                if (H5Z_NBIT_USER_NPARMS != filter[i].cd_nelmts)
                     return 0;
                 break;
 
             case H5Z_FILTER_SCALEOFFSET:
                 /* only client data values checked */
-                for( j = 0; j < H5Z_SCALEOFFSET_USER_NPARMS; j++)
+                for (j = 0; j < H5Z_SCALEOFFSET_USER_NPARMS; j++)
                     if (cd_values[j] != filter[i].cd_values[j])
                         return 0;
                 break;
@@ -567,20 +481,20 @@ int verify_filters(hid_t pid, hid_t tid, int nfilters, filter_info_t *filter)
             case H5Z_FILTER_FLETCHER32:
             case H5Z_FILTER_DEFLATE:
 
-                if ( cd_nelmts != filter[i].cd_nelmts)
+                if (cd_nelmts != filter[i].cd_nelmts)
                     return 0;
 
-                for( j = 0; j < cd_nelmts; j++)
+                for (j = 0; j < cd_nelmts; j++)
                     if (cd_values[j] != filter[i].cd_values[j])
                         return 0;
 
                 break;
 
             default:
-                if ( cd_nelmts != filter[i].cd_nelmts)
+                if (cd_nelmts != filter[i].cd_nelmts)
                     return 0;
 
-                for( j = 0; j < cd_nelmts; j++)
+                for (j = 0; j < cd_nelmts; j++)
                     if (cd_values[j] != filter[i].cd_values[j])
                         return 0;
                 break;
@@ -590,4 +504,3 @@ int verify_filters(hid_t pid, hid_t tid, int nfilters, filter_info_t *filter)
 
     return 1;
 }
-
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index 30b879c..72f76c3 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "h5repack.h"
 #include "h5test.h"
@@ -112,9 +112,9 @@ const char *H5REPACK_FILENAMES[] = {
 #define REG_REF_DS1 "Dset_REGREF"
 
 /*-------------------------------------------------------------------------
-* prototypes
-*-------------------------------------------------------------------------
-*/
+ * prototypes
+ *-------------------------------------------------------------------------
+ */
 static int make_all_objects(hid_t loc_id);
 static int make_attributes(hid_t loc_id);
 static int make_hlinks(hid_t loc_id);
@@ -150,27 +150,23 @@ static int make_complex_attr_references(hid_t loc_id);
 
 
 /*-------------------------------------------------------------------------
-* Function: main
-*
-* Purpose: Executes h5repack tests
-*
-* Return: Success: zero
-*  Failure: 1
-*
-* Programmer:  Pedro Vicente <pvn@ncsa.uiuc.edu>
-*             January, 6, 2004
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: main
+ *
+ * Purpose:  Executes h5repack tests
+ *
+ * Return:   Success: zero
+ *           Failure: 1
+ *-------------------------------------------------------------------------
+ */
 
 int main (void)
 {
     pack_opt_t  pack_options;
     diff_opt_t  diff_options;
-    h5_stat_t        file_stat;
+    h5_stat_t         file_stat;
     h5_stat_size_t    fsize1, fsize2;    /* file sizes */
 #if defined (H5_HAVE_FILTER_SZIP)
-    int szip_can_encode = 0;
+    int               szip_can_encode = 0;
 #endif
 
     h5tools_setprogname(PROGRAMNAME);
@@ -187,7 +183,7 @@ int main (void)
     puts("Testing h5repack:");
 
     /* make the test files */
-    TESTING("    generating datasets");
+    TESTING("    generating files for testing");
     if (make_testfiles() < 0)
         GOERROR;
     PASSED();
@@ -207,128 +203,129 @@ int main (void)
     */
 
     TESTING("    copy of datasets (fill values)");
-    if (h5repack_init (&pack_options, 0) < 0)
+
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME0,FNAME0OUT,&pack_options) < 0)
+    if (h5repack(FNAME0, FNAME0OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME0,FNAME0OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME0, FNAME0OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME0OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME0, FNAME0OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_cmp_pl(FNAME0,FNAME0OUT)<=0)
+    if (h5repack_cmp_pl(FNAME0, FNAME0OUT) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
 
     /*-------------------------------------------------------------------------
-    * file with all kinds of dataset datatypes
-    *-------------------------------------------------------------------------
-    */
+     * file with all kinds of dataset datatypes
+     *-------------------------------------------------------------------------
+     */
     TESTING("    copy of datasets (all datatypes)");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME1,FNAME1OUT,&pack_options) < 0)
+    if (h5repack(FNAME1, FNAME1OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME1,FNAME1OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME1, FNAME1OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME1OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME1, FNAME1OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_cmp_pl(FNAME1,FNAME1OUT)<=0)
+    if (h5repack_cmp_pl(FNAME1, FNAME1OUT) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
 
     /*-------------------------------------------------------------------------
-    * file with attributes
-    *-------------------------------------------------------------------------
-    */
+     * file with attributes
+     *-------------------------------------------------------------------------
+     */
     TESTING("    copy of datasets (attributes)");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME2,FNAME2OUT,&pack_options) < 0)
+    if (h5repack(FNAME2, FNAME2OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME2,FNAME2OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME2, FNAME2OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME2OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME2, FNAME2OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_cmp_pl(FNAME2,FNAME2OUT)<=0)
+    if (h5repack_cmp_pl(FNAME2, FNAME2OUT) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * file with hardlinks
-    *-------------------------------------------------------------------------
-    */
+     * file with hardlinks
+     *-------------------------------------------------------------------------
+     */
     TESTING("    copy of datasets (hardlinks)");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME3,FNAME3OUT,&pack_options) < 0)
+    if (h5repack(FNAME3, FNAME3OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME3,FNAME3OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME3, FNAME3OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME3OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME3, FNAME3OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_cmp_pl(FNAME3,FNAME3OUT)<=0)
+    if (h5repack_cmp_pl(FNAME3, FNAME3OUT) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * alloc early test
-    *-------------------------------------------------------------------------
-    */
+     * alloc early test
+     *-------------------------------------------------------------------------
+     */
     TESTING("    copy of allocation early file");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME5,FNAME5OUT,&pack_options) < 0)
+    if (h5repack(FNAME5, FNAME5OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME5,FNAME5OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME5, FNAME5OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME5OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME5, FNAME5OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * the remaining files differ in the dcpl's
-    *-------------------------------------------------------------------------
-    */
+     * the remaining files differ in the dcpl's
+     *-------------------------------------------------------------------------
+     */
 
     /*-------------------------------------------------------------------------
-    * deflate
-    *-------------------------------------------------------------------------
-    */
+     * deflate
+     *-------------------------------------------------------------------------
+     */
     TESTING("    adding deflate filter");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
     /*-------------------------------------------------------------------------
-    * test an individual object option
-    *-------------------------------------------------------------------------
-    */
+     * test an individual object option
+     *-------------------------------------------------------------------------
+     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset1:GZIP=9",&pack_options) < 0)
+    if (h5repack_addfilter("dset1:GZIP=9", &pack_options) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+    if (h5repack_addlayout("dset1:CHUNK=20x10", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT, &pack_options) <= 0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 #else
@@ -336,27 +333,27 @@ int main (void)
 #endif
 
     /*-------------------------------------------------------------------------
-    * test all objects option
-    *-------------------------------------------------------------------------
-    */
+     * test all objects option
+     *-------------------------------------------------------------------------
+     */
 
     TESTING("    adding deflate filter to all");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("GZIP=1",&pack_options) < 0)
+    if (h5repack_addfilter("GZIP=1", &pack_options) < 0)
         GOERROR;
-    if (h5repack_addlayout("CHUNK=20x10",&pack_options) < 0)
+    if (h5repack_addlayout("CHUNK=20x10", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -365,40 +362,40 @@ int main (void)
 #endif
 
     /*-------------------------------------------------------------------------
-    * SZIP
-    *-------------------------------------------------------------------------
-    */
+     * SZIP
+     *-------------------------------------------------------------------------
+     */
 
     TESTING("    adding szip filter");
 
 #if defined (H5_HAVE_FILTER_SZIP)
-    if (h5tools_can_encode(H5Z_FILTER_SZIP) >0) {
+    if (h5tools_can_encode(H5Z_FILTER_SZIP) > 0)
         szip_can_encode = 1;
-    }
 
     /*-------------------------------------------------------------------------
-    * test an individual object option
-    *-------------------------------------------------------------------------
-    */
+     * test an individual object option
+     *-------------------------------------------------------------------------
+     */
 
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init (&pack_options, 0, FALSE) < 0)
             GOERROR;
-        if (h5repack_addfilter("dset2:SZIP=8,EC",&pack_options) < 0)
+        if (h5repack_addfilter("dset2:SZIP=8,EC", &pack_options) < 0)
             GOERROR;
-        if (h5repack_addlayout("dset2:CHUNK=20x10",&pack_options) < 0)
+        if (h5repack_addlayout("dset2:CHUNK=20x10", &pack_options) < 0)
             GOERROR;
-        if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
             GOERROR;
-        if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
             GOERROR;
-        if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+        if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
             GOERROR;
         if (h5repack_end (&pack_options) < 0)
             GOERROR;
 
         PASSED();
-    } else {
+    }
+    else {
         SKIPPED();
     }
 #else
@@ -407,28 +404,29 @@ int main (void)
 
 
     /*-------------------------------------------------------------------------
-    * test all objects option
-    *-------------------------------------------------------------------------
-    */
+     * test all objects option
+     *-------------------------------------------------------------------------
+     */
     TESTING("    adding szip filter to all");
 
 #if defined (H5_HAVE_FILTER_SZIP)
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
             GOERROR;
-        if (h5repack_addfilter("SZIP=8,NN",&pack_options) < 0)
+        if (h5repack_addfilter("SZIP=8,NN", &pack_options) < 0)
             GOERROR;
-        if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
             GOERROR;
-        if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
             GOERROR;
-        if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+        if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
             GOERROR;
-        if (h5repack_end (&pack_options) < 0)
+        if (h5repack_end(&pack_options) < 0)
             GOERROR;
 
         PASSED();
-    } else {
+    }
+    else {
         SKIPPED();
     }
 #else
@@ -439,47 +437,47 @@ int main (void)
     TESTING("    addding shuffle filter");
 
     /*-------------------------------------------------------------------------
-    * test an individual object option
-    *-------------------------------------------------------------------------
-    */
+     * test an individual object option
+     *-------------------------------------------------------------------------
+     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset1:SHUF",&pack_options) < 0)
+    if (h5repack_addfilter("dset1:SHUF", &pack_options) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+    if (h5repack_addlayout("dset1:CHUNK=20x10", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * test all objects option
-    *-------------------------------------------------------------------------
-    */
+     * test all objects option
+     *-------------------------------------------------------------------------
+     */
 
     TESTING("    addding shuffle filter to all");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("SHUF",&pack_options) < 0)
+    if (h5repack_addfilter("SHUF", &pack_options) < 0)
         GOERROR;
-    if (h5repack_addlayout("CHUNK=20x10",&pack_options) < 0)
+    if (h5repack_addlayout("CHUNK=20x10", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -488,48 +486,45 @@ int main (void)
     TESTING("    adding checksum filter");
 
     /*-------------------------------------------------------------------------
-    * test an individual object option
-    *-------------------------------------------------------------------------
-    */
-
-    if (h5repack_init (&pack_options, 0) < 0)
+     * test an individual object option
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset1:FLET",&pack_options) < 0)
+    if (h5repack_addfilter("dset1:FLET", &pack_options) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+    if (h5repack_addlayout("dset1:CHUNK=20x10", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * test all objects option
-    *-------------------------------------------------------------------------
-    */
-
-
+     * test all objects option
+     *-------------------------------------------------------------------------
+     */
     TESTING("    adding checksum filter to all");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("FLET",&pack_options) < 0)
+    if (h5repack_addfilter("FLET", &pack_options) < 0)
         GOERROR;
-    if (h5repack_addlayout("CHUNK=20x10",&pack_options) < 0)
+    if (h5repack_addlayout("CHUNK=20x10", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -538,38 +533,38 @@ int main (void)
     TESTING("    filter queue fletcher, shuffle, deflate, szip");
 
     /*-------------------------------------------------------------------------
-    * add some filters
-    *-------------------------------------------------------------------------
-    */
+     * add some filters
+     *-------------------------------------------------------------------------
+     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset1:CHUNK 20x10",&pack_options) < 0)
+    if (h5repack_addlayout("dset1:CHUNK 20x10", &pack_options) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset1:FLET",&pack_options) < 0)
+    if (h5repack_addfilter("dset1:FLET", &pack_options) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset1:SHUF",&pack_options) < 0)
+    if (h5repack_addfilter("dset1:SHUF", &pack_options) < 0)
         GOERROR;
 
 #if defined (H5_HAVE_FILTER_SZIP)
     if (szip_can_encode) {
-        if (h5repack_addfilter("dset1:SZIP=8,NN",&pack_options) < 0)
+        if (h5repack_addfilter("dset1:SZIP=8,NN", &pack_options) < 0)
             GOERROR;
     }
 #endif
 
 #ifdef H5_HAVE_FILTER_DEFLATE
-    if (h5repack_addfilter("dset1:GZIP=1",&pack_options) < 0)
+    if (h5repack_addfilter("dset1:GZIP=1", &pack_options) < 0)
         GOERROR;
 #endif
 
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -578,41 +573,41 @@ int main (void)
     TESTING("    adding layout chunked");
 
     /*-------------------------------------------------------------------------
-    * test an individual object option
-    *-------------------------------------------------------------------------
-    */
+     * test an individual object option
+     *-------------------------------------------------------------------------
+     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+    if (h5repack_addlayout("dset1:CHUNK=20x10", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT, &pack_options) <= 0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options ) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * test all objects option
-    *-------------------------------------------------------------------------
-    */
+     * test all objects option
+     *-------------------------------------------------------------------------
+     */
     TESTING("    adding layout chunked to all");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("CHUNK=20x10",&pack_options) < 0)
+    if (h5repack_addlayout("CHUNK=20x10", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -620,20 +615,20 @@ int main (void)
     TESTING("    adding layout contiguous");
 
     /*-------------------------------------------------------------------------
-    * test an individual object option
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * test an individual object option
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset1:CONTI",&pack_options) < 0)
+    if (h5repack_addlayout("dset1:CONTI", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -641,37 +636,37 @@ int main (void)
     TESTING("    adding layout contiguous to all");
 
     /*-------------------------------------------------------------------------
-    * test all objects option
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * test all objects option
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("CONTI",&pack_options) < 0)
+    if (h5repack_addlayout("CONTI", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     /*-------------------------------------------------------------------------
-    * do the same test for a file with filters (chunked)
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * do the same test for a file with filters (chunked)
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("CONTI",&pack_options) < 0)
+    if (h5repack_addlayout("CONTI", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME8,FNAME8OUT,&pack_options) < 0)
+    if (h5repack(FNAME8, FNAME8OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME8, FNAME8OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME8OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME8, FNAME8OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -679,42 +674,42 @@ int main (void)
     TESTING("    adding layout compact");
 
     /*-------------------------------------------------------------------------
-    * test an individual object option
-    *-------------------------------------------------------------------------
-    */
+     * test an individual object option
+     *-------------------------------------------------------------------------
+     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset1:COMPA",&pack_options) < 0)
+    if (h5repack_addlayout("dset1:COMPA", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     TESTING("    adding layout compact to all");
 
     /*-------------------------------------------------------------------------
-    * test all objects option
-    *-------------------------------------------------------------------------
-    */
+     * test all objects option
+     *-------------------------------------------------------------------------
+     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("COMPA",&pack_options) < 0)
+    if (h5repack_addlayout("COMPA", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -723,210 +718,209 @@ int main (void)
     TESTING("    layout compact to contiguous conversion");
 
     /*-------------------------------------------------------------------------
-    * layout compact to contiguous conversion
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * layout compact to contiguous conversion
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset_compact:CONTI",&pack_options) < 0)
+    if (h5repack_addlayout("dset_compact:CONTI", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     TESTING("    layout compact to chunk conversion");
 
     /*-------------------------------------------------------------------------
-    * layout compact to chunk conversion
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * layout compact to chunk conversion
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset_compact:CHUNK=2x5",&pack_options) < 0)
+    if (h5repack_addlayout("dset_compact:CHUNK=2x5", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     TESTING("    layout compact to compact conversion");
 
     /*-------------------------------------------------------------------------
-    * layout compact to compact conversion
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * layout compact to compact conversion
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset_compact:COMPA",&pack_options) < 0)
+    if (h5repack_addlayout("dset_compact:COMPA", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) >0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options)<=   0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     TESTING("    layout contiguous to compact conversion");
     /*-------------------------------------------------------------------------
-    * layout contiguous to compact conversion
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * layout contiguous to compact conversion
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset_contiguous:COMPA",&pack_options) < 0)
+    if (h5repack_addlayout("dset_contiguous:COMPA", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     TESTING("    layout contiguous to chunk conversion");
     /*-------------------------------------------------------------------------
-    * layout contiguous to chunk conversion
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * layout contiguous to chunk conversion
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset_contiguous:CHUNK=3x6",&pack_options) < 0)
+    if (h5repack_addlayout("dset_contiguous:CHUNK=3x6", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     TESTING("    layout contiguous to contiguous conversion");
 
     /*-------------------------------------------------------------------------
-    * layout contiguous to contiguous conversion
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * layout contiguous to contiguous conversion
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset_contiguous:CONTI",&pack_options) < 0)
+    if (h5repack_addlayout("dset_contiguous:CONTI", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     TESTING("    layout chunked to compact conversion");
     /*-------------------------------------------------------------------------
-    * layout chunked to compact conversion
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * layout chunked to compact conversion
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset_chunk:COMPA",&pack_options) < 0)
+    if (h5repack_addlayout("dset_chunk:COMPA", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     TESTING("    layout chunked to contiguous conversion");
 
     /*-------------------------------------------------------------------------
-    * layout chunked to contiguous conversion
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * layout chunked to contiguous conversion
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset_chunk:CONTI",&pack_options) < 0)
+    if (h5repack_addlayout("dset_chunk:CONTI", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     TESTING("    layout chunked to chunk conversion");
     /*-------------------------------------------------------------------------
-    * layout chunked to chunked conversion
-    *-------------------------------------------------------------------------
-    */
-    if (h5repack_init (&pack_options, 0) < 0)
+     * layout chunked to chunked conversion
+     *-------------------------------------------------------------------------
+     */
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addlayout("dset_chunk:CHUNK=18x13",&pack_options) < 0)
+    if (h5repack_addlayout("dset_chunk:CHUNK=18x13", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+    if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
 
     /*-------------------------------------------------------------------------
-    * the following tests assume the input files have filters
-    * FNAME7
-    * FNAME8
-    * FNAME9
-    * FNAME10
-    * FNAME11
-    *-------------------------------------------------------------------------
-    */
-
-
+     * the following tests assume the input files have filters
+     * FNAME7
+     * FNAME8
+     * FNAME9
+     * FNAME10
+     * FNAME11
+     *-------------------------------------------------------------------------
+     */
     TESTING("    copy of szip filter");
 
 #if defined (H5_HAVE_FILTER_SZIP)
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
             GOERROR;
-        if (h5repack(FNAME7,FNAME7OUT,&pack_options) < 0)
+        if (h5repack(FNAME7, FNAME7OUT, &pack_options) < 0)
             GOERROR;
-        if (h5diff(FNAME7,FNAME7OUT,NULL,NULL,&diff_options) >0)
+        if (h5diff(FNAME7, FNAME7OUT, NULL, NULL, &diff_options) > 0)
             GOERROR;
-        if (h5repack_verify(FNAME7OUT,&pack_options)<=0)
+        if (h5repack_verify(FNAME7, FNAME7OUT, &pack_options) <= 0)
             GOERROR;
-        if (h5repack_cmp_pl(FNAME7,FNAME7OUT)<=0)
+        if (h5repack_cmp_pl(FNAME7, FNAME7OUT) <= 0)
             GOERROR;
-        if (h5repack_end (&pack_options) < 0)
+        if (h5repack_end(&pack_options) < 0)
             GOERROR;
 
         PASSED();
-    } else {
+    }
+    else {
         SKIPPED();
     }
 #else
@@ -937,21 +931,22 @@ int main (void)
 
 #if defined (H5_HAVE_FILTER_SZIP)
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
             GOERROR;
-        if (h5repack_addfilter("dset_szip:NONE",&pack_options) < 0)
+        if (h5repack_addfilter("dset_szip:NONE", &pack_options) < 0)
             GOERROR;
-        if (h5repack(FNAME7,FNAME7OUT,&pack_options) < 0)
+        if (h5repack(FNAME7, FNAME7OUT, &pack_options) < 0)
             GOERROR;
-        if (h5diff(FNAME7,FNAME7OUT,NULL,NULL,&diff_options) >0)
+        if (h5diff(FNAME7, FNAME7OUT, NULL, NULL, &diff_options) > 0)
             GOERROR;
-        if (h5repack_verify(FNAME7OUT,&pack_options)<=0)
+        if (h5repack_verify(FNAME7, FNAME7OUT, &pack_options) <= 0)
             GOERROR;
-        if (h5repack_end (&pack_options) < 0)
+        if (h5repack_end(&pack_options) < 0)
             GOERROR;
 
         PASSED();
-    } else {
+    }
+    else {
         SKIPPED();
     }
 #else
@@ -962,15 +957,15 @@ int main (void)
     TESTING("    copy of deflate filter");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME8,FNAME8OUT,&pack_options) < 0)
+    if (h5repack(FNAME8, FNAME8OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME8, FNAME8OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME8OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME8, FNAME8OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -982,17 +977,17 @@ int main (void)
     TESTING("    removing deflate filter");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset_deflate:NONE",&pack_options) < 0)
+    if (h5repack_addfilter("dset_deflate:NONE", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME8,FNAME8OUT,&pack_options) < 0)
+    if (h5repack(FNAME8, FNAME8OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME8, FNAME8OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME8OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME8, FNAME8OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1004,15 +999,15 @@ int main (void)
 
     TESTING("    copy of shuffle filter");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME9,FNAME9OUT,&pack_options) < 0)
+    if (h5repack(FNAME9, FNAME9OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME9,FNAME9OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME9, FNAME9OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME9OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME9, FNAME9OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1020,17 +1015,17 @@ int main (void)
 
     TESTING("    removing shuffle filter");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset_shuffle:NONE",&pack_options) < 0)
+    if (h5repack_addfilter("dset_shuffle:NONE", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME9,FNAME9OUT,&pack_options) < 0)
+    if (h5repack(FNAME9, FNAME9OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME9,FNAME9OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME9, FNAME9OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME9OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME9, FNAME9OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1038,15 +1033,15 @@ int main (void)
 
     TESTING("    copy of fletcher filter");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME10,FNAME10OUT,&pack_options) < 0)
+    if (h5repack(FNAME10, FNAME10OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME10,FNAME10OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME10, FNAME10OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME10OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME10, FNAME10OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1054,17 +1049,17 @@ int main (void)
 
     TESTING("    removing fletcher filter");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset_fletcher32:NONE",&pack_options) < 0)
+    if (h5repack_addfilter("dset_fletcher32:NONE", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME10,FNAME10OUT,&pack_options) < 0)
+    if (h5repack(FNAME10, FNAME10OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME10,FNAME10OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME10, FNAME10OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME10OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME10, FNAME10OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1072,15 +1067,15 @@ int main (void)
 
     TESTING("    copy of nbit filter");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME12,FNAME12OUT,&pack_options) < 0)
+    if (h5repack(FNAME12, FNAME12OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME12, FNAME12OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME12OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME12, FNAME12OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1088,17 +1083,17 @@ int main (void)
 
     TESTING("    removing nbit filter");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset_nbit:NONE",&pack_options) < 0)
+    if (h5repack_addfilter("dset_nbit:NONE", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME12,FNAME12OUT,&pack_options) < 0)
+    if (h5repack(FNAME12, FNAME12OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME12, FNAME12OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME12OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME12, FNAME12OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1106,17 +1101,17 @@ int main (void)
 
     TESTING("    adding nbit filter");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset_int31:NBIT",&pack_options) < 0)
+    if (h5repack_addfilter("dset_int31:NBIT", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME12,FNAME12OUT,&pack_options) < 0)
+    if (h5repack(FNAME12, FNAME12OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME12, FNAME12OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME12OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME12, FNAME12OUT, &pack_options)<= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1124,15 +1119,15 @@ int main (void)
 
     TESTING("    copy of scaleoffset filter");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME13,FNAME13OUT,&pack_options) < 0)
+    if (h5repack(FNAME13, FNAME13OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME13, FNAME13OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME13OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME13, FNAME13OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1140,17 +1135,17 @@ int main (void)
 
     TESTING("    removing scaleoffset filter");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset_scaleoffset:NONE",&pack_options) < 0)
+    if (h5repack_addfilter("dset_scaleoffset:NONE", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME13,FNAME13OUT,&pack_options) < 0)
+    if (h5repack(FNAME13, FNAME13OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME13, FNAME13OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME13OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME13, FNAME13OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1158,53 +1153,52 @@ int main (void)
 
     TESTING("    adding scaleoffset filter");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("dset_none:SOFF=31,IN",&pack_options) < 0)
+    if (h5repack_addfilter("dset_none:SOFF=31,IN", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME13,FNAME13OUT,&pack_options) < 0)
+    if (h5repack(FNAME13, FNAME13OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME13, FNAME13OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME13OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME13, FNAME13OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
 
 
     /*-------------------------------------------------------------------------
-    * file with all filters
-    *  dset_all
-    *  dset_deflate
-    *  dset_szip
-    *  dset_shuffle
-    *  dset_fletcher32
-    *-------------------------------------------------------------------------
-    */
-
-
+     * file with all filters
+     *  dset_all
+     *  dset_deflate
+     *  dset_szip
+     *  dset_shuffle
+     *  dset_fletcher32
+     *-------------------------------------------------------------------------
+     */
     TESTING("    filter conversion from deflate to szip");
 
 #if defined (H5_HAVE_FILTER_SZIP) && defined (H5_HAVE_FILTER_DEFLATE)
 
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
             GOERROR;
-        if (h5repack_addfilter("dset_deflate:SZIP=8,NN",&pack_options) < 0)
+        if (h5repack_addfilter("dset_deflate:SZIP=8,NN", &pack_options) < 0)
             GOERROR;
-        if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
+        if (h5repack(FNAME11, FNAME11OUT, &pack_options) < 0)
             GOERROR;
-        if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) >0)
+        if (h5diff(FNAME11, FNAME11OUT, NULL, NULL, &diff_options) > 0)
             GOERROR;
-        if (h5repack_verify(FNAME11OUT,&pack_options)<=0)
+        if (h5repack_verify(FNAME11, FNAME11OUT, &pack_options) <= 0)
             GOERROR;
-        if (h5repack_end (&pack_options) < 0)
+        if (h5repack_end(&pack_options) < 0)
             GOERROR;
 
         PASSED();
-    } else {
+    }
+    else {
         SKIPPED();
     }
 #else
@@ -1216,21 +1210,22 @@ int main (void)
 #if defined (H5_HAVE_FILTER_SZIP) && defined (H5_HAVE_FILTER_DEFLATE)
 
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init(&pack_options, 0, FALSE) < 0)
             GOERROR;
-        if (h5repack_addfilter("dset_szip:GZIP=1",&pack_options) < 0)
+        if (h5repack_addfilter("dset_szip:GZIP=1", &pack_options) < 0)
             GOERROR;
-        if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
+        if (h5repack(FNAME11, FNAME11OUT, &pack_options) < 0)
             GOERROR;
-        if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) >0)
+        if (h5diff(FNAME11, FNAME11OUT, NULL, NULL, &diff_options) > 0)
             GOERROR;
-        if (h5repack_verify(FNAME11OUT,&pack_options)<=0)
+        if (h5repack_verify(FNAME11, FNAME11OUT, &pack_options) <= 0)
             GOERROR;
-        if (h5repack_end (&pack_options) < 0)
+        if (h5repack_end(&pack_options) < 0)
             GOERROR;
 
         PASSED();
-    } else {
+    }
+    else {
         SKIPPED();
     }
 #else
@@ -1239,25 +1234,25 @@ int main (void)
 
 
     /*-------------------------------------------------------------------------
-    * test the NONE global option
-    *-------------------------------------------------------------------------
-    */
+     * test the NONE global option
+     *-------------------------------------------------------------------------
+     */
 
     TESTING("    removing all filters");
 
 #if defined (H5_HAVE_FILTER_SZIP) && defined (H5_HAVE_FILTER_DEFLATE)
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("NONE",&pack_options) < 0)
+    if (h5repack_addfilter("NONE", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
+    if (h5repack(FNAME11, FNAME11OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME11, FNAME11OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME11OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME11, FNAME11OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1266,51 +1261,52 @@ int main (void)
 #endif
 
     /*-------------------------------------------------------------------------
-    * test a big file
-    *-------------------------------------------------------------------------
-    */
+     * test a big file
+     *-------------------------------------------------------------------------
+     */
     TESTING("    big file");
-    if (h5repack_init (&pack_options, 0) < 0)
+
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME14,FNAME14OUT,&pack_options) < 0)
+    if (h5repack(FNAME14, FNAME14OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME14,FNAME14OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME14, FNAME14OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME14OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME14, FNAME14OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * test external dataset
-    *-------------------------------------------------------------------------
-    */
+     * test external dataset
+     *-------------------------------------------------------------------------
+     */
     TESTING("    external datasets");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack(FNAME15,FNAME15OUT,&pack_options) < 0)
+    if (h5repack(FNAME15, FNAME15OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME15,FNAME15OUT,NULL,NULL,&diff_options) > 0)
+    if (h5diff(FNAME15, FNAME15OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME15OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME15, FNAME15OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * test file with userblock
-    *-------------------------------------------------------------------------
-    */
+     * test file with userblock
+     *-------------------------------------------------------------------------
+     */
     TESTING("    file with userblock");
-    if(h5repack_init(&pack_options, 0) < 0)
+    if(h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
     if(h5repack(FNAME16, FNAME16OUT, &pack_options) < 0)
         GOERROR;
     if(h5diff(FNAME16, FNAME16OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if(h5repack_verify(FNAME16OUT, &pack_options) <= 0)
+    if(h5repack_verify(FNAME16, FNAME16OUT, &pack_options) <= 0)
         GOERROR;
     if(verify_userblock(FNAME16OUT) < 0)
         GOERROR;
@@ -1319,53 +1315,53 @@ int main (void)
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * test --latest options
-    *-------------------------------------------------------------------------
-    */
+     * test --latest options
+     *-------------------------------------------------------------------------
+     */
     TESTING("    latest file format options");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    pack_options.latest=1;
-    pack_options.grp_compact=10;
-    pack_options.grp_indexed=5;
+    pack_options.latest = 1;
+    pack_options.grp_compact = 10;
+    pack_options.grp_indexed = 5;
     pack_options.msg_size[0] = 10;
     pack_options.msg_size[1] = 20;
     pack_options.msg_size[2] = 30;
     pack_options.msg_size[3] = 40;
     pack_options.msg_size[4] = 50;
-    if (h5repack(FNAME1,FNAME1OUT,&pack_options) < 0)
+    if (h5repack(FNAME1, FNAME1OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME1,FNAME1OUT,NULL,NULL,&diff_options) > 0)
+    if (h5diff(FNAME1, FNAME1OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME1OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME1, FNAME1OUT, &pack_options)<=0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
     PASSED();
 
 
     /*-------------------------------------------------------------------------
-    * test several global filters
-    *-------------------------------------------------------------------------
-    */
+     * test several global filters
+     *-------------------------------------------------------------------------
+     */
 
     TESTING("    several global filters");
 
 #if defined (H5_HAVE_FILTER_DEFLATE)
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
-    if (h5repack_addfilter("GZIP=1",&pack_options) < 0)
+    if (h5repack_addfilter("GZIP=1", &pack_options) < 0)
         GOERROR;
-    if (h5repack_addfilter("SHUF",&pack_options) < 0)
+    if (h5repack_addfilter("SHUF", &pack_options) < 0)
         GOERROR;
-    if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
+    if (h5repack(FNAME11, FNAME11OUT, &pack_options) < 0)
         GOERROR;
-    if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) >0)
+    if (h5diff(FNAME11, FNAME11OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if (h5repack_verify(FNAME11OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME11, FNAME11OUT, &pack_options) <= 0)
         GOERROR;
-    if (h5repack_end (&pack_options) < 0)
+    if (h5repack_end(&pack_options) < 0)
         GOERROR;
 
     PASSED();
@@ -1375,14 +1371,14 @@ int main (void)
 
 
     /*-------------------------------------------------------------------------
-    * test file with userblock
-    *-------------------------------------------------------------------------
-    */
+     * test file with userblock
+     *-------------------------------------------------------------------------
+     */
     TESTING("    file with added userblock");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-    if(h5repack_init(&pack_options, 0) < 0)
+    if(h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
 
     /* add the options for a user block size and user block filename */
@@ -1393,7 +1389,7 @@ int main (void)
         GOERROR;
     if(h5diff(FNAME8, FNAME8OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if(h5repack_verify(FNAME8OUT, &pack_options) <= 0)
+    if(h5repack_verify(FNAME8, FNAME8OUT, &pack_options) <= 0)
         GOERROR;
     if(verify_userblock(FNAME8OUT) < 0)
         GOERROR;
@@ -1408,14 +1404,14 @@ int main (void)
 
 
     /*-------------------------------------------------------------------------
-    * test file with aligment
-    *-------------------------------------------------------------------------
-    */
+     * test file with aligment
+     *-------------------------------------------------------------------------
+     */
     TESTING("    file with aligment");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-    if(h5repack_init(&pack_options, 0) < 0)
+    if(h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
 
     /* add the options for aligment */
@@ -1426,27 +1422,27 @@ int main (void)
         GOERROR;
     if(h5diff(FNAME8, FNAME8OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if(h5repack_verify(FNAME8OUT, &pack_options) <= 0)
+    if(h5repack_verify(FNAME8, FNAME8OUT, &pack_options) <= 0)
         GOERROR;
 
     /* verify aligment */
     {
         hsize_t threshold;
         hsize_t alignment;
-        hid_t fapl;
-        hid_t fid;
+        hid_t   fapl;
+        hid_t   fid;
 
-        if (( fid = H5Fopen(FNAME8OUT, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0 )
+        if ((fid = H5Fopen(FNAME8OUT, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
             GOERROR;
         if ((fapl = H5Fget_access_plist(fid)) < 0)
             GOERROR;
-        if ( H5Pget_alignment(fapl, &threshold, &alignment  )  < 0)
+        if (H5Pget_alignment(fapl, &threshold, &alignment)  < 0)
             GOERROR;
-        if ( threshold != 1 )
+        if (threshold != 1)
             GOERROR;
-        if ( alignment != 1 )
+        if (alignment != 1)
             GOERROR;
-        if ( H5Pclose(fapl) < 0)
+        if (H5Pclose(fapl) < 0)
             GOERROR;
         if (H5Fclose(fid) < 0)
             GOERROR;
@@ -1464,19 +1460,19 @@ int main (void)
 #endif
 
     /*-------------------------------------------------------------------------
-    * test file with userblock
-    *-------------------------------------------------------------------------
-    */
+     * test file with userblock
+     *-------------------------------------------------------------------------
+     */
     TESTING("    file with committed datatypes");
 
-    if(h5repack_init(&pack_options, 0) < 0)
+    if(h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
 
     if(h5repack(FNAME17, FNAME17OUT, &pack_options) < 0)
         GOERROR;
     if(h5diff(FNAME17, FNAME17OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if(h5repack_verify(FNAME17OUT, &pack_options) <= 0)
+    if(h5repack_verify(FNAME17, FNAME17OUT, &pack_options) <= 0)
         GOERROR;
     if(h5repack_end(&pack_options) < 0)
         GOERROR;
@@ -1485,16 +1481,18 @@ int main (void)
     PASSED();
 
     /*-------------------------------------------------------------------------
-    * test --metadata_block_size option
-    * Also verify that output file using the metadata_block_size option is
-    * larger than the output file one not using it.
-    *-------------------------------------------------------------------------
-    */
+     * test --metadata_block_size option
+     * Also verify that output file using the metadata_block_size option is
+     * larger than the output file one not using it.
+     * FNAME4 is used because it is the same as the test file used for the
+     * shell script version of this test (h5repack.sh).
+     *-------------------------------------------------------------------------
+     */
     TESTING("    metadata block size option");
     /* First run without metadata option. No need to verify the correctness */
     /* since this has been verified by earlier tests. Just record the file */
     /* size of the output file. */
-    if(h5repack_init(&pack_options, 0) < 0)
+    if(h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
     if(h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
@@ -1505,14 +1503,14 @@ int main (void)
         GOERROR;
 
     /* run it again with metadata option */
-    if(h5repack_init(&pack_options, 0) < 0)
+    if(h5repack_init(&pack_options, 0, FALSE) < 0)
         GOERROR;
     pack_options.meta_block_size = 8192;
     if(h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
         GOERROR;
     if(h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
         GOERROR;
-    if(h5repack_verify(FNAME4OUT, &pack_options) <= 0)
+    if(h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
     /* record the file size of the output file */
     if(HDstat(FNAME4OUT, &file_stat) < 0)
@@ -1527,9 +1525,9 @@ int main (void)
 
 
     /*-------------------------------------------------------------------------
-    * clean temporary test files
-    *-------------------------------------------------------------------------
-    */
+     * clean temporary test files
+     *-------------------------------------------------------------------------
+     */
     {
         hid_t       fapl;
 
@@ -1554,21 +1552,21 @@ error:
 /*-------------------------------------------------------------------------
 * Function: make_testfiles
 *
-* Purpose: make a test file with all types of HDF5 objects,
-*   datatypes and filters
+* Purpose:  make a test file with all types of HDF5 objects,
+*           datatypes and filters
 *
 *-------------------------------------------------------------------------
 */
 static
 int make_testfiles(void)
 {
-    hid_t  fid;
+    hid_t    fid = -1;
 
     /*-------------------------------------------------------------------------
-    * create a file for general copy test
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME0,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file for general copy test
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME0, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_fill(fid) < 0)
         goto out;
@@ -1576,10 +1574,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create another file for general copy test (all datatypes)
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME1,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create another file for general copy test (all datatypes)
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_all_objects(fid) < 0)
         goto out;
@@ -1587,10 +1585,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file for attributes copy test
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME2,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file for attributes copy test
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_attributes(fid) < 0)
         goto out;
@@ -1598,10 +1596,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file for hard links test
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME3,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file for hard links test
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_hlinks(fid) < 0)
         goto out;
@@ -1609,10 +1607,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file for layouts test
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME4,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file for layouts test
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME4, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_layout(fid) < 0)
         goto out;
@@ -1620,9 +1618,9 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file for layout conversion test
-    *-------------------------------------------------------------------------
-    */
+     * create a file for layout conversion test
+     *-------------------------------------------------------------------------
+     */
     if((fid = H5Fcreate(FNAME18, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
 
@@ -1633,9 +1631,9 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * for test layout conversions form chunk with unlimited max dims
-    *-------------------------------------------------------------------------
-    */
+     * for test layout conversions form chunk with unlimited max dims
+     *-------------------------------------------------------------------------
+     */
     if((fid = H5Fcreate("h5repack_layout3.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
 
@@ -1646,18 +1644,18 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file for the H5D_ALLOC_TIME_EARLY test
-    *-------------------------------------------------------------------------
-    */
+     * create a file for the H5D_ALLOC_TIME_EARLY test
+     *-------------------------------------------------------------------------
+     */
     if (make_early() < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * create a file with the SZIP filter
-    *-------------------------------------------------------------------------
-    */
+     * create a file with the SZIP filter
+     *-------------------------------------------------------------------------
+     */
 #ifdef H5_HAVE_FILTER_SZIP
-    if((fid = H5Fcreate(FNAME7,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+    if((fid = H5Fcreate(FNAME7, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_szip(fid) < 0)
         goto out;
@@ -1667,10 +1665,10 @@ int make_testfiles(void)
 
 
     /*-------------------------------------------------------------------------
-    * create a file with the deflate filter
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME8,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file with the deflate filter
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME8, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_deflate(fid) < 0)
         goto out;
@@ -1678,10 +1676,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file with the shuffle filter
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME9,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file with the shuffle filter
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME9, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_shuffle(fid) < 0)
         goto out;
@@ -1689,10 +1687,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file with the fletcher32 filter
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME10,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file with the fletcher32 filter
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME10, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_fletcher32(fid) < 0)
         goto out;
@@ -1700,10 +1698,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file with all the filters
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME11,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file with all the filters
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME11, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_all_filters(fid) < 0)
         goto out;
@@ -1711,10 +1709,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file with the nbit filter
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME12,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file with the nbit filter
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME12, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_nbit(fid) < 0)
         goto out;
@@ -1722,10 +1720,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file with the scaleoffset filter
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME13,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file with the scaleoffset filter
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME13, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_scaleoffset(fid) < 0)
         goto out;
@@ -1733,10 +1731,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a big dataset
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME14,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a big dataset
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME14, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_big(fid) < 0)
         goto out;
@@ -1744,10 +1742,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file with external dataset
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME15,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file with external dataset
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME15, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_external(fid) < 0)
         goto out;
@@ -1755,24 +1753,24 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file with userblock
-    *-------------------------------------------------------------------------
-    */
+     * create a file with userblock
+     *-------------------------------------------------------------------------
+     */
     if(make_userblock() < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * create a userblock file
-    *-------------------------------------------------------------------------
-    */
+     * create a userblock file
+     *-------------------------------------------------------------------------
+     */
     if(make_userblock_file() < 0)
         goto out;
 
     /*-------------------------------------------------------------------------
-    * create a file with named datatypes
-    *-------------------------------------------------------------------------
-    */
-    if((fid = H5Fcreate(FNAME17,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file with named datatypes
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME17, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_named_dtype(fid) < 0)
         goto out;
@@ -1780,11 +1778,12 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create obj and region reference type datasets (bug1814)
-    * add attribute with int type (bug1726)
-    * add attribute with obj and region reference type (bug1726)
-    *-------------------------------------------------------------------------*/
-    if((fid = H5Fcreate(FNAME_REF,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create obj and region reference type datasets (bug1814)
+     * add attribute with int type (bug1726)
+     * add attribute with obj and region reference type (bug1726)
+     *-------------------------------------------------------------------------
+     */
+    if((fid = H5Fcreate(FNAME_REF, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     /* create reference type datasets */
     if (make_references(fid) < 0)
@@ -1793,10 +1792,10 @@ int make_testfiles(void)
         return -1;
 
     /*-------------------------------------------------------------------------
-    * create a file with obj and region references in attribute of compound and
-    * vlen datatype
-    *-------------------------------------------------------------------------*/
-    if((fid = H5Fcreate(FNAME_ATTR_REF,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+     * create a file with obj and region references in attribute of compound and
+     * vlen datatype
+     *-------------------------------------------------------------------------*/
+    if((fid = H5Fcreate(FNAME_ATTR_REF, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         return -1;
     if (make_complex_attr_references(fid) < 0)
         goto out;
@@ -1815,20 +1814,20 @@ out:
 /*-------------------------------------------------------------------------
 * Function: make_all_objects
 *
-* Purpose: make a test file with all types of HDF5 objects
+* Purpose:  make a test file with all types of HDF5 objects
 *
 *-------------------------------------------------------------------------
 */
 static
 int make_all_objects(hid_t loc_id)
 {
-    hid_t   did=-1;
-    hid_t   gid=-1;
-    hid_t   tid=-1;
-    hid_t   rid=-1;
-    hid_t   sid=-1;
-    hid_t   gcplid=-1;
-    hsize_t dims[1]={2};
+    hid_t   did = -1;
+    hid_t   gid = -1;
+    hid_t   tid = -1;
+    hid_t   rid = -1;
+    hid_t   sid = -1;
+    hid_t   gcplid = -1;
+    hsize_t dims[1] = {2};
     /* compound datatype */
     typedef struct s_t
     {
@@ -1903,7 +1902,7 @@ int make_all_objects(hid_t loc_id)
 
     if ((rid  = H5Gopen2(loc_id, "/", H5P_DEFAULT)) < 0)
         goto out;
-    if (write_dset_in(rid,"dset_referenced",loc_id,0) < 0)
+    if (write_dset_in(rid, "dset_referenced", loc_id, 0) < 0)
         goto out;
     if (H5Gclose(rid) < 0)
         goto out;
@@ -1937,18 +1936,18 @@ out:
 /*-------------------------------------------------------------------------
 * Function: make_attributes
 *
-* Purpose: make a test file with all types of attributes
+* Purpose:  make a test file with all types of attributes
 *
 *-------------------------------------------------------------------------
 */
 static
 int make_attributes(hid_t loc_id)
 {
-    hid_t   did=-1;
-    hid_t   gid=-1;
-    hid_t   rid=-1;
-    hid_t   sid=-1;
-    hsize_t dims[1]={2};
+    hid_t   did = -1;
+    hid_t   gid = -1;
+    hid_t   rid = -1;
+    hid_t   sid = -1;
+    hsize_t dims[1] = {2};
 
     /*-------------------------------------------------------------------------
     * H5G_DATASET
@@ -1973,11 +1972,11 @@ int make_attributes(hid_t loc_id)
     *-------------------------------------------------------------------------
     */
 
-    if ( write_attr_in(did,"dset",loc_id,0) < 0)
+    if ( write_attr_in(did, "dset", loc_id, 0) < 0)
         goto out;
-    if (write_attr_in(gid,"dset",loc_id,0) < 0)
+    if (write_attr_in(gid, "dset", loc_id, 0) < 0)
         goto out;
-    if (write_attr_in(rid,"dset",loc_id,0) < 0)
+    if (write_attr_in(rid, "dset", loc_id, 0) < 0)
         goto out;
 
    /* close */
@@ -2007,18 +2006,18 @@ out:
 /*-------------------------------------------------------------------------
 * Function: make_hlinks
 *
-* Purpose: make a test file with hard links
+* Purpose:  make a test file with hard links
 *
 *-------------------------------------------------------------------------
 */
 static
 int make_hlinks(hid_t loc_id)
 {
-    hid_t   g1id=-1;
-    hid_t   g2id=-1;
-    hid_t   g3id=-1;
-    hsize_t dims[2]={3,2};
-    int     buf[3][2]= {{1,1},{1,2},{2,2}};
+    hid_t   g1id =- 1;
+    hid_t   g2id = -1;
+    hid_t   g3id = -1;
+    hsize_t dims[2] = {3,2};
+    int     buf[3][2] = {{1,1}, {1,2}, {2,2}};
 
     /*-------------------------------------------------------------------------
     * create a dataset and some hard links to it
@@ -2077,7 +2076,7 @@ out:
 /*-------------------------------------------------------------------------
 * Function: make_szip
 *
-* Purpose: make a dataset with the SZIP filter
+* Purpose:  make a dataset with the SZIP filter
 *
 *-------------------------------------------------------------------------
 */
@@ -2085,21 +2084,19 @@ out:
 static
 int make_szip(hid_t loc_id)
 {
-    hid_t    dcpl; /* dataset creation property list */
-    hid_t    sid;  /* dataspace ID */
-    unsigned szip_options_mask=H5_SZIP_ALLOW_K13_OPTION_MASK|H5_SZIP_NN_OPTION_MASK;
-    unsigned szip_pixels_per_block=8;
-    hsize_t  dims[RANK]={DIM1,DIM2};
-    hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
+    hid_t    dcpl = -1; /* dataset creation property list */
+    hid_t    sid = -1;  /* dataspace ID */
+    unsigned szip_options_mask = H5_SZIP_ALLOW_K13_OPTION_MASK | H5_SZIP_NN_OPTION_MASK;
+    unsigned szip_pixels_per_block = 8;
+    hsize_t  dims[RANK] = {DIM1, DIM2};
+    hsize_t  chunk_dims[RANK] = {CDIM1, CDIM2};
     int      buf[DIM1][DIM2];
     int      i, j, n;
     int      szip_can_encode = 0;
 
-    for (i=n=0; i<DIM1; i++)
-    {
-        for (j=0; j<DIM2; j++)
-        {
-            buf[i][j]=n++;
+    for (i = n = 0; i < DIM1; i++) {
+        for (j = 0; j < DIM2; j++) {
+            buf[i][j] = n++;
         }
     }
     /* create a space */
@@ -2118,21 +2115,17 @@ int make_szip(hid_t loc_id)
     */
     /* Make sure encoding is enabled */
     if (h5tools_can_encode(H5Z_FILTER_SZIP) == 1)
-    {
         szip_can_encode = 1;
-    }
-    if (szip_can_encode)
-    {
+
+    if (szip_can_encode) {
         /* set szip data */
-        if(H5Pset_szip (dcpl,szip_options_mask,szip_pixels_per_block) < 0)
+        if(H5Pset_szip (dcpl, szip_options_mask, szip_pixels_per_block) < 0)
             goto out;
-        if (make_dset(loc_id,"dset_szip",sid,dcpl,buf) < 0)
+        if (make_dset(loc_id, "dset_szip", sid, dcpl, buf) < 0)
             goto out;
     }
     else
-    {
         /* WARNING? SZIP is decoder only, can't generate test files */
-    }
 
     if(H5Sclose(sid) < 0)
         goto out;
@@ -2162,20 +2155,18 @@ out:
 static
 int make_deflate(hid_t loc_id)
 {
-    hid_t      dcpl; /* dataset creation property list */
-    hid_t      sid;  /* dataspace ID */
-    hsize_t    dims[RANK]={DIM1,DIM2};
-    hsize_t    chunk_dims[RANK]={CDIM1,CDIM2};
+    hid_t      dcpl = -1; /* dataset creation property list */
+    hid_t      sid = -1;  /* dataspace ID */
+    hsize_t    dims[RANK] = {DIM1,DIM2};
+    hsize_t    chunk_dims[RANK] = {CDIM1,CDIM2};
     int        buf[DIM1][DIM2];
     hobj_ref_t bufref[1]; /* reference */
-    hsize_t    dims1r[1]={1};
+    hsize_t    dims1r[1] = {1};
     int        i, j, n;
 
-    for (i=n=0; i<DIM1; i++)
-    {
-        for (j=0; j<DIM2; j++)
-        {
-            buf[i][j]=n++;
+    for (i = n = 0; i < DIM1; i++) {
+        for (j = 0; j < DIM2; j++) {
+            buf[i][j] = n++;
         }
     }
 
@@ -2197,14 +2188,14 @@ int make_deflate(hid_t loc_id)
     /* set deflate data */
     if(H5Pset_deflate(dcpl, 9) < 0)
         goto out;
-    if (make_dset(loc_id,"dset_deflate",sid,dcpl,buf) < 0)
+    if (make_dset(loc_id, "dset_deflate", sid, dcpl, buf) < 0)
         goto out;
 
     /* create a reference to the dataset, test second seeep of file for references */
 
-    if (H5Rcreate(&bufref[0],loc_id,"dset_deflate",H5R_OBJECT,(hid_t)-1) < 0)
+    if (H5Rcreate(&bufref[0], loc_id, "dset_deflate", H5R_OBJECT, (hid_t)-1) < 0)
         goto out;
-    if (write_dset(loc_id,1,dims1r,"ref",H5T_STD_REF_OBJ,bufref) < 0)
+    if (write_dset(loc_id, 1, dims1r, "ref", H5T_STD_REF_OBJ, bufref) < 0)
         goto out;
 #endif
 
@@ -2304,18 +2295,16 @@ out:
 static
 int make_fletcher32(hid_t loc_id)
 {
-    hid_t    dcpl; /* dataset creation property list */
-    hid_t    sid;  /* dataspace ID */
+    hid_t    dcpl = -1; /* dataset creation property list */
+    hid_t    sid = -1;  /* dataspace ID */
     hsize_t  dims[RANK]={DIM1,DIM2};
     hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
     int      buf[DIM1][DIM2];
     int      i, j, n;
 
-    for (i=n=0; i<DIM1; i++)
-    {
-        for (j=0; j<DIM2; j++)
-        {
-            buf[i][j]=n++;
+    for (i = n = 0; i < DIM1; i++) {
+        for (j = 0; j < DIM2; j++) {
+            buf[i][j] = n++;
         }
     }
     /* create a space */
@@ -2373,20 +2362,18 @@ out:
 static
 int make_nbit(hid_t loc_id)
 {
-    hid_t    dcpl; /* dataset creation property list */
-    hid_t    sid;  /* dataspace ID */
-    hid_t    dtid;
-    hid_t    dsid;
+    hid_t    dcpl = -1; /* dataset creation property list */
+    hid_t    sid = -1;  /* dataspace ID */
+    hid_t    dtid = -1;
+    hid_t    dsid = -1;
     hsize_t  dims[RANK]={DIM1,DIM2};
     hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
     int      buf[DIM1][DIM2];
     int      i, j, n;
 
-    for (i=n=0; i<DIM1; i++)
-    {
-        for (j=0; j<DIM2; j++)
-        {
-            buf[i][j]=n++;
+    for (i = n = 0; i < DIM1; i++) {
+        for (j = 0; j < DIM2; j++) {
+            buf[i][j] = n++;
         }
     }
     /* create a space */
@@ -2401,43 +2388,25 @@ int make_nbit(hid_t loc_id)
 
     dtid = H5Tcopy(H5T_NATIVE_INT);
     if (H5Tset_precision(dtid,(H5Tget_precision(dtid) - 1)) < 0)
-    {
-        H5Tclose(dtid);
         goto out;
-    }
 
     /* remove the filters from the dcpl */
     if(H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0)
-    {
-        H5Tclose(dtid);
         goto out;
-    }
-    if(H5Pset_nbit(dcpl) < 0) {
-        H5Tclose(dtid);
+    if(H5Pset_nbit(dcpl) < 0)
         goto out;
-    }
-    if((dsid = H5Dcreate2(loc_id, "dset_nbit", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) {
-        H5Tclose(dtid);
+    if((dsid = H5Dcreate2(loc_id, "dset_nbit", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto out;
-    }
-    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) {
-        H5Tclose(dtid);
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto out;
-    }
     H5Dclose(dsid);
 
-    if(H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0) {
-        H5Tclose(dtid);
+    if(H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0)
         goto out;
-    }
-    if((dsid = H5Dcreate2(loc_id, "dset_int31", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) {
-        H5Tclose(dtid);
+    if((dsid = H5Dcreate2(loc_id, "dset_int31", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto out;
-    }
-    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) {
-        H5Tclose(dtid);
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto out;
-    }
     H5Dclose(dsid);
 
     /*-------------------------------------------------------------------------
@@ -2455,8 +2424,10 @@ int make_nbit(hid_t loc_id)
 
 out:
     H5E_BEGIN_TRY {
+        H5Tclose(dtid);
         H5Pclose(dcpl);
         H5Sclose(sid);
+        H5Dclose(dsid);
     } H5E_END_TRY;
     return -1;
 }
@@ -2472,20 +2443,18 @@ out:
 static
 int make_scaleoffset(hid_t loc_id)
 {
-    hid_t    dcpl; /* dataset creation property list */
-    hid_t    sid;  /* dataspace ID */
-    hid_t    dtid;
-    hid_t    dsid;
-    hsize_t  dims[RANK]={DIM1,DIM2};
-    hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
+    hid_t    dcpl = -1; /* dataset creation property list */
+    hid_t    sid = -1;  /* dataspace ID */
+    hid_t    dtid = -1;
+    hid_t    dsid = -1;
+    hsize_t  dims[RANK] = {DIM1,DIM2};
+    hsize_t  chunk_dims[RANK] = {CDIM1,CDIM2};
     int      buf[DIM1][DIM2];
     int      i, j, n;
 
-    for (i=n=0; i<DIM1; i++)
-    {
-        for (j=0; j<DIM2; j++)
-        {
-            buf[i][j]=n++;
+    for (i = n = 0; i < DIM1; i++) {
+        for (j = 0; j < DIM2; j++) {
+            buf[i][j] = n++;
         }
     }
     /* create a space */
@@ -2501,31 +2470,19 @@ int make_scaleoffset(hid_t loc_id)
     dtid = H5Tcopy(H5T_NATIVE_INT);
 
     /* remove the filters from the dcpl */
-    if(H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0) {
-        H5Tclose(dtid);
+    if(H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0)
         goto out;
-    }
-    if(H5Pset_scaleoffset(dcpl, H5Z_SO_INT, 31) < 0) {
-        H5Tclose(dtid);
+    if(H5Pset_scaleoffset(dcpl, H5Z_SO_INT, 31) < 0)
         goto out;
-    }
-    if((dsid = H5Dcreate2(loc_id, "dset_scaleoffset", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) {
-        H5Tclose(dtid);
+    if((dsid = H5Dcreate2(loc_id, "dset_scaleoffset", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto out;
-    }
-    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) {
-        H5Tclose(dtid);
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto out;
-    }
     H5Dclose(dsid);
-    if((dsid = H5Dcreate2(loc_id, "dset_none", dtid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        H5Tclose(dtid);
+    if((dsid = H5Dcreate2(loc_id, "dset_none", dtid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    }
-    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) {
-        H5Tclose(dtid);
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto out;
-    }
     H5Tclose(dtid);
     H5Dclose(dsid);
 
@@ -2542,6 +2499,8 @@ int make_scaleoffset(hid_t loc_id)
 
 out:
     H5E_BEGIN_TRY {
+        H5Dclose(dsid);
+        H5Tclose(dtid);
         H5Pclose(dcpl);
         H5Sclose(sid);
     } H5E_END_TRY;
@@ -2552,7 +2511,7 @@ out:
 /*-------------------------------------------------------------------------
 * Function: make_all_filters
 *
-* Purpose: make a file with all filters
+* Purpose:  make a file with all filters
 *
 *-------------------------------------------------------------------------
 */
@@ -2693,9 +2652,9 @@ int make_all_filters(hid_t loc_id)
 
     /* close */
     if(H5Tclose(dtid) < 0)
-        return -1;
+        goto out;
     if(H5Dclose(dsid) < 0)
-        return -1;
+        goto out;
 
     if(H5Sclose(sid) < 0)
         goto out;
@@ -2707,6 +2666,8 @@ int make_all_filters(hid_t loc_id)
 out:
     H5E_BEGIN_TRY
     {
+        H5Tclose(dtid);
+        H5Dclose(dsid);
         H5Pclose(dcpl);
         H5Sclose(sid);
     } H5E_END_TRY;
diff --git a/tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl b/tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
index 80b8a19..1b0b821 100644
--- a/tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
+++ b/tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
@@ -76,8 +76,8 @@ GROUP "/" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
       STORAGE_LAYOUT {
-         CHUNKED ( 20, 10 )
-         SIZE 1283 (2.494:1 COMPRESSION)
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
       }
       FILTERS {
          COMPRESSION DEFLATE { LEVEL 1 }
diff --git a/tools/h5repack/testfiles/h5repack-help.txt b/tools/h5repack/testfiles/h5repack-help.txt
index b9157d7..337e004 100644
--- a/tools/h5repack/testfiles/h5repack-help.txt
+++ b/tools/h5repack/testfiles/h5repack-help.txt
@@ -22,7 +22,7 @@ usage: h5repack [OPTIONS] file1 file2
    -f FILT, --filter=FILT  Filter type
    -l LAYT, --layout=LAYT  Layout type
 
-    M - is an integer greater than 1, size of dataset in bytes (default is 0) 
+    M - is an integer greater than 1, size of dataset in bytes (default is 0)
     E - is a filename.
     S - is an integer
     U - is a filename.
@@ -63,8 +63,8 @@ usage: h5repack [OPTIONS] file1 file2
         NBIT (no parameter)
         SOFF=<scale_factor,scale_type> scale_factor is an integer and scale_type
             is either IN or DS
-        UD=<filter_number,cd_value_count,value_1[,value_2,...,value_N]>
-            required values for filter_number,cd_value_count,value_1
+        UD=<filter_number,filter_flag,cd_value_count,value_1[,value_2,...,value_N]>
+            required values for filter_number,filter_flag,cd_value_count,value_1
             optional values for value_2 to value_N
         NONE (no parameter)
 
@@ -99,16 +99,16 @@ Examples of use:
    Chunked layout, with a layout size of 20x10, to objects dset1 and dset2
    and remove filters to objects dset3, dset4, dset5
 
-4) h5repack -L -c 10 -s 20:dtype file1 file2 
+4) h5repack -L -c 10 -s 20:dtype file1 file2
 
    Using latest file format with maximum compact group size of 10 and
    and minimum shared datatype size of 20
 
-5) h5repack -f SHUF -f GZIP=1 file1 file2 
+5) h5repack -f SHUF -f GZIP=1 file1 file2
 
    Add both filters SHUF and GZIP in this order to all datasets
 
-6) h5repack -f UD=307,1,9 file1 file2 
+6) h5repack -f UD=307,0,1,9 file1 file2
 
    Add bzip2 filter to all datasets
 
diff --git a/tools/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst b/tools/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
index 36e65b9..cb12172 100644
--- a/tools/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
+++ b/tools/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
@@ -1,7 +1,8 @@
-Objects to modify layout are...
-Objects to apply filter are...
+No all objects to modify layout
+No all objects to apply filter
  </dset_deflate> with GZIP filter
  </dset_deflate>...Found
+Making new file ...
 -----------------------------------------
  Type     Filter (Compression)     Name
 -----------------------------------------
diff --git a/tools/h5repack/testfiles/h5repack_filters.h5.tst b/tools/h5repack/testfiles/h5repack_filters.h5.tst
deleted file mode 100644
index 36e65b9..0000000
--- a/tools/h5repack/testfiles/h5repack_filters.h5.tst
+++ /dev/null
@@ -1,13 +0,0 @@
-Objects to modify layout are...
-Objects to apply filter are...
- </dset_deflate> with GZIP filter
- </dset_deflate>...Found
------------------------------------------
- Type     Filter (Compression)     Name
------------------------------------------
- group                       /
- dset                        /dset_all
- dset     GZIP   (0.995:1)   /dset_deflate
- dset                        /dset_fletcher32
- dset                        /dset_nbit
- dset                        /dset_shuffle
diff --git a/tools/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
new file mode 100644
index 0000000..95cc4c6
--- /dev/null
+++ b/tools/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
@@ -0,0 +1,38 @@
+HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+  #000: (file name) line (number) in H5Dcreate2(): unable to create dataset
+    major: Dataset
+    minor: Unable to initialize object
+  #001: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
+    major: Dataset
+    minor: Unable to initialize object
+  #002: (file name) line (number) in H5L_link_object(): unable to create new link to object
+    major: Links
+    minor: Unable to initialize object
+  #003: (file name) line (number) in H5L_create_real(): can't insert link
+    major: Symbol table
+    minor: Unable to insert object
+  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+    major: Symbol table
+    minor: Object not found
+  #005: (file name) line (number) in H5G_traverse_real(): traversal operator failed
+    major: Symbol table
+    minor: Callback failed
+  #006: (file name) line (number) in H5L_link_cb(): unable to create object
+    major: Object header
+    minor: Unable to initialize object
+  #007: (file name) line (number) in H5O_obj_create(): unable to open object
+    major: Object header
+    minor: Can't open object
+  #008: (file name) line (number) in H5O__dset_create(): unable to create dataset
+    major: Dataset
+    minor: Unable to initialize object
+  #009: (file name) line (number) in H5D__create(): unable to construct layout information
+    major: Dataset
+    minor: Unable to initialize object
+  #010: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
+    major: Dataset
+    minor: Bad value
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in do_copy_objects(): H5Dcreate2 failed
+    major: Failure in tools library
+    minor: error in function
diff --git a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
index 87b133d..9e80c72 100644
--- a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
+++ b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
@@ -92,7 +92,7 @@ GROUP "/" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
       STORAGE_LAYOUT {
-         CHUNKED ( 20, 10 )
+         CHUNKED ( 40, 20 )
          SIZE 3200 (1.000:1 COMPRESSION)
       }
       FILTERS {
diff --git a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
index 09b2484..255ba9d 100644
--- a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
+++ b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
@@ -11,7 +11,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 19 }
+            PARAMS { 9 1 8 20 }
          }
       }
       FILLVALUE {
@@ -33,7 +33,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 19 }
+            PARAMS { 9 1 8 20 }
          }
       }
       FILLVALUE {
@@ -55,7 +55,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 19 }
+            PARAMS { 9 1 8 20 }
          }
       }
       FILLVALUE {
@@ -77,7 +77,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 19 }
+            PARAMS { 9 1 8 20 }
          }
       }
       FILLVALUE {
@@ -92,14 +92,14 @@ GROUP "/" {
       DATATYPE  H5T_STD_I32LE
       DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
       STORAGE_LAYOUT {
-         CHUNKED ( 20, 10 )
+         CHUNKED ( 40, 20 )
          SIZE 3200 (1.000:1 COMPRESSION)
       }
       FILTERS {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 19 }
+            PARAMS { 9 1 8 20 }
          }
       }
       FILLVALUE {
@@ -121,7 +121,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 19 }
+            PARAMS { 9 1 8 20 }
          }
       }
       FILLVALUE {
@@ -143,7 +143,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 8 19 }
+            PARAMS { 9 1 8 20 }
          }
       }
       FILLVALUE {
diff --git a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl
new file mode 100644
index 0000000..9302485
--- /dev/null
+++ b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl
@@ -0,0 +1,135 @@
+HDF5 "out-plugin_zero.h5repack_layout.h5" {
+GROUP "/" {
+   DATASET "dset1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CONTIGUOUS
+         SIZE 3200
+         OFFSET 2144
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_LATE
+      }
+   }
+   DATASET "dset2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CONTIGUOUS
+         SIZE 3200
+         OFFSET 5344
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_LATE
+      }
+   }
+   DATASET "dset3" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CONTIGUOUS
+         SIZE 3200
+         OFFSET 8544
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_LATE
+      }
+   }
+   DATASET "dset4" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CONTIGUOUS
+         SIZE 3200
+         OFFSET 13792
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_LATE
+      }
+   }
+   DATASET "dset_chunk" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 20, 10 )
+         SIZE 3200
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_compact" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         COMPACT
+         SIZE 3200
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_EARLY
+      }
+   }
+   DATASET "dset_contiguous" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CONTIGUOUS
+         SIZE 3200
+         OFFSET 26280
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_LATE
+      }
+   }
+}
+}
diff --git a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_zero.tst b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_zero.tst
deleted file mode 100644
index 0993d5b..0000000
--- a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_zero.tst
+++ /dev/null
@@ -1,9 +0,0 @@
-Objects to modify layout are...
-Objects to apply filter are...
- User Defined 250
-Making file <out-plugin_zero.h5repack_layout.h5>...
------------------------------------------
- Type     Filter (Compression)     Name
------------------------------------------
- group                       /
-h5repack error: <h5repack_layout.h5>: Could not copy data to: out-plugin_zero.h5repack_layout.h5
diff --git a/tools/h5repack/testfiles/h5repack_none.h5 b/tools/h5repack/testfiles/h5repack_none.h5
new file mode 100644
index 0000000..2e4d789
--- /dev/null
+++ b/tools/h5repack/testfiles/h5repack_none.h5
diff --git a/tools/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst b/tools/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
index 4fb6906..30aa8ad 100644
--- a/tools/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
+++ b/tools/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
@@ -1,6 +1,7 @@
-Objects to modify layout are...
-Objects to apply filter are...
+No all objects to modify layout
+All objects to apply filter are...
  Uncompress all
+Making new file ...
 -----------------------------------------
  Type     Filter (Compression)     Name
 -----------------------------------------
diff --git a/tools/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst b/tools/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
index 7f9bd6e..62ea1cc 100644
--- a/tools/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
+++ b/tools/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
@@ -1,6 +1,7 @@
-Objects to modify layout are...
-Objects to apply filter are...
+No all objects to modify layout
+All objects to apply filter are...
  User Defined 257
+Making new file ...
 -----------------------------------------
  Type     Filter (Compression)     Name
 -----------------------------------------
diff --git a/tools/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst b/tools/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst
index 1a496c6..f5c4736 100644
--- a/tools/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst
+++ b/tools/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst
@@ -1,6 +1,7 @@
-Objects to modify layout are...
-Objects to apply filter are...
+No all objects to modify layout
+All objects to apply filter are...
  User Defined 260
+Making new file ...
 -----------------------------------------
  Type     Filter (Compression)     Name
 -----------------------------------------
diff --git a/tools/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst b/tools/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst
new file mode 100644
index 0000000..54c873c
--- /dev/null
+++ b/tools/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst
@@ -0,0 +1,22 @@
+No all objects to modify layout
+All objects to apply filter are...
+ User Defined 250
+Making new file ...
+-----------------------------------------
+ Type     Filter (Compression)     Name
+-----------------------------------------
+ group                       /
+ warning: could not create dataset </dset1>. Applying original settings
+ dset                        /dset1
+ warning: could not create dataset </dset2>. Applying original settings
+ dset                        /dset2
+ warning: could not create dataset </dset3>. Applying original settings
+ dset                        /dset3
+ warning: could not create dataset </dset4>. Applying original settings
+ dset                        /dset4
+ warning: could not create dataset </dset_chunk>. Applying original settings
+ dset                        /dset_chunk
+ warning: could not create dataset </dset_compact>. Applying original settings
+ dset                        /dset_compact
+ warning: could not create dataset </dset_contiguous>. Applying original settings
+ dset                        /dset_contiguous
diff --git a/tools/h5repack/testh5repack_detect_szip.c b/tools/h5repack/testh5repack_detect_szip.c
index e08d5ab..6e7a24e 100644
--- a/tools/h5repack/testh5repack_detect_szip.c
+++ b/tools/h5repack/testh5repack_detect_szip.c
@@ -11,7 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdio.h>
 #include "h5repack.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
diff --git a/tools/h5stat/CMakeTests.cmake b/tools/h5stat/CMakeTests.cmake
index 40885a1..885cfd1 100644
--- a/tools/h5stat/CMakeTests.cmake
+++ b/tools/h5stat/CMakeTests.cmake
@@ -20,37 +20,37 @@
   # Copy all the HDF5 files from the test directory into the source directory
   # --------------------------------------------------------------------
   set (HDF5_REFERENCE_FILES
-      h5stat_help1.ddl
-      h5stat_help2.ddl
-      h5stat_notexist.ddl
-      h5stat_nofile.ddl
-      h5stat_filters.ddl
-      h5stat_filters-file.ddl
-      h5stat_filters-F.ddl
-      h5stat_filters-d.ddl
-      h5stat_filters-g.ddl
-      h5stat_filters-dT.ddl
-      h5stat_filters-UD.ddl
-      h5stat_filters-UT.ddl
-      h5stat_tsohm.ddl
-      h5stat_newgrat.ddl
-      h5stat_newgrat-UG.ddl
-      h5stat_newgrat-UA.ddl
-      h5stat_err1_links.ddl
-      h5stat_links1.ddl
-      h5stat_links2.ddl
-      h5stat_links3.ddl
-      h5stat_links4.ddl
-      h5stat_links5.ddl
-      h5stat_err1_dims.ddl
-      h5stat_dims1.ddl
-      h5stat_dims2.ddl
-      h5stat_err1_numattrs.ddl
-      h5stat_err2_numattrs.ddl
-      h5stat_numattrs1.ddl
-      h5stat_numattrs2.ddl
-      h5stat_numattrs3.ddl
-      h5stat_numattrs4.ddl
+      h5stat_help1
+      h5stat_help2
+      h5stat_notexist
+      h5stat_nofile
+      h5stat_filters
+      h5stat_filters-file
+      h5stat_filters-F
+      h5stat_filters-d
+      h5stat_filters-g
+      h5stat_filters-dT
+      h5stat_filters-UD
+      h5stat_filters-UT
+      h5stat_tsohm
+      h5stat_newgrat
+      h5stat_newgrat-UG
+      h5stat_newgrat-UA
+      h5stat_err1_links
+      h5stat_links1
+      h5stat_links2
+      h5stat_links3
+      h5stat_links4
+      h5stat_links5
+      h5stat_err1_dims
+      h5stat_dims1
+      h5stat_dims2
+      h5stat_err1_numattrs
+      h5stat_err2_numattrs
+      h5stat_numattrs1
+      h5stat_numattrs2
+      h5stat_numattrs3
+      h5stat_numattrs4
   )
   set (HDF5_REFERENCE_TEST_FILES
       h5stat_filters.h5
@@ -60,7 +60,7 @@
   )
 
   foreach (ddl_file ${HDF5_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_H5STAT_SOURCE_DIR}/testfiles/${ddl_file}" "${PROJECT_BINARY_DIR}/${ddl_file}" "h5stat_files")
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_H5STAT_SOURCE_DIR}/testfiles/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
@@ -78,7 +78,7 @@
     # If using memchecker add tests without using scripts
     if (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (NAME H5STAT-${resultfile} COMMAND $<TARGET_FILE:h5stat> ${ARGN})
-      if (NOT ${resultcode} STREQUAL "0")
+      if (NOT "${resultcode}" STREQUAL "0")
         set_tests_properties (H5STAT-${resultfile} PROPERTIES WILL_FAIL "true")
       endif ()
       if (NOT "${last_test}" STREQUAL "")
@@ -86,6 +86,16 @@
       endif ()
     else (HDF5_ENABLE_USING_MEMCHECKER)
       add_test (
+          NAME H5STAT-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${resultfile}.out
+              ${resultfile}.out.err
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5STAT-${resultfile}-clear-objects PROPERTIES DEPENDS ${last_test})
+      endif ()
+      add_test (
           NAME H5STAT-${resultfile}
           COMMAND "${CMAKE_COMMAND}"
               -D "TEST_PROGRAM=$<TARGET_FILE:h5stat>"
@@ -96,6 +106,7 @@
               -D "TEST_REFERENCE=${resultfile}.ddl"
               -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
       )
+      set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS H5STAT-${resultfile}-clear-objects)
     endif ()
   endmacro ()
 
@@ -107,72 +118,13 @@
 
   if (HDF5_ENABLE_USING_MEMCHECKER)
     # Remove any output file left over from previous test run
+    foreach (ddl_file ${HDF5_REFERENCE_FILES})
+      set (CLEAR_LIST ${CLEAR_LIST} ${ddl_file}.out ${ddl_file}.out.err)
+    endforeach ()
     add_test (
       NAME H5STAT-clearall-objects
       COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          h5stat_help1.out
-          h5stat_help1.out.err
-          h5stat_help2.out
-          h5stat_help2.out.err
-          h5stat_notexist.out
-          h5stat_notexist.out.err
-          h5stat_nofile.out
-          h5stat_nofile.out.err
-          h5stat_filters.out
-          h5stat_filters.out.err
-          h5stat_filters-file.out
-          h5stat_filters-file.out.err
-          h5stat_filters-F.out
-          h5stat_filters-F.out.err
-          h5stat_filters-d.out
-          h5stat_filters-d.out.err
-          h5stat_filters-g.out
-          h5stat_filters-g.out.err
-          h5stat_filters-dT.out
-          h5stat_filters-dT.out.err
-          h5stat_filters-UD.out
-          h5stat_filters-UD.out.err
-          h5stat_filters-UT.out
-          h5stat_filters-UT.out.err
-          h5stat_tsohm.out
-          h5stat_tsohm.out.err
-          h5stat_newgrat.out
-          h5stat_newgrat.out.err
-          h5stat_newgrat-UG.out
-          h5stat_newgrat-UG.out.err
-          h5stat_newgrat-UA.out
-          h5stat_newgrat-UA.out.err
-          h5stat_err1_links.out
-          h5stat_err1_links.out.err
-          h5stat_links1.out
-          h5stat_links1.out.err
-          h5stat_links2.out
-          h5stat_links2.out.err
-          h5stat_links3.out
-          h5stat_links3.out.err
-          h5stat_links4.out
-          h5stat_links4.out.err
-          h5stat_links5.out
-          h5stat_links5.out.err
-          h5stat_err1_dims.out
-          h5stat_err1_dims.out.err
-          h5stat_dims1.out
-          h5stat_dims1.out.err
-          h5stat_dims2.out
-          h5stat_dims2.out.err
-          h5stat_err1_numattrs.out
-          h5stat_err1_numattrs.out.err
-          h5stat_err2_numattrs.out
-          h5stat_err2_numattrs.out.err
-          h5stat_numattrs1.out
-          h5stat_numattrs1.out.err
-          h5stat_numattrs2.out
-          h5stat_numattrs2.out.err
-          h5stat_numattrs3.out
-          h5stat_numattrs3.out.err
-          h5stat_numattrs4.out
-          h5stat_numattrs4.out.err
+          -E remove ${CLEAR_LIST}
     )
     if (NOT "${last_test}" STREQUAL "")
       set_tests_properties (H5STAT-clearall-objects PROPERTIES DEPENDS ${last_test})
diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in
index 11d5ecd..adbc776 100644
--- a/tools/h5stat/Makefile.in
+++ b/tools/h5stat/Makefile.in
@@ -593,6 +593,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index aa43645..1357952 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-#include <string.h>
 #include "H5private.h"    /* Generic Functions      */
 #include "h5tools.h"
 #include "h5tools_utils.h"
diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c
index 42e352e..6031808 100644
--- a/tools/h5stat/h5stat_gentest.c
+++ b/tools/h5stat/h5stat_gentest.c
@@ -64,7 +64,7 @@ gen_newgrat_file(const char *fname)
     if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
 	goto error;
 
-     /* Create dataset */
+     /* Create file */
     if((fid = H5Fcreate(NEWGRAT_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
 	goto error;
 
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 8ee8348..342b4e8 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -581,6 +581,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 20b5136..0b10249 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdlib.h>
-
 #include "H5private.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
@@ -23,25 +21,25 @@
 /*-------------------------------------------------------------------------
  * Function: print_objname
  *
- * Purpose: check if object name is to be printed, only when:
- *  1) verbose mode
- *  2) when diff was found (normal mode)
+ * Purpose:  check if object name is to be printed, only when:
+ *             1) verbose mode
+ *             2) when diff was found (normal mode)
  *-------------------------------------------------------------------------
  */
-int
-print_objname (diff_opt_t * options, hsize_t nfound)
+ int
+print_objname (diff_opt_t * opts, hsize_t nfound)
 {
-    return ((options->m_verbose || nfound) && !options->m_quiet) ? 1 : 0;
+    return ((opts->m_verbose || nfound) && !opts->m_quiet) ? 1 : 0;
 }
 
 /*-------------------------------------------------------------------------
  * Function: do_print_objname
  *
- * Purpose: print object name
- *
+ * Purpose:  print object name
  *-------------------------------------------------------------------------
  */
-void do_print_objname (const char *OBJ, const char *path1, const char *path2, diff_opt_t * opts)
+void
+do_print_objname (const char *OBJ, const char *path1, const char *path2, diff_opt_t * opts)
 {
     /* if verbose level is higher than 0, put space line before
      * displaying any object or symbolic links. This improves
@@ -55,8 +53,7 @@ void do_print_objname (const char *OBJ, const char *path1, const char *path2, di
 /*-------------------------------------------------------------------------
  * Function: do_print_attrname
  *
- * Purpose: print attribute name
- *
+ * Purpose:  print attribute name
  *-------------------------------------------------------------------------
  */
 void
@@ -68,17 +65,16 @@ do_print_attrname (const char *attr, const char *path1, const char *path2)
 /*-------------------------------------------------------------------------
  * Function: print_warn
  *
- * Purpose: check print warning condition.
+ * Purpose:  check print warning condition.
  * Return:
- *    1 if verbose mode
- *    0 if not verbos mode
- * Programmer: Jonathan Kim
- * Date: Feb 4, 2010
+ *           1 if verbose mode
+ *           0 if not verbos mode
  *-------------------------------------------------------------------------
  */
-static int print_warn(diff_opt_t *options)
+static int
+print_warn(diff_opt_t *opts)
 {
-    return ((options->m_verbose))?1:0;
+    return ((opts->m_verbose)) ? 1: 0;
 }
 
 
@@ -86,20 +82,16 @@ static int print_warn(diff_opt_t *options)
 /*-------------------------------------------------------------------------
  * Function: phdiff_dismiss_workers
  *
- * Purpose: tell all workers to end.
- *
- * Return: none
- *
- * Programmer: Albert Cheng
- *
- * Date: Feb 6, 2005
+ * Purpose:  tell all workers to end.
  *
+ * Return:   none
  *-------------------------------------------------------------------------
  */
-void phdiff_dismiss_workers(void)
+void
+phdiff_dismiss_workers(void)
 {
     int i;
-    for(i=1; i<g_nTasks; i++)
+    for (i = 1; i < g_nTasks; i++)
         MPI_Send(NULL, 0, MPI_BYTE, i, MPI_TAG_END, MPI_COMM_WORLD);
 }
 
@@ -107,29 +99,23 @@ void phdiff_dismiss_workers(void)
 /*-------------------------------------------------------------------------
  * Function: print_incoming_data
  *
- * Purpose: special function that prints any output that has been sent to the manager
- *      and is currently sitting in the incoming message queue
- *
- * Return: none
- *
- * Programmer: Leon Arber
- *
- * Date: March 7, 2005
+ * Purpose:  special function that prints any output that has been sent to the manager
+ *           and is currently sitting in the incoming message queue
  *
+ * Return:   none
  *-------------------------------------------------------------------------
  */
 
-static void print_incoming_data(void)
+static void
+print_incoming_data(void)
 {
-    char data[PRINT_DATA_MAX_SIZE+1];
+    char data[PRINT_DATA_MAX_SIZE + 1];
     int  incomingMessage;
     MPI_Status Status;
 
-    do
-    {
+    do {
         MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &incomingMessage, &Status);
-        if(incomingMessage)
-        {
+        if(incomingMessage) {
             HDmemset(data, 0, PRINT_DATA_MAX_SIZE+1);
             MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status);
 
@@ -142,81 +128,68 @@ static void print_incoming_data(void)
 /*-------------------------------------------------------------------------
  * Function: is_valid_options
  *
- * Purpose: check if options are valid
+ * Purpose:  check if options are valid
  *
  * Return:
- *  1 : Valid
- *  0 : Not valid
- *
- * Programmer: Jonathan Kim
- *
- * Date: Feb 17, 2010
- *
+ *           1 : Valid
+ *           0 : Not valid
  *------------------------------------------------------------------------*/
-static int is_valid_options(diff_opt_t *options)
+static int
+is_valid_options(diff_opt_t *opts)
 {
-    int ret=1; /* init to valid */
+    int ret_value = 1; /* init to valid */
 
     /*-----------------------------------------------
      * no -q(quiet) with -v (verbose) or -r (report) */
-    if(options->m_quiet && (options->m_verbose || options->m_report))
-    {
+    if(opts->m_quiet && (opts->m_verbose || opts->m_report)) {
         parallel_print("Error: -q (quiet mode) cannot be added to verbose or report modes\n");
-        options->err_stat=1;
-        ret = 0;
-        goto out;
+        opts->err_stat = 1;
+        HGOTO_DONE(0);
     }
 
     /* -------------------------------------------------------
      * only allow --no-dangling-links along with --follow-symlinks */
-    if(options->no_dangle_links && !options->follow_links)
-    {
+    if(opts->no_dangle_links && !opts->follow_links) {
         parallel_print("Error: --no-dangling-links must be used along with --follow-symlinks option.\n");
-        options->err_stat=1;
-        ret = 0;
-        goto out;
+        opts->err_stat = 1;
+        HGOTO_DONE(0);
     }
 
-out:
+done:
 
-    return ret;
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
  * Function: is_exclude_path
  *
- * Purpose: check if 'paths' are part of exclude path list
+ * Purpose:  check if 'paths' are part of exclude path list
  *
  * Return:
- *   1 - excluded path
- *   0 - not excluded path
- *
- * Programmer: Jonathan Kim
- * Date: Aug 23, 2010
+ *           1 - excluded path
+ *           0 - not excluded path
  *------------------------------------------------------------------------*/
-static int is_exclude_path (char * path, h5trav_type_t type, diff_opt_t *options)
+static int
+is_exclude_path (char * path, h5trav_type_t type, diff_opt_t *opts)
 {
     struct exclude_path_list * exclude_path_ptr;
-    int ret_cmp;
-    int ret = 0;
+    int   ret_cmp;
+    int   ret_value = 0;
 
     /* check if exclude path option is given */
-    if (!options->exclude_path)
-        goto out;
+    if (!opts->exclude_path)
+        HGOTO_DONE(0);
 
     /* assign to local exclude list pointer */
-    exclude_path_ptr = options->exclude;
+    exclude_path_ptr = opts->exclude;
 
     /* search objects in exclude list */
-    while (NULL != exclude_path_ptr)
-    {
+    while (NULL != exclude_path_ptr) {
         /* if exclude path is is group, exclude its members as well */
-        if (exclude_path_ptr->obj_type == H5TRAV_TYPE_GROUP)
-        {
+        if (exclude_path_ptr->obj_type == H5TRAV_TYPE_GROUP) {
             ret_cmp = HDstrncmp(exclude_path_ptr->obj_path, path,
                                 HDstrlen(exclude_path_ptr->obj_path));
-            if (ret_cmp == 0)  /* found matching members */
-            {
+            if (ret_cmp == 0) {  /* found matching members */
                 size_t len_grp;
 
                 /* check if given path belong to an excluding group, if so
@@ -225,22 +198,19 @@ static int is_exclude_path (char * path, h5trav_type_t type, diff_opt_t *options
                  * not under “/grp1xxx/” group.
                  */
                 len_grp = HDstrlen(exclude_path_ptr->obj_path);
-                if (path[len_grp] == '/')
-                {
+                if (path[len_grp] == '/') {
                     /* belong to excluded group! */
-                    ret = 1;
+                    ret_value = 1;
                     break;  /* while */
                 }
             }
         }
         /* exclude target is not group, just exclude the object */
-        else
-        {
+        else {
             ret_cmp = HDstrcmp(exclude_path_ptr->obj_path, path);
-            if (ret_cmp == 0)  /* found matching object */
-            {
+            if (ret_cmp == 0) {  /* found matching object */
                 /* excluded non-group object */
-                ret = 1;
+                ret_value = 1;
                 /* remember the type of this maching object.
                  * if it's group, it can be used for excluding its member
                  * objects in this while() loop */
@@ -251,26 +221,23 @@ static int is_exclude_path (char * path, h5trav_type_t type, diff_opt_t *options
         exclude_path_ptr = exclude_path_ptr->next;
     }
 
-out:
-    return  ret;
+done:
+    return  ret_value;
 }
 
 
 /*-------------------------------------------------------------------------
  * Function: free_exclude_path_list
  *
- * Purpose: free exclud object list from diff options
- *
- * Programmer: Jonathan Kim
- * Date: Aug 23, 2010
+ * Purpose:  free exclude object list from diff options
  *------------------------------------------------------------------------*/
-static void free_exclude_path_list(diff_opt_t *options)
+static void
+free_exclude_path_list(diff_opt_t *opts)
 {
-    struct exclude_path_list * curr = options->exclude;
-    struct exclude_path_list * next;
+    struct exclude_path_list *curr = opts->exclude;
+    struct exclude_path_list *next;
 
-    while (NULL != curr)
-    {
+    while (NULL != curr) {
         next = curr->next;
         HDfree(curr);
         curr = next;
@@ -280,44 +247,43 @@ static void free_exclude_path_list(diff_opt_t *options)
 /*-------------------------------------------------------------------------
  * Function: build_match_list
  *
- * Purpose: get list of matching path_name from info1 and info2
+ * Purpose:  get list of matching path_name from info1 and info2
  *
  * Note:
- *  Find common objects; the algorithm used for this search is the
- *  cosequential match algorithm and is described in
- *  Folk, Michael; Zoellick, Bill. (1992). File Structures. Addison-Wesley.
- *  Moved out from diff_match() to make code more flexible.
+ *           Find common objects; the algorithm used for this search is the
+ *           cosequential match algorithm and is described in
+ *           Folk, Michael; Zoellick, Bill. (1992). File Structures. Addison-Wesley.
+ *           Moved out from diff_match() to make code more flexible.
  *
  * Parameter:
- *  table_out [OUT] : return the list
- *
- * Programmer: Jonathan Kim
- *
- * Date: Aug 18, 2010
+ *           table_out [OUT] : return the list
  *------------------------------------------------------------------------*/
-static void build_match_list (const char *objname1, trav_info_t *info1, const char *objname2, trav_info_t *info2, trav_table_t ** table_out, diff_opt_t *options)
+static void
+build_match_list (const char *objname1, trav_info_t *info1, const char *objname2, trav_info_t *info2,
+        trav_table_t ** table_out, diff_opt_t *opts)
 {
-    size_t curr1 = 0;
-    size_t curr2 = 0;
+    size_t   curr1 = 0;
+    size_t   curr2 = 0;
     unsigned infile[2];
-    char * path1_lp;
-    char * path2_lp;
+    char    *path1_lp = NULL;
+    char    *path2_lp = NULL;
     h5trav_type_t type1_l;
     h5trav_type_t type2_l;
-    size_t path1_offset = 0;
-    size_t path2_offset = 0;
-    int cmp;
-    trav_table_t *table;
-    size_t  idx;
+    size_t   path1_offset = 0;
+    size_t   path2_offset = 0;
+    int      cmp;
+    trav_table_t *table = NULL;
+    size_t   idx;
 
     h5difftrace("build_match_list start\n");
     /* init */
-    trav_table_init( &table );
-
+    trav_table_init(&table);
+    if (table == NULL)
+        H5TOOLS_INFO(H5E_tools_min_id_g, "Cannot create tarverse table");
     /*
      * This is necessary for the case that given objects are group and
      * have different names (ex: obj1 is /grp1 and obj2 is /grp5).
-     * All the objects belong to given groups are the cadidates.
+     * All the objects belong to given groups are the candidates.
      * So prepare to compare paths without the group names.
      */
 
@@ -331,8 +297,7 @@ static void build_match_list (const char *objname1, trav_info_t *info1, const ch
     /*--------------------------------------------------
     * build the list
     */
-    while(curr1 < info1->nused && curr2 < info2->nused)
-    {
+    while(curr1 < info1->nused && curr2 < info2->nused) {
         path1_lp = (info1->paths[curr1].path) + path1_offset;
         path2_lp = (info2->paths[curr2].path) + path2_offset;
         type1_l = info1->paths[curr1].type;
@@ -340,19 +305,15 @@ static void build_match_list (const char *objname1, trav_info_t *info1, const ch
 
         /* criteria is string compare */
         cmp = HDstrcmp(path1_lp, path2_lp);
-
-        if(cmp == 0)
-        {
-            if(!is_exclude_path(path1_lp, type1_l, options))
-            {
+        if(cmp == 0) {
+            if(!is_exclude_path(path1_lp, type1_l, opts)) {
                 infile[0] = 1;
                 infile[1] = 1;
                 trav_table_addflags(infile, path1_lp, info1->paths[curr1].type, table);
                 /* if the two point to the same target object,
                  * mark that in table */
                 if (info1->paths[curr1].fileno == info2->paths[curr2].fileno &&
-                    info1->paths[curr1].objno == info2->paths[curr2].objno )
-                {
+                    info1->paths[curr1].objno == info2->paths[curr2].objno) {
                     idx = table->nobjs - 1;
                     table->objs[idx].is_same_trgobj = 1;
                 }
@@ -360,20 +321,16 @@ static void build_match_list (const char *objname1, trav_info_t *info1, const ch
             curr1++;
             curr2++;
         } /* end if */
-        else if(cmp < 0)
-        {
-            if(!is_exclude_path(path1_lp, type1_l, options))
-            {
+        else if(cmp < 0) {
+            if(!is_exclude_path(path1_lp, type1_l, opts)) {
                 infile[0] = 1;
                 infile[1] = 0;
                 trav_table_addflags(infile, path1_lp, info1->paths[curr1].type, table);
             }
             curr1++;
         } /* end else-if */
-        else
-        {
-            if (!is_exclude_path(path2_lp, type2_l, options))
-            {
+        else {
+            if (!is_exclude_path(path2_lp, type2_l, opts)) {
                 infile[0] = 0;
                 infile[1] = 1;
                 trav_table_addflags(infile, path2_lp, info2->paths[curr2].type, table);
@@ -385,13 +342,11 @@ static void build_match_list (const char *objname1, trav_info_t *info1, const ch
     /* list1 did not end */
     infile[0] = 1;
     infile[1] = 0;
-    while(curr1 < info1->nused)
-    {
+    while(curr1 < info1->nused) {
         path1_lp = (info1->paths[curr1].path) + path1_offset;
         type1_l = info1->paths[curr1].type;
 
-        if(!is_exclude_path(path1_lp, type1_l, options))
-        {
+        if(!is_exclude_path(path1_lp, type1_l, opts)) {
             trav_table_addflags(infile, path1_lp, info1->paths[curr1].type, table);
         }
         curr1++;
@@ -400,19 +355,17 @@ static void build_match_list (const char *objname1, trav_info_t *info1, const ch
     /* list2 did not end */
     infile[0] = 0;
     infile[1] = 1;
-    while(curr2 < info2->nused)
-    {
+    while(curr2 < info2->nused) {
         path2_lp = (info2->paths[curr2].path) + path2_offset;
         type2_l = info2->paths[curr2].type;
 
-        if (!is_exclude_path(path2_lp, type2_l, options))
-        {
+        if (!is_exclude_path(path2_lp, type2_l, opts)) {
             trav_table_addflags(infile, path2_lp, info2->paths[curr2].type, table);
         }
         curr2++;
     } /* end while */
 
-    free_exclude_path_list (options);
+    free_exclude_path_list (opts);
 
     *table_out = table;
     h5difftrace("build_match_list finish\n");
@@ -422,15 +375,11 @@ static void build_match_list (const char *objname1, trav_info_t *info1, const ch
 /*-------------------------------------------------------------------------
  * Function: trav_grp_objs
  *
- * Purpose:
- *  Call back function from h5trav_visit().
- *
- * Programmer: Jonathan Kim
- *
- * Date: Aug 16, 2010
+ * Purpose:  Call back function from h5trav_visit().
  *------------------------------------------------------------------------*/
-static herr_t trav_grp_objs(const char *path, const H5O_info_t *oinfo,
-    const char *already_visited, void *udata)
+static herr_t
+trav_grp_objs(const char *path, const H5O_info_t *oinfo,
+        const char *already_visited, void *udata)
 {
     trav_info_visit_obj(path, oinfo, already_visited, udata);
 
@@ -440,99 +389,86 @@ static herr_t trav_grp_objs(const char *path, const H5O_info_t *oinfo,
 /*-------------------------------------------------------------------------
  * Function: trav_grp_symlinks
  *
- * Purpose:
- *  Call back function from h5trav_visit().
- *  Track and extra checkings while visiting all symbolic-links.
- *
- * Programmer: Jonathan Kim
- *
- * Date: Aug 16, 2010
+ * Purpose:  Call back function from h5trav_visit().
+ *           Track and extra checkings while visiting all symbolic-links.
  *------------------------------------------------------------------------*/
-static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
-                               void *udata)
+static herr_t
+trav_grp_symlinks(const char *path, const H5L_info_t *linfo, void *udata)
 {
-    trav_info_t *tinfo = (trav_info_t *)udata;
-    diff_opt_t *opts = (diff_opt_t *)tinfo->opts;
-    int ret;
+    herr_t         ret_value = 0;
+    trav_info_t   *tinfo = (trav_info_t *)udata;
+    diff_opt_t    *opts = (diff_opt_t *)tinfo->opts;
     h5tool_link_info_t lnk_info;
-    const char *ext_fname;
-    const char *ext_path;
+    const char    *ext_fname;
+    const char    *ext_path;
 
     /* init linkinfo struct */
     HDmemset(&lnk_info, 0, sizeof(h5tool_link_info_t));
 
-    if (!opts->follow_links)
-    {
+    if (!opts->follow_links) {
         trav_info_visit_lnk(path, linfo, tinfo);
-        goto done;
+        HGOTO_DONE(0);
     }
 
-    switch(linfo->type)
-    {
+    switch(linfo->type) {
         case H5L_TYPE_SOFT:
-            ret = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links);
-            /* error */
-            if (ret < 0)
-                goto done;
-            /* no dangling link option given and detect dangling link */
-            else if (ret == 0)
-            {
-                tinfo->symlink_visited.dangle_link = TRUE;
+            if((ret_value = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links)) < 0) {
+                HGOTO_DONE(FAIL);
+            }
+            else if (ret_value == 0) {
+             /* no dangling link option given and detect dangling link */
+               tinfo->symlink_visited.dangle_link = TRUE;
                 trav_info_visit_lnk(path, linfo, tinfo);
                 if (opts->no_dangle_links)
                     opts->err_stat = 1; /* make dangling link is error */
-                goto done;
+                HGOTO_DONE(0);
             }
 
             /* check if already visit the target object */
             if(symlink_is_visited( &(tinfo->symlink_visited), linfo->type, NULL, lnk_info.trg_path))
-                goto done;
+                HGOTO_DONE(0);
 
             /* add this link as visited link */
             if(symlink_visit_add( &(tinfo->symlink_visited), linfo->type, NULL, lnk_info.trg_path) < 0)
-                goto done;
+                HGOTO_DONE(0);
 
             if(h5trav_visit(tinfo->fid, path, TRUE, TRUE,
-                         trav_grp_objs,trav_grp_symlinks, tinfo) < 0)
-            {
+                         trav_grp_objs,trav_grp_symlinks, tinfo) < 0) {
                 parallel_print("Error: Could not get file contents\n");
                 opts->err_stat = 1;
-                goto done;
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Error: Could not get file contents");
             }
             break;
 
         case H5L_TYPE_EXTERNAL:
-            ret = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links);
-            /* error */
-            if (ret < 0)
-                goto done;
+            if ((ret_value = H5tools_get_symlink_info(tinfo->fid, path, &lnk_info, opts->follow_links)) < 0) {
+                HGOTO_DONE(FAIL);
+            }
+            else if (ret_value == 0) {
             /* no dangling link option given and detect dangling link */
-            else if (ret == 0)
-            {
                 tinfo->symlink_visited.dangle_link = TRUE;
                 trav_info_visit_lnk(path, linfo, tinfo);
                 if (opts->no_dangle_links)
                     opts->err_stat = 1; /* make dangling link is error */
-                goto done;
+                HGOTO_DONE(0);
             }
 
             if(H5Lunpack_elink_val(lnk_info.trg_path, linfo->u.val_size, NULL, &ext_fname, &ext_path) < 0)
-                goto done;
+                HGOTO_DONE(0);
 
             /* check if already visit the target object */
             if(symlink_is_visited( &(tinfo->symlink_visited), linfo->type, ext_fname, ext_path))
-                goto done;
+                HGOTO_DONE(0);
 
             /* add this link as visited link */
             if(symlink_visit_add( &(tinfo->symlink_visited), linfo->type, ext_fname, ext_path) < 0)
-                goto done;
+                HGOTO_DONE(0);
 
             if(h5trav_visit(tinfo->fid, path, TRUE, TRUE,
-                            trav_grp_objs,trav_grp_symlinks, tinfo) < 0)
-            {
+                            trav_grp_objs,trav_grp_symlinks, tinfo) < 0) {
                 parallel_print("Error: Could not get file contents\n");
                 opts->err_stat = 1;
-                goto done;
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Error: Could not get file contents\n");
             }
             break;
 
@@ -542,51 +478,48 @@ static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
         default:
             parallel_print("Error: Invalid link type\n");
             opts->err_stat = 1;
-            goto done;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Error: Invalid link type");
             break;
     } /* end of switch */
 
 done:
     if (lnk_info.trg_path)
         HDfree(lnk_info.trg_path);
-    return 0;
+    return ret_value;
 }
 
 
 /*-------------------------------------------------------------------------
  * Function: h5diff
  *
- * Purpose: public function, can be called in an application program.
- *   return differences between 2 HDF5 files
- *
- * Return: Number of differences found.
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: October 22, 2003
+ * Purpose:  public function, can be called in an application program.
+ *           return differences between 2 HDF5 files
  *
+ * Return:   Number of differences found.
  *-------------------------------------------------------------------------
  */
-hsize_t h5diff(const char *fname1,
+hsize_t
+h5diff(const char *fname1,
                const char *fname2,
                const char *objname1,
                const char *objname2,
-               diff_opt_t *options)
+               diff_opt_t *opts)
 {
-    hid_t        file1_id = (-1);
-    hid_t        file2_id = (-1);
-    char         filenames[2][MAX_FILENAME];
-    hsize_t      nfound = 0;
-    int l_ret1 = -1;
-    int l_ret2 = -1;
-    char * obj1fullname = NULL;
-    char * obj2fullname = NULL;
-    int both_objs_grp = 0;
+    int           ret_value = 0;
+    hid_t         file1_id = -1;
+    hid_t         file2_id = -1;
+    char          filenames[2][MAX_FILENAME];
+    hsize_t       nfound = 0;
+    int           l_ret1 = -1;
+    int           l_ret2 = -1;
+    char         *obj1fullname = NULL;
+    char         *obj2fullname = NULL;
+    int           both_objs_grp = 0;
     /* init to group type */
     h5trav_type_t obj1type = H5TRAV_TYPE_GROUP;
     h5trav_type_t obj2type = H5TRAV_TYPE_GROUP;
     /* for single object */
-    H5O_info_t oinfo1, oinfo2; /* object info */
+    H5O_info_t    oinfo1, oinfo2; /* object info */
     trav_info_t  *info1_obj = NULL;
     trav_info_t  *info2_obj = NULL;
     /* for group object */
@@ -596,8 +529,8 @@ hsize_t h5diff(const char *fname1,
     trav_info_t  *info1_lp = NULL;
     trav_info_t  *info2_lp = NULL;
     /* link info from specified object */
-    H5L_info_t src_linfo1;
-    H5L_info_t src_linfo2;
+    H5L_info_t    src_linfo1;
+    H5L_info_t    src_linfo2;
     /* link info from member object */
     h5tool_link_info_t trg_linfo1;
     h5tool_link_info_t trg_linfo2;
@@ -614,37 +547,28 @@ hsize_t h5diff(const char *fname1,
    /*-------------------------------------------------------------------------
     * check invalid combination of options
     *-----------------------------------------------------------------------*/
-    if(!is_valid_options(options))
-        goto out;
+    if(!is_valid_options(opts))
+        HGOTO_DONE(0);
 
-    options->cmn_objs = 1; /* eliminate warning */
+    opts->cmn_objs = 1; /* eliminate warning */
+    opts->err_stat = 0; /* initialize error status */
 
     /*-------------------------------------------------------------------------
     * open the files first; if they are not valid, no point in continuing
     *-------------------------------------------------------------------------
     */
-
-    /* disable error reporting */
-    H5E_BEGIN_TRY
-    {
-        /* open file 1 */
-        if((file1_id = h5tools_fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
-        {
-            parallel_print("h5diff: <%s>: unable to open file\n", fname1);
-            options->err_stat = 1;
-            goto out;
-        } /* end if */
+    /* open file 1 */
+    if((file1_id = h5tools_fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) {
+        parallel_print("h5diff: <%s>: unable to open file\n", fname1);
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "<%s>: unable to open file\n", fname1);
+    } /* end if */
 
 
-        /* open file 2 */
-        if((file2_id = h5tools_fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
-        {
-            parallel_print("h5diff: <%s>: unable to open file\n", fname2);
-            options->err_stat = 1;
-            goto out;
-        } /* end if */
-    /* enable error reporting */
-    } H5E_END_TRY;
+    /* open file 2 */
+    if((file2_id = h5tools_fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) {
+        parallel_print("h5diff: <%s>: unable to open file\n", fname2);
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "<%s>: unable to open file\n", fname2);
+    } /* end if */
 
     /*-------------------------------------------------------------------------
     * Initialize the info structs
@@ -655,18 +579,18 @@ hsize_t h5diff(const char *fname1,
 
     h5difftrace("trav_info_init initialized\n");
     /* if any object is specified */
-    if (objname1)
-    {
+    if (objname1) {
         /* make the given object1 fullpath, start with "/"  */
-        if (HDstrncmp(objname1, "/", 1))
-        {
+        if (HDstrncmp(objname1, "/", 1)) {
 #ifdef H5_HAVE_ASPRINTF
             /* Use the asprintf() routine, since it does what we're trying to do below */
             if(HDasprintf(&obj1fullname, "/%s", objname1) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "name buffer allocation failed");
 #else /* H5_HAVE_ASPRINTF */
             /* (malloc 2 more for "/" and end-of-line) */
-            obj1fullname = (char*)HDmalloc(HDstrlen(objname1) + 2);
+            if ((obj1fullname = (char*)HDmalloc(HDstrlen(objname1) + 2)) == NULL)
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "name buffer allocation failed");
+
             HDstrcpy(obj1fullname, "/");
             HDstrcat(obj1fullname, objname1);
 #endif /* H5_HAVE_ASPRINTF */
@@ -675,15 +599,15 @@ hsize_t h5diff(const char *fname1,
             obj1fullname = HDstrdup(objname1);
 
         /* make the given object2 fullpath, start with "/" */
-        if (HDstrncmp(objname2, "/", 1))
-        {
+        if (HDstrncmp(objname2, "/", 1)) {
 #ifdef H5_HAVE_ASPRINTF
             /* Use the asprintf() routine, since it does what we're trying to do below */
             if(HDasprintf(&obj2fullname, "/%s", objname2) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "name buffer allocation failed");
 #else /* H5_HAVE_ASPRINTF */
             /* (malloc 2 more for "/" and end-of-line) */
-            obj2fullname = (char*)HDmalloc(HDstrlen(objname2) + 2);
+            if ((obj2fullname = (char*)HDmalloc(HDstrlen(objname2) + 2)) == NULL)
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "name buffer allocation failed");
             HDstrcpy(obj2fullname, "/");
             HDstrcat(obj2fullname, objname2);
 #endif /* H5_HAVE_ASPRINTF */
@@ -695,24 +619,19 @@ hsize_t h5diff(const char *fname1,
          * check if obj1 is root, group, single object or symlink
          */
         h5difftrace("h5diff check if obj1 is root, group, single object or symlink\n");
-        if(!HDstrcmp(obj1fullname, "/"))
-        {
+        if(!HDstrcmp(obj1fullname, "/")) {
             obj1type = H5TRAV_TYPE_GROUP;
         }
-        else
-        {
+        else {
             /* check if link itself exist */
-            if(H5Lexists(file1_id, obj1fullname, H5P_DEFAULT) <= 0)
-            {
+            if(H5Lexists(file1_id, obj1fullname, H5P_DEFAULT) <= 0) {
                 parallel_print ("Object <%s> could not be found in <%s>\n", obj1fullname, fname1);
-                options->err_stat = 1;
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Error: Object could not be found");
             }
             /* get info from link */
-            if(H5Lget_info(file1_id, obj1fullname, &src_linfo1, H5P_DEFAULT) < 0)
-            {
+            if(H5Lget_info(file1_id, obj1fullname, &src_linfo1, H5P_DEFAULT) < 0) {
                 parallel_print("Unable to get link info from <%s>\n", obj1fullname);
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Lget_info failed");
             }
 
             info1_lp = info1_obj;
@@ -720,18 +639,15 @@ hsize_t h5diff(const char *fname1,
             /*
              * check the type of specified path for hard and symbolic links
              */
-            if(src_linfo1.type == H5L_TYPE_HARD)
-            {
+            if(src_linfo1.type == H5L_TYPE_HARD) {
                 size_t idx;
 
                 /* optional data pass */
-                info1_obj->opts = (diff_opt_t*)options;
+                info1_obj->opts = (diff_opt_t*)opts;
 
-                if(H5Oget_info_by_name(file1_id, obj1fullname, &oinfo1, H5P_DEFAULT) < 0)
-                {
+                if(H5Oget_info_by_name(file1_id, obj1fullname, &oinfo1, H5P_DEFAULT) < 0) {
                     parallel_print("Error: Could not get file contents\n");
-                    options->err_stat = 1;
-                    goto out;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "Error: Could not get file contents");
                 }
                 obj1type = (h5trav_type_t)oinfo1.type;
                 trav_info_add(info1_obj, obj1fullname, obj1type);
@@ -739,13 +655,11 @@ hsize_t h5diff(const char *fname1,
                 info1_obj->paths[idx].objno = oinfo1.addr;
                 info1_obj->paths[idx].fileno = oinfo1.fileno;
             }
-            else if (src_linfo1.type == H5L_TYPE_SOFT)
-            {
+            else if (src_linfo1.type == H5L_TYPE_SOFT) {
                 obj1type = H5TRAV_TYPE_LINK;
                 trav_info_add(info1_obj, obj1fullname, obj1type);
             }
-            else if (src_linfo1.type == H5L_TYPE_EXTERNAL)
-            {
+            else if (src_linfo1.type == H5L_TYPE_EXTERNAL) {
                 obj1type = H5TRAV_TYPE_UDLINK;
                 trav_info_add(info1_obj, obj1fullname, obj1type);
             }
@@ -755,24 +669,19 @@ hsize_t h5diff(const char *fname1,
          * check if obj2 is root, group, single object or symlink
          */
         h5difftrace("h5diff check if obj2 is root, group, single object or symlink\n");
-        if(!HDstrcmp(obj2fullname, "/"))
-        {
+        if(!HDstrcmp(obj2fullname, "/")) {
             obj2type = H5TRAV_TYPE_GROUP;
         }
-        else
-        {
+        else {
             /* check if link itself exist */
-            if(H5Lexists(file2_id, obj2fullname, H5P_DEFAULT) <= 0)
-            {
+            if(H5Lexists(file2_id, obj2fullname, H5P_DEFAULT) <= 0) {
                 parallel_print ("Object <%s> could not be found in <%s>\n", obj2fullname, fname2);
-                options->err_stat = 1;
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Error: Object could not be found");
             }
             /* get info from link */
-            if(H5Lget_info(file2_id, obj2fullname, &src_linfo2, H5P_DEFAULT) < 0)
-            {
+            if(H5Lget_info(file2_id, obj2fullname, &src_linfo2, H5P_DEFAULT) < 0) {
                 parallel_print("Unable to get link info from <%s>\n", obj2fullname);
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Lget_info failed");
             }
 
             info2_lp = info2_obj;
@@ -780,18 +689,15 @@ hsize_t h5diff(const char *fname1,
             /*
              * check the type of specified path for hard and symbolic links
              */
-            if(src_linfo2.type == H5L_TYPE_HARD)
-            {
+            if(src_linfo2.type == H5L_TYPE_HARD) {
                 size_t idx;
 
                 /* optional data pass */
-                info2_obj->opts = (diff_opt_t*)options;
+                info2_obj->opts = (diff_opt_t*)opts;
 
-                if(H5Oget_info_by_name(file2_id, obj2fullname, &oinfo2, H5P_DEFAULT) < 0)
-                {
+                if(H5Oget_info_by_name(file2_id, obj2fullname, &oinfo2, H5P_DEFAULT) < 0) {
                     parallel_print("Error: Could not get file contents\n");
-                    options->err_stat = 1;
-                    goto out;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "Error: Could not get file contents");
                 }
                 obj2type = (h5trav_type_t)oinfo2.type;
                 trav_info_add(info2_obj, obj2fullname, obj2type);
@@ -799,21 +705,18 @@ hsize_t h5diff(const char *fname1,
                 info2_obj->paths[idx].objno = oinfo2.addr;
                 info2_obj->paths[idx].fileno = oinfo2.fileno;
             }
-            else if (src_linfo2.type == H5L_TYPE_SOFT)
-            {
+            else if (src_linfo2.type == H5L_TYPE_SOFT) {
                 obj2type = H5TRAV_TYPE_LINK;
                 trav_info_add(info2_obj, obj2fullname, obj2type);
             }
-            else if (src_linfo2.type == H5L_TYPE_EXTERNAL)
-            {
+            else if (src_linfo2.type == H5L_TYPE_EXTERNAL) {
                 obj2type = H5TRAV_TYPE_UDLINK;
                 trav_info_add(info2_obj, obj2fullname, obj2type);
             }
         }
     }
     /* if no object specified */
-    else
-    {
+    else {
         h5difftrace("h5diff no object specified\n");
         /* set root group */
         obj1fullname = (char*)HDstrdup("/");
@@ -822,18 +725,17 @@ hsize_t h5diff(const char *fname1,
         obj2type = H5TRAV_TYPE_GROUP;
     }
 
-
+    h5diffdebug2("get any symbolic links info - errstat:%d\n", opts->err_stat);
     /* get any symbolic links info */
-    l_ret1 = H5tools_get_symlink_info(file1_id, obj1fullname, &trg_linfo1, options->follow_links);
-    l_ret2 = H5tools_get_symlink_info(file2_id, obj2fullname, &trg_linfo2, options->follow_links);
+    l_ret1 = H5tools_get_symlink_info(file1_id, obj1fullname, &trg_linfo1, opts->follow_links);
+    l_ret2 = H5tools_get_symlink_info(file2_id, obj2fullname, &trg_linfo2, opts->follow_links);
 
     /*---------------------------------------------
      * check for following symlinks
      */
-    if (options->follow_links)
-    {
+    if (opts->follow_links) {
         /* pass how to handle printing warning to linkinfo option */
-        if(print_warn(options))
+        if(print_warn(opts))
             trg_linfo1.opt.msg_mode = trg_linfo2.opt.msg_mode = 1;
 
         /*-------------------------------
@@ -841,37 +743,29 @@ hsize_t h5diff(const char *fname1,
          */
         h5difftrace("h5diff check symbolic link (object1)\n");
         /* dangling link */
-        if (l_ret1 == 0)
-        {
+        if (l_ret1 == 0) {
             h5difftrace("h5diff ... dangling link\n");
-            if (options->no_dangle_links)
-            {
-                /* treat dangling link is error */
-                if(options->m_verbose)
+            if (opts->no_dangle_links) {
+                /* treat dangling link as error */
+                if(opts->m_verbose)
                     parallel_print("Warning: <%s> is a dangling link.\n", obj1fullname);
-                options->err_stat = 1;
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "treat dangling link as error");
             }
-            else
-            {
-                if(options->m_verbose)
+            else {
+                if(opts->m_verbose)
                     parallel_print("obj1 <%s> is a dangling link.\n", obj1fullname);
-                if (l_ret1 != 0 ||  l_ret2 != 0)
-                {
+                if (l_ret1 != 0 ||  l_ret2 != 0) {
                     nfound++;
                     print_found(nfound);
-                    goto out;
+                    HGOTO_DONE(0);
                 }
             }
         }
-        else if(l_ret1 < 0) /* fail */
-        {
+        else if(l_ret1 < 0) { /* fail */
             parallel_print ("Object <%s> could not be found in <%s>\n", obj1fullname, fname1);
-            options->err_stat = 1;
-            goto out;
+            HGOTO_ERROR(1, H5E_tools_min_id_g, "Object could not be found");
         }
-        else if(l_ret1 != 2) /* symbolic link */
-        {
+        else if(l_ret1 != 2) { /* symbolic link */
             obj1type = (h5trav_type_t)trg_linfo1.trg_type;
             h5difftrace("h5diff ... ... trg_linfo1.trg_type == H5L_TYPE_HARD\n");
             if (info1_lp != NULL) {
@@ -890,37 +784,29 @@ hsize_t h5diff(const char *fname1,
          */
         h5difftrace("h5diff check symbolic link (object2)\n");
         /* dangling link */
-        if (l_ret2 == 0)
-        {
+        if (l_ret2 == 0) {
             h5difftrace("h5diff ... dangling link\n");
-            if (options->no_dangle_links)
-            {
-                /* treat dangling link is error */
-                if(options->m_verbose)
+            if (opts->no_dangle_links) {
+                /* treat dangling link as error */
+                if(opts->m_verbose)
                     parallel_print("Warning: <%s> is a dangling link.\n", obj2fullname);
-                options->err_stat = 1;
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "treat dangling link as error");
             }
-            else
-            {
-                if(options->m_verbose)
+            else {
+                if(opts->m_verbose)
                     parallel_print("obj2 <%s> is a dangling link.\n", obj2fullname);
-                if (l_ret1 != 0 ||  l_ret2 != 0)
-                {
+                if (l_ret1 != 0 || l_ret2 != 0) {
                     nfound++;
                     print_found(nfound);
-                    goto out;
+                    HGOTO_DONE(0);
                 }
             }
         }
-        else if(l_ret2 < 0) /* fail */
-        {
+        else if(l_ret2 < 0) { /* fail */
             parallel_print ("Object <%s> could not be found in <%s>\n", obj2fullname, fname2);
-            options->err_stat = 1;
-            goto out;
+            HGOTO_ERROR(1, H5E_tools_min_id_g, "Object could not be found");
         }
-        else if(l_ret2 != 2)  /* symbolic link */
-        {
+        else if(l_ret2 != 2) {  /* symbolic link */
             obj2type = (h5trav_type_t)trg_linfo2.trg_type;
             if (info2_lp != NULL) {
                 size_t idx = info2_lp->nused - 1;
@@ -941,32 +827,28 @@ hsize_t h5diff(const char *fname1,
     * comparing details of same objects.
     */
 
-    if(!(options->m_verbose || options->m_report))
-    {
-        h5difftrace("h5diff NOT (options->m_verbose || options->m_report)\n");
+    if(!(opts->m_verbose || opts->m_report)) {
+        h5difftrace("h5diff NOT (opts->m_verbose || opts->m_report)\n");
         /* if no danglink links */
-        if ( l_ret1 > 0 && l_ret2 > 0 )
-            if (h5tools_is_obj_same(file1_id, obj1fullname, file2_id, obj2fullname)!=0)
-                goto out;
+        if (l_ret1 > 0 && l_ret2 > 0)
+            if (h5tools_is_obj_same(file1_id, obj1fullname, file2_id, obj2fullname) != 0)
+                HGOTO_DONE(0);
     }
 
     both_objs_grp = (obj1type == H5TRAV_TYPE_GROUP && obj2type == H5TRAV_TYPE_GROUP);
-    if (both_objs_grp)
-    {
+    if (both_objs_grp) {
         h5difftrace("h5diff both_objs_grp TRUE\n");
         /*
          * traverse group1
          */
         trav_info_init(fname1, file1_id, &info1_grp);
         /* optional data pass */
-        info1_grp->opts = (diff_opt_t*)options;
+        info1_grp->opts = (diff_opt_t*)opts;
 
         if(h5trav_visit(file1_id, obj1fullname, TRUE, TRUE,
-                        trav_grp_objs, trav_grp_symlinks, info1_grp) < 0)
-        {
+                        trav_grp_objs, trav_grp_symlinks, info1_grp) < 0) {
             parallel_print("Error: Could not get file contents\n");
-            options->err_stat = 1;
-            goto out;
+            HGOTO_ERROR(1, H5E_tools_min_id_g, "Could not get file contents");
         }
         info1_lp = info1_grp;
 
@@ -975,25 +857,22 @@ hsize_t h5diff(const char *fname1,
          */
         trav_info_init(fname2, file2_id, &info2_grp);
         /* optional data pass */
-        info2_grp->opts = (diff_opt_t*)options;
+        info2_grp->opts = (diff_opt_t*)opts;
 
         if(h5trav_visit(file2_id, obj2fullname, TRUE, TRUE,
-                        trav_grp_objs, trav_grp_symlinks, info2_grp) < 0)
-        {
+                        trav_grp_objs, trav_grp_symlinks, info2_grp) < 0) {
             parallel_print("Error: Could not get file contents\n");
-            options->err_stat = 1;
-            goto out;
-        } /* end if */
+            HGOTO_ERROR(1, H5E_tools_min_id_g, "Could not get file contents");
+       } /* end if */
         info2_lp = info2_grp;
     }
+    h5diffdebug2("groups traversed - errstat:%d\n", opts->err_stat);
 
 #ifdef H5_HAVE_PARALLEL
-    if(g_Parallel)
-    {
+    if(g_Parallel) {
         int i;
 
-        if((HDstrlen(fname1) > MAX_FILENAME) || (HDstrlen(fname2) > MAX_FILENAME))
-        {
+        if((HDstrlen(fname1) > MAX_FILENAME) || (HDstrlen(fname2) > MAX_FILENAME)) {
             HDfprintf(stderr, "The parallel diff only supports path names up to %d characters\n", MAX_FILENAME);
             MPI_Abort(MPI_COMM_WORLD, 0);
         } /* end if */
@@ -1008,15 +887,12 @@ hsize_t h5diff(const char *fname1,
 #endif
 
     /* process the objects */
-    build_match_list (obj1fullname, info1_lp, obj2fullname, info2_lp,
-                     &match_list, options);
-    if (both_objs_grp)
-    {
+    build_match_list (obj1fullname, info1_lp, obj2fullname, info2_lp, &match_list, opts);
+    if (both_objs_grp) {
         /*------------------------------------------------------
          * print the list
          */
-         if(options->m_verbose)
-         {
+         if(opts->m_verbose) {
              unsigned u;
 
              parallel_print("\n");
@@ -1026,8 +902,7 @@ hsize_t h5diff(const char *fname1,
              else
                  parallel_print("file1     file2\n");
              parallel_print("---------------------------------------\n");
-             for(u = 0; u < match_list->nobjs; u++)
-             {
+             for(u = 0; u < match_list->nobjs; u++) {
                  char c1, c2;
                  c1 = (match_list->objs[u].flags[0]) ? 'x' : ' ';
                  c2 = (match_list->objs[u].flags[1]) ? 'x' : ' ';
@@ -1038,9 +913,11 @@ hsize_t h5diff(const char *fname1,
     }
     nfound = diff_match(file1_id, obj1fullname, info1_lp,
                         file2_id, obj2fullname, info2_lp,
-                        match_list, options);
+                        match_list, opts);
+
+done:
+    opts->err_stat = opts->err_stat | ret_value;
 
-out:
 #ifdef H5_HAVE_PARALLEL
     if(g_Parallel)
         /* All done at this point, let tasks know that they won't be needed */
@@ -1075,6 +952,7 @@ out:
         H5Fclose(file1_id);
         H5Fclose(file2_id);
     } H5E_END_TRY;
+
     h5difftrace("h5diff finish\n");
 
     return nfound;
@@ -1085,43 +963,34 @@ out:
 /*-------------------------------------------------------------------------
  * Function: diff_match
  *
- * Purpose:
- *  Compare common objects in given groups according to table structure.
- *  The table structure has flags which can be used to find common objects
- *  and will be compared.
- *  Common object means same name (absolute path) objects in both location.
- *
- * Return: Number of differences found
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Purpose:  Compare common objects in given groups according to table structure.
+ *           The table structure has flags which can be used to find common objects
+ *           and will be compared.
+ *           Common object means same name (absolute path) objects in both location.
  *
- * Date: May 9, 2003
+ * Return:   Number of differences found
  *
- * Modifications: Jan 2005 Leon Arber, larber@uiuc.edu
- *    Added support for parallel diffing
- *
- * Pedro Vicente, pvn@hdfgroup.org, Nov 4, 2008
- *    Compare the graph and make h5diff return 1 for difference if
- * 1) the number of objects in file1 is not the same as in file2
- * 2) the graph does not match, i.e same names (absolute path)
- * 3) objects with the same name are not of the same type
+ * Modifications: Compare the graph and make h5diff return 1 for difference if
+ *           1) the number of objects in file1 is not the same as in file2
+ *           2) the graph does not match, i.e same names (absolute path)
+ *           3) objects with the same name are not of the same type
  *-------------------------------------------------------------------------
  */
-hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
+hsize_t
+diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
                    hid_t file2_id, const char *grp2, trav_info_t *info2,
-                   trav_table_t *table, diff_opt_t *options)
+                   trav_table_t *table, diff_opt_t *opts)
 {
     hsize_t      nfound = 0;
     unsigned     i;
-
-    const char * grp1_path = "";
-    const char * grp2_path = "";
-    char * obj1_fullpath = NULL;
-    char * obj2_fullpath = NULL;
-    diff_args_t argdata;
-    size_t idx1 = 0;
-    size_t idx2 = 0;
-
+    int          ret_value = opts->err_stat;
+    const char  *grp1_path = "";
+    const char  *grp2_path = "";
+    char        *obj1_fullpath = NULL;
+    char        *obj2_fullpath = NULL;
+    diff_args_t  argdata;
+    size_t       idx1 = 0;
+    size_t       idx2 = 0;
 
     h5difftrace("diff_match start\n");
     /*
@@ -1134,85 +1003,89 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
         grp2_path = grp2;
 
     /*-------------------------------------------------------------------------
-    * regarding the return value of h5diff (0, no difference in files, 1 difference )
-    * 1) the number of objects in file1 must be the same as in file2
-    * 2) the graph must match, i.e same names (absolute path)
-    * 3) objects with the same name must be of the same type
-    *-------------------------------------------------------------------------
-    */
+     * regarding the return value of h5diff (0, no difference in files, 1 difference )
+     * 1) the number of objects in file1 must be the same as in file2
+     * 2) the graph must match, i.e same names (absolute path)
+     * 3) objects with the same name must be of the same type
+     *-------------------------------------------------------------------------
+     */
 
     /* not valid compare used when --exclude-path option is used */
-    if (!options->exclude_path)
-    {
+    if (!opts->exclude_path) {
         /* number of different objects */
-        if ( info1->nused != info2->nused )
-        {
-            options->contents = 0;
+        if (info1->nused != info2->nused) {
+            opts->contents = 0;
         }
     }
 
     /* objects in one file and not the other */
-    for( i = 0; i < table->nobjs; i++)
-    {
-        if( table->objs[i].flags[0] != table->objs[i].flags[1] )
-        {
-            options->contents = 0;
+    for(i = 0; i < table->nobjs; i++) {
+        if(table->objs[i].flags[0] != table->objs[i].flags[1]) {
+            opts->contents = 0;
             break;
         }
     }
 
-
     /*-------------------------------------------------------------------------
-    * do the diff for common objects
-    *-------------------------------------------------------------------------
-    */
+     * do the diff for common objects
+     *-------------------------------------------------------------------------
+     */
 #ifdef H5_HAVE_PARALLEL
     {
-    char *workerTasks = (char*)HDmalloc((g_nTasks - 1) * sizeof(char));
-    int n;
-    int busyTasks = 0;
-    struct diffs_found nFoundbyWorker;
-    struct diff_mpi_args args;
-    int havePrintToken = 1;
-    MPI_Status Status;
-
-    /*set all tasks as free */
-    HDmemset(workerTasks, 1, (g_nTasks - 1));
+        char *workerTasks = (char*)HDmalloc((g_nTasks - 1) * sizeof(char));
+        int   n;
+        int   busyTasks = 0;
+        struct diffs_found nFoundbyWorker;
+        struct diff_mpi_args args;
+        int   havePrintToken = 1;
+        MPI_Status Status;
+
+        /*set all tasks as free */
+        HDmemset(workerTasks, 1, (g_nTasks - 1));
 #endif
 
-    for(i = 0; i < table->nobjs; i++)
-    {
-        if( table->objs[i].flags[0] && table->objs[i].flags[1])
-        {
+    for(i = 0; i < table->nobjs; i++) {
+        h5diffdebug3("diff for common objects[%d] - errstat:%d\n", i, opts->err_stat);
+        if(table->objs[i].flags[0] && table->objs[i].flags[1]) {
             /* make full path for obj1 */
 #ifdef H5_HAVE_ASPRINTF
             /* Use the asprintf() routine, since it does what we're trying to do below */
-            if(HDasprintf(&obj1_fullpath, "%s%s", grp1_path, table->objs[i].name) < 0)
-                goto out;
+            if(HDasprintf(&obj1_fullpath, "%s%s", grp1_path, table->objs[i].name) < 0) {
+                HERROR(1, H5E_tools_min_id_g, "name buffer allocation failed");
+            }
 #else /* H5_HAVE_ASPRINTF */
-            obj1_fullpath = (char*)HDmalloc(HDstrlen(grp1_path) + HDstrlen(table->objs[i].name) + 1);
-            HDstrcpy(obj1_fullpath, grp1_path);
-            HDstrcat(obj1_fullpath, table->objs[i].name);
+            if((obj1_fullpath = (char*)HDmalloc(HDstrlen(grp1_path) + HDstrlen(table->objs[i].name) + 1)) == NULL) {
+                HERROR(1, H5E_tools_min_id_g, "name buffer allocation failed");
+            }
+            else {
+                HDstrcpy(obj1_fullpath, grp1_path);
+                HDstrcat(obj1_fullpath, table->objs[i].name);
+            }
 #endif /* H5_HAVE_ASPRINTF */
+            h5diffdebug2("diff_match path1 - %s\n", obj1_fullpath);
 
             /* make full path for obj2 */
 #ifdef H5_HAVE_ASPRINTF
             /* Use the asprintf() routine, since it does what we're trying to do below */
-            if(HDasprintf(&obj2_fullpath, "%s%s", grp2_path, table->objs[i].name) < 0)
-                goto out;
+            if(HDasprintf(&obj2_fullpath, "%s%s", grp2_path, table->objs[i].name) < 0) {
+                HERROR(1, H5E_tools_min_id_g, "name buffer allocation failed");
+            }
 #else /* H5_HAVE_ASPRINTF */
-            obj2_fullpath = (char*)HDmalloc(HDstrlen(grp2_path) + HDstrlen(table->objs[i].name) + 1);
-            HDstrcpy(obj2_fullpath, grp2_path);
-            HDstrcat(obj2_fullpath, table->objs[i].name);
+            if((obj2_fullpath = (char*)HDmalloc(HDstrlen(grp2_path) + HDstrlen(table->objs[i].name) + 1)) == NULL) {
+                HERROR(1, H5E_tools_min_id_g, "name buffer allocation failed");
+            }
+            else {
+                HDstrcpy(obj2_fullpath, grp2_path);
+                HDstrcat(obj2_fullpath, table->objs[i].name);
+            }
 #endif /* H5_HAVE_ASPRINTF */
+            h5diffdebug2("diff_match path2 - %s\n", obj2_fullpath);
 
             /* get index to figure out type of the object in file1 */
-            while(info1->paths[idx1].path &&
-                    (HDstrcmp(obj1_fullpath, info1->paths[idx1].path) != 0))
+            while(info1->paths[idx1].path && (HDstrcmp(obj1_fullpath, info1->paths[idx1].path) != 0))
                 idx1++;
             /* get index to figure out type of the object in file2 */
-            while(info2->paths[idx2].path &&
-                    (HDstrcmp(obj2_fullpath, info2->paths[idx2].path) != 0))
+            while(info2->paths[idx2].path && (HDstrcmp(obj2_fullpath, info2->paths[idx2].path) != 0))
                 idx2++;
 
             /* Set argdata to pass other args into diff() */
@@ -1220,16 +1093,14 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
             argdata.type[1] = info2->paths[idx2].type;
             argdata.is_same_trgobj = table->objs[i].is_same_trgobj;
 
-            options->cmn_objs = 1;
-            if(!g_Parallel)
-            {
+            opts->cmn_objs = 1;
+            if(!g_Parallel) {
                 nfound += diff(file1_id, obj1_fullpath,
                                file2_id, obj2_fullpath,
-                               options, &argdata);
+                            opts, &argdata);
             } /* end if */
 #ifdef H5_HAVE_PARALLEL
-            else
-            {
+            else {
                 int workerFound = 0;
 
                 h5difftrace("Beginning of big else block\n");
@@ -1243,8 +1114,7 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
 
                 /*Set up args to pass to worker task. */
                 if(HDstrlen(obj1_fullpath) > 255 ||
-                   HDstrlen(obj2_fullpath) > 255)
-                {
+                   HDstrlen(obj2_fullpath) > 255) {
                     printf("The parallel diff only supports object names up to 255 characters\n");
                     MPI_Abort(MPI_COMM_WORLD, 0);
                 } /* end if */
@@ -1252,32 +1122,29 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
                 /* set args struct to pass */
                 HDstrcpy(args.name1, obj1_fullpath);
                 HDstrcpy(args.name2, obj2_fullpath);
-                args.options = *options;
+                args.opts = *opts;
                 args.argdata.type[0] = info1->paths[idx1].type;
                 args.argdata.type[1] = info2->paths[idx2].type;
                 args.argdata.is_same_trgobj = table->objs[i].is_same_trgobj;
 
                 /* if there are any outstanding print requests, let's handle one. */
-                if(busyTasks > 0)
-                {
+                if(busyTasks > 0) {
                     int incomingMessage;
 
                     /* check if any tasks freed up, and didn't need to print. */
                     MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &incomingMessage, &Status);
 
                     /* first block*/
-                    if(incomingMessage)
-                    {
+                    if(incomingMessage) {
                         workerTasks[Status.MPI_SOURCE - 1] = 1;
                         MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
                         nfound += nFoundbyWorker.nfound;
-                        options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
+                        opts->not_cmp = opts->not_cmp | nFoundbyWorker.not_cmp;
                         busyTasks--;
                     } /* end if */
 
                     /* check to see if the print token was returned. */
-                    if(!havePrintToken)
-                    {
+                    if(!havePrintToken) {
                         /* If we don't have the token, someone is probably sending us output */
                         print_incoming_data();
 
@@ -1289,19 +1156,17 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
                             workerTasks[Status.MPI_SOURCE - 1] = 1;
                             MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
                             nfound += nFoundbyWorker.nfound;
-                            options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
+                            opts->not_cmp = opts->not_cmp | nFoundbyWorker.not_cmp;
                             busyTasks--;
                             havePrintToken = 1;
                         } /* end if */
                     } /* end if */
 
                     /* check to see if anyone needs the print token. */
-                    if(havePrintToken)
-                    {
+                    if(havePrintToken) {
                         /* check incoming queue for print token requests */
                         MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &incomingMessage, &Status);
-                        if(incomingMessage)
-                        {
+                        if(incomingMessage) {
                             MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
                             MPI_Send(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
                             havePrintToken = 0;
@@ -1312,10 +1177,8 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
                 /* check array of tasks to see which ones are free.
                 * Manager task never does work, so freeTasks[0] is really
                 * worker task 0. */
-                for(n = 1; (n < g_nTasks) && !workerFound; n++)
-                {
-                    if(workerTasks[n-1])
-                    {
+                for(n = 1; (n < g_nTasks) && !workerFound; n++) {
+                    if(workerTasks[n-1]) {
                         /* send file id's and names to first free worker */
                         MPI_Send(&args, sizeof(args), MPI_BYTE, n, MPI_TAG_ARGS, MPI_COMM_WORLD);
 
@@ -1328,55 +1191,47 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
                     } /* end if */
                 } /* end for */
 
-                if(!workerFound)
-                {
+                if(!workerFound) {
                     /* if they were all busy, we've got to wait for one free up
                      *  before we can move on.  If we don't have the token, some
                      * task is currently printing so we'll wait for that task to
                      * return it.
                      */
 
-                    if(!havePrintToken)
-                    {
-                        while(!havePrintToken)
-                        {
+                    if(!havePrintToken) {
+                        while(!havePrintToken) {
                             int incomingMessage;
 
                             print_incoming_data();
                             MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
-                            if(incomingMessage)
-                            {
+                            if(incomingMessage) {
                                 MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
                                 havePrintToken = 1;
                                 nfound += nFoundbyWorker.nfound;
-                                options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
+                                opts->not_cmp = opts->not_cmp | nFoundbyWorker.not_cmp;
                                 /* send this task the work unit. */
                                 MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
                             } /* end if */
                         } /* end while */
                     } /* end if */
                     /* if we do have the token, check for task to free up, or wait for a task to request it */
-                    else
-                    {
+                    else {
                         /* But first print all the data in our incoming queue */
                         print_incoming_data();
                         MPI_Probe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
-                        if(Status.MPI_TAG == MPI_TAG_DONE)
-                        {
+                        if(Status.MPI_TAG == MPI_TAG_DONE) {
                             MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
                             nfound += nFoundbyWorker.nfound;
-                            options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
+                            opts->not_cmp = opts->not_cmp | nFoundbyWorker.not_cmp;
                             MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
                         } /* end if */
-                        else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST)
-                        {
+                        else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST) {
                             int incomingMessage;
 
                             MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
                             MPI_Send(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
 
-                            do
-                            {
+                            do {
                                 MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
 
                                 print_incoming_data();
@@ -1384,11 +1239,10 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
 
                             MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
                             nfound += nFoundbyWorker.nfound;
-                            options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
+                            opts->not_cmp = opts->not_cmp | nFoundbyWorker.not_cmp;
                             MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
                         } /* end else-if */
-                        else
-                        {
+                        else {
                             printf("ERROR: Invalid tag (%d) received \n", Status.MPI_TAG);
                             MPI_Abort(MPI_COMM_WORLD, 0);
                             MPI_Finalize();
@@ -1403,27 +1257,22 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
                 HDfree(obj2_fullpath);
         } /* end if */
     } /* end for */
-    h5difftrace("done with for loop\n");
+    h5diffdebug2("done with for loop - errstat:%d\n", opts->err_stat);
 
 #ifdef H5_HAVE_PARALLEL
-    if(g_Parallel)
-    {
+    if(g_Parallel) {
         /* make sure all tasks are done */
-        while(busyTasks > 0)
-        {
+        while(busyTasks > 0) {
             MPI_Probe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
-            if(Status.MPI_TAG == MPI_TAG_DONE)
-            {
+            if(Status.MPI_TAG == MPI_TAG_DONE) {
                 MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
                 nfound += nFoundbyWorker.nfound;
-                options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
+                opts->not_cmp = opts->not_cmp | nFoundbyWorker.not_cmp;
                 busyTasks--;
             } /* end if */
-            else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST)
-            {
+            else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST) {
                 MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
-                if(havePrintToken)
-                {
+                if(havePrintToken) {
                     int incomingMessage;
 
                     MPI_Send(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
@@ -1436,17 +1285,15 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
 
                     MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
                     nfound += nFoundbyWorker.nfound;
-                    options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
+                    opts->not_cmp = opts->not_cmp | nFoundbyWorker.not_cmp;
                     busyTasks--;
                 } /* end if */
                 /* someone else must have it...wait for them to return it, then give it to the task that just asked for it. */
-                else
-                {
+                else {
                     int source = Status.MPI_SOURCE;
                     int incomingMessage;
 
-                    do
-                    {
+                    do {
                         MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
 
                         print_incoming_data();
@@ -1455,21 +1302,19 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
 
                     MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
                     nfound += nFoundbyWorker.nfound;
-                    options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
+                    opts->not_cmp = opts->not_cmp | nFoundbyWorker.not_cmp;
                     busyTasks--;
                     MPI_Send(NULL, 0, MPI_BYTE, source, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
                 } /* end else */
             } /* end else-if */
-            else if(Status.MPI_TAG == MPI_TAG_TOK_RETURN)
-            {
+            else if(Status.MPI_TAG == MPI_TAG_TOK_RETURN) {
                 MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
                 nfound += nFoundbyWorker.nfound;
-                options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
+                opts->not_cmp = opts->not_cmp | nFoundbyWorker.not_cmp;
                 busyTasks--;
                 havePrintToken = 1;
             } /* end else-if */
-            else if(Status.MPI_TAG == MPI_TAG_PRINT_DATA)
-            {
+            else if(Status.MPI_TAG == MPI_TAG_PRINT_DATA) {
                 char  data[PRINT_DATA_MAX_SIZE + 1];
                 HDmemset(data, 0, PRINT_DATA_MAX_SIZE + 1);
 
@@ -1477,8 +1322,7 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
 
                 printf("%s", data);
             } /* end else-if */
-            else
-            {
+            else {
                 printf("ph5diff-manager: ERROR!! Invalid tag (%d) received \n", Status.MPI_TAG);
                 MPI_Abort(MPI_COMM_WORLD, 0);
             } /* end else */
@@ -1497,10 +1341,12 @@ hsize_t diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
 #endif /* H5_HAVE_PARALLEL */
 
 out:
-    /* free table */
+    opts->err_stat = opts->err_stat | ret_value;
+
+/* free table */
     if (table)
         trav_table_free(table);
-    h5difftrace("diff_match finish\n");
+    h5diffdebug2("diff_match finish:%d\n", nfound);
 
     return nfound;
 }
@@ -1509,47 +1355,36 @@ out:
 /*-------------------------------------------------------------------------
  * Function: diff
  *
- * Purpose: switch between types and choose the diff function
- * TYPE is either
- *  H5G_GROUP         Object is a group
- *  H5G_DATASET       Object is a dataset
- *  H5G_TYPE          Object is a named data type
- *  H5G_LINK          Object is a symbolic link
- *
- * Return: Number of differences found
- *
- * Programmer: Jonathan Kim
- *  - Move follow symlinks code toward top. (March 2812)
- *  - Add following symlinks feature (Feb 11,2010)
- *  - Change to use diff_args_t to pass the rest of args.
- *    Passing through it instead of individual args provides smoother
- *    extensibility through its members along with MPI code update for ph5diff
- *    as it doesn't require interface change.
- *    (May 6,2011)
+ * Purpose:  switch between types and choose the diff function
+ *           TYPE is either
+ *               H5G_GROUP         Object is a group
+ *               H5G_DATASET       Object is a dataset
+ *               H5G_TYPE          Object is a named data type
+ *               H5G_LINK          Object is a symbolic link
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- * Date: May 9, 2003
+ * Return:   Number of differences found
  *-------------------------------------------------------------------------
  */
-
-hsize_t diff(hid_t file1_id,
+hsize_t
+diff(hid_t file1_id,
               const char *path1,
               hid_t file2_id,
               const char *path2,
-              diff_opt_t * options,
+              diff_opt_t * opts,
               diff_args_t *argdata)
 {
-    hid_t   dset1_id = (-1);
-    hid_t   dset2_id = (-1);
-    hid_t   type1_id = (-1);
-    hid_t   type2_id = (-1);
-    hid_t   grp1_id = (-1);
-    hid_t   grp2_id = (-1);
-    int     ret;
-    hbool_t     is_dangle_link1 = FALSE;
-    hbool_t     is_dangle_link2 = FALSE;
-    hbool_t     is_hard_link = FALSE;
-    hsize_t nfound = 0;
+    int           ret_value = opts->err_stat;
+    int           status = -1;
+    hid_t         dset1_id = -1;
+    hid_t         dset2_id = -1;
+    hid_t         type1_id = -1;
+    hid_t         type2_id = -1;
+    hid_t         grp1_id = -1;
+    hid_t         grp2_id = -1;
+    hbool_t       is_dangle_link1 = FALSE;
+    hbool_t       is_dangle_link2 = FALSE;
+    hbool_t       is_hard_link = FALSE;
+    hsize_t       nfound = 0;
     h5trav_type_t object_type;
 
     /* to get link info */
@@ -1559,11 +1394,11 @@ hsize_t diff(hid_t file1_id,
     h5difftrace("diff start\n");
 
     /*init link info struct */
-    HDmemset(&linkinfo1,0,sizeof(h5tool_link_info_t));
-    HDmemset(&linkinfo2,0,sizeof(h5tool_link_info_t));
+    HDmemset(&linkinfo1, 0, sizeof(h5tool_link_info_t));
+    HDmemset(&linkinfo2, 0, sizeof(h5tool_link_info_t));
 
     /* pass how to handle printing warnings to linkinfo option */
-    if(print_warn(options))
+    if(print_warn(opts))
         linkinfo1.opt.msg_mode = linkinfo2.opt.msg_mode = 1;
 
     /* for symbolic links, take care follow symlink and no dangling link
@@ -1571,78 +1406,69 @@ hsize_t diff(hid_t file1_id,
     if (argdata->type[0] == H5TRAV_TYPE_LINK ||
         argdata->type[0] == H5TRAV_TYPE_UDLINK ||
         argdata->type[1] == H5TRAV_TYPE_LINK ||
-        argdata->type[1] == H5TRAV_TYPE_UDLINK )
-    {
+        argdata->type[1] == H5TRAV_TYPE_UDLINK) {
         /*
          * check dangling links for path1 and path2
          */
 
         /* target object1 - get type and name */
-        ret = H5tools_get_symlink_info(file1_id, path1, &linkinfo1, options->follow_links);
+        if ((status = H5tools_get_symlink_info(file1_id, path1, &linkinfo1, opts->follow_links)) < 0)
+            HGOTO_ERROR(1, H5E_tools_min_id_g, "H5tools_get_symlink_info failed");
+
         /* dangling link */
-        if (ret == 0)
-        {
-            if (options->no_dangle_links)
-            {
+        if (status == 0) {
+            if (opts->no_dangle_links) {
                 /* dangling link is error */
-                if(options->m_verbose)
+                if(opts->m_verbose)
                     parallel_print("Warning: <%s> is a dangling link.\n", path1);
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "dangling link is error");
             }
             else
                 is_dangle_link1 = TRUE;
         }
-        else if (ret < 0)
-            goto out;
 
         /* target object2 - get type and name */
-        ret = H5tools_get_symlink_info(file2_id, path2, &linkinfo2, options->follow_links );
+        if ((status = H5tools_get_symlink_info(file2_id, path2, &linkinfo2, opts->follow_links)) < 0)
+            HGOTO_ERROR(1, H5E_tools_min_id_g, "H5tools_get_symlink_info failed");
         /* dangling link */
-        if (ret == 0)
-        {
-            if (options->no_dangle_links)
-            {
+        if (status == 0) {
+            if (opts->no_dangle_links) {
                 /* dangling link is error */
-                if(options->m_verbose)
+                if(opts->m_verbose)
                     parallel_print("Warning: <%s> is a dangling link.\n", path2);
-                goto out;
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "dangling link is error");
             }
             else
                 is_dangle_link2 = TRUE;
         }
-        else if (ret < 0)
-            goto out;
 
         /* found dangling link */
-        if (is_dangle_link1 || is_dangle_link2)
-            goto out2;
+        if (is_dangle_link1 || is_dangle_link2) {
+            HGOTO_DONE(0);
+        }
 
         /* follow symbolic link option */
-        if (options->follow_links)
-        {
+        if (opts->follow_links) {
             if (linkinfo1.linfo.type == H5L_TYPE_SOFT ||
                     linkinfo1.linfo.type == H5L_TYPE_EXTERNAL)
                 argdata->type[0] = (h5trav_type_t)linkinfo1.trg_type;
 
-            if (linkinfo2.linfo.type == H5L_TYPE_SOFT ||
-                    linkinfo2.linfo.type == H5L_TYPE_EXTERNAL)
+            if (linkinfo2.linfo.type == H5L_TYPE_SOFT || linkinfo2.linfo.type == H5L_TYPE_EXTERNAL)
                 argdata->type[1] = (h5trav_type_t)linkinfo2.trg_type;
         }
     }
     /* if objects are not the same type */
-    if (argdata->type[0] != argdata->type[1])
-    {
-        if (options->m_verbose||options->m_list_not_cmp)
-        {
+    if (argdata->type[0] != argdata->type[1]) {
+        if (opts->m_verbose||opts->m_list_not_cmp) {
             parallel_print("Not comparable: <%s> is of type %s and <%s> is of type %s\n",
             path1, get_type(argdata->type[0]),
             path2, get_type(argdata->type[1]));
         }
-        options->not_cmp=1;
+        opts->not_cmp = 1;
         /* TODO: will need to update non-comparable is different
-         * options->contents = 0;
+         * opts->contents = 0;
          */
-        goto out2;
+        HGOTO_DONE(0);
     }
     else /* now both object types are same */
         object_type = argdata->type[0];
@@ -1655,88 +1481,79 @@ hsize_t diff(hid_t file1_id,
      *
      * Perform this to match the outputs as bypassing.
      */
-     if (argdata->is_same_trgobj)
-     {
+     if (argdata->is_same_trgobj) {
         h5difftrace("argdata->is_same_trgobj\n");
         is_hard_link = (object_type == H5TRAV_TYPE_DATASET ||
                         object_type == H5TRAV_TYPE_NAMED_DATATYPE ||
                         object_type == H5TRAV_TYPE_GROUP);
-        if (options->follow_links || is_hard_link)
-        {
+        if (opts->follow_links || is_hard_link) {
             /* print information is only verbose option is used */
-            if(options->m_verbose || options->m_report)
-            {
-                switch(object_type)
-                {
+            if(opts->m_verbose || opts->m_report) {
+                switch(object_type) {
                     case H5TRAV_TYPE_DATASET:
-                        do_print_objname("dataset", path1, path2, options);
+                        do_print_objname("dataset", path1, path2, opts);
                         break;
                     case H5TRAV_TYPE_NAMED_DATATYPE:
-                        do_print_objname("datatype", path1, path2, options);
+                        do_print_objname("datatype", path1, path2, opts);
                         break;
                     case H5TRAV_TYPE_GROUP:
-                        do_print_objname("group", path1, path2, options);
+                        do_print_objname("group", path1, path2, opts);
                         break;
                     case H5TRAV_TYPE_LINK:
-                        do_print_objname("link", path1, path2, options);
+                        do_print_objname("link", path1, path2, opts);
                         break;
                     case H5TRAV_TYPE_UDLINK:
                         if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL && linkinfo2.linfo.type == H5L_TYPE_EXTERNAL)
-                            do_print_objname("external link", path1, path2, options);
+                            do_print_objname("external link", path1, path2, opts);
                         else
-                            do_print_objname ("user defined link", path1, path2, options);
+                            do_print_objname ("user defined link", path1, path2, opts);
                         break;
                     case H5TRAV_TYPE_UNKNOWN:
                     default:
                         parallel_print("Comparison not supported: <%s> and <%s> are of type %s\n",
                             path1, path2, get_type(object_type) );
-                        options->not_cmp = 1;
+                        opts->not_cmp = 1;
                         break;
                 } /* switch(type)*/
 
                 print_found(nfound);
-            } /* if(options->m_verbose || options->m_report) */
+            } /* if(opts->m_verbose || opts->m_report) */
 
             /* exact same, so comparison is done */
-            goto out2;
+            HGOTO_DONE(0);
         }
     }
 
-    switch(object_type)
-    {
+    switch(object_type) {
        /*----------------------------------------------------------------------
         * H5TRAV_TYPE_DATASET
         *----------------------------------------------------------------------
         */
         case H5TRAV_TYPE_DATASET:
             if((dset1_id = H5Dopen2(file1_id, path1, H5P_DEFAULT)) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dopen2 failed");
             if((dset2_id = H5Dopen2(file2_id, path2, H5P_DEFAULT)) < 0)
-                goto out;
-      /* verbose (-v) and report (-r) mode */
-            if(options->m_verbose || options->m_report)
-            {
-                do_print_objname("dataset", path1, path2, options);
-                nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dopen2 failed");
+            /* verbose (-v) and report (-r) mode */
+            if(opts->m_verbose || opts->m_report) {
+                do_print_objname("dataset", path1, path2, opts);
+                nfound = diff_dataset(file1_id, file2_id, path1, path2, opts);
                 print_found(nfound);
             }
             /* quiet mode (-q), just count differences */
-            else if(options->m_quiet)
-            {
-                nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
+            else if(opts->m_quiet) {
+                nfound = diff_dataset(file1_id, file2_id, path1, path2, opts);
             }
-      /* the rest (-c, none, ...) */
-            else
-            {
-                nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
+            /* the rest (-c, none, ...) */
+            else {
+                nfound = diff_dataset(file1_id, file2_id, path1, path2, opts);
                 /* print info if difference found  */
-                if (nfound)
-                {
-                    do_print_objname("dataset", path1, path2, options);
+                if (nfound) {
+                    do_print_objname("dataset", path1, path2, opts);
                     print_found(nfound);
                 }
             }
-
+            h5diffdebug2("diff after dataset:%d\n", nfound);
 
             /*---------------------------------------------------------
              * compare attributes
@@ -1745,13 +1562,13 @@ hsize_t diff(hid_t file1_id,
              *---------------------------------------------------------
              */
             if(path1)
-                nfound += diff_attr(dset1_id, dset2_id, path1, path2, options);
+                nfound += diff_attr(dset1_id, dset2_id, path1, path2, opts);
 
 
             if(H5Dclose(dset1_id) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dclose failed");
             if(H5Dclose(dset2_id) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dclose failed");
             break;
 
        /*----------------------------------------------------------------------
@@ -1760,21 +1577,21 @@ hsize_t diff(hid_t file1_id,
         */
         case H5TRAV_TYPE_NAMED_DATATYPE:
             if((type1_id = H5Topen2(file1_id, path1, H5P_DEFAULT)) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Topen2 failed");
             if((type2_id = H5Topen2(file2_id, path2, H5P_DEFAULT)) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Topen2 failed");
 
-            if((ret = H5Tequal(type1_id, type2_id)) < 0)
-                goto out;
+            if((status = H5Tequal(type1_id, type2_id)) < 0)
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tequal failed");
 
             /* if H5Tequal is > 0 then the datatypes refer to the same datatype */
-            nfound = (ret > 0) ? 0 : 1;
+            nfound = (status > 0) ? 0 : 1;
 
-            if(print_objname(options,nfound))
-                do_print_objname("datatype", path1, path2, options);
+            if(print_objname(opts, nfound))
+                do_print_objname("datatype", path1, path2, opts);
 
             /* always print the number of differences found in verbose mode */
-            if(options->m_verbose)
+            if(opts->m_verbose)
                 print_found(nfound);
 
             /*-----------------------------------------------------------------
@@ -1784,12 +1601,12 @@ hsize_t diff(hid_t file1_id,
              *-----------------------------------------------------------------
              */
             if(path1)
-                nfound += diff_attr(type1_id, type2_id, path1, path2, options);
+                nfound += diff_attr(type1_id, type2_id, path1, path2, opts);
 
             if(H5Tclose(type1_id) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose failed");
             if(H5Tclose(type2_id) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose failed");
             break;
 
        /*----------------------------------------------------------------------
@@ -1797,17 +1614,17 @@ hsize_t diff(hid_t file1_id,
         *----------------------------------------------------------------------
         */
         case H5TRAV_TYPE_GROUP:
-            if(print_objname(options, nfound))
-                do_print_objname("group", path1, path2, options);
+            if(print_objname(opts, nfound))
+                do_print_objname("group", path1, path2, opts);
 
             /* always print the number of differences found in verbose mode */
-            if(options->m_verbose)
+            if(opts->m_verbose)
                 print_found(nfound);
 
             if((grp1_id = H5Gopen2(file1_id, path1, H5P_DEFAULT)) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Gclose failed");
             if((grp2_id = H5Gopen2(file2_id, path2, H5P_DEFAULT)) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Gclose failed");
 
             /*-----------------------------------------------------------------
              * compare attributes
@@ -1816,12 +1633,12 @@ hsize_t diff(hid_t file1_id,
              *-----------------------------------------------------------------
              */
             if(path1)
-                nfound += diff_attr(grp1_id, grp2_id, path1, path2, options);
+                nfound += diff_attr(grp1_id, grp2_id, path1, path2, opts);
 
             if(H5Gclose(grp1_id) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Gclose failed");
             if(H5Gclose(grp2_id) < 0)
-                goto out;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Gclose failed");
             break;
 
 
@@ -1831,19 +1648,19 @@ hsize_t diff(hid_t file1_id,
         */
         case H5TRAV_TYPE_LINK:
             {
-            ret = HDstrcmp(linkinfo1.trg_path, linkinfo2.trg_path);
+                status = HDstrcmp(linkinfo1.trg_path, linkinfo2.trg_path);
 
-            /* if the target link name is not same then the links are "different" */
-            nfound = (ret != 0) ? 1 : 0;
+                /* if the target link name is not same then the links are "different" */
+                nfound = (status != 0) ? 1 : 0;
 
-            if(print_objname(options, nfound))
-                do_print_objname("link", path1, path2, options);
+                if(print_objname(opts, nfound))
+                    do_print_objname("link", path1, path2, opts);
 
-            /* always print the number of differences found in verbose mode */
-            if(options->m_verbose)
-                print_found(nfound);
+                /* always print the number of differences found in verbose mode */
+                if(opts->m_verbose)
+                    print_found(nfound);
 
-            }
+                }
             break;
 
        /*----------------------------------------------------------------------
@@ -1852,101 +1669,85 @@ hsize_t diff(hid_t file1_id,
         */
         case H5TRAV_TYPE_UDLINK:
             {
-            /* Only external links will have a query function registered */
-            if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL && linkinfo2.linfo.type == H5L_TYPE_EXTERNAL)
-            {
-                /* If the buffers are the same size, compare them */
-                if(linkinfo1.linfo.u.val_size == linkinfo2.linfo.u.val_size)
-                {
-                    ret = HDmemcmp(linkinfo1.trg_path, linkinfo2.trg_path, linkinfo1.linfo.u.val_size);
-                }
-                else
-                    ret = 1;
+                /* Only external links will have a query function registered */
+                if(linkinfo1.linfo.type == H5L_TYPE_EXTERNAL && linkinfo2.linfo.type == H5L_TYPE_EXTERNAL) {
+                    /* If the buffers are the same size, compare them */
+                    if(linkinfo1.linfo.u.val_size == linkinfo2.linfo.u.val_size) {
+                        status = HDmemcmp(linkinfo1.trg_path, linkinfo2.trg_path, linkinfo1.linfo.u.val_size);
+                    }
+                    else
+                        status = 1;
 
-                /* if "linkinfo1.trg_path" != "linkinfo2.trg_path" then the links
-                 * are "different" extlinkinfo#.path is combination string of
-                 * file_name and obj_name
-                 */
-                nfound = (ret != 0) ? 1 : 0;
+                    /* if "linkinfo1.trg_path" != "linkinfo2.trg_path" then the links
+                     * are "different" extlinkinfo#.path is combination string of
+                     * file_name and obj_name
+                     */
+                    nfound = (status != 0) ? 1 : 0;
 
-                if(print_objname(options, nfound))
-                    do_print_objname("external link", path1, path2, options);
+                    if(print_objname(opts, nfound))
+                        do_print_objname("external link", path1, path2, opts);
 
-            } /* end if */
-            else
-            {
-                /* If one or both of these links isn't an external link, we can only
-                 * compare information from H5Lget_info since we don't have a query
-                 * function registered for them.
-                 *
-                 * If the link classes or the buffer length are not the
-                 * same, the links are "different"
-                 */
-                if((linkinfo1.linfo.type != linkinfo2.linfo.type) ||
-                   (linkinfo1.linfo.u.val_size != linkinfo2.linfo.u.val_size))
-                    nfound = 1;
-                else
-                    nfound = 0;
-
-                if (print_objname (options, nfound))
-                    do_print_objname ("user defined link", path1, path2, options);
-            } /* end else */
+                } /* end if */
+                else {
+                    /* If one or both of these links isn't an external link, we can only
+                     * compare information from H5Lget_info since we don't have a query
+                     * function registered for them.
+                     *
+                     * If the link classes or the buffer length are not the
+                     * same, the links are "different"
+                     */
+                    if((linkinfo1.linfo.type != linkinfo2.linfo.type) ||
+                    (linkinfo1.linfo.u.val_size != linkinfo2.linfo.u.val_size))
+                        nfound = 1;
+                    else
+                        nfound = 0;
 
-            /* always print the number of differences found in verbose mode */
-            if(options->m_verbose)
-                print_found(nfound);
+                    if (print_objname (opts, nfound))
+                        do_print_objname ("user defined link", path1, path2, opts);
+                } /* end else */
+
+                /* always print the number of differences found in verbose mode */
+                if(opts->m_verbose)
+                    print_found(nfound);
             }
             break;
 
         case H5TRAV_TYPE_UNKNOWN:
         default:
-            if(options->m_verbose)
+            if(opts->m_verbose)
                 parallel_print("Comparison not supported: <%s> and <%s> are of type %s\n",
                     path1, path2, get_type(object_type) );
-            options->not_cmp = 1;
+            opts->not_cmp = 1;
             break;
      }
 
-    /* free link info buffer */
-    if (linkinfo1.trg_path)
-        HDfree(linkinfo1.trg_path);
-    if (linkinfo2.trg_path)
-        HDfree(linkinfo2.trg_path);
-
-    return nfound;
-
-out:
-    options->err_stat = 1;
+done:
+    opts->err_stat = opts->err_stat | ret_value;
 
-out2:
     /*-----------------------------------
      * handle dangling link(s)
      */
     /* both path1 and path2 are dangling links */
-    if(is_dangle_link1 && is_dangle_link2)
-    {
-        if(print_objname(options, nfound))
-        {
-            do_print_objname("dangling link", path1, path2, options);
+    if(is_dangle_link1 && is_dangle_link2) {
+        if(print_objname(opts, nfound)) {
+            do_print_objname("dangling link", path1, path2, opts);
             print_found(nfound);
         }
     }
     /* path1 is dangling link */
-    else if (is_dangle_link1)
-    {
-        if(options->m_verbose)
+    else if (is_dangle_link1) {
+        if(opts->m_verbose)
            parallel_print("obj1 <%s> is a dangling link.\n", path1);
         nfound++;
-        if(print_objname(options, nfound))
+        if(print_objname(opts, nfound))
             print_found(nfound);
     }
     /* path2 is dangling link */
-    else if (is_dangle_link2)
-    {
-        if(options->m_verbose)
+    else if (is_dangle_link2) {
+        if(opts->m_verbose)
             parallel_print("obj2 <%s> is a dangling link.\n", path2);
         nfound++;
-        if(print_objname(options, nfound))
+        if(print_objname(opts, nfound))
             print_found(nfound);
     }
 
@@ -1959,13 +1760,16 @@ out2:
     /* close */
     /* disable error reporting */
     H5E_BEGIN_TRY {
+        H5Dclose(dset1_id);
+        H5Dclose(dset2_id);
         H5Tclose(type1_id);
         H5Tclose(type2_id);
         H5Gclose(grp1_id);
-        H5Tclose(grp2_id);
+        H5Gclose(grp2_id);
         /* enable error reporting */
     } H5E_END_TRY;
-    h5difftrace("diff finish\n");
+
+    h5diffdebug3("diff finish:%d - errstat:%d\n", nfound, opts->err_stat);
 
     return nfound;
 }
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index 0226e83..26bcd95 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -38,7 +38,7 @@
 
 /*-------------------------------------------------------------------------
  * This is used to pass multiple args into diff().
- * Passing this instead of several each arg provides smoother extensibility 
+ * Passing this instead of several each arg provides smoother extensibility
  * through its members along with MPI code for ph5diff
  * as it doesn't require interface change.
  *------------------------------------------------------------------------*/
@@ -95,13 +95,13 @@ H5TOOLS_DLL hsize_t  h5diff(const char *fname1,
                 const char *fname2,
                 const char *objname1,
                 const char *objname2,
-                diff_opt_t *options);
+                diff_opt_t *opts);
 
 H5TOOLS_DLL hsize_t diff( hid_t      file1_id,
               const char *path1,
               hid_t      file2_id,
               const char *path2,
-              diff_opt_t *options,
+              diff_opt_t *opts,
               diff_args_t *argdata);
 
 #ifdef H5_HAVE_PARALLEL
@@ -125,18 +125,18 @@ hsize_t diff_dataset( hid_t file1_id,
                       hid_t file2_id,
                       const char *obj1_name,
                       const char *obj2_name,
-                      diff_opt_t *options);
+                      diff_opt_t *opts);
 
 hsize_t diff_datasetid( hid_t dset1_id,
                         hid_t dset2_id,
                         const char *obj1_name,
                         const char *obj2_name,
-                        diff_opt_t *options);
+                        diff_opt_t *opts);
 
 
 hsize_t diff_match( hid_t file1_id, const char *grp1, trav_info_t *info1,
                     hid_t file2_id, const char *grp2, trav_info_t *info2,
-                    trav_table_t *table, diff_opt_t *options );
+                    trav_table_t *table, diff_opt_t *opts );
 
 hsize_t diff_array( void *_mem1,
                     void *_mem2,
@@ -144,7 +144,7 @@ hsize_t diff_array( void *_mem1,
                     hsize_t hyper_start,
                     int rank,
                     hsize_t *dims,
-                    diff_opt_t *options,
+                    diff_opt_t *opts,
                     const char *name1,
                     const char *name2,
                     hid_t m_type,
@@ -162,7 +162,7 @@ int diff_can_type( hid_t       f_type1, /* file data type */
                    hsize_t     *maxdim2,
                    const char  *obj1_name,
                    const char  *obj2_name,
-                   diff_opt_t  *options,
+                   diff_opt_t  *opts,
                    int         is_compound);
 
 
@@ -170,7 +170,7 @@ hsize_t diff_attr(hid_t loc1_id,
                   hid_t loc2_id,
                   const char *path1,
                   const char *path2,
-                  diff_opt_t *options);
+                  diff_opt_t *opts);
 
 
 /*-------------------------------------------------------------------------
@@ -187,10 +187,10 @@ const char* get_class(H5T_class_t tclass);
 const char* get_sign(H5T_sign_t sign);
 void        print_dimensions (int rank, hsize_t *dims);
 herr_t      match_up_memsize (hid_t f_tid1_id, hid_t f_tid2_id,
-                              hid_t *m_tid1, hid_t *m_tid2, 
+                              hid_t *m_tid1, hid_t *m_tid2,
                               size_t *m_size1, size_t  *m_size2);
 /* in h5diff.c */
-int         print_objname(diff_opt_t *options, hsize_t nfound);
+int         print_objname(diff_opt_t *opts, hsize_t nfound);
 void        do_print_objname (const char *OBJ, const char *path1, const char *path2, diff_opt_t * opts);
 void        do_print_attrname (const char *attr, const char *path1, const char *path2);
 
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 1b17382..955819e 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -17,7 +17,6 @@
 #include "h5diff.h"
 #include "ph5diff.h"
 
-
 /*-------------------------------------------------------------------------
  * printf formatting
  *-------------------------------------------------------------------------
@@ -66,9 +65,8 @@
 #define LLI_FORMAT_P_NOTCOMP  "%-15" H5_PRINTF_LL_WIDTH "d %-15" H5_PRINTF_LL_WIDTH "d %-15" H5_PRINTF_LL_WIDTH "d not comparable\n"
 #define ULLI_FORMAT_P_NOTCOMP "%-15" H5_PRINTF_LL_WIDTH "u %-15" H5_PRINTF_LL_WIDTH "u %-15" H5_PRINTF_LL_WIDTH "d not comparable\n"
 
-
 /* if system EPSILON is defined, use the system EPSILON; otherwise, use
-   constants that are close to most EPSILON values */
+ constants that are close to most EPSILON values */
 
 #ifndef FLT_EPSILON
 #define FLT_EPSILON 1.19209E-07
@@ -78,7 +76,6 @@
 #define DBL_EPSILON 2.22045E-16
 #endif
 
-
 /*-------------------------------------------------------------------------
  * -p relative error formula
  *
@@ -97,234 +94,131 @@
 static hbool_t not_comparable;
 
 #define PER(A,B) {                                   \
-        per = -1;                                        \
-        not_comparable = FALSE;                          \
-        both_zero = FALSE;                               \
-        if(0 == (A) && 0 == (B))                         \
+    per = -1;                                        \
+    not_comparable = FALSE;                          \
+    both_zero = FALSE;                               \
+    if(0 == (A) && 0 == (B))                         \
         both_zero = TRUE;                            \
-        if(0 != (A))                                     \
+    if(0 != (A))                                     \
         per = (double)ABS((double)((B) - (A)) / (double)(A)); \
-        else                                             \
+    else                                             \
         not_comparable = TRUE;                       \
 }
 
-
 #define PER_UNSIGN(TYPE,A,B) {                       \
-        per = -1;                                        \
-        not_comparable = FALSE;                          \
-        both_zero = FALSE;                               \
-        if((A) == 0 && (B) == 0)                         \
+    per = -1;                                        \
+    not_comparable = FALSE;                          \
+    both_zero = FALSE;                               \
+    if((A) == 0 && (B) == 0)                         \
         both_zero = TRUE;                            \
-        if((A) != 0)                                     \
+    if((A) != 0)                                     \
         per = ABS((double)((TYPE)((B) - (A))) / (double)(A)) ; \
-        else                                             \
+    else                                             \
         not_comparable = TRUE;                       \
 }
 
-
 #define PDIFF(a,b)    (((b) > (a)) ? ((b) - (a)) : ((a) -(b)))
 
-typedef struct mcomp_t
-{
-    unsigned        n;      /* number of members */
-    hid_t           *ids;   /* member type id */
-    size_t          *offsets;
-    struct mcomp_t  **m;     /* members */
-}mcomp_t;
-
+typedef struct mcomp_t {
+    unsigned n; /* number of members */
+    hid_t *ids; /* member type id */
+    size_t *offsets;
+    struct mcomp_t **m; /* members */
+} mcomp_t;
 
 /*-------------------------------------------------------------------------
  * local prototypes
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id,hid_t region1_id, hid_t region2_id, diff_opt_t *options);
+static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id, hid_t region1_id,
+        hid_t region2_id, diff_opt_t *opts);
 static hbool_t all_zero(const void *_mem, size_t size);
-static int     ull2float(unsigned long long ull_value, float *f_value);
-static hsize_t character_compare(char *mem1,char *mem2,hsize_t i,unsigned u,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
-static hsize_t character_compare_opt(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
-static hbool_t equal_float(float value, float expected, diff_opt_t *options);
-static hbool_t equal_double(double value, double expected, diff_opt_t *options);
+static int ull2float(unsigned long long ull_value, float *f_value);
+static hsize_t character_compare(char *mem1, char *mem2, hsize_t i, unsigned u,
+        int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos,
+        diff_opt_t *opts, const char *obj1, const char *obj2, int *ph);
+static hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2,
+        hsize_t i, int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos,
+        diff_opt_t *opts, const char *obj1, const char *obj2, int *ph);
+static hbool_t equal_float(float value, float expected, diff_opt_t *opts);
+static hbool_t equal_double(double value, double expected, diff_opt_t *opts);
 #if H5_SIZEOF_LONG_DOUBLE !=0
-static hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *options);
+static hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *opts);
 #endif
-static int print_data(diff_opt_t *options);
-static void print_pos(int *ph,int pp,hsize_t curr_pos,hsize_t *acc,hsize_t *pos,int rank,hsize_t *dims,const char *obj1,const char *obj2 );
-static void print_char_pos(int *ph,int pp,hsize_t curr_pos,unsigned u,hsize_t *acc,hsize_t *pos,int rank,hsize_t *dims,const char *obj1,const char *obj2 );
+static int print_data(diff_opt_t *opts);
+static void print_pos(int *ph, int pp, hsize_t curr_pos, hsize_t *acc,
+        hsize_t *pos, int rank, hsize_t *dims, const char *obj1, const char *obj2);
+static void print_char_pos(int *ph, int pp, hsize_t curr_pos, unsigned u,
+        hsize_t *acc, hsize_t *pos, int rank, hsize_t *dims, const char *obj1, const char *obj2);
 static void h5diff_print_char(char ch);
-static hsize_t diff_datum(void       *_mem1,
-                   void       *_mem2,
-                   hid_t      m_type,
-                   hsize_t    i,
-                   int        rank,
-                   hsize_t    *dims,
-                   hsize_t    *acc,
-                   hsize_t    *pos,
-                   diff_opt_t *options,
-                   const char *obj1,
-                   const char *obj2,
-                   hid_t      container1_id,
-                   hid_t      container2_id, /*where the reference came from*/
-                   int        *ph,           /*print header */
-                   mcomp_t    *members);      /*compound members */
-static hsize_t diff_float(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
-static hsize_t diff_double(unsigned char *mem1,
-                    unsigned char *mem2,
-                    hsize_t       nelmts,
-                    hsize_t       hyper_start,
-                    int           rank,
-                    hsize_t       *dims,
-                    hsize_t       *acc,
-                    hsize_t       *pos,
-                    diff_opt_t    *options,
-                    const char    *obj1,
-                    const char    *obj2,
-                    int           *ph);
+static hsize_t diff_datum(void *_mem1, void *_mem2, hid_t m_type, hsize_t index,
+        int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos,
+        diff_opt_t *opts, const char *obj1, const char *obj2,
+        hid_t container1_id, hid_t container2_id, /*where the reference came from*/
+        int *ph, /*print header */
+        mcomp_t *members); /*compound members */
+static hsize_t diff_float(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
+static hsize_t diff_double(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
 #if H5_SIZEOF_LONG_DOUBLE !=0
 static hsize_t diff_ldouble(unsigned char *mem1,
-                     unsigned char *mem2,
-                     hsize_t       nelmts,
-                     hsize_t       hyper_start,
-                     int           rank,
-                     hsize_t       *dims,
-                     hsize_t       *acc,
-                     hsize_t       *pos,
-                     diff_opt_t    *options,
-                     const char    *obj1,
-                     const char    *obj2,
-                     int           *ph);
+        unsigned char *mem2,
+        hsize_t nelmts,
+        hsize_t hyper_start,
+        int rank,
+        hsize_t *dims,
+        hsize_t *acc,
+        hsize_t *pos,
+        diff_opt_t *opts,
+        const char *obj1,
+        const char *obj2,
+        int *ph);
 #endif
-static hsize_t diff_schar(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
-static hsize_t diff_uchar(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
-static hsize_t diff_short(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
-static hsize_t diff_ushort(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
-static hsize_t diff_int(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
-static hsize_t diff_uint(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
-static hsize_t diff_long(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
-static hsize_t diff_ulong(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
-static hsize_t diff_llong(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
-static hsize_t diff_ullong(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
-
+static hsize_t diff_schar(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
+static hsize_t diff_uchar(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
+static hsize_t diff_short(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
+static hsize_t diff_ushort(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
+static hsize_t diff_int(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
+static hsize_t diff_uint(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
+static hsize_t diff_long(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
+static hsize_t diff_ulong(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
+static hsize_t diff_llong(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
+static hsize_t diff_ullong(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph);
 
 /*-------------------------------------------------------------------------
  * NaN detection
@@ -337,13 +231,11 @@ typedef enum dtype_t
     FLT_FLOAT,
     FLT_DOUBLE,
     FLT_LDOUBLE
-} dtype_t;
+}dtype_t;
 #else
 
-typedef enum dtype_t
-{
-    FLT_FLOAT,
-    FLT_DOUBLE
+typedef enum dtype_t {
+    FLT_FLOAT, FLT_DOUBLE
 } dtype_t;
 #endif
 
@@ -356,50 +248,44 @@ static hbool_t my_isnan(dtype_t type, void *val);
 static void get_member_types(hid_t tid, mcomp_t *members);
 static void close_member_types(mcomp_t *members);
 
-
-
 /*-------------------------------------------------------------------------
  * Function: diff_array
  *
  * Purpose: compare two memory buffers;
  *
  * Return: number of differences found
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 12, 2003
- *
  *-------------------------------------------------------------------------
  */
 
-hsize_t diff_array( void *_mem1,
-                    void *_mem2,
-                    hsize_t nelmts,
-                    hsize_t hyper_start,
-                    int rank,
-                    hsize_t *dims,
-                    diff_opt_t *options,
-                    const char *name1,
-                    const char *name2,
-                    hid_t m_type,
-                    hid_t container1_id,
-                    hid_t container2_id) /* dataset where the reference came from*/
+hsize_t diff_array(
+        void *_mem1,
+        void *_mem2,
+        hsize_t nelmts,
+        hsize_t hyper_start,
+        int rank,
+        hsize_t *dims,
+        diff_opt_t *opts,
+        const char *name1,
+        const char *name2,
+        hid_t m_type,
+        hid_t container1_id,
+        hid_t container2_id) /* dataset where the reference came from*/
 {
-    hsize_t       nfound=0;          /* number of differences found */
-    size_t        size;              /* size of datum */
-    unsigned char *mem1 = (unsigned char*)_mem1;
-    unsigned char *mem2 = (unsigned char*)_mem2;
-    hsize_t       acc[32];    /* accumulator position */
-    hsize_t       pos[32];    /* matrix position */
-    int           ph=1;       /* print header  */
-    hsize_t       i;
-    int           j;
-    mcomp_t       members;
-    H5T_class_t   type_class;
-
-    h5difftrace("diff_array start\n");
+    hsize_t         nfound = 0; /* number of differences found */
+    size_t          size; /* size of datum */
+    unsigned char  *mem1 = (unsigned char*) _mem1;
+    unsigned char  *mem2 = (unsigned char*) _mem2;
+    hsize_t         acc[32]; /* accumulator position */
+    hsize_t         pos[32]; /* matrix position */
+    int             ph = 1; /* print header  */
+    hsize_t         i;
+    int             j;
+    mcomp_t         members;
+    H5T_class_t     type_class;
+
+    h5diffdebug2("diff_array start - errstat:%d\n", opts->err_stat);
     /* get the size. */
-    size = H5Tget_size( m_type );
+    size = H5Tget_size(m_type);
     type_class = H5Tget_class(m_type);
 
     /* Fast comparison first for atomic type by memcmp().
@@ -410,23 +296,19 @@ hsize_t diff_array( void *_mem1,
             type_class != H5T_COMPOUND &&
             type_class != H5T_STRING &&
             type_class != H5T_VLEN &&
-            HDmemcmp(mem1, mem2, size*nelmts)==0)
+            HDmemcmp(mem1, mem2, size*nelmts) == 0)
         return 0;
 
-    if ( rank > 0 )
-    {
-
-        acc[rank-1]=1;
-        for(j=(rank-2); j>=0; j--)
-        {
-            acc[j]=acc[j+1]*dims[j+1];
+    if (rank > 0) {
+        acc[rank - 1] = 1;
+        for (j = (rank - 2); j >= 0; j--) {
+            acc[j] = acc[j + 1] * dims[j + 1];
         }
-        for ( j = 0; j < rank; j++)
-            pos[j]=0;
+        for (j = 0; j < rank; j++)
+            pos[j] = 0;
     }
 
-    switch (type_class)
-    {
+    switch (type_class) {
     case H5T_NO_CLASS:
     case H5T_TIME:
     case H5T_NCLASSES:
@@ -434,52 +316,48 @@ hsize_t diff_array( void *_mem1,
         HDassert(0);
         break;
 
-   /*-------------------------------------------------------------------------
-    * float and integer atomic types
-    *-------------------------------------------------------------------------
-    */
-
+    /*-------------------------------------------------------------------------
+     * float and integer atomic types
+     *-------------------------------------------------------------------------
+     */
     case H5T_FLOAT:
         if (H5Tequal(m_type, H5T_NATIVE_FLOAT))
-            nfound=diff_float(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            nfound = diff_float(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
         else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE))
-            nfound=diff_double(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-#if H5_SIZEOF_LONG_DOUBLE !=0
+            nfound = diff_double(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
+#if H5_SIZEOF_LONG_DOUBLE != 0
         else if (H5Tequal(m_type, H5T_NATIVE_LDOUBLE))
-            nfound=diff_ldouble(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+        nfound = diff_ldouble(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
 #endif
         break;
 
     case H5T_INTEGER:
-
         if (H5Tequal(m_type, H5T_NATIVE_SCHAR))
-            nfound=diff_schar(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            nfound = diff_schar(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
         else if (H5Tequal(m_type, H5T_NATIVE_UCHAR))
-            nfound=diff_uchar(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            nfound = diff_uchar(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
         else if (H5Tequal(m_type, H5T_NATIVE_SHORT))
-            nfound=diff_short(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            nfound = diff_short(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
         else if (H5Tequal(m_type, H5T_NATIVE_USHORT))
-            nfound=diff_ushort(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            nfound = diff_ushort(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
         else if (H5Tequal(m_type, H5T_NATIVE_INT))
-            nfound=diff_int(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            nfound = diff_int(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
         else if (H5Tequal(m_type, H5T_NATIVE_UINT))
-            nfound=diff_uint(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            nfound = diff_uint(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
         else if (H5Tequal(m_type, H5T_NATIVE_LONG))
-            nfound=diff_long(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            nfound = diff_long(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
         else if (H5Tequal(m_type, H5T_NATIVE_ULONG))
-            nfound=diff_ulong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            nfound = diff_ulong(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
         else if (H5Tequal(m_type, H5T_NATIVE_LLONG))
-            nfound=diff_llong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+            nfound = diff_llong(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
         else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
-            nfound=diff_ullong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-
+            nfound = diff_ullong(mem1, mem2, nelmts, hyper_start, rank, dims, acc, pos, opts, name1, name2, &ph);
         break;
 
     /*-------------------------------------------------------------------------
      * Other types than float and integer
      *-------------------------------------------------------------------------
      */
-
     case H5T_COMPOUND:
     case H5T_STRING:
     case H5T_BITFIELD:
@@ -488,34 +366,17 @@ hsize_t diff_array( void *_mem1,
     case H5T_ARRAY:
     case H5T_VLEN:
     case H5T_REFERENCE:
-        HDmemset(&members, 0, sizeof (mcomp_t));
+        HDmemset(&members, 0, sizeof(mcomp_t));
         get_member_types(m_type, &members);
-        for ( i = 0; i < nelmts; i++)
-        {
-            nfound+=diff_datum(
-                    mem1 + i * size,
-                    mem2 + i * size, /* offset */
-                    m_type,
-                    i,
-                    rank,
-                    dims,
-                    acc,
-                    pos,
-                    options,
-                    name1,
-                    name2,
-                    container1_id,
-                    container2_id,
-                    &ph, &members);
-            if (options->n && nfound>=options->count)
-            {
-                close_member_types(&members);
-                return nfound;
-            }
+        for (i = 0; i < nelmts; i++) {
+            nfound += diff_datum(mem1 + i * size, mem2 + i * size, m_type, i, rank, dims, acc, pos, opts,
+                    name1, name2, container1_id, container2_id, &ph, &members);
+            if (opts->n && nfound >= opts->count)
+                break;
         } /* i */
         close_member_types(&members);
     } /* switch */
-    h5difftrace("diff_array finish\n");
+    h5diffdebug3("diff_array finish:%d - errstat:%d\n", nfound, opts->err_stat);
 
     return nfound;
 }
@@ -527,10 +388,6 @@ hsize_t diff_array( void *_mem1,
  *
  * Return: number of differences found
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: October 29, 2003
- *
  * The comparison of the 2 buffers read from the files is made datum by datum.
  *
  * H5T_INTEGER and H5T_FLOAT
@@ -557,46 +414,45 @@ hsize_t diff_array( void *_mem1,
  *  Dereference the object and compare the type (basic object type).
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_datum(void       *_mem1,
-                          void       *_mem2,
-                          hid_t      m_type,
-                          hsize_t    i,
-                          int        rank,
-                          hsize_t    *dims,
-                          hsize_t    *acc,
-                          hsize_t    *pos,
-                          diff_opt_t *options,
-                          const char *obj1,
-                          const char *obj2,
-                          hid_t      container1_id,
-                          hid_t      container2_id, /*where the reference came from*/
-                          int        *ph,           /*print header */
-                          mcomp_t    *members)      /*compound members */
+static hsize_t diff_datum(
+        void *_mem1,
+        void *_mem2,
+        hid_t m_type,
+        hsize_t index,
+        int rank,
+        hsize_t *dims,
+        hsize_t *acc,
+        hsize_t *pos,
+        diff_opt_t *opts,
+        const char *obj1,
+        const char *obj2,
+        hid_t container1_id,
+        hid_t container2_id, /*where the reference came from*/
+        int *ph,             /*print header */
+        mcomp_t *members)    /*compound members */
 {
-    unsigned char *mem1 = (unsigned char*)_mem1;
-    unsigned char *mem2 = (unsigned char*)_mem2;
-    unsigned      u;
-    hid_t         memb_type;
-    size_t        type_size;
-    H5T_sign_t    type_sign;
-    H5T_class_t   type_class;
-    size_t        offset;
-    unsigned      nmembs;
-    unsigned      j;
-    hsize_t       nelmts;
-    size_t        size=0;
-    hbool_t       iszero1;
-    hbool_t       iszero2;
-    hid_t         obj1_id;
-    hid_t         obj2_id;
-    hsize_t       nfound=0;   /* differences found */
-    int           ret=0;      /* check return error */
-    float         f1, f2;
-    double        per;
-    hbool_t       both_zero;
+    unsigned char  *mem1 = (unsigned char*) _mem1;
+    unsigned char  *mem2 = (unsigned char*) _mem2;
+    unsigned        u;
+    size_t          type_size;
+    H5T_sign_t      type_sign;
+    H5T_class_t     type_class;
+    size_t          offset;
+    unsigned        nmembs;
+    unsigned        j;
+    hsize_t         nelmts;
+    size_t          size = 0;
+    hbool_t         iszero1;
+    hbool_t         iszero2;
+    hsize_t         nfound = 0;    /* differences found */
+    hsize_t         ret_value = opts->err_stat;
+    float           f1, f2;
+    double          per;
+    hbool_t         both_zero;
 
     h5difftrace("diff_datum start\n");
-    type_size = H5Tget_size( m_type );
+
+    type_size = H5Tget_size(m_type);
     type_class = H5Tget_class(m_type);
 
     /* Fast comparison first for atomic type by memcmp().
@@ -607,97 +463,100 @@ static hsize_t diff_datum(void       *_mem1,
             type_class != H5T_COMPOUND &&
             type_class != H5T_STRING &&
             type_class != H5T_VLEN &&
-            HDmemcmp(mem1, mem2, type_size)==0)
-        return 0;
+            HDmemcmp(mem1, mem2, type_size) == 0)
+        HGOTO_DONE(opts->err_stat);
 
-    switch (H5Tget_class(m_type))
-    {
+    switch (H5Tget_class(m_type)) {
     case H5T_NO_CLASS:
     case H5T_TIME:
     case H5T_NCLASSES:
     default:
-        HDassert(0);
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "Invalid type class");
         break;
 
-   /*-------------------------------------------------------------------------
-    * H5T_COMPOUND
-    *-------------------------------------------------------------------------
-    */
+    /*-------------------------------------------------------------------------
+     * H5T_COMPOUND
+     *-------------------------------------------------------------------------
+     */
     case H5T_COMPOUND:
         h5difftrace("diff_datum H5T_COMPOUND\n");
+        {
+            hid_t memb_type = -1;
+            nmembs = members->n;
 
-        nmembs = members->n;
-
+            for (j = 0; j < nmembs; j++) {
+                offset = members->offsets[j];
+                memb_type = members->ids[j];
 
-        for (j = 0; j < nmembs; j++)
-        {
-            offset    = members->offsets[j];
-            memb_type = members->ids[j];
-
-            nfound+=diff_datum(
-                    mem1 + offset,
-                    mem2 + offset,
-                    memb_type,
-                    i,
-                    rank,
-                    dims,
-                    acc,
-                    pos,
-                    options,
-                    obj1,
-                    obj2,
-                    container1_id,
-                    container2_id,
-                    ph, members->m[j]);
+                nfound += diff_datum(mem1 + offset, mem2 + offset, memb_type, index,
+                        rank, dims, acc, pos, opts, obj1, obj2, container1_id, container2_id, ph, members->m[j]);
+            }
         }
         break;
 
-   /*-------------------------------------------------------------------------
-    * H5T_STRING
-    *-------------------------------------------------------------------------
-    */
+    /*-------------------------------------------------------------------------
+     * H5T_STRING
+     *-------------------------------------------------------------------------
+     */
     case H5T_STRING:
         h5difftrace("diff_datum H5T_STRING\n");
         {
-            char      *s = NULL;
-            char      *sx = NULL;
-            char      *s1 = NULL;
-            char      *s2 = NULL;
-            size_t     size1;
-            size_t     size2;
-            size_t     sizex;
-            size_t     size_mtype = H5Tget_size(m_type);
-            H5T_str_t  pad = H5Tget_strpad(m_type);
+            char *s = NULL;
+            char *sx = NULL;
+            char *s1 = NULL;
+            char *s2 = NULL;
+            size_t size1;
+            size_t size2;
+            size_t sizex;
+            size_t size_mtype = H5Tget_size(m_type);
+            H5T_str_t pad = H5Tget_strpad(m_type);
 
             /* if variable length string */
-            if(H5Tis_variable_str(m_type)) {
+            if (H5Tis_variable_str(m_type)) {
                 h5difftrace("diff_datum H5T_STRING variable\n");
                 /* Get pointer to first string */
                 s1 = *(char**) mem1;
-                size1 = HDstrlen(s1);
+                if (s1)
+                    size1 = HDstrlen(s1);
+                else
+                    size1 = 0;
+
                 /* Get pointer to second string */
                 s2 = *(char**) mem2;
-                size2 = HDstrlen(s2);
+                if (s2)
+                    size2 = HDstrlen(s2);
+                else
+                    size2 = 0;
             }
             else if (H5T_STR_NULLTERM == pad) {
                 h5difftrace("diff_datum H5T_STRING null term\n");
                 /* Get pointer to first string */
                 s1 = (char*) mem1;
-                size1 = HDstrlen(s1);
+                if (s1)
+                    size1 = HDstrlen(s1);
+                else
+                    size1 = 0;
+
                 if (size1 > size_mtype)
                     size1 = size_mtype;
+
                 /* Get pointer to second string */
                 s2 = (char*) mem2;
-                size2 = HDstrlen(s2);
+                if (s2)
+                    size2 = HDstrlen(s2);
+                else
+                    size2 = 0;
+
                 if (size2 > size_mtype)
                     size2 = size_mtype;
             }
             else {
                 /* Get pointer to first string */
-                s1 = (char *)mem1;
+                s1 = (char *) mem1;
                 size1 = size_mtype;
+
                 /* Get pointer to second string */
-                s2 = (char *)mem2;
+                s2 = (char *) mem2;
                 size2 = size_mtype;
             }
 
@@ -707,13 +566,13 @@ static hsize_t diff_datum(void       *_mem1,
              *       of length of strings.
              *       For now mimic the previous way.
              */
-            h5diffdebug2("diff_datum string size:%d\n",size1);
-            h5diffdebug2("diff_datum string size:%d\n",size2);
-            if(size1 != size2) {
+            h5diffdebug2("diff_datum string size:%d\n", size1);
+            h5diffdebug2("diff_datum string size:%d\n", size2);
+            if (size1 != size2) {
                 h5difftrace("diff_datum string sizes\n");
                 nfound++;
             }
-            if(size1 < size2) {
+            if (size1 < size2) {
                 size = size1;
                 s = s1;
                 sizex = size2;
@@ -727,68 +586,30 @@ static hsize_t diff_datum(void       *_mem1,
             }
 
             /* check for NULL pointer for string */
-            if(s!=NULL) {
+            if (s != NULL) {
                 /* try fast compare first */
-                if(HDmemcmp(s1, s2, size)==0) {
-                    if(size1 != size2)
-                        if(print_data(options))
-                            for (u=size; u<sizex; u++)
-                                character_compare(
-                                        s1 + u,
-                                        s2 + u, /* offset */
-                                        i,        /* index position */
-                                        u,        /* string character position */
-                                        rank,
-                                        dims,
-                                        acc,
-                                        pos,
-                                        options,
-                                        obj1,
-                                        obj2,
-                                        ph);
+                if (HDmemcmp(s, sx, size) == 0) {
+                    if (size1 != size2)
+                        if (print_data(opts))
+                            for (u = size; u < sizex; u++)
+                                character_compare(s + u, sx + u, index, u, rank, dims, acc, pos, opts, obj1, obj2, ph);
                 }
                 else
-                    for (u=0; u<size; u++)
-                        nfound+=character_compare(
-                                s1 + u,
-                                s2 + u, /* offset */
-                                i,        /* index position */
-                                u,        /* string character position */
-                                rank,
-                                dims,
-                                acc,
-                                pos,
-                                options,
-                                obj1,
-                                obj2,
-                                ph);
-            }
-
+                    for (u = 0; u < size; u++)
+                        nfound += character_compare(s + u, sx + u, index, u, rank, dims, acc, pos, opts, obj1, obj2, ph);
+            } /* end check for NULL pointer for string */
         }
         break;
 
-   /*-------------------------------------------------------------------------
-    * H5T_BITFIELD
-    *-------------------------------------------------------------------------
-    */
+    /*-------------------------------------------------------------------------
+     * H5T_BITFIELD
+     *-------------------------------------------------------------------------
+     */
     case H5T_BITFIELD:
         h5difftrace("diff_datum H5T_BITFIELD\n");
-
         /* byte-by-byte comparison */
-        for (u=0; u<type_size; u++)
-            nfound+=character_compare_opt(
-                    mem1 + u,
-                    mem2 + u, /* offset */
-                    i,        /* index position */
-                    rank,
-                    dims,
-                    acc,
-                    pos,
-                    options,
-                    obj1,
-                    obj2,
-                    ph);
-
+        for (u = 0; u < type_size; u++)
+            nfound += character_compare_opt(mem1 + u, mem2 + u, index, rank, dims, acc, pos, opts, obj1, obj2, ph);
         break;
 
     /*-------------------------------------------------------------------------
@@ -798,1189 +619,910 @@ static hsize_t diff_datum(void       *_mem1,
     case H5T_OPAQUE:
         h5difftrace("diff_datum H5T_OPAQUE\n");
         /* byte-by-byte comparison */
-        for (u=0; u<type_size; u++)
-            nfound+=character_compare_opt(
-                    mem1 + u,
-                    mem2 + u, /* offset */
-                    i,        /* index position */
-                    rank,
-                    dims,
-                    acc,
-                    pos,
-                    options,
-                    obj1,
-                    obj2,
-                    ph);
-
+        for (u = 0; u < type_size; u++)
+            nfound += character_compare_opt(mem1 + u, mem2 + u, index, rank, dims, acc, pos, opts, obj1, obj2, ph);
         break;
 
-
-   /*-------------------------------------------------------------------------
-    * H5T_ENUM
-    *-------------------------------------------------------------------------
-    */
+    /*-------------------------------------------------------------------------
+     * H5T_ENUM
+     *-------------------------------------------------------------------------
+     */
     case H5T_ENUM:
+        /* For enumeration types we compare the names instead of the
+         * integer values.  For each pair of elements being
+         * compared, we convert both bit patterns to their corresponding
+         * enumeration constant and do a string comparison
+         */
         h5difftrace("diff_datum H5T_ENUM\n");
-
-    /* For enumeration types we compare the names instead of the
-    integer values.  For each pair of elements being
-    compared, we convert both bit patterns to their corresponding
-    enumeration constant and do a string comparison
-        */
-
         {
             char enum_name1[1024];
             char enum_name2[1024];
-
             herr_t err1;
             herr_t err2;
 
             /* disable error reporting */
             H5E_BEGIN_TRY {
-
                 /* If the enum value cannot be converted to a string
                  * it is set to an error string for later output.
                  */
                 err1 = H5Tenum_nameof(m_type, mem1, enum_name1, sizeof enum_name1);
-                if(err1 < 0)
+                if (err1 < 0)
                     HDsnprintf(enum_name1, sizeof(enum_name1), "**INVALID VALUE**");
 
                 err2 = H5Tenum_nameof(m_type, mem2, enum_name2, sizeof enum_name2);
-                if(err2 < 0)
+                if (err2 < 0)
                     HDsnprintf(enum_name2, sizeof(enum_name2), "**INVALID VALUE**");
 
-                if(err1 < 0 || err2 < 0)
-                {
-                    /* One or more bad enum values */
-
+                /* One or more bad enum values */
+                if (err1 < 0 || err2 < 0) {
                     /* If the two values cannot be converted to a string
                      * (probably due to them being invalid enum values),
                      * don't attempt to convert them - just report errors.
                      */
                     nfound += 1;
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(S_FORMAT,enum_name1,enum_name2);
+                        parallel_print(S_FORMAT, enum_name1, enum_name2);
                     }
                 }
-                else
-                {
+                else {
                     /* Both enum values were valid */
-
-                    if (HDstrcmp(enum_name1,enum_name2)!=0)
-                    {
-                        nfound=1;
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    if (HDstrcmp(enum_name1, enum_name2) != 0) {
+                        nfound = 1;
+                        if (print_data(opts)) {
+                            print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                             parallel_print(SPACES);
-                            parallel_print(S_FORMAT,enum_name1,enum_name2);
+                            parallel_print(S_FORMAT, enum_name1, enum_name2);
                         }
                     }
-                    else
-                    {
-                        for (u=0; u<type_size; u++)
-                            nfound+=character_compare_opt(
-                                    mem1 + u,
-                                    mem2 + u, /* offset */
-                                    i,        /* index position */
-                                    rank,
-                                    dims,
-                                    acc,
-                                    pos,
-                                    options,
-                                    obj1,
-                                    obj2,
-                                    ph);
+                    else {
+                        for (u = 0; u < type_size; u++)
+                            nfound += character_compare_opt(mem1 + u, mem2 + u, index, rank, dims, acc, pos, opts, obj1, obj2, ph);
                     }
                 }
                 /* enable error reporting */
             } H5E_END_TRY;
         }
-
-
         break;
 
-   /*-------------------------------------------------------------------------
-    * H5T_ARRAY
-    *-------------------------------------------------------------------------
-    */
+    /*-------------------------------------------------------------------------
+     * H5T_ARRAY
+     *-------------------------------------------------------------------------
+     */
     case H5T_ARRAY:
-
-    {
-        hsize_t adims[H5S_MAX_RANK];
-        int       ndims;
-
-        /* get the array's base datatype for each element */
-        memb_type = H5Tget_super(m_type);
-        size      = H5Tget_size(memb_type);
-        ndims     = H5Tget_array_ndims(m_type);
-        H5Tget_array_dims2(m_type, adims);
-        HDassert(ndims >= 1 && ndims <= H5S_MAX_RANK);
-
-        /* calculate the number of array elements */
-        for (u = 0, nelmts = 1; u < (unsigned)ndims; u++)
-            nelmts *= adims[u];
-        for (u = 0; u < nelmts; u++) {
-            nfound += diff_datum(
-                    mem1 + u * size,
-                    mem2 + u * size, /* offset */
-                    memb_type,
-                    i,               /* index position */
-                    rank,
-                    dims,
-                    acc,
-                    pos,
-                    options,
-                    obj1,
-                    obj2,
-                    container1_id,
-                    container2_id,
-                    ph, members);
+        {
+            hid_t   memb_type = -1;
+            hsize_t adims[H5S_MAX_RANK];
+            int     ndims;
+
+            /* get the array's base datatype for each element */
+            memb_type = H5Tget_super(m_type);
+            size = H5Tget_size(memb_type);
+            ndims = H5Tget_array_ndims(m_type);
+            H5Tget_array_dims2(m_type, adims);
+            HDassert(ndims >= 1 && ndims <= H5S_MAX_RANK);
+
+            /* calculate the number of array elements */
+            for (u = 0, nelmts = 1; u < (unsigned) ndims; u++)
+                nelmts *= adims[u];
+            for (u = 0; u < nelmts; u++) {
+                nfound += diff_datum(mem1 + u * size, mem2 + u * size, memb_type, index,
+                        rank, dims, acc, pos, opts, obj1, obj2, container1_id, container2_id, ph, members);
+            }
+            H5Tclose(memb_type);
         }
-        H5Tclose(memb_type);
-    }
-    break;
-
-
-
-   /*-------------------------------------------------------------------------
-    * H5T_REFERENCE
-    *-------------------------------------------------------------------------
-    */
+        break;
 
+    /*-------------------------------------------------------------------------
+     * H5T_REFERENCE
+     *-------------------------------------------------------------------------
+     */
     case H5T_REFERENCE:
-
-        iszero1=all_zero(_mem1, H5Tget_size(m_type));
-        iszero2=all_zero(_mem2, H5Tget_size(m_type));
-        if (iszero1 != iszero2)
-        {
-            return 1;
+        iszero1 = all_zero(_mem1, H5Tget_size(m_type));
+        iszero2 = all_zero(_mem2, H5Tget_size(m_type));
+        if (iszero1 != iszero2) {
+            nfound++;
+            HGOTO_DONE (opts->err_stat);
         }
-        else if (!iszero1 && !iszero2)
-        {
-
-        /*-------------------------------------------------------------------------
-        * H5T_STD_REF_DSETREG
-        * Dataset region reference
-        *-------------------------------------------------------------------------
-            */
-            if (type_size==H5R_DSET_REG_REF_BUF_SIZE)
-            {
-                hid_t  region1_id;
-                hid_t  region2_id;
+        else if (!iszero1 && !iszero2) {
+            /*-------------------------------------------------------------------------
+             * H5T_STD_REF_DSETREG
+             * Dataset region reference
+             *-------------------------------------------------------------------------
+             */
+            hid_t obj1_id = -1;
+            hid_t obj2_id = -1;
 
-                if ((obj1_id = H5Rdereference(container1_id, H5R_DATASET_REGION, _mem1))<0)
-                    ret= -1;
-                if ((obj2_id = H5Rdereference(container2_id, H5R_DATASET_REGION, _mem2))<0)
-                    ret= -1;
-                if ((region1_id = H5Rget_region(container1_id, H5R_DATASET_REGION, _mem1))<0)
-                    ret= -1;
-                if ((region2_id = H5Rget_region(container2_id, H5R_DATASET_REGION, _mem2))<0)
-                    ret= -1;
+            if (type_size == H5R_DSET_REG_REF_BUF_SIZE) {
+                hid_t region1_id = -1;
+                hid_t region2_id = -1;
 
-                if (ret==-1) {
-                    options->err_stat=1;
-                    return 0;
+                if ((obj1_id = H5Rdereference(container1_id, H5R_DATASET_REGION, _mem1)) < 0) {
+                    opts->err_stat = 1;
+                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Rdereference object 1 failed");
+                }
+                if ((obj2_id = H5Rdereference(container2_id, H5R_DATASET_REGION, _mem2)) < 0) {
+                    opts->err_stat = 1;
+                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Rdereference object 2 failed");
+                }
+                if ((region1_id = H5Rget_region(container1_id, H5R_DATASET_REGION, _mem1)) < 0) {
+                    opts->err_stat = 1;
+                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Rget_region object 1 failed");
+                }
+                if ((region2_id = H5Rget_region(container2_id, H5R_DATASET_REGION, _mem2)) < 0) {
+                    opts->err_stat = 1;
+                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Rget_region object 2 failed");
                 }
 
-                nfound = diff_region(obj1_id,obj2_id,region1_id,region2_id,options);
+                nfound = diff_region(obj1_id, obj2_id, region1_id, region2_id, opts);
 
                 H5Oclose(obj1_id);
                 H5Oclose(obj2_id);
                 H5Sclose(region1_id);
                 H5Sclose(region2_id);
-
             }/*dataset reference*/
 
+            /*-------------------------------------------------------------------------
+             * H5T_STD_REF_OBJ
+             * Object references. get the type and OID of the referenced object
+             *-------------------------------------------------------------------------
+             */
+            else if (type_size == H5R_OBJ_REF_BUF_SIZE) {
+                H5O_type_t obj1_type;
+                H5O_type_t obj2_type;
 
-           /*-------------------------------------------------------------------------
-            * H5T_STD_REF_OBJ
-            * Object references. get the type and OID of the referenced object
-            *-------------------------------------------------------------------------
-            */
-            else if (type_size == H5R_OBJ_REF_BUF_SIZE)
-            {
-                H5O_type_t     obj1_type;
-                H5O_type_t     obj2_type;
-
-                if(H5Rget_obj_type2(container1_id, H5R_OBJECT, _mem1, &obj1_type) < 0)
-                    ret = -1;
-                if(H5Rget_obj_type2(container2_id, H5R_OBJECT, _mem2, &obj2_type) < 0)
-                    ret = -1;
-                if(ret == -1) {
-                    options->err_stat = 1;
-                    return 0;
-                } /* end if */
+                if (H5Rget_obj_type2(container1_id, H5R_OBJECT, _mem1, &obj1_type) < 0) {
+                    opts->err_stat = 1;
+                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Rget_obj_type2 object 1 failed");
+                }
+                if (H5Rget_obj_type2(container2_id, H5R_OBJECT, _mem2, &obj2_type) < 0) {
+                    opts->err_stat = 1;
+                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Rget_obj_type2 object 2 failed");
+                }
 
                 /* check object type */
-                if(obj1_type != obj2_type)
-                {
-                    parallel_print("Different object types referenced: <%s> and <%s>", obj1, obj2);
-                    options->not_cmp = 1;
-                    return 0;
-                }
-
-                if((obj1_id = H5Rdereference(container1_id, H5R_OBJECT, _mem1)) < 0)
-                    ret = -1;
-                if((obj2_id = H5Rdereference(container2_id, H5R_OBJECT, _mem2)) < 0)
-                    ret = -1;
-                if(ret == -1) {
-                    options->err_stat = 1;
-                    return 0;
-                } /* end if */
+                if (ret_value >= 0)
+                    if (obj1_type != obj2_type) {
+                        parallel_print("Different object types referenced: <%s> and <%s>", obj1, obj2);
+                        opts->not_cmp = 1;
+                        HGOTO_DONE (opts->err_stat);
+                    }
+
+                if ((obj1_id = H5Rdereference(container1_id, H5R_OBJECT, _mem1)) < 0) {
+                    opts->err_stat = 1;
+                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Rdereference object 1 failed");
+                }
+                if ((obj2_id = H5Rdereference(container2_id, H5R_OBJECT, _mem2)) < 0) {
+                    opts->err_stat = 1;
+                    H5TOOLS_INFO(H5E_tools_min_id_g, "H5Rdereference object 2 failed");
+                }
 
                 /* compare */
-                if(obj1_type == H5O_TYPE_DATASET)
-                    nfound = diff_datasetid(obj1_id,
-                            obj2_id,
-                            NULL,
-                            NULL,
-                            options);
+                if (obj1_type == H5O_TYPE_DATASET)
+                    nfound = diff_datasetid(obj1_id, obj2_id, NULL, NULL, opts);
                 else {
-                    if(options->m_verbose)
-                        parallel_print("Warning: Comparison not possible of object types referenced: <%s> and <%s>\n",
+                    if (opts->m_verbose)
+                        parallel_print(
+                                "Warning: Comparison not possible of object types referenced: <%s> and <%s>\n",
                                 obj1, obj2);
-                    options->not_cmp = 1;
+                    opts->not_cmp = 1;
                 }
 
                 H5Oclose(obj1_id);
                 H5Oclose(obj2_id);
-
             }/*object reference*/
-
         }/*is zero*/
-
-
         break;
 
-   /*-------------------------------------------------------------------------
-    * H5T_VLEN
-    *-------------------------------------------------------------------------
-    */
-
+    /*-------------------------------------------------------------------------
+     * H5T_VLEN
+     *-------------------------------------------------------------------------
+     */
     case H5T_VLEN:
+        {
+            hid_t memb_type = -1;
 
-        /* get the VL sequences's base datatype for each element */
-        memb_type = H5Tget_super(m_type);
-        size      = H5Tget_size(memb_type);
-
-        /* get the number of sequence elements */
-        nelmts = ((hvl_t *)mem1)->len;
-
-        for (j = 0; j < nelmts; j++)
-            nfound += diff_datum(
-                    ((char *)(((hvl_t *)mem1)->p)) + j * size,
-                    ((char *)(((hvl_t *)mem2)->p)) + j * size, /* offset */
-                    memb_type,
-                    i,         /* index position */
-                    rank,
-                    dims,
-                    acc,
-                    pos,
-                    options,
-                    obj1,
-                    obj2,
-                    container1_id,
-                    container2_id,
-                    ph, members);
-
-        H5Tclose(memb_type);
-
-        break;
+            /* get the VL sequences's base datatype for each element */
+            memb_type = H5Tget_super(m_type);
+            size = H5Tget_size(memb_type);
 
+            /* get the number of sequence elements */
+            nelmts = ((hvl_t *) mem1)->len;
 
+            for (j = 0; j < nelmts; j++)
+                nfound += diff_datum(((char *) (((hvl_t *) mem1)->p)) + j * size, ((char *) (((hvl_t *) mem2)->p)) + j * size, memb_type, index,
+                        rank, dims, acc, pos, opts, obj1, obj2, container1_id, container2_id, ph, members);
 
-   /*-------------------------------------------------------------------------
-    * H5T_INTEGER
-    *-------------------------------------------------------------------------
-    */
+            H5Tclose(memb_type);
+        }
+        break;
 
+    /*-------------------------------------------------------------------------
+     * H5T_INTEGER
+     *-------------------------------------------------------------------------
+     */
     case H5T_INTEGER:
         type_sign = H5Tget_sign(m_type);
-
-       /*-------------------------------------------------------------------------
-        * H5T_NATIVE_SCHAR
-        *-------------------------------------------------------------------------
-        */
-        if (type_size==1 && type_sign!=H5T_SGN_NONE)
-        {
-            char        temp1_char;
-            char        temp2_char;
-            HDassert(type_size==sizeof(char));
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_SCHAR
+         *-------------------------------------------------------------------------
+         */
+        if (type_size == 1 && type_sign != H5T_SGN_NONE) {
+            char temp1_char;
+            char temp2_char;
+
+            if(type_size != sizeof(char))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not char size");
             HDmemcpy(&temp1_char, mem1, sizeof(char));
             HDmemcpy(&temp2_char, mem2, sizeof(char));
             /* -d and !-p */
-            if (options->d && !options->p)
-            {
-                if (ABS(temp1_char-temp2_char) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            if (opts->d && !opts->p) {
+                if (ABS(temp1_char-temp2_char) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+                        parallel_print(I_FORMAT, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
                     }
                     nfound++;
                 }
             }
             /* !-d and -p */
-            else if (!options->d && options->p)
-            {
-                PER(temp1_char,temp2_char);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (!opts->d && opts->p) {
+                PER(temp1_char, temp2_char);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(I_FORMAT_P,temp1_char,temp2_char,ABS(temp1_char-temp2_char),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P, temp1_char, temp2_char, ABS(temp1_char - temp2_char), per);
                     }
+                    nfound++;
+                }
             }
             /* -d and -p */
-            else if ( options->d && options->p)
-            {
-                PER(temp1_char,temp2_char);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (opts->d && opts->p) {
+                PER(temp1_char, temp2_char);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent && ABS(temp1_char-temp2_char) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(I_FORMAT_P,temp1_char,temp2_char,ABS(temp1_char-temp2_char),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent && ABS(temp1_char - temp2_char) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P, temp1_char, temp2_char, ABS(temp1_char - temp2_char), per);
                     }
+                    nfound++;
+                }
             }
-            else if (temp1_char != temp2_char)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            else if (temp1_char != temp2_char) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+                    parallel_print(I_FORMAT, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
                 }
                 nfound++;
             }
-
         } /*H5T_NATIVE_SCHAR*/
 
-       /*-------------------------------------------------------------------------
-        * H5T_NATIVE_UCHAR
-        *-------------------------------------------------------------------------
-        */
-        else if (type_size==1 && type_sign==H5T_SGN_NONE)
-        {
-            unsigned char      temp1_uchar;
-            unsigned char      temp2_uchar;
-            HDassert(type_size==sizeof(unsigned char));
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_UCHAR
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == 1 && type_sign == H5T_SGN_NONE) {
+            unsigned char temp1_uchar;
+            unsigned char temp2_uchar;
+
+            if(type_size != sizeof(unsigned char))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not unsigned char size");
 
             HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
             HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
             /* -d and !-p */
-            if (options->d && !options->p)
-            {
-                if ( PDIFF(temp1_uchar,temp2_uchar) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            if (opts->d && !opts->p) {
+                if (PDIFF(temp1_uchar, temp2_uchar) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+                        parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
                     }
                     nfound++;
                 }
             }
             /* !-d and -p */
-            else if (!options->d && options->p)
-            {
-                PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (!opts->d && opts->p) {
+                PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
                     }
+                    nfound++;
+                }
             }
             /* -d and -p */
-            else if ( options->d && options->p)
-            {
-                PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (opts->d && opts->p) {
+                PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent && PDIFF(temp1_uchar,temp2_uchar) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent && PDIFF(temp1_uchar, temp2_uchar) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
                     }
+                    nfound++;
+                }
             }
-            else if (temp1_uchar != temp2_uchar)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            else if (temp1_uchar != temp2_uchar) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+                    parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
                 }
                 nfound++;
             }
-
         } /*H5T_NATIVE_UCHAR*/
 
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_SHORT
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == 2 && type_sign != H5T_SGN_NONE) {
+            short temp1_short;
+            short temp2_short;
 
-       /*-------------------------------------------------------------------------
-        * H5T_NATIVE_SHORT
-        *-------------------------------------------------------------------------
-        */
-
-        else if (type_size==2 && type_sign!=H5T_SGN_NONE)
-        {
-            short       temp1_short;
-            short       temp2_short;
-            HDassert(type_size==sizeof(short));
+            if(type_size != sizeof(short))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not short size");
 
             HDmemcpy(&temp1_short, mem1, sizeof(short));
             HDmemcpy(&temp2_short, mem2, sizeof(short));
             /* -d and !-p */
-            if (options->d && !options->p)
-            {
-                if (ABS(temp1_short-temp2_short) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            if (opts->d && !opts->p) {
+                if (ABS(temp1_short - temp2_short) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+                        parallel_print(I_FORMAT, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
                     }
                     nfound++;
                 }
             }
             /* !-d and -p */
-            else if (!options->d && options->p)
-            {
-                PER(temp1_short,temp2_short);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (!opts->d && opts->p) {
+                PER(temp1_short, temp2_short);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(I_FORMAT_P,temp1_short,temp2_short,ABS(temp1_short-temp2_short),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P, temp1_short, temp2_short, ABS(temp1_short - temp2_short), per);
                     }
+                    nfound++;
+                }
             }
             /* -d and -p */
-            else if ( options->d && options->p)
-            {
-                PER(temp1_short,temp2_short);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (opts->d && opts->p) {
+                PER(temp1_short, temp2_short);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent && ABS(temp1_short-temp2_short) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(I_FORMAT_P,temp1_short,temp2_short,ABS(temp1_short-temp2_short),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent && ABS(temp1_short - temp2_short) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P, temp1_short, temp2_short, ABS(temp1_short - temp2_short), per);
                     }
+                    nfound++;
+                }
             }
-            else if (temp1_short != temp2_short)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            else if (temp1_short != temp2_short) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+                    parallel_print(I_FORMAT, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
                 }
                 nfound++;
             }
-
-
         } /*H5T_NATIVE_SHORT*/
 
-       /*-------------------------------------------------------------------------
-        * H5T_NATIVE_USHORT
-        *-------------------------------------------------------------------------
-        */
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_USHORT
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == 2 && type_sign == H5T_SGN_NONE) {
+            unsigned short temp1_ushort;
+            unsigned short temp2_ushort;
 
-        else if (type_size==2 && type_sign==H5T_SGN_NONE)
-        {
-            unsigned short       temp1_ushort;
-            unsigned short       temp2_ushort;
-            HDassert(type_size==sizeof(short));
+            if(type_size != sizeof(unsigned short))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not unsigned short size");
 
             HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short));
             HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short));
             /* -d and !-p */
-            if (options->d && !options->p)
-            {
-                if ( PDIFF(temp1_ushort,temp2_ushort) > options->delta)
-                {
-
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            if (opts->d && !opts->p) {
+                if (PDIFF(temp1_ushort, temp2_ushort) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
+                        parallel_print(I_FORMAT, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
                     }
                     nfound++;
                 }
             }
             /* !-d and -p */
-            else if (!options->d && options->p)
-            {
-                PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (!opts->d && opts->p) {
+                PER_UNSIGN(signed short, temp1_ushort, temp2_ushort);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
-                                PDIFF(temp1_ushort,temp2_ushort));
+                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort), per);
                     }
+                    nfound++;
+                }
             }
             /* -d and -p */
-            else if ( options->d && options->p)
-            {
-                PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (opts->d && opts->p) {
+                PER_UNSIGN(signed short, temp1_ushort, temp2_ushort);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
+                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent && PDIFF(temp1_ushort,temp2_ushort) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent && PDIFF(temp1_ushort, temp2_ushort) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort), per);
                     }
+                    nfound++;
+                }
             }
-            else if (temp1_ushort != temp2_ushort)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            else if (temp1_ushort != temp2_ushort) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
+                    parallel_print(I_FORMAT, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
                 }
                 nfound++;
             }
         } /*H5T_NATIVE_USHORT*/
 
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_INT
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == 4 && type_sign != H5T_SGN_NONE) {
+            int temp1_int;
+            int temp2_int;
 
-       /*-------------------------------------------------------------------------
-        * H5T_NATIVE_INT
-        *-------------------------------------------------------------------------
-        */
-
-        else if (type_size==4 && type_sign!=H5T_SGN_NONE)
-        {
-            int         temp1_int;
-            int         temp2_int;
-            HDassert(type_size==sizeof(int));
+            if(type_size != sizeof(int))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not int size");
 
             HDmemcpy(&temp1_int, mem1, sizeof(int));
             HDmemcpy(&temp2_int, mem2, sizeof(int));
             /* -d and !-p */
-            if (options->d && !options->p)
-            {
-                if (ABS(temp1_int-temp2_int) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            if (opts->d && !opts->p) {
+                if (ABS(temp1_int-temp2_int) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+                        parallel_print(I_FORMAT, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
                     }
                     nfound++;
                 }
             }
             /* !-d and -p */
-            else if (!options->d && options->p)
-            {
-                PER(temp1_int,temp2_int);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (!opts->d && opts->p) {
+                PER(temp1_int, temp2_int);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(I_FORMAT_P,temp1_int,temp2_int,ABS(temp1_int-temp2_int),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P, temp1_int, temp2_int, ABS(temp1_int - temp2_int), per);
                     }
+                    nfound++;
+                }
             }
             /* -d and -p */
-            else if ( options->d && options->p)
-            {
-                PER(temp1_int,temp2_int);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (opts->d && opts->p) {
+                PER(temp1_int, temp2_int);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+                        parallel_print(I_FORMAT_P_NOTCOMP, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent && ABS(temp1_int-temp2_int) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(I_FORMAT_P,temp1_int,temp2_int,ABS(temp1_int-temp2_int),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent && ABS(temp1_int - temp2_int) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(I_FORMAT_P, temp1_int, temp2_int, ABS(temp1_int - temp2_int), per);
                     }
+                    nfound++;
+                }
             }
-            else if (temp1_int != temp2_int)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            else if (temp1_int != temp2_int) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+                    parallel_print(I_FORMAT, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
                 }
                 nfound++;
             }
         } /*H5T_NATIVE_INT*/
 
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_UINT
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == 4 && type_sign == H5T_SGN_NONE) {
+            unsigned int temp1_uint;
+            unsigned int temp2_uint;
 
-       /*-------------------------------------------------------------------------
-        * H5T_NATIVE_UINT
-        *-------------------------------------------------------------------------
-        */
-
-        else if (type_size==4 && type_sign==H5T_SGN_NONE)
-        {
-            unsigned int         temp1_uint;
-            unsigned int         temp2_uint;
-            HDassert(type_size==sizeof(int));
+            if(type_size != sizeof(unsigned int))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not unsigned int size");
 
             HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int));
             HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int));
             /* -d and !-p */
-            if (options->d && !options->p)
-            {
-                if ( PDIFF(temp1_uint,temp2_uint) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            if (opts->d && !opts->p) {
+                if (PDIFF(temp1_uint, temp2_uint) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(UI_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                        parallel_print(UI_FORMAT, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
                     }
                     nfound++;
                 }
             }
             /* !-d and -p */
-            else if (!options->d && options->p)
-            {
-                PER_UNSIGN(signed int,temp1_uint,temp2_uint);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (!opts->d && opts->p) {
+                PER_UNSIGN(signed int, temp1_uint, temp2_uint);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(UI_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                        parallel_print(UI_FORMAT_P_NOTCOMP, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(UI_FORMAT_P,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(UI_FORMAT_P, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint), per);
                     }
+                    nfound++;
+                }
             }
             /* -d and -p */
-            else if ( options->d && options->p)
-            {
-                PER_UNSIGN(signed int,temp1_uint,temp2_uint);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (opts->d && opts->p) {
+                PER_UNSIGN(signed int, temp1_uint, temp2_uint);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(UI_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                        parallel_print(UI_FORMAT_P_NOTCOMP, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent && PDIFF(temp1_uint,temp2_uint) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(UI_FORMAT_P,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent && PDIFF(temp1_uint,temp2_uint) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(UI_FORMAT_P, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint), per);
                     }
+                    nfound++;
+                }
             }
-            else if (temp1_uint != temp2_uint)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            else if (temp1_uint != temp2_uint) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(UI_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                    parallel_print(UI_FORMAT, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
                 }
                 nfound++;
             }
         } /*H5T_NATIVE_UINT*/
 
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_LONG
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == 8 && type_sign != H5T_SGN_NONE) {
+            long temp1_long;
+            long temp2_long;
 
-       /*-------------------------------------------------------------------------
-        * H5T_NATIVE_LONG
-        *-------------------------------------------------------------------------
-        */
-
-        else if (type_size==8 && type_sign!=H5T_SGN_NONE)
-        {
-            long        temp1_long;
-            long        temp2_long;
-            HDassert(type_size==sizeof(long));
+            if(type_size != sizeof(long))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not long size");
 
             HDmemcpy(&temp1_long, mem1, sizeof(long));
             HDmemcpy(&temp2_long, mem2, sizeof(long));
             /* -d and !-p */
-            if (options->d && !options->p)
-            {
-                if (ABS(temp1_long-temp2_long) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            if (opts->d && !opts->p) {
+                if (ABS(temp1_long-temp2_long) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
+                        parallel_print(LI_FORMAT, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
                     }
                     nfound++;
                 }
             }
             /* !-d and -p */
-            else if (!options->d && options->p)
-            {
-                PER(temp1_long,temp2_long);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (!opts->d && opts->p) {
+                PER(temp1_long, temp2_long);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
-                                ABS(temp1_long-temp2_long));
+                        parallel_print(LI_FORMAT_P_NOTCOMP, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(LI_FORMAT_P,temp1_long,temp2_long,ABS(temp1_long-temp2_long),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(LI_FORMAT_P, temp1_long, temp2_long, ABS(temp1_long - temp2_long), per);
                     }
+                    nfound++;
+                }
             }
             /* -d and -p */
-            else if ( options->d && options->p)
-            {
-                PER(temp1_long,temp2_long);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (opts->d && opts->p) {
+                PER(temp1_long, temp2_long);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
+                        parallel_print(LI_FORMAT_P_NOTCOMP, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent && ABS(temp1_long-temp2_long) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(LI_FORMAT_P,temp1_long,temp2_long,
-                                    ABS(temp1_long-temp2_long),
-                                    per);
-                        }
-                        nfound++;
+                else if (per > opts->percent && ABS(temp1_long-temp2_long) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(LI_FORMAT_P, temp1_long, temp2_long, ABS(temp1_long - temp2_long), per);
                     }
+                    nfound++;
+                }
             }
-            else if (temp1_long != temp2_long)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            else if (temp1_long != temp2_long) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
+                    parallel_print(LI_FORMAT, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
                 }
                 nfound++;
             }
         } /*H5T_NATIVE_LONG*/
 
-       /*-------------------------------------------------------------------------
-        * H5T_NATIVE_ULONG
-        *-------------------------------------------------------------------------
-        */
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_ULONG
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == 8 && type_sign == H5T_SGN_NONE) {
+            unsigned long temp1_ulong;
+            unsigned long temp2_ulong;
 
-        else if (type_size==8 && type_sign==H5T_SGN_NONE)
-        {
-            unsigned long        temp1_ulong;
-            unsigned long        temp2_ulong;
-            HDassert(type_size==sizeof(unsigned long));
+            if(type_size != sizeof(unsigned long))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not unsigned long size");
 
             HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long));
             HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long));
             /* -d and !-p */
-            if (options->d && !options->p)
-            {
-                if ( PDIFF(temp1_ulong,temp2_ulong) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            if (opts->d && !opts->p) {
+                if (PDIFF(temp1_ulong, temp2_ulong) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(ULI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                        parallel_print(ULI_FORMAT, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
                     }
                     nfound++;
                 }
             }
             /* !-d and -p */
-            else if (!options->d && options->p)
-            {
-                PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (!opts->d && opts->p) {
+                PER_UNSIGN(signed long, temp1_ulong, temp2_ulong);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                        parallel_print(ULI_FORMAT_P_NOTCOMP, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(ULI_FORMAT_P,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(ULI_FORMAT_P, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong), per);
                     }
+                    nfound++;
+                }
             }
             /* -d and -p */
-            else if ( options->d && options->p)
-            {
-                PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (opts->d && opts->p) {
+                PER_UNSIGN(signed long, temp1_ulong, temp2_ulong);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                        parallel_print(ULI_FORMAT_P_NOTCOMP, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent && PDIFF(temp1_ulong,temp2_ulong) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(ULI_FORMAT_P,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent && PDIFF(temp1_ulong,temp2_ulong) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(ULI_FORMAT_P, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong), per);
                     }
+                    nfound++;
+                }
             }
-            else if (temp1_ulong != temp2_ulong)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            else if (temp1_ulong != temp2_ulong) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(ULI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                    parallel_print(ULI_FORMAT, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
                 }
                 nfound++;
             }
-
-
         } /*H5T_NATIVE_ULONG*/
 
         /*-------------------------------------------------------------------------
-        * H5T_NATIVE_LLONG
-        *-------------------------------------------------------------------------
-        */
+         * H5T_NATIVE_LLONG
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == 8 && type_sign != H5T_SGN_NONE) {
+            long long temp1_llong;
+            long long temp2_llong;
 
-        else if (type_size==8 && type_sign!=H5T_SGN_NONE)
-        {
-            long long        temp1_llong;
-            long long        temp2_llong;
-            HDassert(type_size==sizeof(long long));
+            if(type_size != sizeof(long long))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not long long size");
 
             HDmemcpy(&temp1_llong, mem1, sizeof(long long));
             HDmemcpy(&temp2_llong, mem2, sizeof(long long));
             /* -d and !-p */
-            if (options->d && !options->p)
-            {
-                if (ABS(temp1_llong-temp2_llong) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            if (opts->d && !opts->p) {
+                if (ABS(temp1_llong-temp2_llong) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+                        parallel_print(LLI_FORMAT, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
                     }
                     nfound++;
                 }
             }
             /* !-d and -p */
-            else if (!options->d && options->p)
-            {
-                PER(temp1_llong,temp2_llong);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (!opts->d && opts->p) {
+                PER(temp1_llong, temp2_llong);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+                        parallel_print(LLI_FORMAT_P_NOTCOMP, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(LLI_FORMAT_P, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong),per);
                     }
+                    nfound++;
+                }
             }
             /* -d and -p */
-            else if ( options->d && options->p)
-            {
-                PER(temp1_llong,temp2_llong);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (opts->d && opts->p) {
+                PER(temp1_llong, temp2_llong);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+                        parallel_print(LLI_FORMAT_P_NOTCOMP, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
                     }
                     nfound++;
                 }
 
-                else
-
-                    if ( per > options->percent  && ABS(temp1_llong-temp2_llong) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per);
-                        }
-                        nfound++;
+                else if (per > opts->percent && ABS(temp1_llong-temp2_llong) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(LLI_FORMAT_P, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong),per);
                     }
+                    nfound++;
+                }
             }
-            else if (temp1_llong != temp2_llong)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            else if (temp1_llong != temp2_llong) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+                    parallel_print(LLI_FORMAT, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
                 }
                 nfound++;
             }
@@ -1988,769 +1530,584 @@ static hsize_t diff_datum(void       *_mem1,
         } /*H5T_NATIVE_LLONG*/
 
         /*-------------------------------------------------------------------------
-        * H5T_NATIVE_ULLONG
-        *-------------------------------------------------------------------------
-        */
+         * H5T_NATIVE_ULLONG
+         *-------------------------------------------------------------------------
+         */
 
-        else if (type_size==8 && type_sign==H5T_SGN_NONE)
-        {
-            unsigned long long        temp1_ullong;
-            unsigned long long        temp2_ullong;
-            HDassert(type_size==sizeof(unsigned long long));
+        else if (type_size == 8 && type_sign == H5T_SGN_NONE) {
+            unsigned long long temp1_ullong;
+            unsigned long long temp2_ullong;
+
+            if(type_size != sizeof(unsigned long long))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not unsigned long long size");
 
             HDmemcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
             HDmemcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
             /* -d and !-p */
-            if (options->d && !options->p)
-            {
-                if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long)options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            if (opts->d && !opts->p) {
+                if (PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long) opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+                        parallel_print(ULLI_FORMAT, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong, temp2_ullong));
                     }
                     nfound++;
                 }
             }
             /* !-d and -p */
-            else if (!options->d && options->p)
-            {
-                ull2float(temp1_ullong,&f1);
-                ull2float(temp2_ullong,&f2);
-                PER(f1,f2);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                        {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (!opts->d && opts->p) {
+                ull2float(temp1_ullong, &f1);
+                ull2float(temp2_ullong, &f2);
+                PER(f1, f2);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+                        parallel_print(ULLI_FORMAT_P_NOTCOMP, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong, temp2_ullong));
                     }
                     nfound++;
-                        }
-
-                else
+                }
 
-                    if ( per > options->percent )
-                    {
+                else if (per > opts->percent) {
 
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
-                        }
-                        nfound++;
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(ULLI_FORMAT_P, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong, temp2_ullong),per);
                     }
+                    nfound++;
+                }
             }
             /* -d and -p */
-            else if ( options->d && options->p)
-            {
-                ull2float(temp1_ullong,&f1);
-                ull2float(temp2_ullong,&f2);
-                PER(f1,f2);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                        {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+            else if (opts->d && opts->p) {
+                ull2float(temp1_ullong, &f1);
+                ull2float(temp2_ullong, &f2);
+                PER(f1, f2);
+
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+                        parallel_print(ULLI_FORMAT_P_NOTCOMP, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong, temp2_ullong));
                     }
                     nfound++;
-                        }
-
-                else
-
-                    if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long)options->delta )
-                    {
-
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-
-                            parallel_print(SPACES);
-                            parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
-                        }
-                        nfound++;
+                }
+                else if (per > opts->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long) opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(ULLI_FORMAT_P, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong, temp2_ullong),per);
                     }
+                    nfound++;
+                }
             }
-            else if (temp1_ullong != temp2_ullong)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            else if (temp1_ullong != temp2_ullong) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+                    parallel_print(ULLI_FORMAT, temp1_ullong, temp2_ullong, PDIFF(temp1_ullong, temp2_ullong));
                 }
                 nfound++;
             }
 
         } /*H5T_NATIVE_ULLONG*/
 
-
         break; /* H5T_INTEGER class */
 
-
-   /*-------------------------------------------------------------------------
-    * H5T_FLOAT
-    *-------------------------------------------------------------------------
-    */
-
+    /*-------------------------------------------------------------------------
+     * H5T_FLOAT
+     *-------------------------------------------------------------------------
+     */
     case H5T_FLOAT:
-
-
-
-       /*-------------------------------------------------------------------------
-        * H5T_NATIVE_FLOAT
-        *-------------------------------------------------------------------------
-        */
-        if (type_size==4)
-        {
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_FLOAT
+         *-------------------------------------------------------------------------
+         */
+        if (type_size == 4) {
             float temp1_float;
             float temp2_float;
-            hbool_t   isnan1 = FALSE;
-            hbool_t   isnan2 = FALSE;
+            hbool_t isnan1 = FALSE;
+            hbool_t isnan2 = FALSE;
 
-            HDassert(type_size==sizeof(float));
+            if(type_size != sizeof(float))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not float size");
 
             HDmemcpy(&temp1_float, mem1, sizeof(float));
             HDmemcpy(&temp2_float, mem2, sizeof(float));
 
-            /* logic for detecting NaNs is different with options -d, -p and no options */
+            /* logic for detecting NaNs is different with opts -d, -p and no opts */
 
-           /*-------------------------------------------------------------------------
-            * -d and !-p
-            *-------------------------------------------------------------------------
-            */
-            if (options->d && !options->p)
-            {
-
-
-               /*-------------------------------------------------------------------------
-                * detect NaNs
-                *-------------------------------------------------------------------------
-                */
-                if ( options->do_nans )
-                {
-                    isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
-                    isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
+            /*-------------------------------------------------------------------------
+             * -d and !-p
+             *-------------------------------------------------------------------------
+             */
+            if (opts->d && !opts->p) {
+                /*-------------------------------------------------------------------------
+                 * detect NaNs
+                 *-------------------------------------------------------------------------
+                 */
+                if (opts->do_nans) {
+                    isnan1 = my_isnan(FLT_FLOAT, &temp1_float);
+                    isnan2 = my_isnan(FLT_FLOAT, &temp2_float);
                 }
 
-                 /* both not NaN, do the comparison */
-                if ( !isnan1 && !isnan2)
-                {
-
-                    if (ABS(temp1_float-temp2_float) > (float)options->delta)
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                /* both not NaN, do the comparison */
+                if (!isnan1 && !isnan2) {
+                    if (ABS(temp1_float-temp2_float) > (float) opts->delta) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                             parallel_print(SPACES);
-                            parallel_print(F_FORMAT,(double)temp1_float,(double)temp2_float, (double)ABS(temp1_float - temp2_float));
+                            parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                         }
                         nfound++;
                     }
-
                 }
                 /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT, (double)temp1_float, (double)temp2_float, (double)ABS(temp1_float - temp2_float));
+                        parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                     }
                     nfound++;
-
                 }
             }
-           /*-------------------------------------------------------------------------
-            * !-d and -p
-            *-------------------------------------------------------------------------
-            */
-            else if (!options->d && options->p)
-            {
-
-               /*-------------------------------------------------------------------------
-                * detect NaNs
-                *-------------------------------------------------------------------------
-                */
-                if ( options->do_nans )
-                {
-                    isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
-                    isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
+            /*-------------------------------------------------------------------------
+             * !-d and -p
+             *-------------------------------------------------------------------------
+             */
+            else if (!opts->d && opts->p) {
+                /*-------------------------------------------------------------------------
+                 * detect NaNs
+                 *-------------------------------------------------------------------------
+                 */
+                if (opts->do_nans) {
+                    isnan1 = my_isnan(FLT_FLOAT, &temp1_float);
+                    isnan2 = my_isnan(FLT_FLOAT, &temp2_float);
                 }
 
                 /* both not NaN, do the comparison */
-                if ( !isnan1 && !isnan2)
-                {
+                if (!isnan1 && !isnan2) {
+                    PER(temp1_float, temp2_float);
 
-                    PER(temp1_float,temp2_float);
-
-                    if (not_comparable && !both_zero) /* not comparable */
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                    if (not_comparable && !both_zero) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                             parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P_NOTCOMP, (double)temp1_float, (double)temp2_float, (double)ABS(temp1_float - temp2_float));
+                            parallel_print(F_FORMAT_P_NOTCOMP, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                         }
                         nfound++;
                     }
-
-                    else
-
-                        if ( per > options->percent && (double)ABS(temp1_float-temp2_float) > options->delta )
-                        {
-                            if ( print_data(options) )
-                            {
-                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                                parallel_print(SPACES);
-                                parallel_print(F_FORMAT_P, (double)temp1_float, (double)temp2_float,
-                                        (double)ABS(temp1_float - temp2_float),
-                                        (double)ABS(1 - temp2_float / temp1_float));
-                            }
-                            nfound++;
+                    else if (per > opts->percent && (double) ABS(temp1_float - temp2_float) > opts->delta) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT_P, (double) temp1_float, (double) temp2_float,
+                                    (double) ABS(temp1_float - temp2_float), (double) ABS(1 - temp2_float / temp1_float));
                         }
-
+                        nfound++;
+                    }
                 }
                 /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT, (double)temp1_float, (double)temp2_float, (double)ABS(temp1_float - temp2_float));
+                        parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                     }
                     nfound++;
-
                 }
             }
-
-           /*-------------------------------------------------------------------------
-            * -d and -p
-            *-------------------------------------------------------------------------
-            */
-
-            else if ( options->d && options->p)
-            {
-
-               /*-------------------------------------------------------------------------
-                * detect NaNs
-                *-------------------------------------------------------------------------
-                */
-                if ( options->do_nans )
-                {
-                    isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
-                    isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
+            /*-------------------------------------------------------------------------
+             * -d and -p
+             *-------------------------------------------------------------------------
+             */
+            else if (opts->d && opts->p) {
+                /*-------------------------------------------------------------------------
+                 * detect NaNs
+                 *-------------------------------------------------------------------------
+                 */
+                if (opts->do_nans) {
+                    isnan1 = my_isnan(FLT_FLOAT, &temp1_float);
+                    isnan2 = my_isnan(FLT_FLOAT, &temp2_float);
                 }
 
-                 /* both not NaN, do the comparison */
-                if ( !isnan1 && !isnan2)
-                {
-
-                    PER(temp1_float,temp2_float);
+                /* both not NaN, do the comparison */
+                if (!isnan1 && !isnan2) {
+                    PER(temp1_float, temp2_float);
 
-                    if (not_comparable && !both_zero) /* not comparable */
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                    if (not_comparable && !both_zero) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                             parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P_NOTCOMP, (double)temp1_float, (double)temp2_float,
-                                    (double)ABS(temp1_float - temp2_float));
+                            parallel_print(F_FORMAT_P_NOTCOMP, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                         }
                         nfound++;
                     }
-
-                    else
-
-                        if ( per > options->percent )
-                        {
-                            if ( print_data(options) )
-                            {
-                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                                parallel_print(SPACES);
-                                parallel_print(F_FORMAT_P, (double)temp1_float, (double)temp2_float,
-                                        (double)ABS(temp1_float - temp2_float),
-                                        (double)ABS(1 - temp2_float / temp1_float));
-                            }
-                            nfound++;
+                    else if (per > opts->percent) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT_P, (double) temp1_float, (double) temp2_float,
+                                    (double) ABS(temp1_float - temp2_float), (double) ABS(1 - temp2_float / temp1_float));
                         }
-
+                        nfound++;
+                    }
                 }
                 /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT, (double)temp1_float, (double)temp2_float, (double)ABS(temp1_float - temp2_float));
+                        parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                     }
                     nfound++;
-
                 }
             }
-
-           /*-------------------------------------------------------------------------
-            * no -d and -p
-            *-------------------------------------------------------------------------
-            */
-            else if (equal_float(temp1_float,temp2_float,options)==FALSE)
-            {
-
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            /*-------------------------------------------------------------------------
+             * no -d and -p
+             *-------------------------------------------------------------------------
+             */
+            else if (equal_float(temp1_float, temp2_float, opts) == FALSE) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT, (double)temp1_float, (double)temp2_float, (double)ABS(temp1_float - temp2_float));
+                    parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                 }
                 nfound++;
             }
         } /*H5T_NATIVE_FLOAT*/
 
-       /*-------------------------------------------------------------------------
-        * H5T_NATIVE_DOUBLE
-        *-------------------------------------------------------------------------
-        */
-
-        else if (type_size==8)
-        {
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_DOUBLE
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == 8) {
             double temp1_double;
             double temp2_double;
-            hbool_t    isnan1 = FALSE;
-            hbool_t    isnan2 = FALSE;
+            hbool_t isnan1 = FALSE;
+            hbool_t isnan2 = FALSE;
 
-            HDassert(type_size==sizeof(double));
+            if(type_size != sizeof(double))
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not double size");
 
             HDmemcpy(&temp1_double, mem1, sizeof(double));
             HDmemcpy(&temp2_double, mem2, sizeof(double));
 
-           /* logic for detecting NaNs is different with options -d, -p and no options */
-
-           /*-------------------------------------------------------------------------
-            * -d and !-p
-            *-------------------------------------------------------------------------
-            */
-            if (options->d && !options->p)
-            {
-               /*-------------------------------------------------------------------------
-                * detect NaNs
-                *-------------------------------------------------------------------------
-                */
-                if ( options->do_nans )
-                {
-                    isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-                    isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+            /* logic for detecting NaNs is different with opts -d, -p and no opts */
+            /*-------------------------------------------------------------------------
+             * -d and !-p
+             *-------------------------------------------------------------------------
+             */
+            if (opts->d && !opts->p) {
+                /*-------------------------------------------------------------------------
+                 * detect NaNs
+                 *-------------------------------------------------------------------------
+                 */
+                if (opts->do_nans) {
+                    isnan1 = my_isnan(FLT_DOUBLE, &temp1_double);
+                    isnan2 = my_isnan(FLT_DOUBLE, &temp2_double);
                 }
 
                 /* both not NaN, do the comparison */
-                if ( !isnan1 && !isnan2)
-                {
-
-                    if (ABS(temp1_double-temp2_double) > options->delta)
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                if (!isnan1 && !isnan2) {
+                    if (ABS(temp1_double-temp2_double) > opts->delta) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                             parallel_print(SPACES);
-                            parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                            parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                         }
                         nfound++;
                     }
-
                 }
                 /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
-
                 }
-            } /* options->d && !options->p */
-
-           /*-------------------------------------------------------------------------
-            * !-d and -p
-            *-------------------------------------------------------------------------
-            */
-            else if (!options->d && options->p)
-            {
-
-               /*-------------------------------------------------------------------------
-                * detect NaNs
-                *-------------------------------------------------------------------------
-                */
-                if ( options->do_nans )
-                {
-                    isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-                    isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+            } /* opts->d && !opts->p */
+            /*-------------------------------------------------------------------------
+             * !-d and -p
+             *-------------------------------------------------------------------------
+             */
+            else if (!opts->d && opts->p) {
+                /*-------------------------------------------------------------------------
+                 * detect NaNs
+                 *-------------------------------------------------------------------------
+                 */
+                if (opts->do_nans) {
+                    isnan1 = my_isnan(FLT_DOUBLE, &temp1_double);
+                    isnan2 = my_isnan(FLT_DOUBLE, &temp2_double);
                 }
 
                 /* both not NaN, do the comparison */
-                if ( !isnan1 && !isnan2)
-                {
+                if (!isnan1 && !isnan2) {
+                    PER(temp1_double, temp2_double);
 
-                    PER(temp1_double,temp2_double);
-
-                    if (not_comparable && !both_zero) /* not comparable */
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                    if (not_comparable && !both_zero) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                             parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                                    ABS(temp1_double-temp2_double));
+                            parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                         }
                         nfound++;
                     }
-
-                    else
-
-                        if ( per > options->percent )
-                        {
-                            if ( print_data(options) )
-                            {
-                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                                parallel_print(SPACES);
-                                parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                                        ABS(temp1_double-temp2_double),
-                                        ABS(1-temp2_double/temp1_double));
-                            }
-                            nfound++;
+                    else if (per > opts->percent) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
                         }
-
+                        nfound++;
+                    }
                 }
                 /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
-
                 }
             }
-
-           /*-------------------------------------------------------------------------
-            * -d and -p
-            *-------------------------------------------------------------------------
-            */
-            else if ( options->d && options->p)
-            {
-
-               /*-------------------------------------------------------------------------
+            /*-------------------------------------------------------------------------
+             * -d and -p
+             *-------------------------------------------------------------------------
+             */
+            else if (opts->d && opts->p) {
+                /*-------------------------------------------------------------------------
                 * detect NaNs
                 *-------------------------------------------------------------------------
                 */
-                if ( options->do_nans )
-                {
-                    isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-                    isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+                if (opts->do_nans) {
+                    isnan1 = my_isnan(FLT_DOUBLE, &temp1_double);
+                    isnan2 = my_isnan(FLT_DOUBLE, &temp2_double);
                 }
 
                 /* both not NaN, do the comparison */
-                if ( !isnan1 && !isnan2)
-                {
-
-                    PER(temp1_double,temp2_double);
+                if (!isnan1 && !isnan2) {
+                    PER(temp1_double, temp2_double);
 
-                    if (not_comparable && !both_zero) /* not comparable */
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                    if (not_comparable && !both_zero) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                             parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                                    ABS(temp1_double-temp2_double));
+                            parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                         }
                         nfound++;
                     }
-
-                    else
-
-                        if ( per > options->percent &&
-                                ABS(temp1_double-temp2_double) > options->delta )
-                        {
-                            if ( print_data(options) )
-                            {
-                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                                parallel_print(SPACES);
-                                parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                                        ABS(temp1_double-temp2_double),
-                                        ABS(1-temp2_double/temp1_double));
-                            }
-                            nfound++;
+                    else if (per > opts->percent &&
+                    ABS(temp1_double-temp2_double) > opts->delta) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                            parallel_print(SPACES);
+                            parallel_print(F_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
                         }
-
+                        nfound++;
+                    }
                 }
                 /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
                 }
             }
-
-           /*-------------------------------------------------------------------------
-            * no -d and -p
-            *-------------------------------------------------------------------------
-            */
-            else if (equal_double(temp1_double,temp2_double,options)==FALSE)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            /*-------------------------------------------------------------------------
+             * no -d and -p
+             *-------------------------------------------------------------------------
+             */
+            else if (equal_double(temp1_double, temp2_double, opts) == FALSE) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
             }
         } /*H5T_NATIVE_DOUBLE*/
 
-#if H5_SIZEOF_LONG_DOUBLE !=0
-
-
-       /*-------------------------------------------------------------------------
-        * H5T_NATIVE_LDOUBLE
-        *-------------------------------------------------------------------------
-        */
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
 
-        else if (type_size==8)
-        {
+        /*-------------------------------------------------------------------------
+         * H5T_NATIVE_LDOUBLE
+         *-------------------------------------------------------------------------
+         */
+        else if (type_size == H5_SIZEOF_LONG_DOUBLE) {
             long double temp1_double;
             long double temp2_double;
-            hbool_t         isnan1 = FALSE;
-            hbool_t         isnan2 = FALSE;
+            hbool_t     isnan1 = FALSE;
+            hbool_t     isnan2 = FALSE;
 
-
-            HDassert(type_size == sizeof(long double));
+            if(type_size != sizeof(long double)) {
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "Type size is not long double size");
+            }
 
             HDmemcpy(&temp1_double, mem1, sizeof(long double));
             HDmemcpy(&temp2_double, mem2, sizeof(long double));
 
-           /* logic for detecting NaNs is different with options -d, -p and no options */
-
-           /*-------------------------------------------------------------------------
-            * -d and !-p
-            *-------------------------------------------------------------------------
-            */
-            if (options->d && !options->p)
-            {
+            /* logic for detecting NaNs is different with options -d, -p and no options */
 
-               /*-------------------------------------------------------------------------
-                * detect NaNs
-                *-------------------------------------------------------------------------
-                */
-                if ( options->do_nans )
-                {
+            /*-------------------------------------------------------------------------
+             * -d and !-p
+             *-------------------------------------------------------------------------
+             */
+            if (opts->d && !opts->p) {
+                /*-------------------------------------------------------------------------
+                 * detect NaNs
+                 *-------------------------------------------------------------------------
+                 */
+                if (opts->do_nans) {
                     isnan1 = my_isnan(FLT_LDOUBLE,&temp1_double);
                     isnan2 = my_isnan(FLT_LDOUBLE,&temp2_double);
                 }
 
                 /* both not NaN, do the comparison */
-                if ( !isnan1 && !isnan2)
-                {
-
-                    if (ABS(temp1_double-temp2_double) > options->delta)
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                if (!isnan1 && !isnan2) {
+                    if (ABS(temp1_double-temp2_double) > opts->delta) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                             parallel_print(SPACES);
-                            parallel_print(LD_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                            parallel_print(LD_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                         }
                         nfound++;
                     }
                 } /* NaN */
                 /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
                 }
             }
-
-           /*-------------------------------------------------------------------------
-            * !-d and -p
-            *-------------------------------------------------------------------------
-            */
-            else if (!options->d && options->p)
-            {
-
-               /*-------------------------------------------------------------------------
-                * detect NaNs
-                *-------------------------------------------------------------------------
-                */
-                if ( options->do_nans )
-                {
-                    isnan1 = my_isnan(FLT_LDOUBLE,&temp1_double);
-                    isnan2 = my_isnan(FLT_LDOUBLE,&temp2_double);
+            /*-------------------------------------------------------------------------
+             * !-d and -p
+             *-------------------------------------------------------------------------
+             */
+            else if (!opts->d && opts->p) {
+                /*-------------------------------------------------------------------------
+                 * detect NaNs
+                 *-------------------------------------------------------------------------
+                 */
+                if (opts->do_nans) {
+                    isnan1 = my_isnan(FLT_LDOUBLE, &temp1_double);
+                    isnan2 = my_isnan(FLT_LDOUBLE, &temp2_double);
                 }
 
                 /* both not NaN, do the comparison */
-                if ( !isnan1 && !isnan2)
-                {
-
+                if (!isnan1 && !isnan2) {
                     PER(temp1_double,temp2_double);
 
-                    if (not_comparable && !both_zero) /* not comparable */
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                    if (not_comparable && !both_zero) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                             parallel_print(SPACES);
-                            parallel_print(LD_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                                    ABS(temp1_double-temp2_double));
+                            parallel_print(LD_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                         }
                         nfound++;
                     }
-
-                    else
-
-                        if ( per > options->percent )
-                        {
-                            if ( print_data(options) )
-                            {
-                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                                parallel_print(SPACES);
-                                parallel_print(LD_FORMAT_P,temp1_double,temp2_double,
-                                        ABS(temp1_double-temp2_double),
-                                        ABS(1-temp2_double/temp1_double));
-                            }
-                            nfound++;
+                    else if (per > opts->percent) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                            parallel_print(SPACES);
+                            parallel_print(LD_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
                         }
-
+                        nfound++;
+                    }
                 } /* NaN */
                 /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
                 }
             }
-
-           /*-------------------------------------------------------------------------
-            * -d and -p
-            *-------------------------------------------------------------------------
-            */
-            else if ( options->d && options->p)
-            {
-
-               /*-------------------------------------------------------------------------
-                * detect NaNs
-                *-------------------------------------------------------------------------
-                */
-                if ( options->do_nans )
-                {
-                    isnan1 = my_isnan(FLT_LDOUBLE,&temp1_double);
-                    isnan2 = my_isnan(FLT_LDOUBLE,&temp2_double);
+            /*-------------------------------------------------------------------------
+             * -d and -p
+             *-------------------------------------------------------------------------
+             */
+            else if (opts->d && opts->p) {
+                /*-------------------------------------------------------------------------
+                 * detect NaNs
+                 *-------------------------------------------------------------------------
+                 */
+                if (opts->do_nans) {
+                    isnan1 = my_isnan(FLT_LDOUBLE, &temp1_double);
+                    isnan2 = my_isnan(FLT_LDOUBLE, &temp2_double);
                 }
 
                 /* both not NaN, do the comparison */
-                if ( !isnan1 && !isnan2)
-                {
-
+                if (!isnan1 && !isnan2) {
                     PER(temp1_double,temp2_double);
 
-                    if (not_comparable && !both_zero) /* not comparable */
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                    if (not_comparable && !both_zero) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
                             parallel_print(SPACES);
-                            parallel_print(LD_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                                    ABS(temp1_double-temp2_double));
+                            parallel_print(LD_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                         }
                         nfound++;
                     }
-
-                    else
-
-                        if ( per > options->percent &&
-                                ABS(temp1_double-temp2_double) > options->delta )
-                        {
-                            if ( print_data(options) )
-                            {
-                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                                parallel_print(SPACES);
-                                parallel_print(LD_FORMAT_P,temp1_double,temp2_double,
-                                        ABS(temp1_double-temp2_double),
-                                        ABS(1-temp2_double/temp1_double));
-                            }
-                            nfound++;
+                    else if (per > opts->percent && ABS(temp1_double-temp2_double) > opts->delta) {
+                        if (print_data(opts)) {
+                            print_pos(ph, 1, index, acc, pos, rank, dims, obj1, obj2);
+                            parallel_print(SPACES);
+                            parallel_print(LD_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
                         }
-
+                        nfound++;
+                    }
                 } /* NaN */
                 /* only one is NaN, assume difference */
-                else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
                 }
             }
-
-           /*-------------------------------------------------------------------------
-            * no -d and -p
-            *-------------------------------------------------------------------------
-            */
-            else if (equal_ldouble(temp1_double,temp2_double,options)==FALSE)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+            /*-------------------------------------------------------------------------
+             * no -d and -p
+             *-------------------------------------------------------------------------
+             */
+            else if (equal_ldouble(temp1_double, temp2_double, opts) == FALSE) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, index, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(LD_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                    parallel_print(LD_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
             }
         } /*H5T_NATIVE_LDOUBLE*/
 #endif  /* H5_SIZEOF_LONG_DOUBLE */
 
-
-
         break; /* H5T_FLOAT class */
 
     } /* switch */
-    h5difftrace("diff_datum finish\n");
+
+done:
+    opts->err_stat = opts->err_stat | ret_value;
+
+    h5diffdebug3("diff_datum finish:%d - errstat:%d\n", nfound, opts->err_stat);
 
     return nfound;
-                }
+}
 
 /*-------------------------------------------------------------------------
  * Function: all_zero
@@ -2758,16 +2115,14 @@ static hsize_t diff_datum(void       *_mem1,
  * Purpose: Determines if memory is initialized to all zero bytes.
  *
  * Return: TRUE if all bytes are zero; FALSE otherwise
- *
  *-------------------------------------------------------------------------
  */
 
-static hbool_t all_zero(const void *_mem, size_t size)
-{
-    const unsigned char *mem = (const unsigned char *)_mem;
+static hbool_t all_zero(const void *_mem, size_t size) {
+    const unsigned char *mem = (const unsigned char *) _mem;
 
-    while(size-- > 0)
-        if(mem[size])
+    while (size-- > 0)
+        if (mem[size])
             return FALSE;
 
     return TRUE;
@@ -2779,46 +2134,38 @@ static hbool_t all_zero(const void *_mem, size_t size)
  * Purpose: print start coordinates and opposite corner of a region block
  *
  * Return: void
- *
  *-------------------------------------------------------------------------
  */
 
 static
-void print_region_block(int i, hsize_t *ptdata, int ndims)
-{
+void print_region_block(int i, hsize_t *ptdata, int ndims) {
     int j;
 
     parallel_print("        ");
     for (j = 0; j < ndims; j++)
-        parallel_print("%s%lu", j ? "," : "   (",
-                (unsigned long)ptdata[i * 2 * ndims + j]);
+        parallel_print("%s%lu", j ? "," : "   (", (unsigned long) ptdata[i * 2 * ndims + j]);
     for (j = 0; j < ndims; j++)
-        parallel_print("%s%lu", j ? "," : ")-(",
-                (unsigned long)ptdata[i * 2 * ndims + j + ndims]);
+        parallel_print("%s%lu", j ? "," : ")-(", (unsigned long) ptdata[i * 2 * ndims + j + ndims]);
     parallel_print(")");
 
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: print_points
  *
  * Purpose: print points of a region reference
  *
  * Return: void
- *
  *-------------------------------------------------------------------------
  */
 
 static
-void print_points(int i, hsize_t *ptdata, int ndims)
-{
+void print_points(int i, hsize_t *ptdata, int ndims) {
     int j;
 
     parallel_print("              ");
     for (j = 0; j < ndims; j++)
-        parallel_print("%s%lu", j ? "," : "(",
-                (unsigned long)(ptdata[i * ndims + j]));
+        parallel_print("%s%lu", j ? "," : "(", (unsigned long) (ptdata[i * ndims + j]));
     parallel_print(")");
 
 }
@@ -2829,37 +2176,32 @@ void print_points(int i, hsize_t *ptdata, int ndims)
  * Purpose: diff a dataspace region
  *
  * Return: number of differences
- *
  *-------------------------------------------------------------------------
  */
 
-static
-hsize_t diff_region(hid_t obj1_id,
-                    hid_t obj2_id,
-                    hid_t region1_id,
-                    hid_t region2_id,
-                    diff_opt_t *options)
+static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id, hid_t region1_id, hid_t region2_id, diff_opt_t *opts)
 
 {
-    hssize_t   nblocks1, npoints1;
-    hssize_t   nblocks2, npoints2;
-    hsize_t    alloc_size;
-    hsize_t    *ptdata1;
-    hsize_t    *ptdata2;
-    int        ndims1;
-    int        ndims2;
-    int        i, j;
-    hsize_t    nfound_b = 0;     /* block differences found */
-    hsize_t    nfound_p = 0;     /* point differences found */
+    hsize_t  ret_value = 0;
+    hssize_t nblocks1, npoints1;
+    hssize_t nblocks2, npoints2;
+    hsize_t  alloc_size;
+    hsize_t *ptdata1 = NULL;
+    hsize_t *ptdata2 = NULL;
+    int      ndims1;
+    int      ndims2;
+    int      i, j;
+    hsize_t  nfound_b = 0; /* block differences found */
+    hsize_t  nfound_p = 0; /* point differences found */
 
     ndims1 = H5Sget_simple_extent_ndims(region1_id);
     ndims2 = H5Sget_simple_extent_ndims(region2_id);
 
     /*
-    * These two functions fail if the region does not have blocks or points,
-    * respectively. They do not currently know how to translate from one to
-    * the other.
-    */
+     * These two functions fail if the region does not have blocks or points,
+     * respectively. They do not currently know how to translate from one to
+     * the other.
+     */
     H5E_BEGIN_TRY {
         nblocks1 = H5Sget_select_hyper_nblocks(region1_id);
         nblocks2 = H5Sget_select_hyper_nblocks(region2_id);
@@ -2868,179 +2210,182 @@ hsize_t diff_region(hid_t obj1_id,
         npoints2 = H5Sget_select_elem_npoints(region2_id);
     } H5E_END_TRY;
 
-    if(nblocks1 != nblocks2 || npoints1 != npoints2 || ndims1 != ndims2) {
-        options->not_cmp = 1;
-        return 0;
+    if (nblocks1 != nblocks2 || npoints1 != npoints2 || ndims1 != ndims2) {
+        opts->not_cmp = 1;
+        HGOTO_DONE (0);
     }
 
     /*-------------------------------------------------------------------------
-    * compare block information
-    *-------------------------------------------------------------------------
-    */
-    if(nblocks1 > 0) {
+     * compare block information
+     *-------------------------------------------------------------------------
+     */
+    if (nblocks1 > 0) {
         HDassert(ndims1 > 0);
-        alloc_size = (hsize_t)nblocks1 * (unsigned)ndims1 * 2 * sizeof(ptdata1[0]);
-        HDassert(alloc_size == (hsize_t)((size_t)alloc_size)); /*check for overflow*/
-
-        ptdata1 = (hsize_t *)HDmalloc((size_t)alloc_size);
-        H5_CHECK_OVERFLOW(nblocks1, hssize_t, hsize_t);
-        H5Sget_select_hyper_blocklist(region1_id, (hsize_t)0, (hsize_t)nblocks1, ptdata1);
+        alloc_size = (hsize_t) nblocks1 * (unsigned) ndims1 * 2 * sizeof(ptdata1[0]);
+        HDassert(alloc_size == (hsize_t)((size_t )alloc_size)); /*check for overflow*/
 
-        ptdata2 = (hsize_t *)HDmalloc((size_t)alloc_size);
-        H5_CHECK_OVERFLOW(nblocks2, hssize_t, hsize_t);
-        H5Sget_select_hyper_blocklist(region2_id, (hsize_t)0, (hsize_t)nblocks2, ptdata2);
-
-        for (i = 0; i < nblocks1; i++) {
-            /* start coordinates and opposite corner */
-            for (j = 0; j < ndims1; j++) {
-                hsize_t start1, start2, end1, end2;
-
-                start1 = ptdata1[i * 2 * ndims1 + j];
-                start2 = ptdata2[i * 2 * ndims1 + j];
-                end1   = ptdata1[i * 2 * ndims1 + j + ndims1];
-                end2   = ptdata2[i * 2 * ndims1 + j + ndims1];
-                if (start1 != start2 || end1 != end2)
-                    nfound_b++;
-            }
+        if((ptdata1 = (hsize_t *) HDmalloc((size_t )alloc_size)) == NULL) {
+            opts->err_stat = 1;
+            H5TOOLS_INFO(H5E_tools_min_id_g, "Buffer allocation failed");
         }
+        else {
+            H5_CHECK_OVERFLOW(nblocks1, hssize_t, hsize_t);
+            H5Sget_select_hyper_blocklist(region1_id, (hsize_t) 0, (hsize_t) nblocks1, ptdata1);
 
+            if((ptdata2 = (hsize_t *) HDmalloc((size_t )alloc_size)) == NULL) {
+                opts->err_stat = 1;
+                H5TOOLS_INFO(H5E_tools_min_id_g, "Buffer allocation failed");
+            }
+            else {
+                H5_CHECK_OVERFLOW(nblocks2, hssize_t, hsize_t);
+                H5Sget_select_hyper_blocklist(region2_id, (hsize_t) 0, (hsize_t) nblocks2, ptdata2);
+
+                for (i = 0; i < nblocks1; i++) {
+                    /* start coordinates and opposite corner */
+                    for (j = 0; j < ndims1; j++) {
+                        hsize_t start1, start2, end1, end2;
+
+                        start1 = ptdata1[i * 2 * ndims1 + j];
+                        start2 = ptdata2[i * 2 * ndims1 + j];
+                        end1 = ptdata1[i * 2 * ndims1 + j + ndims1];
+                        end2 = ptdata2[i * 2 * ndims1 + j + ndims1];
+                        if (start1 != start2 || end1 != end2)
+                            nfound_b++;
+                    }
+                }
 
-        /* print differences if found */
-        if (nfound_b && options->m_verbose) {
-            H5O_info_t oi1, oi2;
+                /* print differences if found */
+                if (nfound_b && opts->m_verbose) {
+                    H5O_info_t oi1, oi2;
 
-            H5Oget_info(obj1_id, &oi1);
-            H5Oget_info(obj2_id, &oi2);
+                    H5Oget_info(obj1_id, &oi1);
+                    H5Oget_info(obj2_id, &oi2);
 
-            parallel_print("Referenced dataset      %lu            %lu\n",
-                    (unsigned long)oi1.addr, (unsigned long)oi2.addr);
-            parallel_print("------------------------------------------------------------\n");
+                    parallel_print("Referenced dataset      %lu            %lu\n", (unsigned long) oi1.addr, (unsigned long) oi2.addr);
+                    parallel_print( "------------------------------------------------------------\n");
 
-            parallel_print("Region blocks\n");
-            for (i = 0; i < nblocks1; i++) {
-                parallel_print("block #%d", i);
-                print_region_block(i, ptdata1, ndims1);
-                print_region_block(i, ptdata2, ndims1);
-                parallel_print("\n");
-            }
-        }
+                    parallel_print("Region blocks\n");
+                    for (i = 0; i < nblocks1; i++) {
+                        parallel_print("block #%d", i);
+                        print_region_block(i, ptdata1, ndims1);
+                        print_region_block(i, ptdata2, ndims1);
+                        parallel_print("\n");
+                    }
+                }
+                HDfree(ptdata2);
+            } /* else ptdata2 */
 
-        HDfree(ptdata1);
-        HDfree(ptdata2);
+            HDfree(ptdata1);
+        } /* else ptdata1 */
     }
 
     /*-------------------------------------------------------------------------
-    * compare point information
-    *-------------------------------------------------------------------------
-    */
-    if(npoints1 > 0) {
-        alloc_size = (hsize_t)npoints1 * (unsigned)ndims1 * sizeof(ptdata1[0]);
-        HDassert(alloc_size == (hsize_t)((size_t)alloc_size)); /*check for overflow*/
-
-        ptdata1 = (hsize_t *)HDmalloc((size_t)alloc_size);
-        H5_CHECK_OVERFLOW(npoints1,hssize_t,hsize_t);
-        H5Sget_select_elem_pointlist(region1_id, (hsize_t)0, (hsize_t)npoints1, ptdata1);
-
-        ptdata2 = (hsize_t *)HDmalloc((size_t)alloc_size);
-        H5_CHECK_OVERFLOW(npoints1,hssize_t,hsize_t);
-        H5Sget_select_elem_pointlist(region2_id, (hsize_t)0, (hsize_t)npoints2, ptdata2);
+     * compare point information
+     *-------------------------------------------------------------------------
+     */
+    if (npoints1 > 0) {
+        alloc_size = (hsize_t) npoints1 * (unsigned) ndims1 * sizeof(ptdata1[0]);
+        HDassert(alloc_size == (hsize_t)((size_t )alloc_size)); /*check for overflow*/
 
-        for(i = 0; i < npoints1; i++) {
-            hsize_t pt1, pt2;
+        if((ptdata1 = (hsize_t *) HDmalloc((size_t )alloc_size)) == NULL) {
+            opts->err_stat = 1;
+            H5TOOLS_INFO(H5E_tools_min_id_g, "Buffer allocation failed");
+        }
+        else {
+            H5_CHECK_OVERFLOW(npoints1, hssize_t, hsize_t);
+            H5Sget_select_elem_pointlist(region1_id, (hsize_t) 0, (hsize_t) npoints1, ptdata1);
 
-            for(j = 0; j < ndims1; j++) {
-                pt1 = ptdata1[i * ndims1 + j];
-                pt2 = ptdata2[i * ndims1 + j];
-                if(pt1 != pt2)
-                    nfound_p++;
+            if((ptdata2 = (hsize_t *) HDmalloc((size_t )alloc_size)) == NULL) {
+                opts->err_stat = 1;
+                H5TOOLS_INFO(H5E_tools_min_id_g, "Buffer allocation failed");
             }
-        }
+            else {
+                H5_CHECK_OVERFLOW(npoints1, hssize_t, hsize_t);
+                H5Sget_select_elem_pointlist(region2_id, (hsize_t) 0, (hsize_t) npoints2, ptdata2);
+
+                for (i = 0; i < npoints1; i++) {
+                    hsize_t pt1, pt2;
 
-        if(nfound_p && options->m_verbose) {
-            parallel_print("Region points\n");
-            for(i = 0; i < npoints1; i++) {
-                hsize_t pt1, pt2;
-                int     diff_data = 0;
-
-                for(j = 0; j < ndims1; j++) {
-                    pt1 = ptdata1[i * ndims1 + j];
-                    pt2 = ptdata2[i * ndims1 + j];
-                    if(pt1 != pt2) {
-                        diff_data = 1;
-                        break;
+                    for (j = 0; j < ndims1; j++) {
+                        pt1 = ptdata1[i * ndims1 + j];
+                        pt2 = ptdata2[i * ndims1 + j];
+                        if (pt1 != pt2)
+                            nfound_p++;
                     }
                 }
-                if(diff_data) {
-                    parallel_print("point #%d", i);
-                    print_points(i, ptdata1, ndims1);
-                    print_points(i, ptdata2, ndims1);
-                    parallel_print("\n");
-                }
-            }
-        }
 
+                if (nfound_p && opts->m_verbose) {
+                    parallel_print("Region points\n");
+                    for (i = 0; i < npoints1; i++) {
+                        hsize_t pt1, pt2;
+                        int diff_data = 0;
 
-#if defined (H5DIFF_DEBUG)
-        for (i = 0; i < npoints1; i++) {
-            int j;
+                        for (j = 0; j < ndims1; j++) {
+                            pt1 = ptdata1[i * ndims1 + j];
+                            pt2 = ptdata2[i * ndims1 + j];
+                            if (pt1 != pt2) {
+                                diff_data = 1;
+                                break;
+                            }
+                        }
+                        if (diff_data) {
+                            parallel_print("point #%d", i);
+                            print_points(i, ptdata1, ndims1);
+                            print_points(i, ptdata2, ndims1);
+                            parallel_print("\n");
+                        }
+                    }
+                }
+                HDfree(ptdata2);
+            } /* else ptdata2 */
 
-            parallel_print("%sPt%lu: " , i ? "," : "", (unsigned long)i);
+#if defined (H5DIFF_DEBUG)
+            for (i = 0; i < npoints1; i++) {
+                parallel_print("%sPt%lu: " , i ? "," : "", (unsigned long)i);
 
-            for (j = 0; j < ndims1; j++)
-                parallel_print("%s%lu", j ? "," : "(",
-                        (unsigned long)(ptdata1[i * ndims1 + j]));
+                for (j = 0; j < ndims1; j++)
+                    parallel_print("%s%lu", j ? "," : "(", (unsigned long)(ptdata1[i * ndims1 + j]));
 
-            parallel_print(")");
-        }
+                parallel_print(")");
+            }
 #endif
 
-        HDfree(ptdata1);
-        HDfree(ptdata2);
+            HDfree(ptdata1);
+        } /* else ptdata1 */
     }
 
-    nfound_b = nfound_b / (unsigned)ndims1;
-    nfound_p = nfound_p / (unsigned)ndims1;
-    return (nfound_p + nfound_b);
-}
+    nfound_b = nfound_b / (unsigned) ndims1;
+    nfound_p = nfound_p / (unsigned) ndims1;
+
+    ret_value = nfound_p + nfound_b;
 
+done:
+    return ret_value;
+}
 
 /*-------------------------------------------------------------------------
  * Function: character_compare
  *
- * Purpose: do a byte-by-byte comparison and print in char format
- *
- * Return: number of differences found
+ * Purpose:  do a byte-by-byte comparison and print in char format
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
 
-static
-hsize_t character_compare(char *mem1,
-                  char *mem2,
-                  hsize_t       i,
-                  unsigned      u,
-                  int           rank,
-                  hsize_t       *dims,
-                  hsize_t       *acc,
-                  hsize_t       *pos,
-                  diff_opt_t    *options,
-                  const char    *obj1,
-                  const char    *obj2,
-                  int           *ph)
+static hsize_t character_compare(char *mem1, char *mem2, hsize_t i, unsigned u,
+        int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1, const char *obj2, int *ph)
 {
-    hsize_t            nfound=0;  /* differences found */
-    char      temp1_uchar;
-    char      temp2_uchar;
+    hsize_t nfound = 0; /* differences found */
+    char    temp1_uchar;
+    char    temp2_uchar;
 
     HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
     HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
     h5diffdebug3("character_compare start %d=%d\n",temp1_uchar,temp2_uchar);
 
-    if (temp1_uchar != temp2_uchar)
-    {
-        if ( print_data(options) )
-        {
-            print_char_pos(ph,0,i,u,acc,pos,rank,dims,obj1,obj2);
+    if (temp1_uchar != temp2_uchar) {
+        if (print_data(opts)) {
+            print_char_pos(ph, 0, i, u, acc, pos, rank, dims, obj1, obj2);
             parallel_print("            ");
             h5diff_print_char(temp1_uchar);
             parallel_print("            ");
@@ -3054,34 +2399,23 @@ hsize_t character_compare(char *mem1,
     return nfound;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: character_compare_opt
  *
- * Purpose: do a byte-by-byte comparison and print in numerical format
- *
- * Return: number of differences found
+ * Purpose:  do a byte-by-byte comparison and print in numerical format
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
 
-static hsize_t character_compare_opt(unsigned char *mem1,
-                          unsigned char *mem2,
-                          hsize_t       i,
-                          int           rank,
-                          hsize_t       *dims,
-                          hsize_t       *acc,
-                          hsize_t       *pos,
-                          diff_opt_t    *options,
-                          const char    *obj1,
-                          const char    *obj2,
-                          int           *ph)
+static hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2,
+        hsize_t i, int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1, const char *obj2, int *ph)
 {
-    hsize_t            nfound=0;  /* differences found */
-    unsigned char      temp1_uchar;
-    unsigned char      temp2_uchar;
-    double             per;
-    hbool_t            both_zero;
+    hsize_t       nfound = 0; /* differences found */
+    unsigned char temp1_uchar;
+    unsigned char temp2_uchar;
+    double        per;
+    hbool_t       both_zero;
 
     HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
     HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
@@ -3089,650 +2423,501 @@ static hsize_t character_compare_opt(unsigned char *mem1,
     h5difftrace("character_compare_opt start\n");
     /* -d and !-p */
 
-    if (options->d && !options->p)
-    {
-        if ( PDIFF(temp1_uchar,temp2_uchar) > options->delta)
-        {
-            if ( print_data(options) )
-            {
-                print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+    if (opts->d && !opts->p) {
+        if (PDIFF(temp1_uchar,temp2_uchar) > opts->delta) {
+            if (print_data(opts)) {
+                print_pos(ph, 0, i, acc, pos, rank, dims, obj1, obj2);
                 parallel_print(SPACES);
-                parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+                parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
             }
             nfound++;
         }
     }
     /* !-d and -p */
-    else if (!options->d && options->p)
-    {
-        PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-        if ( per > options->percent )
-        {
-            if ( print_data(options) )
-            {
-                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+    else if (!opts->d && opts->p) {
+        PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
+        if (per > opts->percent) {
+            if (print_data(opts)) {
+                print_pos(ph, 1, i, acc, pos, rank, dims, obj1, obj2);
                 parallel_print(SPACES);
-                parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
+                parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
             }
             nfound++;
         }
     }
     /* -d and -p */
-    else if ( options->d && options->p)
-    {
-        PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-        if ( per > options->percent && PDIFF(temp1_uchar,temp2_uchar) > options->delta )
-        {
-            if ( print_data(options) )
-            {
-                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+    else if (opts->d && opts->p) {
+        PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
+        if (per > opts->percent && PDIFF(temp1_uchar,temp2_uchar) > opts->delta) {
+            if (print_data(opts)) {
+                print_pos(ph, 1, i, acc, pos, rank, dims, obj1, obj2);
                 parallel_print(SPACES);
-                parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar),per);
+                parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
             }
             nfound++;
         }
     }
-    else if (temp1_uchar != temp2_uchar)
-    {
-        if ( print_data(options) )
-        {
-            print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+    else if (temp1_uchar != temp2_uchar) {
+        if (print_data(opts)) {
+            print_pos(ph, 0, i, acc, pos, rank, dims, obj1, obj2);
             parallel_print(SPACES);
-            parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+            parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
         }
         nfound++;
-    }
-    h5difftrace("character_compare_opt finish\n");
+    } h5difftrace("character_compare_opt finish\n");
 
     return nfound;
-
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: diff_float
  *
- * Purpose: diff a H5T_NATIVE_FLOAT type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_FLOAT type
  *
+ * Return:   number of differences found
+*
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_float(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph)
+static hsize_t diff_float(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph)
 
 {
-    hsize_t     nfound=0;          /* number of differences found */
-    float       temp1_float;
-    float       temp2_float;
-    hsize_t     i;
-    double      per;
-    hbool_t     both_zero;
-    hbool_t     isnan1 = FALSE;
-    hbool_t     isnan2 = FALSE;
+    hsize_t nfound = 0; /* number of differences found */
+    float   temp1_float;
+    float   temp2_float;
+    hsize_t i;
+    double  per;
+    hbool_t both_zero;
+    hbool_t isnan1 = FALSE;
+    hbool_t isnan2 = FALSE;
 
     h5difftrace("diff_float start\n");
 
- /*-------------------------------------------------------------------------
-  * -d and !-p
-  *-------------------------------------------------------------------------
-  */
+    /*-------------------------------------------------------------------------
+     * -d and !-p
+     *-------------------------------------------------------------------------
+     */
 
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_float, mem1, sizeof(float));
             HDmemcpy(&temp2_float, mem2, sizeof(float));
 
-           /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            if ( options->do_nans )
-            {
-                isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
-                isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
+            /*-------------------------------------------------------------------------
+             * detect NaNs
+             *-------------------------------------------------------------------------
+             */
+            if (opts->do_nans) {
+                isnan1 = my_isnan(FLT_FLOAT, &temp1_float);
+                isnan2 = my_isnan(FLT_FLOAT, &temp2_float);
             }
 
             /* both not NaN, do the comparison */
-            if ( !isnan1 && !isnan2)
-            {
-                if ((double)ABS(temp1_float-temp2_float) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (!isnan1 && !isnan2) {
+                if ((double) ABS(temp1_float - temp2_float) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT, (double)temp1_float, (double)temp2_float, (double)ABS(temp1_float - temp2_float));
+                        parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                     }
                     nfound++;
                 }
             }
             /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT, (double)temp1_float, (double)temp2_float, (double)ABS(temp1_float - temp2_float));
+                    parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                 }
                 nfound++;
 
             }
-            mem1+=sizeof(float);
-            mem2+=sizeof(float);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(float);
+            mem2 += sizeof(float);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* i */
     }
-
-   /*-------------------------------------------------------------------------
-    * !-d and -p
-    *-------------------------------------------------------------------------
-    */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    /*-------------------------------------------------------------------------
+     * !-d and -p
+     *-------------------------------------------------------------------------
+     */
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_float, mem1, sizeof(float));
             HDmemcpy(&temp2_float, mem2, sizeof(float));
 
-           /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            if ( options->do_nans )
-            {
-                isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
-                isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
+            /*-------------------------------------------------------------------------
+             * detect NaNs
+             *-------------------------------------------------------------------------
+             */
+            if (opts->do_nans) {
+                isnan1 = my_isnan(FLT_FLOAT, &temp1_float);
+                isnan2 = my_isnan(FLT_FLOAT, &temp2_float);
             }
             /* both not NaN, do the comparison */
-            if ( (!isnan1 && !isnan2))
-            {
-
-                PER(temp1_float,temp2_float);
+            if ((!isnan1 && !isnan2)) {
+                PER(temp1_float, temp2_float);
 
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP, (double)temp1_float, (double)temp2_float,
-                                (double)ABS(temp1_float - temp2_float));
+                        parallel_print(F_FORMAT_P_NOTCOMP, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P, (double)temp1_float, (double)temp2_float,
-                                    (double)ABS(temp1_float - temp2_float),
-                                    (double)ABS(1 - temp2_float / temp1_float));
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(F_FORMAT_P, (double) temp1_float, (double) temp2_float,
+                                (double) ABS(temp1_float - temp2_float), (double) ABS(1 - temp2_float / temp1_float));
                     }
+                    nfound++;
+                }
             }
             /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT, (double)temp1_float, (double)temp2_float, (double)ABS(temp1_float - temp2_float));
+                    parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                 }
                 nfound++;
 
             }
-            mem1+=sizeof(float);
-            mem2+=sizeof(float);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(float);
+            mem2 += sizeof(float);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* i */
     }
-
-   /*-------------------------------------------------------------------------
-    * -d and -p
-    *-------------------------------------------------------------------------
-    */
-    else if ( options->d && options->p)
-    {
-
-        for ( i = 0; i < nelmts; i++)
-        {
+    /*-------------------------------------------------------------------------
+     * -d and -p
+     *-------------------------------------------------------------------------
+     */
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_float, mem1, sizeof(float));
             HDmemcpy(&temp2_float, mem2, sizeof(float));
 
             /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            if ( options->do_nans )
-            {
-                isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
-                isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
+             * detect NaNs
+             *-------------------------------------------------------------------------
+             */
+            if (opts->do_nans) {
+                isnan1 = my_isnan(FLT_FLOAT, &temp1_float);
+                isnan2 = my_isnan(FLT_FLOAT, &temp2_float);
             }
 
             /* both not NaN, do the comparison */
-            if ( !isnan1 && !isnan2)
-            {
-
-                PER(temp1_float,temp2_float);
+            if (!isnan1 && !isnan2) {
+                PER(temp1_float, temp2_float);
 
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP, (double)temp1_float, (double)temp2_float,
-                                (double)ABS(temp1_float - temp2_float));
+                        parallel_print(F_FORMAT_P_NOTCOMP, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent && (double)ABS(temp1_float - temp2_float) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P, (double)temp1_float, (double)temp2_float,
-                                    (double)ABS(temp1_float - temp2_float),
-                                    (double)ABS(1 - temp2_float / temp1_float));
-                        }
-                        nfound++;
+                else if (per > opts->percent && (double) ABS(temp1_float - temp2_float) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(F_FORMAT_P, (double) temp1_float, (double) temp2_float,
+                                (double) ABS(temp1_float - temp2_float), (double) ABS(1 - temp2_float / temp1_float));
                     }
+                    nfound++;
+                }
 
             }
             /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT, (double)temp1_float, (double)temp2_float, (double)ABS(temp1_float - temp2_float));
+                    parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                 }
                 nfound++;
 
             }
-            mem1+=sizeof(float);
-            mem2+=sizeof(float);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(float);
+            mem2 += sizeof(float);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* i */
     }
 
-   /*-------------------------------------------------------------------------
-    * no -d and -p
-    *-------------------------------------------------------------------------
-    */
-    else
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    /*-------------------------------------------------------------------------
+     * no -d and -p
+     *-------------------------------------------------------------------------
+     */
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_float, mem1, sizeof(float));
             HDmemcpy(&temp2_float, mem2, sizeof(float));
 
-            if (equal_float(temp1_float,temp2_float,options)==FALSE)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (equal_float(temp1_float, temp2_float, opts) == FALSE) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT, (double)temp1_float, (double)temp2_float, (double)ABS(temp1_float - temp2_float));
+                    parallel_print(F_FORMAT, (double) temp1_float, (double) temp2_float, (double) ABS(temp1_float - temp2_float));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(float);
-            mem2+=sizeof(float);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(float);
+            mem2 += sizeof(float);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
-
         } /* nelmts */
-
-
-
-
-
     }
     h5difftrace("diff_float finish\n");
 
     return nfound;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: diff_double
  *
- * Purpose: diff a H5T_NATIVE_DOUBLE type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_DOUBLE type
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_double(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph)
+static hsize_t diff_double(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph)
 
 {
-    hsize_t     nfound=0;          /* number of differences found */
-    double      temp1_double;
-    double      temp2_double;
-    hsize_t     i;
-    double      per;
-    hbool_t     both_zero;
-    hbool_t     isnan1 = FALSE;
-    hbool_t     isnan2 = FALSE;
+    hsize_t nfound = 0; /* number of differences found */
+    double  temp1_double;
+    double  temp2_double;
+    hsize_t i;
+    double  per;
+    hbool_t both_zero;
+    hbool_t isnan1 = FALSE;
+    hbool_t isnan2 = FALSE;
 
     h5difftrace("diff_double start\n");
-   /*-------------------------------------------------------------------------
-    * -d and !-p
-    *-------------------------------------------------------------------------
-    */
+    /*-------------------------------------------------------------------------
+     * -d and !-p
+     *-------------------------------------------------------------------------
+     */
 
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_double, mem1, sizeof(double));
             HDmemcpy(&temp2_double, mem2, sizeof(double));
 
-           /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            if ( options->do_nans )
-            {
-                isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-                isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+            /*-------------------------------------------------------------------------
+             * detect NaNs
+             *-------------------------------------------------------------------------
+             */
+            if (opts->do_nans) {
+                isnan1 = my_isnan(FLT_DOUBLE, &temp1_double);
+                isnan2 = my_isnan(FLT_DOUBLE, &temp2_double);
             }
 
             /* both not NaN, do the comparison */
-            if ( !isnan1 && !isnan2)
-            {
-                if (ABS(temp1_double-temp2_double) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (!isnan1 && !isnan2) {
+                if (ABS(temp1_double-temp2_double) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
                 }
             }
             /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2))
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
 
             }
-            mem1+=sizeof(double);
-            mem2+=sizeof(double);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(double);
+            mem2 += sizeof(double);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* i */
     }
 
-   /*-------------------------------------------------------------------------
-    * !-d and -p
-    *-------------------------------------------------------------------------
-    */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    /*-------------------------------------------------------------------------
+     * !-d and -p
+     *-------------------------------------------------------------------------
+     */
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_double, mem1, sizeof(double));
             HDmemcpy(&temp2_double, mem2, sizeof(double));
 
-           /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            if ( options->do_nans )
-            {
-                isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-                isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+            /*-------------------------------------------------------------------------
+             * detect NaNs
+             *-------------------------------------------------------------------------
+             */
+            if (opts->do_nans) {
+                isnan1 = my_isnan(FLT_DOUBLE, &temp1_double);
+                isnan2 = my_isnan(FLT_DOUBLE, &temp2_double);
             }
             /* both not NaN, do the comparison */
-            if ( !isnan1 && !isnan2)
-            {
-
-                PER(temp1_double,temp2_double);
+            if (!isnan1 && !isnan2) {
+                PER(temp1_double, temp2_double);
 
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                                ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                                    ABS(temp1_double-temp2_double),
-                                    ABS(1-temp2_double/temp1_double));
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(F_FORMAT_P, temp1_double, temp2_double,
+                                ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
                     }
+                    nfound++;
+                }
             }
             /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
 
             }
-            mem1+=sizeof(double);
-            mem2+=sizeof(double);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(double);
+            mem2 += sizeof(double);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* i */
     }
+    /*-------------------------------------------------------------------------
+     * -d and -p
+     *-------------------------------------------------------------------------
+     */
+    else if (opts->d && opts->p) {
 
-   /*-------------------------------------------------------------------------
-    * -d and -p
-    *-------------------------------------------------------------------------
-    */
-    else if ( options->d && options->p)
-    {
-
-        for ( i = 0; i < nelmts; i++)
-        {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_double, mem1, sizeof(double));
             HDmemcpy(&temp2_double, mem2, sizeof(double));
 
             /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            if ( options->do_nans )
-            {
-                isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-                isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+             * detect NaNs
+             *-------------------------------------------------------------------------
+             */
+            if (opts->do_nans) {
+                isnan1 = my_isnan(FLT_DOUBLE, &temp1_double);
+                isnan2 = my_isnan(FLT_DOUBLE, &temp2_double);
             }
 
             /* both not NaN, do the comparison */
-            if ( !isnan1 && !isnan2)
-            {
-
-                PER(temp1_double,temp2_double);
+            if (!isnan1 && !isnan2) {
+                PER(temp1_double, temp2_double);
 
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                if (not_comparable && !both_zero)  {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                                ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent && ABS(temp1_double-temp2_double) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                                    ABS(temp1_double-temp2_double),
-                                    ABS(1-temp2_double/temp1_double));
-                        }
-                        nfound++;
+                else if (per > opts->percent && ABS(temp1_double-temp2_double) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(F_FORMAT_P, temp1_double, temp2_double,
+                                ABS(temp1_double - temp2_double), ABS(1 - temp2_double / temp1_double));
                     }
-
+                    nfound++;
+                }
             }
             /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2))
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
-
             }
-            mem1+=sizeof(double);
-            mem2+=sizeof(double);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(double);
+            mem2 += sizeof(double);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* i */
     }
-
-   /*-------------------------------------------------------------------------
-    * no -d and -p
-    *-------------------------------------------------------------------------
-    */
-    else
-    {
-
-
-
-        for ( i = 0; i < nelmts; i++)
-        {
+    /*-------------------------------------------------------------------------
+     * no -d and -p
+     *-------------------------------------------------------------------------
+     */
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_double, mem1, sizeof(double));
             HDmemcpy(&temp2_double, mem2, sizeof(double));
 
-
-            if (equal_double(temp1_double,temp2_double,options)==FALSE)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (equal_double(temp1_double, temp2_double, opts) == FALSE) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(double);
-            mem2+=sizeof(double);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(double);
+            mem2 += sizeof(double);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
-
         } /* nelmts */
-
-
-
-
-
     }
     h5difftrace("diff_double finish\n");
 
     return nfound;
 }
 
-
-
-
-
 /*-------------------------------------------------------------------------
  * Function: diff_ldouble
  *
- * Purpose: diff a H5T_NATIVE_LDOUBLE type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_LDOUBLE type
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
 #if H5_SIZEOF_LONG_DOUBLE !=0
 
 static hsize_t diff_ldouble(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph)
+        unsigned char *mem2,
+        hsize_t nelmts,
+        hsize_t hyper_start,
+        int rank,
+        hsize_t *dims,
+        hsize_t *acc,
+        hsize_t *pos,
+        diff_opt_t *opts,
+        const char *obj1,
+        const char *obj2,
+        int *ph)
 
 {
-    hsize_t     nfound=0;          /* number of differences found */
+    hsize_t     nfound = 0; /* number of differences found */
     long double temp1_double;
     long double temp2_double;
     hsize_t     i;
@@ -3743,245 +2928,183 @@ static hsize_t diff_ldouble(unsigned char *mem1,
 
     h5difftrace("diff_ldouble start\n");
 
-   /*-------------------------------------------------------------------------
-    * -d and !-p
-    *-------------------------------------------------------------------------
-    */
+    /*-------------------------------------------------------------------------
+     * -d and !-p
+     *-------------------------------------------------------------------------
+     */
 
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    if (opts->d && !opts->p) {
+        for ( i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_double, mem1, sizeof(long double));
             HDmemcpy(&temp2_double, mem2, sizeof(long double));
 
-           /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            if ( options->do_nans )
-            {
+            /*-------------------------------------------------------------------------
+             * detect NaNs
+             *-------------------------------------------------------------------------
+             */
+            if (opts->do_nans) {
                 isnan1 = my_isnan(FLT_LDOUBLE,&temp1_double);
                 isnan2 = my_isnan(FLT_LDOUBLE,&temp2_double);
             }
 
             /* both not NaN, do the comparison */
-            if ( !isnan1 && !isnan2)
-            {
-                if (ABS(temp1_double-temp2_double) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (!isnan1 && !isnan2) {
+                if (ABS(temp1_double-temp2_double) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
                 }
             }
             /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
 
             }
-            mem1+=sizeof(long double);
-            mem2+=sizeof(long double);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(long double);
+            mem2 += sizeof(long double);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* i */
     }
 
-   /*-------------------------------------------------------------------------
-    * !-d and -p
-    *-------------------------------------------------------------------------
-    */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    /*-------------------------------------------------------------------------
+     * !-d and -p
+     *-------------------------------------------------------------------------
+     */
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_double, mem1, sizeof(long double));
             HDmemcpy(&temp2_double, mem2, sizeof(long double));
 
-           /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            if ( options->do_nans )
-            {
-                isnan1 = my_isnan(FLT_LDOUBLE,&temp1_double);
-                isnan2 = my_isnan(FLT_LDOUBLE,&temp2_double);
+            /*-------------------------------------------------------------------------
+             * detect NaNs
+             *-------------------------------------------------------------------------
+             */
+            if (opts->do_nans) {
+                isnan1 = my_isnan(FLT_LDOUBLE, &temp1_double);
+                isnan2 = my_isnan(FLT_LDOUBLE, &temp2_double);
             }
             /* both not NaN, do the comparison */
-            if ( !isnan1 && !isnan2)
-            {
-
-                PER(temp1_double,temp2_double);
+            if (!isnan1 && !isnan2) {
+                PER(temp1_double, temp2_double);
 
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                                ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                                    ABS(temp1_double-temp2_double),
-                                    ABS(1-temp2_double/temp1_double));
-                        }
-                        nfound++;
+                else if (per > opts->percent) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(F_FORMAT_P, temp1_double, temp2_double,
+                                ABS(temp1_double - temp2_double), ABS(1-temp2_double / temp1_double));
                     }
+                    nfound++;
+                }
             }
             /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start+i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
-
             }
-            mem1+=sizeof(long double);
-            mem2+=sizeof(long double);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(long double);
+            mem2 += sizeof(long double);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* i */
     }
-
-   /*-------------------------------------------------------------------------
-    * -d and -p
-    *-------------------------------------------------------------------------
-    */
-    else if ( options->d && options->p)
-    {
-
-        for ( i = 0; i < nelmts; i++)
-        {
+    /*-------------------------------------------------------------------------
+     * -d and -p
+     *-------------------------------------------------------------------------
+     */
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_double, mem1, sizeof(long double));
             HDmemcpy(&temp2_double, mem2, sizeof(long double));
 
             /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            if ( options->do_nans )
-            {
-                isnan1 = my_isnan(FLT_LDOUBLE,&temp1_double);
-                isnan2 = my_isnan(FLT_LDOUBLE,&temp2_double);
+             * detect NaNs
+             *-------------------------------------------------------------------------
+             */
+            if (opts->do_nans) {
+                isnan1 = my_isnan(FLT_LDOUBLE, &temp1_double);
+                isnan2 = my_isnan(FLT_LDOUBLE, &temp2_double);
             }
 
             /* both not NaN, do the comparison */
-            if ( !isnan1 && !isnan2)
-            {
+            if (!isnan1 && !isnan2) {
+                PER(temp1_double, temp2_double);
 
-                PER(temp1_double,temp2_double);
-
-                if (not_comparable && !both_zero) /* not comparable */
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                if (not_comparable && !both_zero) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                                ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT_P_NOTCOMP, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                     }
                     nfound++;
                 }
-
-                else
-
-                    if ( per > options->percent && ABS(temp1_double-temp2_double) > options->delta )
-                    {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                                    ABS(temp1_double-temp2_double),
-                                    ABS(1-temp2_double/temp1_double));
-                        }
-                        nfound++;
+                else if (per > opts->percent && ABS(temp1_double - temp2_double) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                        parallel_print(SPACES);
+                        parallel_print(F_FORMAT_P, temp1_double, temp2_double, ABS(temp1_double - temp2_double), ABS(1-temp2_double / temp1_double));
                     }
-
+                    nfound++;
+                }
             }
             /* only one is NaN, assume difference */
-            else if ((isnan1 && !isnan2)  || (!isnan1 && isnan2))
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            else if ((isnan1 && !isnan2) || (!isnan1 && isnan2)) {
+                if (print_data(opts))  {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
-
             }
-            mem1+=sizeof(long double);
-            mem2+=sizeof(long double);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(long double);
+            mem2 += sizeof(long double);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* i */
     }
-
-   /*-------------------------------------------------------------------------
-    * no -d and -p
-    *-------------------------------------------------------------------------
-    */
-    else
-    {
-
-
-
-        for ( i = 0; i < nelmts; i++)
-        {
+    /*-------------------------------------------------------------------------
+     * no -d and -p
+     *-------------------------------------------------------------------------
+     */
+    else {
+        for (i = 0; i < nelmts; i++)  {
             HDmemcpy(&temp1_double, mem1, sizeof(long double));
             HDmemcpy(&temp2_double, mem2, sizeof(long double));
 
-
-            if (equal_ldouble(temp1_double,temp2_double,options)==FALSE)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (equal_ldouble(temp1_double, temp2_double, opts) == FALSE) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                    parallel_print(F_FORMAT, temp1_double, temp2_double, ABS(temp1_double - temp2_double));
                 }
                 nfound++;
             }
-
-            mem1+=sizeof(long double);
-            mem2+=sizeof(long double);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(long double);
+            mem2 += sizeof(long double);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
-
         } /* nelmts */
-
-
-
-
-
     }
     h5difftrace("diff_ldouble finish\n");
 
@@ -3989,209 +3112,147 @@ static hsize_t diff_ldouble(unsigned char *mem1,
 }
 #endif /* H5_SIZEOF_LONG_DOUBLE */
 
-
-
-
-
-
 /*-------------------------------------------------------------------------
  * Function: diff_schar
  *
- * Purpose: diff a H5T_NATIVE_SCHAR type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_SCHAR type
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_schar(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph)
+static hsize_t diff_schar(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph)
 
 {
-    hsize_t     nfound=0;          /* number of differences found */
-    char        temp1_char;
-    char        temp2_char;
-    hsize_t     i;
-    double      per;
-    hbool_t     both_zero;
+    hsize_t nfound = 0; /* number of differences found */
+    char    temp1_char;
+    char    temp2_char;
+    hsize_t i;
+    double  per;
+    hbool_t both_zero;
 
     h5difftrace("diff_schar start\n");
-
     /* -d and !-p */
-    if (options->d && !options->p)
-    {
-
-        for ( i = 0; i < nelmts; i++)
-        {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_char, mem1, sizeof(char));
             HDmemcpy(&temp2_char, mem2, sizeof(char));
 
-            if (ABS(temp1_char-temp2_char) > options->delta)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (ABS(temp1_char-temp2_char) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+                    parallel_print(I_FORMAT, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
                 }
                 nfound++;
             }
-            mem1+=sizeof(char);
-            mem2+=sizeof(char);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(char);
+            mem2 += sizeof(char);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-
     /* !-d and -p */
-    else if (!options->d && options->p)
-    {
-
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_char, mem1, sizeof(char));
             HDmemcpy(&temp2_char, mem2, sizeof(char));
 
-            PER(temp1_char,temp2_char);
+            PER(temp1_char, temp2_char);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,
-                            ABS(temp1_char-temp2_char));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_char,temp2_char,
-                                ABS(temp1_char-temp2_char),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_char, temp2_char, ABS(temp1_char - temp2_char), per);
                 }
-            mem1+=sizeof(char);
-            mem2+=sizeof(char);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(char);
+            mem2 += sizeof(char);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-
     /* -d and -p */
-    else if ( options->d && options->p)
-    {
-
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_char, mem1, sizeof(char));
             HDmemcpy(&temp2_char, mem2, sizeof(char));
 
-            PER(temp1_char,temp2_char);
+            PER(temp1_char, temp2_char);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,
-                            ABS(temp1_char-temp2_char));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent && ABS(temp1_char-temp2_char) > options->delta )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_char,temp2_char,
-                                ABS(temp1_char-temp2_char),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent && ABS(temp1_char-temp2_char) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_char, temp2_char, ABS(temp1_char - temp2_char), per);
                 }
-            mem1+=sizeof(char);
-            mem2+=sizeof(char);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(char);
+            mem2 += sizeof(char);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
-
     }
-    else
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_char, mem1, sizeof(char));
             HDmemcpy(&temp2_char, mem2, sizeof(char));
 
-            if (temp1_char != temp2_char)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (temp1_char != temp2_char) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+                    parallel_print(I_FORMAT, temp1_char, temp2_char, ABS(temp1_char - temp2_char));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(char);
-            mem2+=sizeof(char);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(char);
+            mem2 += sizeof(char);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* nelmts */
-
     }
     h5difftrace("diff_schar finish\n");
 
     return nfound;
 }
 
-
-
 /*-------------------------------------------------------------------------
  * Function: diff_uchar
  *
- * Purpose: diff a H5T_NATIVE_UCHAR type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_UCHAR type
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_uchar(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph)
-
+static hsize_t diff_uchar(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph)
 {
-    hsize_t       nfound=0;          /* number of differences found */
+    hsize_t       nfound = 0; /* number of differences found */
     unsigned char temp1_uchar;
     unsigned char temp2_uchar;
     hsize_t       i;
@@ -4199,137 +3260,105 @@ static hsize_t diff_uchar(unsigned char *mem1,
     hbool_t       both_zero;
 
     h5difftrace("diff_uchar start\n");
-
     /* -d and !-p */
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
             HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
 
-            if ( PDIFF(temp1_uchar,temp2_uchar) > options->delta)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (PDIFF(temp1_uchar,temp2_uchar) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+                    parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
                 }
                 nfound++;
             }
-            mem1+=sizeof(unsigned char);
-            mem2+=sizeof(unsigned char);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(unsigned char);
+            mem2 += sizeof(unsigned char);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-
     /* !-d and -p */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
             HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
 
-            PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
+            PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,
-                            PDIFF(temp1_uchar,temp2_uchar));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,
-                                PDIFF(temp1_uchar,temp2_uchar),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
                 }
-            mem1+=sizeof(unsigned char);
-            mem2+=sizeof(unsigned char);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(unsigned char);
+            mem2 += sizeof(unsigned char);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-
     /* -d and -p */
-    else if ( options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
             HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
 
-            PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
+            PER_UNSIGN(signed char, temp1_uchar, temp2_uchar);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,
-                            PDIFF(temp1_uchar,temp2_uchar));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent && PDIFF(temp1_uchar,temp2_uchar) > options->delta )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_uchar,temp2_uchar,
-                                PDIFF(temp1_uchar,temp2_uchar),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent && PDIFF(temp1_uchar,temp2_uchar) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar), per);
                 }
-            mem1+=sizeof(unsigned char);
-            mem2+=sizeof(unsigned char);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(unsigned char);
+            mem2 += sizeof(unsigned char);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-    else
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char));
             HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char));
 
-            if (temp1_uchar != temp2_uchar)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (temp1_uchar != temp2_uchar) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+                    parallel_print(I_FORMAT, temp1_uchar, temp2_uchar, PDIFF(temp1_uchar, temp2_uchar));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(unsigned char);
-            mem2+=sizeof(unsigned char);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(unsigned char);
+            mem2 += sizeof(unsigned char);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* nelmts */
-
     }
     h5difftrace("diff_uchar finish\n");
 
@@ -4339,161 +3368,121 @@ static hsize_t diff_uchar(unsigned char *mem1,
 /*-------------------------------------------------------------------------
  * Function: diff_short
  *
- * Purpose: diff a H5T_NATIVE_SHORT type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_SHORT type
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_short(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph)
-
+static hsize_t diff_short(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph)
 {
-    hsize_t       nfound=0;          /* number of differences found */
-    short         temp1_short;
-    short         temp2_short;
-    hsize_t       i;
-    double        per;
-    hbool_t       both_zero;
+    hsize_t nfound = 0; /* number of differences found */
+    short   temp1_short;
+    short   temp2_short;
+    hsize_t i;
+    double  per;
+    hbool_t both_zero;
 
     h5difftrace("diff_short start\n");
     /* -d and !-p */
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_short, mem1, sizeof(short));
             HDmemcpy(&temp2_short, mem2, sizeof(short));
 
-            if (ABS(temp1_short-temp2_short) > options->delta)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (ABS(temp1_short-temp2_short) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+                    parallel_print(I_FORMAT, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
                 }
                 nfound++;
             }
-            mem1+=sizeof(short);
-            mem2+=sizeof(short);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(short);
+            mem2 += sizeof(short);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-
     /* !-d and -p */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_short, mem1, sizeof(short));
             HDmemcpy(&temp2_short, mem2, sizeof(short));
 
-            PER(temp1_short,temp2_short);
+            PER(temp1_short, temp2_short);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,
-                            ABS(temp1_short-temp2_short));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_short,temp2_short,
-                                ABS(temp1_short-temp2_short),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_short, temp2_short, ABS(temp1_short - temp2_short), per);
                 }
-            mem1+=sizeof(short);
-            mem2+=sizeof(short);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(short);
+            mem2 += sizeof(short);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-
     /* -d and -p */
-    else if ( options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_short, mem1, sizeof(short));
             HDmemcpy(&temp2_short, mem2, sizeof(short));
 
-            PER(temp1_short,temp2_short);
+            PER(temp1_short, temp2_short);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,
-                            ABS(temp1_short-temp2_short));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent && ABS(temp1_short-temp2_short) > options->delta )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_short,temp2_short,
-                                ABS(temp1_short-temp2_short),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent && ABS(temp1_short-temp2_short) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_short, temp2_short, ABS(temp1_short - temp2_short), per);
                 }
-            mem1+=sizeof(short);
-            mem2+=sizeof(short);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(short);
+            mem2 += sizeof(short);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-    else
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_short, mem1, sizeof(short));
             HDmemcpy(&temp2_short, mem2, sizeof(short));
 
-            if (temp1_short != temp2_short)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (temp1_short != temp2_short) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+                    parallel_print(I_FORMAT, temp1_short, temp2_short, ABS(temp1_short - temp2_short));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(short);
-            mem2+=sizeof(short);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(short);
+            mem2 += sizeof(short);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* nelmts */
     }
@@ -4502,31 +3491,21 @@ static hsize_t diff_short(unsigned char *mem1,
     return nfound;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: diff_ushort
  *
- * Purpose: diff a H5T_NATIVE_USHORT type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_USHORT type
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_ushort(unsigned char *mem1,
-                    unsigned char *mem2,
-                    hsize_t       nelmts,
-                    hsize_t       hyper_start,
-                    int           rank,
-                    hsize_t       *dims,
-                    hsize_t       *acc,
-                    hsize_t       *pos,
-                    diff_opt_t    *options,
-                    const char    *obj1,
-                    const char    *obj2,
-                    int           *ph)
+static hsize_t diff_ushort(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph)
 
 {
-    hsize_t        nfound=0;          /* number of differences found */
+    hsize_t        nfound = 0; /* number of differences found */
     unsigned short temp1_ushort;
     unsigned short temp2_ushort;
     hsize_t        i;
@@ -4535,460 +3514,355 @@ static hsize_t diff_ushort(unsigned char *mem1,
 
     h5difftrace("diff_ushort start\n");
     /* -d and !-p */
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short));
             HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short));
 
-            if ( PDIFF(temp1_ushort,temp2_ushort) > options->delta)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (PDIFF(temp1_ushort,temp2_ushort) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
+                    parallel_print(I_FORMAT, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
                 }
                 nfound++;
             }
-            mem1+=sizeof(unsigned short);
-            mem2+=sizeof(unsigned short);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(unsigned short);
+            mem2 += sizeof(unsigned short);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
     /* !-d and -p */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short));
             HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short));
 
-            PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
+            PER_UNSIGN(signed short, temp1_ushort, temp2_ushort);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero)  {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
-                            PDIFF(temp1_ushort,temp2_ushort));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort,
-                                PDIFF(temp1_ushort,temp2_ushort),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort), per);
                 }
-            mem1+=sizeof(unsigned short);
-            mem2+=sizeof(unsigned short);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(unsigned short);
+            mem2 += sizeof(unsigned short);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
     /* -d and -p */
-    else if ( options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short));
             HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short));
 
-            PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
+            PER_UNSIGN(signed short, temp1_ushort, temp2_ushort);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
-                            PDIFF(temp1_ushort,temp2_ushort));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent && PDIFF(temp1_ushort,temp2_ushort) > options->delta )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_ushort,temp2_ushort,
-                                PDIFF(temp1_ushort,temp2_ushort),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent && PDIFF(temp1_ushort,temp2_ushort) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort), per);
                 }
-            mem1+=sizeof(unsigned short);
-            mem2+=sizeof(unsigned short);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(unsigned short);
+            mem2 += sizeof(unsigned short);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-    else
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short));
             HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short));
 
-            if (temp1_ushort != temp2_ushort)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (temp1_ushort != temp2_ushort) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
+                    parallel_print(I_FORMAT, temp1_ushort, temp2_ushort, PDIFF(temp1_ushort, temp2_ushort));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(unsigned short);
-            mem2+=sizeof(unsigned short);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(unsigned short);
+            mem2 += sizeof(unsigned short);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* nelmts */
-
     }
     h5difftrace("diff_ushort finish\n");
 
     return nfound;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: diff_int
- *
- * Purpose: diff a H5T_NATIVE_INT type
+ * Function:  diff_int
  *
- * Return: number of differences found
+ * Purpose:   diff a H5T_NATIVE_INT type
  *
- *-------------------------------------------------------------------------
+ * Return:    number of differences found
+  *-------------------------------------------------------------------------
  */
-static hsize_t diff_int(unsigned char *mem1,
-                 unsigned char *mem2,
-                 hsize_t       nelmts,
-                 hsize_t       hyper_start,
-                 int           rank,
-                 hsize_t       *dims,
-                 hsize_t       *acc,
-                 hsize_t       *pos,
-                 diff_opt_t    *options,
-                 const char    *obj1,
-                 const char    *obj2,
-                 int           *ph)
-
+static hsize_t diff_int(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph)
 {
-    hsize_t       nfound=0;          /* number of differences found */
-    int           temp1_int;
-    int           temp2_int;
-    hsize_t       i;
-    double        per;
-    hbool_t       both_zero;
+    hsize_t nfound = 0; /* number of differences found */
+    int     temp1_int;
+    int     temp2_int;
+    hsize_t i;
+    double  per;
+    hbool_t both_zero;
 
     h5difftrace("diff_int start\n");
     /* -d and !-p */
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_int, mem1, sizeof(int));
             HDmemcpy(&temp2_int, mem2, sizeof(int));
 
-            if (ABS(temp1_int-temp2_int) > options->delta)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (ABS(temp1_int-temp2_int) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+                    parallel_print(I_FORMAT, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
                 }
                 nfound++;
             }
-            mem1+=sizeof(int);
-            mem2+=sizeof(int);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(int);
+            mem2 += sizeof(int);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
     /* !-d and -p */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_int, mem1, sizeof(int));
             HDmemcpy(&temp2_int, mem2, sizeof(int));
 
-            PER(temp1_int,temp2_int);
+            PER(temp1_int, temp2_int);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,
-                            ABS(temp1_int-temp2_int));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_int,temp2_int,
-                                ABS(temp1_int-temp2_int),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_int, temp2_int, ABS(temp1_int - temp2_int), per);
                 }
-            mem1+=sizeof(int);
-            mem2+=sizeof(int);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(int);
+            mem2 += sizeof(int);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
     /* -d and -p */
-    else if ( options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_int, mem1, sizeof(int));
             HDmemcpy(&temp2_int, mem2, sizeof(int));
 
-            PER(temp1_int,temp2_int);
+            PER(temp1_int, temp2_int);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,
-                            ABS(temp1_int-temp2_int));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent && ABS(temp1_int-temp2_int) > options->delta )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_int,temp2_int,
-                                ABS(temp1_int-temp2_int),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent && ABS(temp1_int-temp2_int) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_int, temp2_int, ABS(temp1_int - temp2_int), per);
                 }
-            mem1+=sizeof(int);
-            mem2+=sizeof(int);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(int);
+            mem2 += sizeof(int);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-    else
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_int, mem1, sizeof(int));
             HDmemcpy(&temp2_int, mem2, sizeof(int));
 
-            if (temp1_int != temp2_int)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (temp1_int != temp2_int) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+                    parallel_print(I_FORMAT, temp1_int, temp2_int, ABS(temp1_int - temp2_int));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(int);
-            mem2+=sizeof(int);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(int);
+            mem2 += sizeof(int);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* nelmts */
 
     }
     h5difftrace("diff_int finish\n");
-
     return nfound;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: diff_uint
  *
- * Purpose: diff a H5T_NATIVE_UINT type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_UINT type
  *
+ * Return:  number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_uint(unsigned char *mem1,
-                  unsigned char *mem2,
-                  hsize_t       nelmts,
-                  hsize_t       hyper_start,
-                  int           rank,
-                  hsize_t       *dims,
-                  hsize_t       *acc,
-                  hsize_t       *pos,
-                  diff_opt_t    *options,
-                  const char    *obj1,
-                  const char    *obj2,
-                  int           *ph)
-
+static hsize_t diff_uint(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph)
 {
-    hsize_t        nfound=0;          /* number of differences found */
-    unsigned int   temp1_uint;
-    unsigned int   temp2_uint;
-    hsize_t        i;
-    double         per;
-    hbool_t        both_zero;
+    hsize_t nfound = 0; /* number of differences found */
+    unsigned int temp1_uint;
+    unsigned int temp2_uint;
+    hsize_t i;
+    double per;
+    hbool_t both_zero;
 
     h5difftrace("diff_uint start\n");
     /* -d and !-p */
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int));
             HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int));
 
-            if ( PDIFF(temp1_uint,temp2_uint) > options->delta)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (PDIFF(temp1_uint,temp2_uint) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                    parallel_print(I_FORMAT, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
                 }
                 nfound++;
             }
-            mem1+=sizeof(unsigned int);
-            mem2+=sizeof(unsigned int);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(unsigned int);
+            mem2 += sizeof(unsigned int);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
     /* !-d and -p */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int));
             HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int));
 
-            PER_UNSIGN(signed int,temp1_uint,temp2_uint);
+            PER_UNSIGN(signed int, temp1_uint, temp2_uint);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_uint,temp2_uint,
-                                PDIFF(temp1_uint,temp2_uint),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint), per);
                 }
-            mem1+=sizeof(unsigned int);
-            mem2+=sizeof(unsigned int);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(unsigned int);
+            mem2 += sizeof(unsigned int);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
     /* -d and -p */
-    else if ( options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int));
             HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int));
 
-            PER_UNSIGN(signed int,temp1_uint,temp2_uint);
+            PER_UNSIGN(signed int, temp1_uint, temp2_uint);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                    parallel_print(I_FORMAT_P_NOTCOMP, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent && PDIFF(temp1_uint,temp2_uint) > options->delta )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(I_FORMAT_P,temp1_uint,temp2_uint,
-                                PDIFF(temp1_uint,temp2_uint),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent
+                    && PDIFF(temp1_uint,temp2_uint) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(I_FORMAT_P, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint), per);
                 }
-            mem1+=sizeof(unsigned int);
-            mem2+=sizeof(unsigned int);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(unsigned int);
+            mem2 += sizeof(unsigned int);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-    else
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int));
             HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int));
 
-            if (temp1_uint != temp2_uint)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (temp1_uint != temp2_uint) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(I_FORMAT,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+                    parallel_print(I_FORMAT, temp1_uint, temp2_uint, PDIFF(temp1_uint, temp2_uint));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(unsigned int);
-            mem2+=sizeof(unsigned int);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(unsigned int);
+            mem2 += sizeof(unsigned int);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* nelmts */
     }
@@ -4997,334 +3871,256 @@ static hsize_t diff_uint(unsigned char *mem1,
     return nfound;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: diff_long
  *
- * Purpose: diff a H5T_NATIVE_LONG type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_LONG type
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_long(unsigned char *mem1,
-                  unsigned char *mem2,
-                  hsize_t       nelmts,
-                  hsize_t       hyper_start,
-                  int           rank,
-                  hsize_t       *dims,
-                  hsize_t       *acc,
-                  hsize_t       *pos,
-                  diff_opt_t    *options,
-                  const char    *obj1,
-                  const char    *obj2,
-                  int           *ph)
-
+static hsize_t diff_long(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph)
 {
-    hsize_t       nfound=0;          /* number of differences found */
-    long          temp1_long;
-    long          temp2_long;
-    hsize_t       i;
-    double        per;
-    hbool_t       both_zero;
+    hsize_t nfound = 0; /* number of differences found */
+    long temp1_long;
+    long temp2_long;
+    hsize_t i;
+    double per;
+    hbool_t both_zero;
 
     h5difftrace("diff_long start\n");
     /* -d and !-p */
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
-            for ( i = 0; i < nelmts; i++)
-            {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
+            for (i = 0; i < nelmts; i++) {
                 HDmemcpy(&temp1_long, mem1, sizeof(long));
                 HDmemcpy(&temp2_long, mem2, sizeof(long));
 
-                if (ABS(temp1_long-temp2_long) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                if (ABS(temp1_long-temp2_long) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
+                        parallel_print(LI_FORMAT, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
                     }
                     nfound++;
                 }
-                mem1+=sizeof(long);
-                mem2+=sizeof(long);
-                if (options->n && nfound>=options->count)
+                mem1 += sizeof(long);
+                mem2 += sizeof(long);
+                if (opts->n && nfound >= opts->count)
                     return nfound;
             }
         }
     }
     /* !-d and -p */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_long, mem1, sizeof(long));
             HDmemcpy(&temp2_long, mem2, sizeof(long));
 
-            PER(temp1_long,temp2_long);
+            PER(temp1_long, temp2_long);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
-                            ABS(temp1_long-temp2_long));
+                    parallel_print(LI_FORMAT_P_NOTCOMP, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LI_FORMAT_P,temp1_long,temp2_long,
-                                ABS(temp1_long-temp2_long),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(LI_FORMAT_P, temp1_long, temp2_long, ABS(temp1_long - temp2_long), per);
                 }
-            mem1+=sizeof(long);
-            mem2+=sizeof(long);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(long);
+            mem2 += sizeof(long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
     /* -d and -p */
-    else if ( options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_long, mem1, sizeof(long));
             HDmemcpy(&temp2_long, mem2, sizeof(long));
 
-            PER(temp1_long,temp2_long);
+            PER(temp1_long, temp2_long);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
-                            ABS(temp1_long-temp2_long));
+                    parallel_print(LI_FORMAT_P_NOTCOMP, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent && ABS(temp1_long-temp2_long) > options->delta )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LI_FORMAT_P,temp1_long,temp2_long,
-                                ABS(temp1_long-temp2_long),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent && ABS(temp1_long-temp2_long) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(LI_FORMAT_P, temp1_long, temp2_long, ABS(temp1_long - temp2_long), per);
                 }
-            mem1+=sizeof(long);
-            mem2+=sizeof(long);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(long);
+            mem2 += sizeof(long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-    else
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_long, mem1, sizeof(long));
             HDmemcpy(&temp2_long, mem2, sizeof(long));
 
-            if (temp1_long != temp2_long)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (temp1_long != temp2_long) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(LI_FORMAT,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
+                    parallel_print(LI_FORMAT, temp1_long, temp2_long, ABS(temp1_long - temp2_long));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(long);
-            mem2+=sizeof(long);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(long);
+            mem2 += sizeof(long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* nelmts */
-
     }
     h5difftrace("diff_long finish\n");
 
     return nfound;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: diff_ulong
  *
- * Purpose: diff a H5T_NATIVE_ULONG type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_ULONG type
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_ulong(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph)
-
+static hsize_t diff_ulong(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph)
 {
-    hsize_t        nfound=0;          /* number of differences found */
-    unsigned long  temp1_ulong;
-    unsigned long  temp2_ulong;
-    hsize_t        i;
-    double         per;
-    hbool_t        both_zero;
+    hsize_t       nfound = 0; /* number of differences found */
+    unsigned long temp1_ulong;
+    unsigned long temp2_ulong;
+    hsize_t       i;
+    double        per;
+    hbool_t       both_zero;
 
     h5difftrace("diff_ulong start\n");
 
     /* -d and !-p */
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
-            for ( i = 0; i < nelmts; i++)
-            {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
+            for (i = 0; i < nelmts; i++) {
                 HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long));
                 HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long));
 
-                if ( PDIFF(temp1_ulong,temp2_ulong) > options->delta)
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                if (PDIFF(temp1_ulong,temp2_ulong) > opts->delta) {
+                    if (print_data(opts)) {
+                        print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                         parallel_print(SPACES);
-                        parallel_print(LI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                        parallel_print(LI_FORMAT, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
                     }
                     nfound++;
                 }
-                mem1+=sizeof(unsigned long);
-                mem2+=sizeof(unsigned long);
-                if (options->n && nfound>=options->count)
+                mem1 += sizeof(unsigned long);
+                mem2 += sizeof(unsigned long);
+                if (opts->n && nfound >= opts->count)
                     return nfound;
             }
         }
     }
     /* !-d and -p */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long));
             HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long));
 
-            PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
+            PER_UNSIGN(signed long, temp1_ulong, temp2_ulong);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                    parallel_print(ULI_FORMAT_P_NOTCOMP, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LI_FORMAT_P,temp1_ulong,temp2_ulong,
-                                PDIFF(temp1_ulong,temp2_ulong),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(LI_FORMAT_P, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong), per);
                 }
-            mem1+=sizeof(unsigned long);
-            mem2+=sizeof(unsigned long);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(unsigned long);
+            mem2 += sizeof(unsigned long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
     /* -d and -p */
-    else if ( options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long));
             HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long));
 
-            PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
+            PER_UNSIGN(signed long, temp1_ulong, temp2_ulong);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                    parallel_print(ULI_FORMAT_P_NOTCOMP, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent && PDIFF(temp1_ulong,temp2_ulong) > options->delta )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LI_FORMAT_P,temp1_ulong,temp2_ulong,
-                                PDIFF(temp1_ulong,temp2_ulong),
-                                per);
-                    }
-                    nfound++;
+            else if (per > opts->percent
+                    && PDIFF(temp1_ulong,temp2_ulong) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(LI_FORMAT_P, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong), per);
                 }
-            mem1+=sizeof(unsigned long);
-            mem2+=sizeof(unsigned long);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(unsigned long);
+            mem2 += sizeof(unsigned long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-    else
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long));
             HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long));
 
-            if (temp1_ulong != temp2_ulong)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (temp1_ulong != temp2_ulong) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(LI_FORMAT,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+                    parallel_print(LI_FORMAT, temp1_ulong, temp2_ulong, PDIFF(temp1_ulong, temp2_ulong));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(unsigned long);
-            mem2+=sizeof(unsigned long);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(unsigned long);
+            mem2 += sizeof(unsigned long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* nelmts */
     }
@@ -5333,157 +4129,125 @@ static hsize_t diff_ulong(unsigned char *mem1,
     return nfound;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: diff_llong
  *
- * Purpose: diff a H5T_NATIVE_LLONG type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_LLONG type
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_llong(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph)
-
+static hsize_t diff_llong(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims,
+        hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1,
+        const char *obj2, int *ph)
 {
-    hsize_t       nfound=0;          /* number of differences found */
-    long long     temp1_llong;
-    long long     temp2_llong;
-    hsize_t       i;
-    double        per;
-    hbool_t       both_zero;
+    hsize_t   nfound = 0; /* number of differences found */
+    long long temp1_llong;
+    long long temp2_llong;
+    hsize_t   i;
+    double    per;
+    hbool_t   both_zero;
 
     h5difftrace("diff_llong start\n");
     /* -d and !-p */
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_llong, mem1, sizeof(long long));
             HDmemcpy(&temp2_llong, mem2, sizeof(long long));
 
-            if (ABS( temp1_llong-temp2_llong) > options->delta)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (ABS( temp1_llong-temp2_llong) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+                    parallel_print(LLI_FORMAT, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
                 }
                 nfound++;
             }
-            mem1+=sizeof(long long);
-            mem2+=sizeof(long long);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(long long);
+            mem2 += sizeof(long long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
     /* !-d and -p */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_llong, mem1, sizeof(long long));
             HDmemcpy(&temp2_llong, mem2, sizeof(long long));
 
-            PER(temp1_llong,temp2_llong);
+            PER(temp1_llong, temp2_llong);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
-                }
-                nfound++;
+                parallel_print(LLI_FORMAT_P_NOTCOMP, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
             }
-            else
-                if ( per > options->percent )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per);
-                    }
-                    nfound++;
-                }
-            mem1+=sizeof(long long);
-            mem2+=sizeof(long long);
-            if (options->n && nfound>=options->count)
-                return nfound;
+            nfound++;
+        }
+        else if (per > opts->percent) {
+            if (print_data(opts)) {
+                print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                parallel_print(SPACES);
+                parallel_print(LLI_FORMAT_P, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong),per);
+            }
+            nfound++;
+        }
+        mem1 += sizeof(long long);
+        mem2 += sizeof(long long);
+        if (opts->n && nfound >= opts->count)
+            return nfound;
         }
     }
     /* -d and -p */
-    else if ( options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_llong, mem1, sizeof(long long));
             HDmemcpy(&temp2_llong, mem2, sizeof(long long));
 
-            PER(temp1_llong,temp2_llong);
+            PER(temp1_llong, temp2_llong);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+                    parallel_print(LLI_FORMAT_P_NOTCOMP, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent && ABS(temp1_llong-temp2_llong) > options->delta )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(LLI_FORMAT_P,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong),per);
-                    }
-                    nfound++;
+            else if (per > opts->percent
+                    && ABS(temp1_llong-temp2_llong) > opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(LLI_FORMAT_P, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong),per);
                 }
-            mem1+=sizeof(long long);
-            mem2+=sizeof(long long);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(long long);
+            mem2 += sizeof(long long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-    else
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_llong, mem1, sizeof(long long));
             HDmemcpy(&temp2_llong, mem2, sizeof(long long));
 
-            if (temp1_llong != temp2_llong)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (temp1_llong != temp2_llong) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
-                    parallel_print(LLI_FORMAT,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+                    parallel_print(LLI_FORMAT, temp1_llong, temp2_llong, ABS(temp1_llong - temp2_llong));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(long long);
-            mem2+=sizeof(long long);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(long long);
+            mem2 += sizeof(long long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* nelmts */
     }
@@ -5492,162 +4256,130 @@ static hsize_t diff_llong(unsigned char *mem1,
     return nfound;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: diff_ullong
  *
- * Purpose: diff a H5T_NATIVE_ULLONG type
- *
- * Return: number of differences found
+ * Purpose:  diff a H5T_NATIVE_ULLONG type
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
-static hsize_t diff_ullong(unsigned char *mem1,
-                    unsigned char *mem2,
-                    hsize_t       nelmts,
-                    hsize_t       hyper_start,
-                    int           rank,
-                    hsize_t       *dims,
-                    hsize_t       *acc,
-                    hsize_t       *pos,
-                    diff_opt_t    *options,
-                    const char    *obj1,
-                    const char    *obj2,
-                    int           *ph)
+static hsize_t diff_ullong(unsigned char *mem1, unsigned char *mem2,
+        hsize_t nelmts, hsize_t hyper_start, int rank, hsize_t *dims, hsize_t *acc,
+        hsize_t *pos, diff_opt_t *opts, const char *obj1, const char *obj2, int *ph)
 
 {
-    hsize_t             nfound=0;          /* number of differences found */
-    unsigned long long  temp1_ullong;
-    unsigned long long  temp2_ullong;
-    hsize_t             i;
-    float               f1, f2;
-    double              per;
-    hbool_t             both_zero;
+    hsize_t            nfound = 0; /* number of differences found */
+    unsigned long long temp1_ullong;
+    unsigned long long temp2_ullong;
+    hsize_t            i;
+    float              f1, f2;
+    double             per;
+    hbool_t            both_zero;
 
     h5difftrace("diff_ullong start\n");
     /* -d and !-p */
-    if (options->d && !options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    if (opts->d && !opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
             HDmemcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
 
-            if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long) options->delta)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long) opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
                     parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
                 }
                 nfound++;
             }
-            mem1+=sizeof(unsigned long long);
-            mem2+=sizeof(unsigned long long);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(unsigned long long);
+            mem2 += sizeof(unsigned long long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
     /* !-d and -p */
-    else if (!options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (!opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
             HDmemcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
 
-            ull2float(temp1_ullong,&f1);
-            ull2float(temp2_ullong,&f2);
-            PER(f1,f2);
+            ull2float(temp1_ullong, &f1);
+            ull2float(temp2_ullong, &f2);
+            PER(f1, f2);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
                     parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
-                    }
-                    nfound++;
+            else if (per > opts->percent) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
                 }
-            mem1+=sizeof(unsigned long long);
-            mem2+=sizeof(unsigned long long);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(unsigned long long);
+            mem2 += sizeof(unsigned long long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
     /* -d and -p */
-    else if ( options->d && options->p)
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else if (opts->d && opts->p) {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
             HDmemcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
 
-            ull2float(temp1_ullong,&f1);
-            ull2float(temp2_ullong,&f2);
-            PER(f1,f2);
+            ull2float(temp1_ullong, &f1);
+            ull2float(temp2_ullong, &f2);
+            PER(f1, f2);
 
-            if (not_comparable && !both_zero) /* not comparable */
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (not_comparable && !both_zero) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
                     parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
                 }
                 nfound++;
             }
-            else
-                if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long)options->delta )
-                {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
-                    }
-                    nfound++;
+            else if (per > opts->percent
+                    && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long) opts->delta) {
+                if (print_data(opts)) {
+                    print_pos(ph, 1, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
+                    parallel_print(SPACES);
+                    parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
                 }
-            mem1+=sizeof(unsigned long long);
-            mem2+=sizeof(unsigned long long);
-            if (options->n && nfound>=options->count)
+                nfound++;
+            }
+            mem1 += sizeof(unsigned long long);
+            mem2 += sizeof(unsigned long long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         }
     }
-    else
-    {
-        for ( i = 0; i < nelmts; i++)
-        {
+    else {
+        for (i = 0; i < nelmts; i++) {
             HDmemcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
             HDmemcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
 
-            if (temp1_ullong != temp2_ullong)
-            {
-                if ( print_data(options) )
-                {
-                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+            if (temp1_ullong != temp2_ullong) {
+                if (print_data(opts)) {
+                    print_pos(ph, 0, hyper_start + i, acc, pos, rank, dims, obj1, obj2);
                     parallel_print(SPACES);
                     parallel_print(ULLI_FORMAT,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(unsigned long long);
-            mem2+=sizeof(unsigned long long);
-            if (options->n && nfound>=options->count)
+            mem1 += sizeof(unsigned long long);
+            mem2 += sizeof(unsigned long long);
+            if (opts->n && nfound >= opts->count)
                 return nfound;
         } /* nelmts */
     }
@@ -5656,114 +4388,89 @@ static hsize_t diff_ullong(unsigned char *mem1,
     return nfound;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    ull2float
  *
  * Purpose:     convert unsigned long long to float
- *
- * Programmer:  pvn
- *              Mar 22, 2006
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static
 int ull2float(unsigned long long ull_value, float *f_value)
 {
-    hid_t          dxpl_id;
-    unsigned char  *buf = NULL;
+    int            ret_value = SUCCEED;
+    hid_t          dxpl_id = -1;
+    unsigned char *buf = NULL;
     size_t         src_size;
     size_t         dst_size;
 
     h5difftrace("ull2float start\n");
-    if((dxpl_id = H5Pcreate(H5P_DATASET_XFER))<0)
-        goto error;
+    if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcreate failed");
 
     src_size = H5Tget_size(H5T_NATIVE_ULLONG);
     dst_size = H5Tget_size(H5T_NATIVE_FLOAT);
-    buf = (unsigned char*)HDcalloc((size_t)1, MAX(src_size, dst_size));
-    if(!buf)
-        goto error;
+    if((buf = (unsigned char*) HDcalloc((size_t )1, MAX(src_size, dst_size))) == NULL)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for dims");
 
     HDmemcpy(buf, &ull_value, src_size);
 
     /* do conversion */
-    if(H5Tconvert(H5T_NATIVE_ULLONG, H5T_NATIVE_FLOAT, (size_t)1, buf, NULL, dxpl_id)<0)
-        goto error;
+    if (H5Tconvert(H5T_NATIVE_ULLONG, H5T_NATIVE_FLOAT, (size_t) 1, buf, NULL, dxpl_id) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tconvert failed");
 
     HDmemcpy(f_value, buf, dst_size);
 
-    if(buf)
-        HDfree(buf);
-    h5difftrace("ull2float finish\n");
-
-    return 0;
-
-error:
+done:
     H5E_BEGIN_TRY {
         H5Pclose(dxpl_id);
     } H5E_END_TRY;
-    if(buf)
+
+    if (buf)
         HDfree(buf);
-    h5difftrace("ull2float errored\n");
 
-    return -1;
-}
+    h5difftrace("ull2float finish\n");
 
+    return ret_value;
+}
 
 /*-------------------------------------------------------------------------
  * Function:    equal_double
  *
- * Purpose:     use a absolute error formula to deal with floating point
- *              uncertainty
- *
- * Modifications:
- *  8/1/2007. handle NaNs
- *
+ * Purpose:     use a absolute error formula to deal with floating point uncertainty
  *-------------------------------------------------------------------------
  */
-static
-hbool_t equal_double(double value, double expected, diff_opt_t *options)
-{
+static hbool_t equal_double(double value, double expected, diff_opt_t *opts) {
     h5difftrace("equal_double start\n");
-    if ( options->do_nans )
-    {
-
+    if (opts->do_nans) {
         /*-------------------------------------------------------------------------
         * detect NaNs
         *-------------------------------------------------------------------------
         */
-        hbool_t isnan1 = my_isnan(FLT_DOUBLE,&value);
-        hbool_t isnan2 = my_isnan(FLT_DOUBLE,&expected);
+        hbool_t isnan1 = my_isnan(FLT_DOUBLE, &value);
+        hbool_t isnan2 = my_isnan(FLT_DOUBLE, &expected);
 
         /*-------------------------------------------------------------------------
         * we consider NaN == NaN to be true
         *-------------------------------------------------------------------------
         */
-        if ( isnan1 && isnan2 )
-        {
+        if (isnan1 && isnan2)
             return TRUE;
-        }
 
         /*-------------------------------------------------------------------------
         * one is a NaN, do not compare but assume difference
         *-------------------------------------------------------------------------
         */
-        if ( (isnan1 && !isnan2) || ( !isnan1 && isnan2 ) )
-        {
+        if ((isnan1 && !isnan2) || (!isnan1 && isnan2))
             return FALSE;
-        }
     }
 
     if (value == expected)
         return TRUE;
 
-    if (options->use_system_epsilon) {
-        if ( ABS( (value-expected) ) < DBL_EPSILON)
+    if (opts->use_system_epsilon)
+        if (ABS((value-expected)) < DBL_EPSILON)
             return TRUE;
-    }
+
     h5difftrace("equal_double finish\n");
 
     return FALSE;
@@ -5772,53 +4479,45 @@ hbool_t equal_double(double value, double expected, diff_opt_t *options)
 /*-------------------------------------------------------------------------
  * Function:    equal_ldouble
  *
- * Purpose:     use a absolute error formula to deal with floating point
- *              uncertainty
- *
+ * Purpose:     use a absolute error formula to deal with floating point uncertainty
  *-------------------------------------------------------------------------
  */
 
 #if H5_SIZEOF_LONG_DOUBLE !=0
 static
-hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *options)
+hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *opts)
 {
     h5difftrace("equal_ldouble start\n");
-    if ( options->do_nans )
-    {
-
+    if (opts->do_nans) {
         /*-------------------------------------------------------------------------
-        * detect NaNs
-        *-------------------------------------------------------------------------
-        */
-        hbool_t isnan1 = my_isnan(FLT_LDOUBLE,&value);
-        hbool_t isnan2 = my_isnan(FLT_LDOUBLE,&expected);
+         * detect NaNs
+         *-------------------------------------------------------------------------
+         */
+        hbool_t isnan1 = my_isnan(FLT_LDOUBLE, &value);
+        hbool_t isnan2 = my_isnan(FLT_LDOUBLE, &expected);
 
         /*-------------------------------------------------------------------------
-        * we consider NaN == NaN to be true
-        *-------------------------------------------------------------------------
-        */
-        if ( isnan1 && isnan2 )
-        {
+         * we consider NaN == NaN to be true
+         *-------------------------------------------------------------------------
+         */
+        if (isnan1 && isnan2)
             return TRUE;
-        }
 
         /*-------------------------------------------------------------------------
-        * one is a NaN, do not compare but assume difference
-        *-------------------------------------------------------------------------
-        */
-        if ( (isnan1 && !isnan2) || ( !isnan1 && isnan2 ) )
-        {
+         * one is a NaN, do not compare but assume difference
+         *-------------------------------------------------------------------------
+         */
+        if ((isnan1 && !isnan2) || (!isnan1 && isnan2))
             return FALSE;
-        }
     }
 
     if (value == expected)
         return TRUE;
 
-    if (options->use_system_epsilon) {
-        if ( ABS( (value-expected) ) < DBL_EPSILON)
+    if (opts->use_system_epsilon)
+        if (ABS((value-expected)) < DBL_EPSILON)
             return TRUE;
-    }
+
     h5difftrace("equal_ldouble finish\n");
 
     return FALSE;
@@ -5826,106 +4525,76 @@ hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *optio
 
 #endif /* #if H5_SIZEOF_LONG_DOUBLE !=0 */
 
-
 /*-------------------------------------------------------------------------
  * Function:    equal_float
  *
- * Purpose:     use a absolute error formula to deal with floating point
- *              uncertainty
- *
- * Modifications:
- *  8/1/2007. handle NaNs
- *
+ * Purpose:     use a absolute error formula to deal with floating point uncertainty
  *-------------------------------------------------------------------------
  */
-static
-hbool_t equal_float(float value, float expected, diff_opt_t *options)
-{
+static hbool_t equal_float(float value, float expected, diff_opt_t *opts) {
     h5difftrace("equal_float start\n");
-    if ( options->do_nans )
-    {
-
+    if (opts->do_nans) {
         /*-------------------------------------------------------------------------
         * detect NaNs
         *-------------------------------------------------------------------------
         */
-        hbool_t isnan1 = my_isnan(FLT_FLOAT,&value);
-        hbool_t isnan2 = my_isnan(FLT_FLOAT,&expected);
+        hbool_t isnan1 = my_isnan(FLT_FLOAT, &value);
+        hbool_t isnan2 = my_isnan(FLT_FLOAT, &expected);
 
         /*-------------------------------------------------------------------------
-        * we consider NaN == NaN to be true
-        *-------------------------------------------------------------------------
-        */
-        if ( isnan1 && isnan2 )
-        {
+         * we consider NaN == NaN to be true
+         *-------------------------------------------------------------------------
+         */
+        if (isnan1 && isnan2)
             return TRUE;
-        }
 
         /*-------------------------------------------------------------------------
-        * one is a NaN, do not compare but assume difference
-        *-------------------------------------------------------------------------
-        */
-        if ( (isnan1 && !isnan2) || ( !isnan1 && isnan2 ) )
-        {
+         * one is a NaN, do not compare but assume difference
+         *-------------------------------------------------------------------------
+         */
+        if ((isnan1 && !isnan2) || (!isnan1 && isnan2))
             return FALSE;
-        }
     }
 
     if (value == expected)
         return TRUE;
 
-    if (options->use_system_epsilon) {
-        if ( ABS( (value-expected) ) < FLT_EPSILON)
+    if (opts->use_system_epsilon)
+        if (ABS( (value-expected) ) < FLT_EPSILON)
             return TRUE;
-    }
+
     h5difftrace("equal_float finish\n");
 
     return FALSE;
-
 }
 
-
-
 /*-------------------------------------------------------------------------
  * Function:  my_isnan
  *
- * Purpose:  Determines whether VAL points to NaN.
- *
- * Return:  TRUE or FALSE
- *
- * Programmer:  Robb Matzke
- *              Monday, July  6, 1998
- *
- * Modifications:
- *  Pedro Vicente, 12 October 2007.
- *  Add a string detection type for WIN32
+ * Purpose:   Determines whether VAL points to NaN.
  *
+ * Return:    TRUE or FALSE
  *-------------------------------------------------------------------------
  */
-static hbool_t
-my_isnan(dtype_t type, void *val)
-{
+static hbool_t my_isnan(dtype_t type, void *val) {
     hbool_t retval = FALSE;
     char s[256];
 
     h5difftrace("my_isnan start\n");
-    if (FLT_FLOAT==type)
-    {
+    if (FLT_FLOAT == type) {
         float x;
 
         HDmemcpy(&x, val, sizeof(float));
-        retval = (x!=x);
+        retval = (x != x);
     }
-    else if (FLT_DOUBLE==type)
-    {
+    else if (FLT_DOUBLE == type) {
         double x;
 
         HDmemcpy(&x, val, sizeof(double));
-        retval = (x!=x);
+        retval = (x != x);
     }
-#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
-    else if (FLT_LDOUBLE==type)
-    {
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+    else if (FLT_LDOUBLE == type) {
         long double x;
 
         HDmemcpy(&x, val, sizeof(long double));
@@ -5933,33 +4602,27 @@ my_isnan(dtype_t type, void *val)
     }
 #endif
     else
-    {
         return FALSE;
-    }
 
-   /*
+    /*
     * Sometimes NaN==NaN (e.g., DEC Alpha) so we try to print it and see if
     * the result contains a NaN string.
     */
-    if (!retval)
-    {
-        if (FLT_FLOAT==type)
-        {
+    if (!retval) {
+        if (FLT_FLOAT == type) {
             float x;
 
             HDmemcpy(&x, val, sizeof(float));
-            HDsnprintf(s, sizeof(s), "%g", (double)x);
+            HDsnprintf(s, sizeof(s), "%g", (double) x);
         }
-        else if (FLT_DOUBLE==type)
-        {
+        else if (FLT_DOUBLE == type) {
             double x;
 
             HDmemcpy(&x, val, sizeof(double));
             HDsnprintf(s, sizeof(s), "%g", x);
         }
-#if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
-        else if (FLT_LDOUBLE==type)
-        {
+#if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE != 0
+        else if (FLT_LDOUBLE == type) {
             long double x;
 
             HDmemcpy(&x, val, sizeof(long double));
@@ -5967,16 +4630,12 @@ my_isnan(dtype_t type, void *val)
         }
 #endif
         else
-        {
             return FALSE;
-        }
 
-        if ( HDstrstr(s, "NaN") ||
+        if (HDstrstr(s, "NaN") ||
                 HDstrstr(s, "NAN") ||
                 HDstrstr(s, "nan") ||
-                HDstrstr(s, "-1.#IND") /* WIN32 */
-        )
-        {
+                HDstrstr(s, "-1.#IND")) {
             retval = TRUE;
         }
     }
@@ -5986,7 +4645,6 @@ my_isnan(dtype_t type, void *val)
     return retval;
 }
 
-
 /*-------------------------------------------------------------------------
  *
  * Local functions
@@ -5997,180 +4655,140 @@ my_isnan(dtype_t type, void *val)
 /*-------------------------------------------------------------------------
  * Function: print_data
  *
- * Purpose: print data only in report or verbose modes, and do not print in quiet mode
+ * Purpose:  print data only in report or verbose modes, and do not print in quiet mode
  *-------------------------------------------------------------------------
  */
 static
-int print_data(diff_opt_t *options)
+int print_data(diff_opt_t *opts)
 {
-    return ( (options->m_report || options->m_verbose) && !options->m_quiet)?1:0;
+    return ((opts->m_report || opts->m_verbose) && !opts->m_quiet) ? 1 : 0;
 }
 
 /*-------------------------------------------------------------------------
  * Function: print_header
  *
- * Purpose: print header for difference
- *
+ * Purpose:  print header for difference
  *-------------------------------------------------------------------------
  */
-
 static
-void print_header(int        pp,        /* print percentage */
-                int        rank,
-                hsize_t    *dims,
-                const char *obj1,
-                const char *obj2 )
+void print_header(int pp, /* print percentage */
+        int rank, hsize_t *dims, const char *obj1, const char *obj2)
 {
     /* print header */
-    parallel_print("%-16s","size:");
-    print_dimensions (rank,dims);
-    parallel_print("%-11s","");
-    print_dimensions (rank,dims);
+    parallel_print("%-16s", "size:");
+    print_dimensions(rank, dims);
+    parallel_print("%-11s", "");
+    print_dimensions(rank, dims);
     parallel_print("\n");
 
-    if(pp) {
-        parallel_print("%-15s %-15s %-15s %-15s %-15s\n",
-                "position",
-                (obj1!=NULL) ? obj1 : " ",
-                        (obj2!=NULL) ? obj2 : " ",
-                                "difference",
-                                "relative");
-        parallel_print("------------------------------------------------------------------------\n");
+    if (pp) {
+        parallel_print("%-15s %-15s %-15s %-15s %-15s\n", "position",
+                (obj1 != NULL) ? obj1 : " ", (obj2 != NULL) ? obj2 : " ", "difference", "relative");
+        parallel_print(
+                "------------------------------------------------------------------------\n");
     }
     else {
-        parallel_print("%-15s %-15s %-15s %-20s\n",
-                "position",
-                (obj1!=NULL) ? obj1 : " ",
-                        (obj2!=NULL) ? obj2 : " ",
-                                "difference");
-        parallel_print("------------------------------------------------------------\n");
+        parallel_print("%-15s %-15s %-15s %-20s\n", "position",
+                (obj1 != NULL) ? obj1 : " ", (obj2 != NULL) ? obj2 : " ", "difference");
+        parallel_print(
+                "------------------------------------------------------------\n");
     }
 }
 
 /*-------------------------------------------------------------------------
  * Function: print_pos
  *
- * Purpose: print in matrix notation, converting from an array index position
- *
+ * Purpose:  print in matrix notation, converting from an array index position
  *-------------------------------------------------------------------------
  */
-
 static
-void print_pos( int        *ph,       /* print header */
-                int        pp,        /* print percentage */
-                hsize_t    curr_pos,
-                hsize_t    *acc,
-                hsize_t    *pos,
-                int        rank,
-                hsize_t    *dims,
-                const char *obj1,
-                const char *obj2 )
+void print_pos(int *ph, /* print header */
+        int pp, /* print percentage */
+        hsize_t curr_pos, hsize_t *acc, hsize_t *pos, int rank, hsize_t *dims,
+        const char *obj1, const char *obj2)
 {
     int i;
 
     /* print header */
-    if ( *ph==1 )
-    {
-        *ph=0;
+    if (*ph == 1) {
+        *ph = 0;
 
         print_header(pp, rank, dims, obj1, obj2);
     } /* end print header */
 
-    for ( i = 0; i < rank; i++)
-    {
-        pos[i] = curr_pos/acc[i];
-        curr_pos -= acc[i]*pos[i];
+    for (i = 0; i < rank; i++) {
+        pos[i] = curr_pos / acc[i];
+        curr_pos -= acc[i] * pos[i];
     }
-    HDassert( curr_pos == 0 );
+    HDassert(curr_pos == 0);
 
-    if ( rank > 0 )
-    {
-        parallel_print("[ " );
-        for ( i = 0; i < rank; i++)
-        {
+    if (rank > 0) {
+        parallel_print("[ ");
+        for (i = 0; i < rank; i++) {
             parallel_print(HSIZE_T_FORMAT, (unsigned long long)pos[i]);
             parallel_print(" ");
         }
-        parallel_print("]" );
+        parallel_print("]");
     }
     else
-    {
         parallel_print("      ");
-    }
 }
 
 /*-------------------------------------------------------------------------
  * Function: print_char_pos
  *
- * Purpose: print character position in string
- *
+ * Purpose:  print character position in string
  *-------------------------------------------------------------------------
  */
-
 static
-void print_char_pos( int        *ph,       /* print header */
-                     int        pp,        /* print percentage */
-                     hsize_t    curr_pos,
-                     unsigned   u,
-                     hsize_t    *acc,
-                     hsize_t    *pos,
-                     int        rank,
-                     hsize_t    *dims,
-                     const char *obj1,
-                     const char *obj2 )
+void print_char_pos(int *ph, /* print header */
+        int pp, /* print percentage */
+        hsize_t curr_pos, unsigned u, hsize_t *acc, hsize_t *pos, int rank, hsize_t *dims,
+        const char *obj1, const char *obj2)
 {
     int i;
 
     /* print header */
-    if ( *ph==1 )
-    {
-        *ph=0;
+    if (*ph == 1) {
+        *ph = 0;
 
         print_header(pp, rank, dims, obj1, obj2);
     } /* end print header */
 
-    for ( i = 0; i < rank; i++)
-    {
-        pos[i] = curr_pos/acc[i];
-        curr_pos -= acc[i]*pos[i];
+    for (i = 0; i < rank; i++) {
+        pos[i] = curr_pos / acc[i];
+        curr_pos -= acc[i] * pos[i];
     }
-    HDassert( curr_pos == 0 );
-
-    parallel_print("[ " );
-    if ( rank > 0 )
-    {
+    HDassert(curr_pos == 0);
 
-        for ( i = 0; i < rank; i++)
-        {
+    parallel_print("[ ");
+    if (rank > 0) {
+        for (i = 0; i < rank; i++) {
             parallel_print(HSIZE_T_FORMAT, (unsigned long long)pos[i]);
             parallel_print(" ");
         }
 
     }
     else
-    {
-        parallel_print("%u", (unsigned)u);
-    }
-    parallel_print("]" );
+        parallel_print("%zu", u);
+
+    parallel_print("]");
 }
 
 /*-------------------------------------------------------------------------
- * Function:    h5diff_print_char. Adapted from h5tools_print_char
- *
- * Purpose: Print a char
+ * Function: h5diff_print_char. Adapted from h5tools_print_char
  *
+ * Purpose:  Print a char
  *-------------------------------------------------------------------------
  */
 static void h5diff_print_char(char ch)
 {
-
-    switch (ch)
-    {
+    switch (ch) {
     case '"':
         parallel_print("\\\"");
         break;
     case '\\':
-        parallel_print( "\\\\");
+        parallel_print("\\\\");
         break;
     case '\b':
         parallel_print("\\b");
@@ -6189,79 +4807,69 @@ static void h5diff_print_char(char ch)
         break;
     default:
         if (isprint(ch))
-            parallel_print( "%c", ch);
+            parallel_print("%c", ch);
         else
-            parallel_print( "\\%03o", ch);
-
+            parallel_print("\\%03o", ch);
         break;
     }
 }
 
-
 /*-------------------------------------------------------------------------
- * XCAO, 11/10/2010
  * added to improve performance for compound datasets
  * set up compound datatype structures.
+ *-------------------------------------------------------------------------
  */
 static void get_member_types(hid_t tid, mcomp_t *members)
 {
-    int tclass;
+    int      tclass;
     unsigned u;
 
-    if (tid <=0 || !members)
+    if (tid <= 0 || !members)
         return;
 
     tclass = H5Tget_class(tid);
-    if (tclass == H5T_ARRAY || tclass == H5T_VLEN)
-    {
+    if (tclass == H5T_ARRAY || tclass == H5T_VLEN) {
         hid_t base_tid = H5Tget_super(tid);
         get_member_types(base_tid, members);
         H5Tclose(base_tid);
     }
-    else if (tclass == H5T_COMPOUND)
-    {
-        int      nmembs;
+    else if (tclass == H5T_COMPOUND) {
+        int nmembs;
 
-        nmembs = H5Tget_nmembers(tid);
-        if(nmembs <= 0)
+        if ((nmembs = H5Tget_nmembers(tid)) <= 0)
             return;
-        members->n = (unsigned)nmembs;
+        members->n = (unsigned) nmembs;
 
-        members->ids = (hid_t *)HDcalloc((size_t)members->n, sizeof(hid_t));
-        members->offsets = (size_t *)HDcalloc((size_t)members->n, sizeof(size_t));
-        members->m = (mcomp_t **)HDcalloc((size_t)members->n, sizeof(mcomp_t *));
+        members->ids = (hid_t *) HDcalloc((size_t )members->n, sizeof(hid_t));
+        members->offsets = (size_t *) HDcalloc((size_t )members->n, sizeof(size_t));
+        members->m = (mcomp_t **) HDcalloc((size_t )members->n, sizeof(mcomp_t *));
 
-        for(u = 0; u < members->n; u++)
-        {
-            members->ids[u] = H5Tget_member_type( tid, u );
-            members->offsets[u] = H5Tget_member_offset( tid, u );
-            members->m[u] = (mcomp_t *)HDmalloc(sizeof(mcomp_t));
+        for (u = 0; u < members->n; u++) {
+            members->ids[u] = H5Tget_member_type(tid, u);
+            members->offsets[u] = H5Tget_member_offset(tid, u);
+            members->m[u] = (mcomp_t *) HDmalloc(sizeof(mcomp_t));
             HDmemset(members->m[u], 0, sizeof(mcomp_t));
             get_member_types(members->ids[u], members->m[u]);
         }
     }
 
     return;
-
-
 }
 
 /*-------------------------------------------------------------------------
- * XCAO, 11/10/2010
  * added to improve performance for compound datasets
  * clean and close compound members.
+ *-------------------------------------------------------------------------
  */
 static void close_member_types(mcomp_t *members)
 {
     unsigned u;
 
-    if (!members || members->n<=0 || !members->ids)
+    if (!members || members->n <= 0 || !members->ids)
         return;
 
-    for(u = 0; u < members->n; u++)
-    {
-        if(members->m[u])
-        {
+    for (u = 0; u < members->n; u++) {
+        if (members->m[u]) {
             close_member_types(members->m[u]);
             HDfree(members->m[u]);
         }
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index 3018f18..6019738 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -136,52 +136,55 @@ static void table_attr_mark_exist(unsigned *exist, char *name, table_attrs_t *ta
  *
  * Parameter:
  *  table_out [OUT] : return the list
- *
- * Programmer: Jonathan Kim
- *
- * Date: March 15, 2011
  *------------------------------------------------------------------------*/
-static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t ** table_out,  diff_opt_t *options)
+static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t ** table_out,  diff_opt_t *opts)
 {
-    H5O_info_t oinfo1, oinfo2;  /* Object info */
-    hid_t      attr1_id=-1;     /* attr ID */
-    hid_t      attr2_id=-1;     /* attr ID */
-    size_t curr1 = 0;
-    size_t curr2 = 0;
-    unsigned infile[2];
-    char  name1[ATTR_NAME_MAX];
-    char  name2[ATTR_NAME_MAX];
-    int cmp;
-    unsigned i;
+    int        ret_value = 0;
+    H5O_info_t oinfo1, oinfo2;    /* Object info */
+    hid_t      attr1_id = -1;     /* attr ID */
+    hid_t      attr2_id = -1;     /* attr ID */
+    size_t     curr1 = 0;
+    size_t     curr2 = 0;
+    unsigned   infile[2];
+    char       name1[ATTR_NAME_MAX];
+    char       name2[ATTR_NAME_MAX];
+    int        cmp;
+    unsigned   i;
     table_attrs_t *table_lp = NULL;
 
+    h5difftrace("build_match_list_attrs start\n");
+
     if(H5Oget_info(loc1_id, &oinfo1) < 0)
-        goto error;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Oget_info first object failed");
     if(H5Oget_info(loc2_id, &oinfo2) < 0)
-        goto error;
-
-    table_attrs_init( &table_lp );
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Oget_info second object failed");
 
+    table_attrs_init(&table_lp);
+    if (table_lp == NULL)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Table allocation failed");
 
     /*--------------------------------------------------
      * build the list
      */
     while(curr1 < oinfo1.num_attrs && curr2 < oinfo2.num_attrs) {
+        h5diffdebug3("build_match_list_attrs 1: %ld - %ld\n", curr1, oinfo1.num_attrs);
+        h5diffdebug3("build_match_list_attrs 2: %ld - %ld\n", curr2, oinfo2.num_attrs);
+
         /*------------------
         * open attribute1 */
         if((attr1_id = H5Aopen_by_idx(loc1_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aopen_by_idx first attribute failed");
         /* get name */
         if(H5Aget_name(attr1_id, (size_t)ATTR_NAME_MAX, name1) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aget_name first attribute failed");
 
         /*------------------
         * open attribute2 */
         if((attr2_id = H5Aopen_by_idx(loc2_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aopen_by_idx second attribute failed");
         /* get name */
         if(H5Aget_name(attr2_id, (size_t)ATTR_NAME_MAX, name2) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aget_name second attribute failed");
 
         /* criteria is string compare */
         cmp = HDstrcmp(name1, name2);
@@ -219,13 +222,16 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
     infile[0] = 1;
     infile[1] = 0;
     while(curr1 < oinfo1.num_attrs) {
+        h5diffdebug3("build_match_list_attrs 1: %ld - %ld\n", curr1, oinfo1.num_attrs);
+
         /*------------------
         * open attribute1 */
         if((attr1_id = H5Aopen_by_idx(loc1_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aopen_by_idx first attribute failed");
         /* get name */
         if(H5Aget_name(attr1_id, (size_t)ATTR_NAME_MAX, name1) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aget_name first attribute failed");
+        h5diffdebug2("build_match_list_attrs #1 name - %s\n", name1);
 
         table_attr_mark_exist(infile, name1, table_lp);
         table_lp->nattrs_only1++;
@@ -240,13 +246,15 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
     infile[0] = 0;
     infile[1] = 1;
     while(curr2 < oinfo2.num_attrs) {
+        h5diffdebug3("build_match_list_attrs 2: %ld - %ld\n", curr2, oinfo2.num_attrs);
         /*------------------
         * open attribute2 */
         if((attr2_id = H5Aopen_by_idx(loc2_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aopen_by_idx second attribute failed");
         /* get name */
         if(H5Aget_name(attr2_id, (size_t)ATTR_NAME_MAX, name2) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aget_name second attribute failed");
+        h5diffdebug2("build_match_list_attrs #2 name - %s\n", name2);
 
         table_attr_mark_exist(infile, name2, table_lp);
         table_lp->nattrs_only2++;
@@ -254,12 +262,13 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
 
         /* close for next turn */
         H5Aclose(attr2_id);
+        attr2_id = -1;
     }
 
     /*------------------------------------------------------
      * print the list
      */
-    if(options->m_verbose_level == 2) {
+    if(opts->m_verbose_level == 2) {
         /* if '-v2' is detected */
         parallel_print("   obj1   obj2\n");
         parallel_print(" --------------------------------------\n");
@@ -271,42 +280,35 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
         } /* end for */
     }
 
-    if(options->m_verbose_level >= 1)
+    if(opts->m_verbose_level >= 1)
         parallel_print("Attributes status:  %d common, %d only in obj1, %d only in obj2\n",
                 table_lp->nattrs - table_lp->nattrs_only1 - table_lp->nattrs_only2,
                 table_lp->nattrs_only1, table_lp->nattrs_only2);
 
+done:
     *table_out = table_lp;
 
-    return 0;
-
-error:
-    if (0 < attr1_id)
+    /* disable error reporting */
+    H5E_BEGIN_TRY {
         H5Aclose(attr1_id);
-    if (0 < attr2_id)
         H5Aclose(attr2_id);
+    } H5E_END_TRY;
+
+    h5diffdebug2("build_match_list_attrs end - errstat:%d\n", opts->err_stat);
 
-    return -1;
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
  * Function: diff_attr
  *
- * Purpose: compare attributes located in LOC1_ID and LOC2_ID, which are
- *  obtained either from
- * loc_id = H5Gopen2(fid, name, H5P_DEFAULT);
- * loc_id = H5Dopen2(fid, name);
- * loc_id = H5Topen2(fid, name, H5P_DEFAULT);
- *
- * Return: number of differences found
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November, 03, 2003
- *
- * Modifications:
- *  March, 02, 2007: return the number of differences found
+ * Purpose:  compare attributes located in LOC1_ID and LOC2_ID, which are
+ *           obtained either from
+ *               loc_id = H5Gopen2(fid, name, H5P_DEFAULT);
+ *               loc_id = H5Dopen2(fid, name);
+ *               loc_id = H5Topen2(fid, name, H5P_DEFAULT);
  *
+ * Return:   number of differences found
  *-------------------------------------------------------------------------
  */
 
@@ -314,107 +316,118 @@ hsize_t diff_attr(hid_t loc1_id,
                   hid_t loc2_id,
                   const char *path1,
                   const char *path2,
-                  diff_opt_t *options)
+                  diff_opt_t *opts)
 {
-    hid_t      attr1_id=-1;     /* attr ID */
-    hid_t      attr2_id=-1;     /* attr ID */
-    hid_t      space1_id=-1;    /* space ID */
-    hid_t      space2_id=-1;    /* space ID */
-    hid_t      ftype1_id=-1;    /* file data type ID */
-    hid_t      ftype2_id=-1;    /* file data type ID */
-    int	       vstrtype1=0;     /* ftype1 is a variable string */
-    int	       vstrtype2=0;     /* ftype2 is a variable string */
-    hid_t      mtype1_id=-1;    /* memory data type ID */
-    hid_t      mtype2_id=-1;    /* memory data type ID */
-    size_t     msize1;          /* memory size of memory type */
-    size_t     msize2;          /* memory size of memory type */
-    void       *buf1=NULL;      /* data buffer */
-    void       *buf2=NULL;      /* data buffer */
-    hbool_t    buf1hasdata=FALSE;    /* buffer has data */
-    hbool_t    buf2hasdata=FALSE;    /* buffer has data */
-    hsize_t    nelmts1;         /* number of elements in dataset */
-    int        rank1;           /* rank of dataset */
-    int        rank2;           /* rank of dataset */
-    hsize_t    dims1[H5S_MAX_RANK];/* dimensions of dataset */
-    hsize_t    dims2[H5S_MAX_RANK];/* dimensions of dataset */
-    char       *name1;
-    char       *name2;
+    int        ret_value = opts->err_stat;
+    hid_t      attr1_id = -1;     /* attr ID */
+    hid_t      attr2_id = -1;     /* attr ID */
+    hid_t      space1_id = -1;    /* space ID */
+    hid_t      space2_id = -1;    /* space ID */
+    hid_t      ftype1_id = -1;    /* file data type ID */
+    hid_t      ftype2_id = -1;    /* file data type ID */
+    int        vstrtype1 = 0;     /* ftype1 is a variable string */
+    int        vstrtype2 = 0;     /* ftype2 is a variable string */
+    hid_t      mtype1_id = -1;    /* memory data type ID */
+    hid_t      mtype2_id = -1;    /* memory data type ID */
+    size_t     msize1;            /* memory size of memory type */
+    size_t     msize2;            /* memory size of memory type */
+    void       *buf1 = NULL;      /* data buffer */
+    void       *buf2 = NULL;      /* data buffer */
+    hbool_t    buf1hasdata = FALSE;    /* buffer has data */
+    hbool_t    buf2hasdata = FALSE;    /* buffer has data */
+    hsize_t    nelmts1;           /* number of elements in dataset */
+    int        rank1;             /* rank of dataset */
+    int        rank2;             /* rank of dataset */
+    hsize_t    dims1[H5S_MAX_RANK];    /* dimensions of dataset */
+    hsize_t    dims2[H5S_MAX_RANK];    /* dimensions of dataset */
+    char       *name1 = NULL;
+    char       *name2 = NULL;
     char       np1[512];
     char       np2[512];
-    unsigned   u;                  /* Local index variable */
+    unsigned   u;                 /* Local index variable */
     hsize_t    nfound = 0;
     hsize_t    nfound_total = 0;
     int       j;
 
-    table_attrs_t * match_list_attrs = NULL;
-    if(build_match_list_attrs(loc1_id, loc2_id, &match_list_attrs, options) < 0)
-        goto error;
+    table_attrs_t *match_list_attrs = NULL;
+    h5difftrace("diff_attr start\n");
+
+    if(build_match_list_attrs(loc1_id, loc2_id, &match_list_attrs, opts) < 0) {
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "build_match_list_attrs failed");
+    }
+    h5diffdebug2("build_match_list_attrs - errstat:%d\n", opts->err_stat);
 
     /* if detect any unique extra attr */
     if(match_list_attrs->nattrs_only1 || match_list_attrs->nattrs_only2) {
+        h5difftrace("diff_attr attributes only in one file\n");
         /* exit will be 1 */
-        options->contents = 0;
+        opts->contents = 0;
     }
+    h5diffdebug2("match_list_attrs info - errstat:%d\n", opts->err_stat);
 
     for(u = 0; u < (unsigned)match_list_attrs->nattrs; u++) {
+        h5diffdebug3("match_list_attrs loop[%d] - errstat:%d\n", u, opts->err_stat);
         if((match_list_attrs->attrs[u].exist[0]) && (match_list_attrs->attrs[u].exist[1])) {
             name1 = name2 = match_list_attrs->attrs[u].name;
+            h5diffdebug2("diff_attr name - %s\n", name1);
 
             /*--------------
             * attribute 1 */
             if((attr1_id = H5Aopen(loc1_id, name1, H5P_DEFAULT)) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aopen first attribute failed");
 
             /*--------------
             * attribute 2 */
             if((attr2_id = H5Aopen(loc2_id, name2, H5P_DEFAULT)) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aopen second attribute failed");
 
+            h5difftrace("diff_attr got attributes\n");
             /* get the datatypes  */
             if((ftype1_id = H5Aget_type(attr1_id)) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type first attribute failed");
             vstrtype1 = H5Tis_variable_str(ftype1_id);
             if((ftype2_id = H5Aget_type(attr2_id)) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type second attribute failed");
             vstrtype2 = H5Tis_variable_str(ftype2_id);
+
             /* no compare if either one but not both are variable string type */
             if (vstrtype1 != vstrtype2) {
-                if((options->m_verbose || options->m_list_not_cmp))
+                if((opts->m_verbose || opts->m_list_not_cmp))
                     parallel_print("Not comparable: one of attribute <%s/%s> or <%s/%s> is of variable length type\n",
                             path1, name1, path2, name2);
-                options->not_cmp = 1;
+                opts->not_cmp = 1;
                 if (H5Tclose(ftype1_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose first attribute ftype failed");
                 if (H5Tclose(ftype2_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose second attribute ftype failed");
                 if (H5Aclose(attr1_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aclose first attribute failed");
                 if (H5Aclose(attr2_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aclose second attribute failed");
 
                 continue;
             }
 
             if((mtype1_id = H5Tget_native_type(ftype1_id, H5T_DIR_DEFAULT)) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tget_native_type first attribute ftype failed");
             if((mtype2_id = H5Tget_native_type(ftype2_id, H5T_DIR_DEFAULT)) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tget_native_type second attribute ftype failed");
             if((msize1 = H5Tget_size(mtype1_id)) == 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tget_size first attribute mtype failed");
             if((msize2 = H5Tget_size(mtype2_id)) == 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tget_size second attribute mtype failed");
 
             /* get the dataspace   */
             if((space1_id = H5Aget_space(attr1_id)) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_space first attribute failed");
             if((space2_id = H5Aget_space(attr2_id)) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_space second attribute failed");
 
             /* get dimensions  */
             if((rank1 = H5Sget_simple_extent_dims(space1_id, dims1, NULL)) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Sget_simple_extent_dims first attribute failed");
             if((rank2 = H5Sget_simple_extent_dims(space2_id, dims2, NULL)) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Sget_simple_extent_dims second attribute failed");
 
             /*----------------------------------------------------------------------
             * check for comparable TYPE and SPACE
@@ -424,23 +437,23 @@ hsize_t diff_attr(hid_t loc1_id,
             /* pass dims1 and dims2 for maxdims as well since attribute's maxdims
             * are always same */
             if(diff_can_type(ftype1_id, ftype2_id, rank1, rank2, dims1, dims2,
-                    dims1, dims2, name1, name2, options, 0) != 1) {
+                    dims1, dims2, name1, name2, opts, 0) != 1) {
                 if(H5Tclose(ftype1_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose first attribute ftype failed");
                 if(H5Tclose(ftype2_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose second attribute ftype failed");
                 if(H5Sclose(space1_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Sclose first attribute failed");
                 if(H5Sclose(space2_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Sclose second attribute failed");
                 if(H5Aclose(attr1_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aclose first attribute failed");
                 if(H5Aclose(attr2_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aclose second attribute failed");
                 if(H5Tclose(mtype1_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose first attribute mtype failed");
                 if(H5Tclose(mtype2_id) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose second attribute mtype failed");
 
                 continue;
             }
@@ -451,7 +464,7 @@ hsize_t diff_attr(hid_t loc1_id,
             */
             if(FAIL == match_up_memsize(ftype1_id, ftype2_id, &mtype1_id,
                             &mtype2_id, &msize1, &msize2))
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "match_up_memsize failed");
 
             /*---------------------------------------------------------------------
             * read
@@ -461,22 +474,22 @@ hsize_t diff_attr(hid_t loc1_id,
             for(j = 0; j < rank1; j++)
                 nelmts1 *= dims1[j];
 
-            buf1 = (void *)HDmalloc((size_t)(nelmts1 * msize1));
-            buf2 = (void *)HDmalloc((size_t)(nelmts1 * msize2));
+            buf1 = (void *)HDcalloc((size_t)(nelmts1), msize1);
+            buf2 = (void *)HDcalloc((size_t)(nelmts1), msize2);
             if(buf1 == NULL || buf2 == NULL) {
                 parallel_print("cannot read into memory\n");
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "buffer allocation failed");
             }
             if(H5Aread(attr1_id, mtype1_id, buf1) < 0) {
                 parallel_print("Failed reading attribute1 %s/%s\n", path1, name1);
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type first attribute failed");
             }
             else
                 buf1hasdata = TRUE;
 
             if(H5Aread(attr2_id, mtype2_id, buf2) < 0) {
                 parallel_print("Failed reading attribute2 %s/%s\n", path2, name2);
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type second attribute failed");
             }
             else
                 buf2hasdata = TRUE;
@@ -492,22 +505,22 @@ hsize_t diff_attr(hid_t loc1_id,
 
             /* always print name */
             /* verbose (-v) and report (-r) mode */
-            if(options->m_verbose || options->m_report) {
+            if(opts->m_verbose || opts->m_report) {
                 do_print_attrname("attribute", np1, np2);
 
                 nfound = diff_array(buf1, buf2, nelmts1, (hsize_t) 0, rank1,
-                        dims1, options, np1, np2, mtype1_id, attr1_id, attr2_id);
+                        dims1, opts, np1, np2, mtype1_id, attr1_id, attr2_id);
                 print_found(nfound);
             }
             /* quiet mode (-q), just count differences */
-            else if(options->m_quiet) {
+            else if(opts->m_quiet) {
                 nfound = diff_array(buf1, buf2, nelmts1, (hsize_t) 0, rank1,
-                        dims1, options, np1, np2, mtype1_id, attr1_id, attr2_id);
+                        dims1, opts, np1, np2, mtype1_id, attr1_id, attr2_id);
             }
             /* the rest (-c, none, ...) */
             else {
                 nfound = diff_array(buf1, buf2, nelmts1, (hsize_t) 0, rank1,
-                        dims1, options, np1, np2, mtype1_id, attr1_id, attr2_id);
+                        dims1, opts, np1, np2, mtype1_id, attr1_id, attr2_id);
 
                 /* print info if compatible and difference found */
                 if (nfound) {
@@ -534,31 +547,29 @@ hsize_t diff_attr(hid_t loc1_id,
             buf2 = NULL;
 
             if(H5Tclose(ftype1_id) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type first attribute failed");
             if(H5Tclose(ftype2_id) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type second attribute failed");
             if(H5Sclose(space1_id) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type first attribute failed");
             if(H5Sclose(space2_id) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type second attribute failed");
             if(H5Aclose(attr1_id) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type first attribute failed");
             if(H5Aclose(attr2_id) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Aget_type second attribute failed");
             if(H5Tclose(mtype1_id) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose first attribute mtype failed");
             if(H5Tclose(mtype2_id) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tclose second attribute mtype failed");
 
             nfound_total += nfound;
         }
     } /* u */
 
-    table_attrs_free(match_list_attrs);
-
-    return nfound_total;
+done:
+    opts->err_stat = opts->err_stat | ret_value;
 
-error:
     H5E_BEGIN_TRY {
         if(buf1) {
             if(buf1hasdata && TRUE == h5tools_detect_vlen(mtype1_id))
@@ -583,7 +594,7 @@ error:
         H5Aclose(attr2_id);
     } H5E_END_TRY;
 
-    options->err_stat = 1;
+    h5diffdebug2("diff_attr end - errstat:%d\n", opts->err_stat);
     return nfound_total;
 }
 
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 1ac3d79..9d0462d 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -1,15 +1,15 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* Copyright by The HDF Group.                                               *
-* Copyright by the Board of Trustees of the University of Illinois.         *
-* All rights reserved.                                                      *
-*                                                                           *
-* This file is part of HDF5.  The full HDF5 copyright notice, including     *
-* terms governing use, modification, and redistribution, is contained in    *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
  * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "H5private.h"
 #include "h5tools.h"
@@ -19,25 +19,22 @@
 
 
 /*-------------------------------------------------------------------------
-* Function: diff_dataset
-*
-* Purpose: check for comparable datasets and read into a compatible
-*  memory type
-*
-* Return: Number of differences found
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: May 9, 2003
-*
-*-------------------------------------------------------------------------
-*/
-hsize_t diff_dataset( hid_t file1_id,
-                      hid_t file2_id,
-                      const char *obj1_name,
-                      const char *obj2_name,
-                      diff_opt_t *options)
+ * Function: diff_dataset
+ *
+ * Purpose: check for comparable datasets and read into a compatible
+ *  memory type
+ *
+ * Return: Number of differences found
+ *-------------------------------------------------------------------------
+ */
+hsize_t diff_dataset(hid_t file1_id,
+                     hid_t file2_id,
+                     const char *obj1_name,
+                     const char *obj2_name,
+                     diff_opt_t *opts)
 {
+    int     ret_value = opts->err_stat;
+    int     status = -1;
     hid_t   did1 = -1;
     hid_t   did2 = -1;
     hid_t   dcpl1 = -1;
@@ -46,53 +43,45 @@ hsize_t diff_dataset( hid_t file1_id,
 
     h5difftrace("diff_dataset start\n");
     /*-------------------------------------------------------------------------
-    * open the handles
-    *-------------------------------------------------------------------------
-    */
-    /* disable error reporting */
-    H5E_BEGIN_TRY
-    {
-        /* Open the datasets */
-        if((did1 = H5Dopen2(file1_id, obj1_name, H5P_DEFAULT)) < 0) {
-            parallel_print("Cannot open dataset <%s>\n", obj1_name);
-            goto error;
-        }
-        if((did2 = H5Dopen2(file2_id, obj2_name, H5P_DEFAULT)) < 0) {
-            parallel_print("Cannot open dataset <%s>\n", obj2_name);
-            goto error;
-        }
-        /* enable error reporting */
-    } H5E_END_TRY;
-
+     * open the handles
+     *-------------------------------------------------------------------------
+     */
+    /* Open the datasets */
+    if((did1 = H5Dopen2(file1_id, obj1_name, H5P_DEFAULT)) < 0) {
+        parallel_print("Cannot open dataset <%s>\n", obj1_name);
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dopen2 first dataset failed");
+    }
+    if((did2 = H5Dopen2(file2_id, obj2_name, H5P_DEFAULT)) < 0) {
+        parallel_print("Cannot open dataset <%s>\n", obj2_name);
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dopen2 second dataset failed");
+    }
 
     if((dcpl1 = H5Dget_create_plist(did1)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dget_create_plist first dataset failed");
     if((dcpl2 = H5Dget_create_plist(did2)) < 0)
-        goto error;
-
-    /*-------------------------------------------------------------------------
-    * check if the dataset creation property list has filters that
-    * are not registered in the current configuration
-    * 1) the external filters GZIP and SZIP might not be available
-    * 2) the internal filters might be turned off
-    *-------------------------------------------------------------------------
-    */
-    if ((h5tools_canreadf((options->m_verbose ? obj1_name : NULL), dcpl1) == 1) &&
-        (h5tools_canreadf((options->m_verbose ? obj2_name : NULL), dcpl2) == 1))
-        nfound = diff_datasetid(did1, did2, obj1_name, obj2_name, options);
-    else
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dget_create_plist second dataset failed");
 
     /*-------------------------------------------------------------------------
-    * close
-    *-------------------------------------------------------------------------
-    */
-    goto done;
-
-error:
-    options->err_stat = 1;
+     * check if the dataset creation property list has filters that
+     * are not registered in the current configuration
+     * 1) the external filters GZIP and SZIP might not be available
+     * 2) the internal filters might be turned off
+     *-------------------------------------------------------------------------
+     */
+    if ((status = h5tools_canreadf((opts->m_verbose ? obj1_name : NULL), dcpl1) == 1) &&
+            (status = h5tools_canreadf((opts->m_verbose ? obj2_name : NULL), dcpl2) == 1))
+        nfound = diff_datasetid(did1, did2, obj1_name, obj2_name, opts);
+    else if (status < 0) {
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "h5tools_canreadf failed");
+    }
+    else {
+        ret_value = 1;
+        opts->not_cmp = 1;
+    }
 
 done:
+    opts->err_stat = opts->err_stat | ret_value;
+
     /* disable error reporting */
     H5E_BEGIN_TRY {
         H5Pclose(dcpl1);
@@ -102,81 +91,75 @@ done:
         /* enable error reporting */
     } H5E_END_TRY;
 
-    h5difftrace("diff_dataset end\n");
+    h5diffdebug3("diff_dataset finish:%d - errstat:%d\n", nfound, opts->err_stat);
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
-* Function: diff_datasetid
-*
-* Purpose: check for comparable datasets and read into a compatible
-*  memory type
-*
-* Return: Number of differences found
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: May 9, 2003
-*
-* Modifications:
-*
-*
-* October 2006:  Read by hyperslabs for big datasets.
-*
-*  A threshold of H5TOOLS_MALLOCSIZE (128 MB) is the limit upon which I/O hyperslab is done
-*  i.e., if the memory needed to read a dataset is greater than this limit,
-*  then hyperslab I/O is done instead of one operation I/O
-*  For each dataset, the memory needed is calculated according to
-*
-*  memory needed = number of elements * size of each element
-*
-*  if the memory needed is lower than H5TOOLS_MALLOCSIZE, then the following operations
-*  are done
-*
-*  H5Dread( input_dataset1 )
-*  H5Dread( input_dataset2 )
-*
-*  with all elements in the datasets selected. If the memory needed is greater than
-*  H5TOOLS_MALLOCSIZE, then the following operations are done instead:
-*
-*  a strip mine is defined for each dimension k (a strip mine is defined as a
-*  hyperslab whose size is memory manageable) according to the formula
-*
-*  (1) strip_mine_size[k ] = MIN(dimension[k ], H5TOOLS_BUFSIZE / size of memory type)
-*
-*  where H5TOOLS_BUFSIZE is a constant currently defined as 1MB. This formula assures
-*  that for small datasets (small relative to the H5TOOLS_BUFSIZE constant), the strip
-*  mine size k is simply defined as its dimension k, but for larger datasets the
-*  hyperslab size is still memory manageable.
-*  a cycle is done until the number of elements in the dataset is reached. In each
-*  iteration, two parameters are defined for the function H5Sselect_hyperslab,
-*  the start and size of each hyperslab, according to
-*
-*  (2) hyperslab_size [k] = MIN(dimension[k] - hyperslab_offset[k], strip_mine_size [k])
-*
-*  where hyperslab_offset [k] is initially set to zero, and later incremented in
-*  hyperslab_size[k] offsets. The reason for the operation
-*
-*  dimension[k] - hyperslab_offset[k]
-*
-*  in (2) is that, when using the strip mine size, it assures that the "remaining" part
-*  of the dataset that does not fill an entire strip mine is processed.
-*
-*-------------------------------------------------------------------------
-*/
-hsize_t diff_datasetid( hid_t did1,
-                        hid_t did2,
-                        const char *obj1_name,
-                        const char *obj2_name,
-                        diff_opt_t *options)
+ * Function: diff_datasetid
+ *
+ * Purpose: check for comparable datasets and read into a compatible
+ *  memory type
+ *
+ * Return: Number of differences found
+ *
+ * October 2006:  Read by hyperslabs for big datasets.
+ *
+ *  A threshold of H5TOOLS_MALLOCSIZE (128 MB) is the limit upon which I/O hyperslab is done
+ *  i.e., if the memory needed to read a dataset is greater than this limit,
+ *  then hyperslab I/O is done instead of one operation I/O
+ *  For each dataset, the memory needed is calculated according to
+ *
+ *  memory needed = number of elements * size of each element
+ *
+ *  if the memory needed is lower than H5TOOLS_MALLOCSIZE, then the following operations
+ *  are done
+ *
+ *  H5Dread( input_dataset1 )
+ *  H5Dread( input_dataset2 )
+ *
+ *  with all elements in the datasets selected. If the memory needed is greater than
+ *  H5TOOLS_MALLOCSIZE, then the following operations are done instead:
+ *
+ *  a strip mine is defined for each dimension k (a strip mine is defined as a
+ *  hyperslab whose size is memory manageable) according to the formula
+ *
+ *  (1) strip_mine_size[k ] = MIN(dimension[k ], H5TOOLS_BUFSIZE / size of memory type)
+ *
+ *  where H5TOOLS_BUFSIZE is a constant currently defined as 1MB. This formula assures
+ *  that for small datasets (small relative to the H5TOOLS_BUFSIZE constant), the strip
+ *  mine size k is simply defined as its dimension k, but for larger datasets the
+ *  hyperslab size is still memory manageable.
+ *  a cycle is done until the number of elements in the dataset is reached. In each
+ *  iteration, two parameters are defined for the function H5Sselect_hyperslab,
+ *  the start and size of each hyperslab, according to
+ *
+ *  (2) hyperslab_size [k] = MIN(dimension[k] - hyperslab_offset[k], strip_mine_size [k])
+ *
+ *  where hyperslab_offset [k] is initially set to zero, and later incremented in
+ *  hyperslab_size[k] offsets. The reason for the operation
+ *
+ *  dimension[k] - hyperslab_offset[k]
+ *
+ *  in (2) is that, when using the strip mine size, it assures that the "remaining" part
+ *  of the dataset that does not fill an entire strip mine is processed.
+ *
+ *-------------------------------------------------------------------------
+ */
+hsize_t diff_datasetid(hid_t did1,
+                       hid_t did2,
+                       const char *obj1_name,
+                       const char *obj2_name,
+                       diff_opt_t *opts)
 {
-    hid_t      sid1=-1;
-    hid_t      sid2=-1;
-    hid_t      f_tid1=-1;
-    hid_t      f_tid2=-1;
-    hid_t      dam_tid=-1;               /* m_tid for diff_array function */
-    hid_t      m_tid1=-1;
-    hid_t      m_tid2=-1;
+    int        ret_value = opts->err_stat;
+    hid_t      sid1 = -1;
+    hid_t      sid2 = -1;
+    hid_t      f_tid1 = -1;
+    hid_t      f_tid2 = -1;
+    hid_t      dam_tid = -1;             /* m_tid for diff_array function */
+    hid_t      m_tid1 = -1;
+    hid_t      m_tid2 = -1;
     hid_t      dcpl1 = -1;
     hid_t      dcpl2 = -1;
     H5D_layout_t     stl1 = -1;
@@ -196,78 +179,78 @@ hsize_t diff_datasetid( hid_t did1,
     hsize_t    dims2[H5S_MAX_RANK];
     hsize_t    maxdim1[H5S_MAX_RANK];
     hsize_t    maxdim2[H5S_MAX_RANK];
-    const char *name1=NULL;            /* relative names */
-    const char *name2=NULL;
+    const char *name1 = NULL;           /* relative names */
+    const char *name2 = NULL;
     hsize_t    storage_size1;
     hsize_t    storage_size2;
-    hsize_t    nfound=0;               /* number of differences found */
-    int        can_compare=1;          /* do diff or not */
-    void       *buf1=NULL;
-    void       *buf2=NULL;
-    void       *sm_buf1=NULL;
-    void       *sm_buf2=NULL;
-    hid_t      sm_space;               /*stripmine data space */
-    size_t     need;                   /* bytes needed for malloc */
+    hsize_t    nfound = 0;              /* number of differences found */
+    int        can_compare = 1;         /* do diff or not */
+    void       *buf1 = NULL;
+    void       *buf2 = NULL;
+    void       *sm_buf1 = NULL;
+    void       *sm_buf2 = NULL;
+    hid_t      sm_space = -1;           /*stripmine data space */
+    size_t     need;                    /* bytes needed for malloc */
     int        i;
-    unsigned int  vl_data = 0;         /*contains VL datatypes */
+    unsigned int  vl_data = 0;          /*contains VL datatypes */
 
     h5difftrace("diff_datasetid start\n");
     /* Get the dataspace handle */
     if((sid1 = H5Dget_space(did1)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dget_space failed");
 
     /* Get rank */
     if((rank1 = H5Sget_simple_extent_ndims(sid1)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Sget_simple_extent_ndims failed");
 
     /* Get the dataspace handle */
     if((sid2 = H5Dget_space(did2)) < 0 )
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dget_space failed");
 
     /* Get rank */
     if((rank2 = H5Sget_simple_extent_ndims(sid2)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Sget_simple_extent_ndims failed");
 
     /* Get dimensions */
     if(H5Sget_simple_extent_dims(sid1, dims1, maxdim1) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Sget_simple_extent_dims failed");
 
     /* Get dimensions */
     if(H5Sget_simple_extent_dims(sid2, dims2, maxdim2) < 0)
-        goto error;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sget_simple_extent_dims failed");
     h5diffdebug3("rank: %ld - %ld\n", rank1, rank2);
 
     /*-------------------------------------------------------------------------
-    * get the file data type
-    *-------------------------------------------------------------------------
-    */
+     * get the file data type
+     *-------------------------------------------------------------------------
+     */
 
     /* Get the data type */
     if((f_tid1 = H5Dget_type(did1)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dget_type failed");
 
     /* Get the data type */
     if((f_tid2 = H5Dget_type(did2)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dget_type failed");
 
     /*-------------------------------------------------------------------------
-    * get the storage layout type
-    *-------------------------------------------------------------------------
-    */
+     * get the storage layout type
+     *-------------------------------------------------------------------------
+     */
     if((dcpl1 = H5Dget_create_plist(did1)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dget_create_plist failed");
     if((dcpl2 = H5Dget_create_plist(did2)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dget_create_plist failed");
 
     if((stl1 = H5Pget_layout(dcpl1)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Pget_layout failed");
     if((stl2 = H5Pget_layout(dcpl2)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Pget_layout failed");
 
     /*-------------------------------------------------------------------------
-    * check for empty datasets
-    *-------------------------------------------------------------------------
-    */
+     * check for empty datasets
+     *-------------------------------------------------------------------------
+     */
     h5difftrace("check for empty datasets\n");
 
     storage_size1 = H5Dget_storage_size(did1);
@@ -275,66 +258,69 @@ hsize_t diff_datasetid( hid_t did1,
     h5diffdebug3("storage size: %ld - %ld\n", storage_size1, storage_size2);
 
     if(storage_size1 == 0 || storage_size2 == 0) {
-        if((options->m_verbose || options->m_list_not_cmp) && obj1_name && obj2_name)
-                parallel_print("Not comparable: <%s> or <%s> is an empty dataset\n", obj1_name, obj2_name);
+        if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name)
+            parallel_print("Not comparable: <%s> or <%s> is an empty dataset\n", obj1_name, obj2_name);
         can_compare = 0;
-        options->not_cmp = 1;
+        opts->not_cmp = 1;
     }
 
     /*-------------------------------------------------------------------------
-    * check for comparable TYPE and SPACE
-    *-------------------------------------------------------------------------
-    */
+     * check for comparable TYPE and SPACE
+     *-------------------------------------------------------------------------
+     */
     if (diff_can_type(f_tid1, f_tid2, rank1, rank2,
             dims1, dims2, maxdim1, maxdim2,
             obj1_name, obj2_name,
-            options, 0) != 1)
+            opts, 0) != 1)
         can_compare = 0;
+    h5diffdebug2("diff_can_type - errstat:%d\n", opts->err_stat);
 
     /*-------------------------------------------------------------------------
-    * memory type and sizes
-    *-------------------------------------------------------------------------
-    */
+     * memory type and sizes
+     *-------------------------------------------------------------------------
+     */
     h5difftrace("check for memory type and sizes\n");
     if((m_tid1 = H5Tget_native_type(f_tid1, H5T_DIR_DEFAULT)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tget_native_type failed");
 
     if((m_tid2 = H5Tget_native_type(f_tid2, H5T_DIR_DEFAULT)) < 0)
-        goto error;
+        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Tget_native_type failed");
 
     m_size1 = H5Tget_size(m_tid1);
     m_size2 = H5Tget_size(m_tid2);
     h5diffdebug3("type size: %ld - %ld\n", m_size1, m_size2);
 
     /*-------------------------------------------------------------------------
-    * check for different signed/unsigned types
-    *-------------------------------------------------------------------------
-    */
+     * check for different signed/unsigned types
+     *-------------------------------------------------------------------------
+     */
     if(can_compare) {
         h5difftrace("can_compare for sign\n");
         sign1 = H5Tget_sign(m_tid1);
         sign2 = H5Tget_sign(m_tid2);
         if(sign1 != sign2) {
             h5difftrace("sign1 != sign2\n");
-            if((options->m_verbose || options->m_list_not_cmp) && obj1_name && obj2_name) {
+            if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
                 parallel_print("Not comparable: <%s> has sign %s ", obj1_name, get_sign(sign1));
                 parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
             }
 
             can_compare = 0;
-            options->not_cmp = 1;
+            opts->not_cmp = 1;
         }
     }
 
     /* Check if type is either VLEN-data or VLEN-string to reclaim any
-     * VLEN memory buffer later */
+     * VLEN memory buffer later
+     */
     if(TRUE == h5tools_detect_vlen(m_tid1))
         vl_data = TRUE;
+    h5diffdebug2("h5tools_detect_vlen - errstat:%d\n", opts->err_stat);
 
     /*------------------------------------------------------------------------
-    * only attempt to compare if possible
-    *-------------------------------------------------------------------------
-    */
+     * only attempt to compare if possible
+     *-------------------------------------------------------------------------
+     */
     if(can_compare) { /* it is possible to compare */
         H5T_class_t  tclass = H5Tget_class(f_tid1);
         h5difftrace("can_compare attempt\n");
@@ -352,25 +338,24 @@ hsize_t diff_datasetid( hid_t did1,
             nelmts2 *= dims2[i];
 
         h5diffdebug3("nelmts: %ld - %ld\n", nelmts1, nelmts2);
-        HDassert(nelmts1 == nelmts2);
 
         if(tclass != H5T_ARRAY) {
             /*-----------------------------------------------------------------
-            * "upgrade" the smaller memory size
-            *------------------------------------------------------------------
-            */
+             * "upgrade" the smaller memory size
+             *------------------------------------------------------------------
+             */
             h5difftrace("upgrade the smaller memory size?\n");
             if (FAIL == match_up_memsize (f_tid1, f_tid2,
                                         &m_tid1, &m_tid2,
                                         &m_size1, &m_size2))
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "match_up_memsize failed");
             h5diffdebug3("m_size: %ld - %ld\n", m_size1, m_size2);
             dadims = dims1;
             dam_size = m_size1;
             dam_tid = m_tid1;
             danelmts = nelmts1;
             need = (size_t)(nelmts1 * m_size1);  /* bytes needed */
-         }
+        }
         else {
             h5diffdebug3("Array dims: %d - %d\n", dims1[0], dims2[0]);
             /* Compare the smallest array, but create the largest buffer */
@@ -394,12 +379,13 @@ hsize_t diff_datasetid( hid_t did1,
             name1 = diff_basename(obj1_name);
         if(obj2_name)
             name2 = diff_basename(obj2_name);
+        h5diffdebug3("obj_names: %s - %s\n", name1, name2);
 
 
         /*----------------------------------------------------------------
-        * read/compare
-        *-----------------------------------------------------------------
-        */
+         * read/compare
+         *-----------------------------------------------------------------
+         */
         if(need < H5TOOLS_MALLOCSIZE) {
             buf1 = HDmalloc(need);
             buf2 = HDmalloc(need);
@@ -408,20 +394,30 @@ hsize_t diff_datasetid( hid_t did1,
         if(buf1 != NULL && buf2 != NULL) {
             h5difftrace("buf1 != NULL && buf2 != NULL\n");
             if(H5Dread(did1, m_tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dread failed");
             h5difftrace("H5Dread did2\n");
             if(H5Dread(did2, m_tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2) < 0)
-                goto error;
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dread failed");
 
             /* array diff */
             nfound = diff_array(buf1, buf2, danelmts, (hsize_t)0, rank1, dadims,
-                options, name1, name2, dam_tid, did1, did2);
+                opts, name1, name2, dam_tid, did1, did2);
+            h5diffdebug2("diff_array nfound:%d\n", nfound);
 
             /* reclaim any VL memory, if necessary */
             if(vl_data) {
+                h5difftrace("check vl_data\n");
                 H5Dvlen_reclaim(m_tid1, sid1, H5P_DEFAULT, buf1);
                 H5Dvlen_reclaim(m_tid2, sid2, H5P_DEFAULT, buf2);
             } /* end if */
+            if(buf1 != NULL) {
+                HDfree(buf1);
+                buf1 = NULL;
+            }
+            if(buf2 != NULL) {
+                HDfree(buf2);
+                buf2 = NULL;
+            }
         } /* end if */
         else { /* possibly not enough memory, read/compare by hyperslabs */
             size_t        p_type_nbytes = dam_size; /*size of memory type */
@@ -453,7 +449,7 @@ hsize_t diff_datasetid( hid_t did1,
                     size = 1;
                 sm_size[i - 1] = MIN(dadims[i - 1], size);
                 sm_nbytes *= sm_size[i - 1];
-                HDassert(sm_nbytes > 0);
+                h5diffdebug2("sm_nbytes: %ld\n", sm_nbytes);
             } /* end for */
 
             /* malloc return code should be verified.
@@ -463,10 +459,10 @@ hsize_t diff_datasetid( hid_t did1,
              * that fails to address freeing other objects created here.
              * E.g., sm_space.
              */
-            sm_buf1 = HDmalloc((size_t)sm_nbytes);
-            HDassert(sm_buf1);
-            sm_buf2 = HDmalloc((size_t)sm_nbytes);
-            HDassert(sm_buf2);
+            if((sm_buf1 = HDmalloc((size_t)sm_nbytes)) == NULL)
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "HDmalloc failed");
+            if((sm_buf2 = HDmalloc((size_t)sm_nbytes)) == NULL)
+                HGOTO_ERROR(1, H5E_tools_min_id_g, "HDmalloc failed");
 
             sm_nelmts = sm_nbytes / p_type_nbytes;
             sm_space = H5Screate_simple(1, &sm_nelmts, NULL);
@@ -483,24 +479,24 @@ hsize_t diff_datasetid( hid_t did1,
                         hs_nelmts *= hs_size[i];
                     } /* end for */
                     if(H5Sselect_hyperslab(sid1, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL) < 0)
-                        goto error;
+                        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Sselect_hyperslab failed");
                     if(H5Sselect_hyperslab(sid2, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL) < 0)
-                        goto error;
+                        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Sselect_hyperslab failed");
                     if(H5Sselect_hyperslab(sm_space, H5S_SELECT_SET, zero, NULL, &hs_nelmts, NULL) < 0)
-                        goto error;
+                        HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Sselect_hyperslab failed");
                 } /* end if */
                 else
                     hs_nelmts = 1;
 
                 if(H5Dread(did1, m_tid1, sm_space, sid1, H5P_DEFAULT, sm_buf1) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dread failed");
                 if(H5Dread(did2, m_tid2, sm_space, sid2, H5P_DEFAULT, sm_buf2) < 0)
-                    goto error;
+                    HGOTO_ERROR(1, H5E_tools_min_id_g, "H5Dread failed");
 
                 /* get array differences. in the case of hyperslab read, increment the number of differences
                 found in each hyperslab and pass the position at the beginning for printing */
                 nfound += diff_array(sm_buf1, sm_buf2, hs_nelmts, elmtno, rank1,
-                        dadims, options, name1, name2, dam_tid, did1, did2);
+                        dadims, opts, name1, name2, dam_tid, did1, did2);
 
                 /* reclaim any VL memory, if necessary */
                 if(vl_data) {
@@ -517,6 +513,14 @@ hsize_t diff_datasetid( hid_t did1,
                         carry = 0;
                 } /* i */
             } /* elmtno */
+            if(sm_buf1 != NULL) {
+                HDfree(sm_buf1);
+                sm_buf1 = NULL;
+            }
+            if(sm_buf2 != NULL) {
+                HDfree(sm_buf2);
+                sm_buf2 = NULL;
+            }
 
             H5Sclose(sm_space);
         } /* hyperslab read */
@@ -527,40 +531,10 @@ hsize_t diff_datasetid( hid_t did1,
      * close
      *-------------------------------------------------------------------------
      */
-    h5difftrace("compare attributes?\n");
-
-    /* free */
-    if(buf1 != NULL) {
-        HDfree(buf1);
-        buf1 = NULL;
-    } /* end if */
-    if(buf2 != NULL) {
-        HDfree(buf2);
-        buf2 = NULL;
-    } /* end if */
-    if(sm_buf1 != NULL) {
-        HDfree(sm_buf1);
-        sm_buf1 = NULL;
-    } /* end if */
-    if(sm_buf2 != NULL) {
-        HDfree(sm_buf2);
-        sm_buf2 = NULL;
-    } /* end if */
-
-    H5E_BEGIN_TRY {
-        H5Sclose(sid1);
-        H5Sclose(sid2);
-        H5Tclose(f_tid1);
-        H5Tclose(f_tid2);
-        H5Tclose(m_tid1);
-        H5Tclose(m_tid2);
-    } H5E_END_TRY;
-    h5difftrace("diff_datasetid finish\n");
-
-    return nfound;
+    h5diffdebug2("reclaim any VL memory - errstat:%d\n", opts->err_stat);
 
-error:
-    options->err_stat=1;
+done:
+    opts->err_stat = opts->err_stat | ret_value;
 
     /* free */
     if(buf1 != NULL) {
@@ -602,60 +576,55 @@ error:
         H5Tclose(m_tid2);
         /* enable error reporting */
     } H5E_END_TRY;
-    h5difftrace("diff_datasetid errored\n");
 
+    h5diffdebug3("diff_datasetid return:%d with nfound:%d\n", ret_value, nfound);
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
-* Function: diff_can_type
-*
-* Purpose: check for comparable TYPE and SPACE
-*
-* Return:
-*  1, can compare
-*  0, cannot compare
-* -1, error
-*
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
-*
-* Date: November 3, 2003
-*
-*-------------------------------------------------------------------------
-*/
-
-int diff_can_type( hid_t       f_tid1, /* file data type */
-                   hid_t       f_tid2, /* file data type */
-                   int         rank1,
-                   int         rank2,
-                   hsize_t     *dims1,
-                   hsize_t     *dims2,
-                   hsize_t     *maxdim1,
-                   hsize_t     *maxdim2,
-                   const char  *obj1_name,
-                   const char  *obj2_name,
-                   diff_opt_t  *options,
-                   int         is_compound)
+ * Function: diff_can_type
+ *
+ * Purpose:  check for comparable TYPE and SPACE
+ *
+ * Return:
+ *           1, can compare
+ *           0, cannot compare
+ *          -1, error
+ *-------------------------------------------------------------------------
+ */
+
+int diff_can_type(hid_t       f_tid1, /* file data type */
+                  hid_t       f_tid2, /* file data type */
+                  int         rank1,
+                  int         rank2,
+                  hsize_t     *dims1,
+                  hsize_t     *dims2,
+                  hsize_t     *maxdim1,
+                  hsize_t     *maxdim2,
+                  const char  *obj1_name,
+                  const char  *obj2_name,
+                  diff_opt_t  *opts,
+                  int         is_compound)
 {
+    int          ret_value = 1;            /* can_compare value */
     H5T_class_t  tclass1;
     H5T_class_t  tclass2;
     int          maxdim_diff = 0;          /* maximum dimensions are different */
     int          dim_diff = 0;             /* current dimensions are different */
     int          i;
-    int          can_compare = 1;          /* return value */
 
     h5difftrace("diff_can_type start\n");
     /*-------------------------------------------------------------------------
-    * check for the same class
-    *-------------------------------------------------------------------------
-    */
+     * check for the same class
+     *-------------------------------------------------------------------------
+     */
     if((tclass1 = H5Tget_class(f_tid1)) < 0)
-        return -1;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_class first object failed");
     if((tclass2 = H5Tget_class(f_tid2)) < 0)
-        return -1;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_class second object failed");
 
     if(tclass1 != tclass2) {
-        if((options->m_verbose || options->m_list_not_cmp) && obj1_name && obj2_name) {
+        if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
             if(is_compound) {
                 parallel_print("Not comparable: <%s> has a class %s and <%s> has a class %s\n",
                         obj1_name, get_class(tclass1),
@@ -667,25 +636,22 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
                         obj2_name, get_class(tclass2));
             }
         }
-        can_compare = 0;
-        options->not_cmp = 1;
-        goto done;
+        opts->not_cmp = 1;
+        HGOTO_DONE(0);
     }
 
     /*-------------------------------------------------------------------------
-    * check for non supported classes
-    *-------------------------------------------------------------------------
-    */
-    HDassert(tclass1 == tclass2);
+     * check for non supported classes
+     *-------------------------------------------------------------------------
+     */
     switch (tclass1) {
         case H5T_TIME:
-            if((options->m_verbose || options->m_list_not_cmp) && obj1_name && obj2_name) {
+            if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
                 parallel_print("Not comparable: <%s> and <%s> are of class %s\n",
                         obj1_name, obj2_name, get_class(tclass2));
             } /* end if */
-            can_compare = 0;
-            options->not_cmp = 1;
-            goto done;
+            opts->not_cmp = 1;
+            HGOTO_DONE(0);
 
         case H5T_INTEGER:
         case H5T_FLOAT:
@@ -705,10 +671,10 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
     } /* end switch */
 
     /*-------------------------------------------------------------------------
-    * check for equal file datatype; warning only
-    *-------------------------------------------------------------------------
-    */
-    if((H5Tequal(f_tid1, f_tid2) == 0) && (options->m_verbose) && obj1_name && obj2_name) {
+     * check for equal file datatype; warning only
+     *-------------------------------------------------------------------------
+     */
+    if((H5Tequal(f_tid1, f_tid2) == 0) && (opts->m_verbose) && obj1_name && obj2_name) {
         H5T_class_t cl = H5Tget_class(f_tid1);
 
         parallel_print("Warning: different storage datatype\n");
@@ -723,11 +689,11 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
     }
 
     /*-------------------------------------------------------------------------
-    * check for the same rank
-    *-------------------------------------------------------------------------
-    */
+     * check for the same rank
+     *-------------------------------------------------------------------------
+     */
     if(rank1 != rank2) {
-        if((options->m_verbose || options->m_list_not_cmp) && obj1_name && obj2_name) {
+        if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
             parallel_print("Not comparable: <%s> has rank %d, dimensions ", obj1_name, rank1);
             print_dimensions(rank1, dims1);
             parallel_print(", max dimensions ");
@@ -739,16 +705,14 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
             print_dimensions(rank2, maxdim2);
             parallel_print("\n");
         }
-        can_compare = 0;
-        options->not_cmp = 1;
-        goto done;
+        opts->not_cmp = 1;
+        HGOTO_DONE(0);
     }
 
     /*-------------------------------------------------------------------------
-    * check for different dimensions
-    *-------------------------------------------------------------------------
-    */
-    HDassert(rank1 == rank2);
+     * check for different dimensions
+     *-------------------------------------------------------------------------
+     */
     for(i = 0; i<rank1; i++) {
         if(maxdim1 && maxdim2) {
             if(maxdim1[i] != maxdim2[i])
@@ -759,11 +723,11 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
     }
 
     /*-------------------------------------------------------------------------
-    * current dimensions
-    *-------------------------------------------------------------------------
-    */
+     * current dimensions
+     *-------------------------------------------------------------------------
+     */
     if(dim_diff == 1) {
-        if((options->m_verbose || options->m_list_not_cmp) && obj1_name && obj2_name) {
+        if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
             parallel_print("Not comparable: <%s> has rank %d, dimensions ", obj1_name, rank1);
             print_dimensions(rank1, dims1);
             if(maxdim1 && maxdim2) {
@@ -777,17 +741,16 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
                 parallel_print("\n");
             }
         }
-        can_compare = 0;
-        options->not_cmp = 1;
-        goto done;
+        opts->not_cmp = 1;
+        HGOTO_DONE(0);
     }
 
     /*-------------------------------------------------------------------------
-    * maximum dimensions; just give a warning
-    *-------------------------------------------------------------------------
-    */
+     * maximum dimensions; just give a warning
+     *-------------------------------------------------------------------------
+     */
     if(maxdim1 && maxdim2 && maxdim_diff == 1 && obj1_name) {
-        if(options->m_verbose) {
+        if(opts->m_verbose) {
             parallel_print( "Warning: different maximum dimensions\n");
             parallel_print("<%s> has max dimensions ", obj1_name);
             print_dimensions(rank1, maxdim1);
@@ -802,21 +765,20 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
         int   nmembs1;
         int   nmembs2;
         int   j;
-        hid_t memb_type1;
-        hid_t memb_type2;
+        hid_t memb_type1 = -1;
+        hid_t memb_type2 = -1;
 
         nmembs1 = H5Tget_nmembers(f_tid1);
         nmembs2 = H5Tget_nmembers(f_tid2);
 
         if(nmembs1 != nmembs2) {
-            if((options->m_verbose || options->m_list_not_cmp) && obj1_name && obj2_name) {
+            if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) {
                 parallel_print("Not comparable: <%s> has %d members ", obj1_name, nmembs1);
                 parallel_print("<%s> has %d members ", obj2_name, nmembs2);
                 parallel_print("\n");
             }
-            can_compare = 0;
-            options->not_cmp = 1;
-            goto done;
+            opts->not_cmp = 1;
+            HGOTO_DONE(0);
         }
 
         for (j = 0; j < nmembs1; j++) {
@@ -825,30 +787,31 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
 
             if (diff_can_type(memb_type1, memb_type2, rank1, rank2,
                     dims1, dims2, maxdim1, maxdim2, obj1_name, obj2_name,
-                    options, 1) != 1) {
-                can_compare = 0;
-                options->not_cmp = 1;
+                    opts, 1) != 1) {
+                opts->not_cmp = 1;
                 H5Tclose(memb_type1);
                 H5Tclose(memb_type2);
-                goto done;
+                HGOTO_DONE(0);
             }
             H5Tclose(memb_type1);
             H5Tclose(memb_type2);
         }
     }
 done:
-    h5diffdebug2("diff_can_type end - %d\n", can_compare);
-    return can_compare;
+    if (ret_value < 0)
+        opts->err_stat = 1;
+
+    h5diffdebug2("diff_can_type end - %d\n", ret_value);
+    return ret_value;
 }
 
 
 /*-------------------------------------------------------------------------
-* Function: print_sizes
-*
-* Purpose: Print datatype sizes
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: print_sizes
+ *
+ * Purpose: Print datatype sizes
+ *-------------------------------------------------------------------------
+ */
 #if defined (H5DIFF_DEBUG)
 void print_sizes( const char *obj1,
                   const char *obj2,
diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c
index 0c02779..0f0fd14 100644
--- a/tools/lib/h5diff_util.c
+++ b/tools/lib/h5diff_util.c
@@ -24,8 +24,7 @@ int      g_nTasks = 1;
 /*-------------------------------------------------------------------------
  * Function: print_dimensions
  *
- * Purpose: print dimensions
- *
+ * Purpose:  print dimensions
  *-------------------------------------------------------------------------
  */
 void
@@ -33,14 +32,14 @@ print_dimensions (int rank, hsize_t *dims)
 {
     int  i;
 
-    if( rank <= 0 )
+    if(rank <= 0)
         parallel_print("H5S_SCALAR" );
     else {
         if (!dims)
             parallel_print("dimension is NULL");
         else {
             parallel_print("[");
-            for ( i = 0; i < rank-1; i++) {
+            for (i = 0; i < rank-1; i++) {
                 parallel_print(HSIZE_T_FORMAT, dims[i]);
                 parallel_print("x");
             }
@@ -55,16 +54,11 @@ print_dimensions (int rank, hsize_t *dims)
 /*-------------------------------------------------------------------------
  * Function: print_type
  *
- * Purpose: Print name of datatype
- *
- * Return: void
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Purpose:  Print name of datatype
  *
- * Date: May 9, 2003
- *
- * Comments: Adapted from h5dump for H5T_INTEGER and H5T_FLOAT classes only
+ * Return:   void
  *
+ * Comments:  Adapted from h5dump for H5T_INTEGER and H5T_FLOAT classes only
  *-------------------------------------------------------------------------
  */
 void print_type(hid_t type)
@@ -188,15 +182,10 @@ void print_type(hid_t type)
 /*-------------------------------------------------------------------------
  * Function: diff_basename
  *
- * Purpose: Returns a pointer to the last component absolute name
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
+ * Purpose:  Returns a pointer to the last component absolute name
  *-------------------------------------------------------------------------
  */
-const char*
+ const char*
 diff_basename(const char *name)
 {
     size_t i;
@@ -219,12 +208,7 @@ diff_basename(const char *name)
 /*-------------------------------------------------------------------------
  * Function: get_type
  *
- * Purpose: Returns the type as a string
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
+ * Purpose:  Returns the type as a string
  *-------------------------------------------------------------------------
  */
 const char*
@@ -255,21 +239,13 @@ get_type(h5trav_type_t type)
 /*-------------------------------------------------------------------------
  * Function: get_sign
  *
- * Purpose: Returns the sign as a string
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Comments:
- *
+ * Purpose:  Returns the sign as a string
  *-------------------------------------------------------------------------
  */
-const char*
+ const char*
 get_sign(H5T_sign_t sign)
 {
-    switch(sign)
-    {
+    switch(sign) {
         case H5T_SGN_NONE:
             return "H5T_SGN_NONE";
 
@@ -283,7 +259,6 @@ get_sign(H5T_sign_t sign)
             return "H5T_NSGN";
 
         default:
-            HDassert(0);
             return "unknown sign value";
     } /* end switch */
 }
@@ -292,15 +267,10 @@ get_sign(H5T_sign_t sign)
 /*-------------------------------------------------------------------------
  * Function: get_class
  *
- * Purpose: Returns the class as a string
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
+ * Purpose:  Returns the class as a string
  *-------------------------------------------------------------------------
  */
-const char*
+ const char*
 get_class(H5T_class_t tclass)
 {
     switch(tclass) {
@@ -340,7 +310,6 @@ get_class(H5T_class_t tclass)
         case H5T_NO_CLASS:
         case H5T_NCLASSES:
         default:
-            HDassert(0);
             return("Invalid class");
     } /* end switch */
 } /* end get_class() */
@@ -348,8 +317,7 @@ get_class(H5T_class_t tclass)
 /*-------------------------------------------------------------------------
  * Function: print_found
  *
- * Purpose: print number of differences found
- *
+ * Purpose:  print number of differences found
  *-------------------------------------------------------------------------
  */
 void print_found(hsize_t nfound)
@@ -364,40 +332,37 @@ void print_found(hsize_t nfound)
 /*-----------------------------------------------------------------
  * Function: match_up_memsize
  *
- * Purpose: match smaller memory size up to bigger memory size
+ * Purpose:  match smaller memory size up to bigger memory size
  *------------------------------------------------------------------
  */
 herr_t match_up_memsize (hid_t f_tid1_id, hid_t f_tid2_id,
                          hid_t *m_tid1, hid_t *m_tid2,
                          size_t *m_size1, size_t  *m_size2)
 {
-    herr_t ret = SUCCEED;
+    herr_t ret_value = SUCCEED;
 
     if((*m_size1) != (*m_size2)) {
         if((*m_size1) < (*m_size2)) {
-            H5Tclose( *m_tid1 );
+            H5Tclose(*m_tid1);
 
-            if(((*m_tid1) = H5Tget_native_type(f_tid2_id, H5T_DIR_DEFAULT)) < 0) {
-                ret = FAIL;
-                goto out;
-            }
+            if(((*m_tid1) = H5Tget_native_type(f_tid2_id, H5T_DIR_DEFAULT)) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_native_type failed");
 
-            *m_size1 = H5Tget_size( *m_tid1 );
+            *m_size1 = H5Tget_size(*m_tid1);
         } /* end if */
         else {
             H5Tclose(*m_tid2);
 
-            if(((*m_tid2) = H5Tget_native_type(f_tid1_id, H5T_DIR_DEFAULT)) < 0) {
-                ret = FAIL;
-                goto out;
-            }
+            if(((*m_tid2) = H5Tget_native_type(f_tid1_id, H5T_DIR_DEFAULT)) < 0)
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_native_type failed");
 
             *m_size2 = H5Tget_size(*m_tid2);
         } /* end else */
     } /* end if */
-    HDassert((*m_size1) == (*m_size2));
+    if((*m_size1) != (*m_size2))
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "native type sizes do not compare");
 
-out:
-    return ret;
+done:
+    return ret_value;
 }
 
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 159349a..9230bb1 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -12,16 +12,10 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
- *              Thursday, July 23, 1998
- *
  * Purpose: A library for displaying the values of a dataset in a human
  *  readable format.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "h5tools.h"
 #include "h5tools_dump.h"
 #include "h5tools_ref.h"
@@ -29,10 +23,10 @@
 #include "H5private.h"
 
 /* global variables */
-hid_t H5tools_ERR_STACK_g = 0;
-hid_t H5tools_ERR_CLS_g = -1;
-hid_t H5E_tools_g = -1;
-hid_t H5E_tools_min_id_g = -1;
+hid_t       H5tools_ERR_STACK_g = 0;
+hid_t       H5tools_ERR_CLS_g = -1;
+hid_t       H5E_tools_g = -1;
+hid_t       H5E_tools_min_id_g = -1;
 int         compound_data;
 FILE       *rawattrstream = NULL;      /* should initialize to stdout but gcc moans about it */
 FILE       *rawdatastream = NULL;      /* should initialize to stdout but gcc moans about it */
@@ -40,7 +34,7 @@ FILE       *rawinstream = NULL;        /* should initialize to stdin but gcc moa
 FILE       *rawoutstream = NULL;       /* should initialize to stdout but gcc moans about it */
 FILE       *rawerrorstream = NULL;     /* should initialize to stderr but gcc moans about it */
 int         bin_output;         /* binary output */
-int         bin_form;           /* binary form */
+int         bin_form = 0;       /* binary form, default NATIVE */
 int         region_output;      /* region output */
 int         oid_output;         /* oid output */
 int         data_output;        /* data output */
@@ -83,18 +77,13 @@ typedef enum {
 #define NUM_DRIVERS     (sizeof(drivernames) / sizeof(drivernames[0]))
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
- * Purpose:     Initialize the H5 Tools library
- * Description:
- *      This should be called before any other h5tools function is called.
- *      Effect of any h5tools function called before this has been called is
- *      undetermined.
- * Return:
- *      None
- * Programmer:
- *      Albert Cheng, 2000-10-31
- * Modifications:
+ * Function: h5tools_init
+ *
+ * Purpose:  This should be called before any other h5tools function is called.
+ *           Effect of any h5tools function called before this has been called is
+ *           undetermined.
+ *
+ * Return    None
  *-------------------------------------------------------------------------
  */
 void
@@ -127,19 +116,14 @@ h5tools_init(void)
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
- * Purpose: Close the H5 Tools library
- * Description:
- *      Close or release resources such as files opened by the library. This
- *      should be called after all other h5tools functions have been called.
- *      Effect of any h5tools function called after this has been called is
- *      undetermined.
- * Return:
- *      None
- * Programmer:
- *      Albert Cheng, 2000-10-31
- * Modifications:
+ * Function: h5tools_close
+ *
+ * Purpose:  Close or release resources such as files opened by the library. This
+ *           should be called after all other h5tools functions have been called.
+ *           Effect of any h5tools function called after this has been called is
+ *           undetermined.
+ *
+ * Return:   None
  *-------------------------------------------------------------------------
  */
 void
@@ -199,19 +183,13 @@ h5tools_close(void)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    h5tools_set_data_output_file
+ * Function: h5tools_set_data_output_file
  *
- * Purpose:     Open fname as the output file for dataset raw data.
- *      Set rawdatastream as its file stream.
- *
- * Return:      0 -- succeeded
- *      negative -- failed
- *
- * Programmer:  Albert Cheng, 2000/09/30
- *
- * Modifications:
- *  pvn June, 1, 2006. Add a switch for binary output
+ * Purpose:  Open fname as the output file for dataset raw data.
+ *           Set rawdatastream as its file stream.
  *
+ * Return:   0 -- succeeded
+ *           negative -- failed
  *-------------------------------------------------------------------------
  */
 int
@@ -253,14 +231,13 @@ h5tools_set_data_output_file(const char *fname, int is_bin)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    h5tools_set_attr_output_file
+ * Function: h5tools_set_attr_output_file
  *
- * Purpose:     Open fname as the output file for attribute raw data.
- *      Set rawattrstream as its file stream.
- *
- * Return:      0 -- succeeded
- *      negative -- failed
+ * Purpose:  Open fname as the output file for attribute raw data.
+ *           Set rawattrstream as its file stream.
  *
+ * Return:   0 -- succeeded
+ *           negative -- failed
  *-------------------------------------------------------------------------
  */
 int
@@ -302,13 +279,13 @@ h5tools_set_attr_output_file(const char *fname, int is_bin)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    h5tools_set_input_file
+ * Function: h5tools_set_input_file
  *
- * Purpose:     Open fname as the input file for raw input.
- *      Set rawinstream as its file stream.
+ * Purpose:  Open fname as the input file for raw input.
+ *           Set rawinstream as its file stream.
  *
- * Return:      0 -- succeeded
- *      negative -- failed
+ * Return:   0 -- succeeded
+ *           negative -- failed
  *
  *-------------------------------------------------------------------------
  */
@@ -350,13 +327,13 @@ h5tools_set_input_file(const char *fname, int is_bin)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    h5tools_set_output_file
+ * Function: h5tools_set_output_file
  *
- * Purpose:     Open fname as the output file for raw output.
- *      Set rawoutstream as its file stream.
+ * Purpose:  Open fname as the output file for raw output.
+ *           Set rawoutstream as its file stream.
  *
- * Return:      0 -- succeeded
- *      negative -- failed
+ * Return:   0 -- succeeded
+ *           negative -- failed
  *
  *-------------------------------------------------------------------------
  */
@@ -398,14 +375,13 @@ h5tools_set_output_file(const char *fname, int is_bin)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    h5tools_set_error_file
- *
- * Purpose:     Open fname as the error output file for dataset raw error.
- *      Set rawerrorstream as its file stream.
+ * Function: h5tools_set_error_file
  *
- * Return:      0 -- succeeded
- *      negative -- failed
+ * Purpose:  Open fname as the error output file for dataset raw error.
+ *           Set rawerrorstream as its file stream.
  *
+ * Return:   0 -- succeeded
+ *           negative -- failed
  *-------------------------------------------------------------------------
  */
 int
@@ -447,33 +423,28 @@ h5tools_set_error_file(const char *fname, int is_bin)
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Private
- * Chapter:     H5Tools Library
- * Purpose: Get a FAPL for a driver
- * Description:
- *      Get a FAPL for a given VFL driver name.
- * Return:
- *      None
- * Programmer:
- *      Quincey Koziol, 2004-02-04
- * Modifications:
- *      Pedro Vicente Nunes, Thursday, July 27, 2006
- *   Added error return conditions for the H5Pset_fapl calls
+ * Function: h5tools_get_fapl
+ *
+ * Purpose:  Get a FAPL for a given VFL driver name.
+ *
+ * Return:   positive - succeeded
+ *           negative - failed
  *-------------------------------------------------------------------------
  */
 static hid_t
 h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
 {
-    hid_t new_fapl; /* Copy of file access property list passed in, or new property list */
+    hid_t       new_fapl = -1; /* Copy of file access property list passed in, or new property list */
+    int         ret_value = SUCCEED;
 
     /* Make a copy of the FAPL, for the file open call to use, eventually */
     if (fapl == H5P_DEFAULT) {
         if ((new_fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcreate failed");
     } /* end if */
     else {
         if ((new_fapl = H5Pcopy(fapl)) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcopy failed");
     } /* end else */
 
     /* Determine which driver the user wants to open the file with. Try
@@ -481,7 +452,7 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
     if (!HDstrcmp(driver, drivernames[SEC2_IDX])) {
         /* SEC2 driver */
         if (H5Pset_fapl_sec2(new_fapl) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_sec2 failed");
 
         if (drivernum)
             *drivernum = SEC2_IDX;
@@ -493,7 +464,7 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
          * is the member size.
          */
         if (H5Pset_fapl_family(new_fapl, (hsize_t) 0, H5P_DEFAULT) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_family failed");
 
         if (drivernum)
             *drivernum = FAMILY_IDX;
@@ -501,7 +472,7 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
     else if (!HDstrcmp(driver, drivernames[SPLIT_IDX])) {
         /* SPLIT Driver */
         if (H5Pset_fapl_split(new_fapl, "-m.h5", H5P_DEFAULT, "-r.h5", H5P_DEFAULT) < 0)
-            goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_split failed");
 
         if (drivernum)
             *drivernum = SPLIT_IDX;
@@ -509,7 +480,7 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
     else if (!HDstrcmp(driver, drivernames[MULTI_IDX])) {
         /* MULTI Driver */
         if (H5Pset_fapl_multi(new_fapl, NULL, NULL, NULL, NULL, TRUE) < 0)
-        goto error;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_multi failed");
 
         if(drivernum)
         *drivernum = MULTI_IDX;
@@ -525,29 +496,28 @@ h5tools_get_fapl(hid_t fapl, const char *driver, unsigned *drivernum)
 
         if(mpi_initialized && !mpi_finalized) {
             if(H5Pset_fapl_mpio(new_fapl, MPI_COMM_WORLD, MPI_INFO_NULL) < 0)
-                goto error;
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_fapl_mpio failed");
             if(drivernum)
                 *drivernum = MPIO_IDX;
         } /* end if */
     }
 #endif /* H5_HAVE_PARALLEL */
     else
-        goto error;
+        ret_value = -1;
 
-    return(new_fapl);
-
-error:
-    if(new_fapl != H5P_DEFAULT)
+done:
+    if((new_fapl != H5P_DEFAULT) && (ret_value < 0)) {
         H5Pclose(new_fapl);
-    return -1;
+        new_fapl = -1;
+    }
+
+    return(new_fapl);
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
- * Purpose:     Open a file with various VFL drivers.
- * Description:
- *      Loop through the various types of VFL drivers trying to open FNAME.
+ * Function: h5tools_fopen
+ *
+ * Purpose:  Loop through the various types of VFL drivers trying to open FNAME.
  *      If the HDF5 library is version 1.2 or less, then we have only the SEC2
  *      driver to try out. If the HDF5 library is greater than version 1.2,
  *      then we have the FAMILY, SPLIT, and MULTI drivers to play with.
@@ -555,6 +525,7 @@ error:
  *      If DRIVER is non-NULL, then it will try to open the file with that
  *      driver first. We assume that the user knows what they are doing so, if
  *      we fail, then we won't try other file drivers.
+ *
  * Return:
  *      On success, returns a file id for the opened file. If DRIVERNAME is
  *      non-null then the first DRIVERNAME_SIZE-1 characters of the driver
@@ -562,38 +533,6 @@ error:
  *
  *      Otherwise, the function returns FAIL. If DRIVERNAME is non-null then
  *      the first byte is set to the null terminator.
- * Programmer:
- *      Lost in the mists of time.
- * Modifications:
- *      Robb Matzke, 2000-06-23
- *      We only have to initialize driver[] on the first call, thereby
- *      preventing memory leaks from repeated calls to H5Pcreate().
- *
- *      Robb Matzke, 2000-06-23
- *      Added DRIVERNAME_SIZE arg to prevent overflows when writing to
- *      DRIVERNAME.
- *
- *      Robb Matzke, 2000-06-23
- *      Added test to prevent coredump when the file could not be opened by
- *      any driver.
- *
- *      Robb Matzke, 2000-06-23
- *      Changed name from H5ToolsFopen() so it jives better with the names we
- *      already have at the top of this source file.
- *
- *      Thomas Radke, 2000-09-12
- *      Added Stream VFD to the driver[] array.
- *
- *      Bill Wendling, 2001-01-10
- *      Changed macro behavior so that if we have a version other than 1.2.x
- *      (i.e., > 1.2), then we do the drivers check.
- *
- *      Bill Wendling, 2001-07-30
- *      Added DRIVER parameter so that the user can specify "try this driver"
- *      instead of the default behaviour. If it fails to open the file with
- *      that driver, this will fail completely (i.e., we won't try the other
- *      drivers). We're assuming the user knows what they're doing. How UNIX
- *      of us.
  *-------------------------------------------------------------------------
  */
 hid_t
@@ -658,18 +597,13 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
- * Purpose:     Count the number of columns in a string.
- * Description:
- *      Count the number of columns in a string. This is the number of
- *      characters in the string not counting line-control characters.
- * Return:
- *      On success, returns the width of the string. Otherwise this function
- *      returns 0.
- * Programmer:
- *       Robb Matzke, Tuesday, April 27, 1999
- * Modifications:
+ * Function: h5tools_count_ncols
+ *
+ * Purpose:  Count the number of columns in a string. This is the number of
+ *           characters in the string not counting line-control characters.
+ *
+ * Return:   success - returns the width of the string.
+ *           failure - 0.
  *-------------------------------------------------------------------------
  */
 static size_t
@@ -687,20 +621,17 @@ h5tools_count_ncols(const char *s)
 /*-------------------------------------------------------------------------
  * Function: h5tools_detect_vlen
  *
- * Purpose: Recursive check for any variable length data in given type.
+ * Purpose:  Recursive check for any variable length data in given type.
  *
- * Return:
- *    TRUE : type conatains any variable length data
- *    FALSE : type doesn't contain any variable length data
- *    Negative value: error occur
- *
- * Programmer: Jonathan Kim  March 18, 2011
+ * Return:   TRUE : type contains any variable length data
+ *           FALSE : type doesn't contain any variable length data
+ *           Negative value: failed
  *-------------------------------------------------------------------------
  */
 htri_t
 h5tools_detect_vlen(hid_t tid)
 {
-    htri_t ret;
+    htri_t ret = FALSE;
 
     /* recursive detect any vlen data values in type (compound, array ...) */
     ret = H5Tdetect_class(tid, H5T_VLEN);
@@ -719,20 +650,18 @@ done:
 /*-------------------------------------------------------------------------
  * Function: h5tools_detect_vlen_str
  *
- * Purpose: Recursive check for variable length string of a datatype.
- *
- * Return:
- *    TRUE : type conatains any variable length string
- *    FALSE : type doesn't contain any variable length string
- *    Negative value: error occur
+ * Purpose:  Recursive check for variable length string of a datatype.
  *
+ * Return:   TRUE : type contains any variable length string
+ *           FALSE : type doesn't contain any variable length string
+ *           Negative value: failed
  *-------------------------------------------------------------------------
  */
 htri_t
 h5tools_detect_vlen_str(hid_t tid)
 {
     H5T_class_t tclass = -1;
-    htri_t ret = FALSE;
+    htri_t      ret = FALSE;
 
     ret = H5Tis_variable_str(tid);
     if((ret == TRUE) || (ret < 0))
@@ -780,25 +709,13 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
- * Purpose:     Emit a simple prefix to STREAM.
- * Description:
- *      If /ctx->need_prefix/ is set then terminate the current line (if
- *      applicable), calculate the prefix string, and display it at the start
- *      of a line.
- * Return:
- *      None
- * Programmer:
- *      Robb Matzke, Monday, April 26, 1999
- * Modifications:
- *      Robb Matzke, 1999-09-29
- * If a new prefix is printed then the current element number is set back
- * to zero.
- *      pvn, 2004-07-08
- * Added support for printing array indices:
- *  the indentation is printed before the prefix (printed one indentation
- *  level before)
+ * Function: h5tools_simple_prefix
+ *
+ * Purpose:  If /ctx->need_prefix/ is set then terminate the current line (if
+ *           applicable), calculate the prefix string, and display it at the start
+ *           of a line.
+ *
+ * Return:   None
  *-------------------------------------------------------------------------
  */
 void
@@ -806,7 +723,7 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
                       h5tools_context_t *ctx, hsize_t elmtno, int secnum)
 {
     h5tools_str_t prefix;
-    h5tools_str_t str; /*temporary for indentation */
+    h5tools_str_t str;          /*temporary for indentation */
     size_t templength = 0;
     unsigned u, indentlevel = 0;
 
@@ -877,15 +794,13 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info,
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
- * Purpose:     Emit a simple prefix to STREAM.
- * Description:
- *      If /ctx->need_prefix/ is set then terminate the current line (if
- *      applicable), calculate the prefix string, and display it at the start
- *      of a line. Calls region specific function.
- * Return:
- *      None
+ * Function: h5tools_region_simple_prefix
+ *
+ * Purpose:  If /ctx->need_prefix/ is set then terminate the current line (if
+ *           applicable), calculate the prefix string, and display it at the start
+ *           of a line. Calls region specific function.
+ *
+ * Return:   None
  *-------------------------------------------------------------------------
  */
 void
@@ -893,7 +808,7 @@ h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info,
         h5tools_context_t *ctx, hsize_t elmtno, hsize_t *ptdata, int secnum)
 {
     h5tools_str_t prefix;
-    h5tools_str_t str; /*temporary for indentation */
+    h5tools_str_t str;       /*temporary for indentation */
     size_t templength = 0;
     unsigned u, indentlevel = 0;
 
@@ -964,28 +879,26 @@ h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info,
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
- * Purpose:     Render an element to output STREAM.
- * Description:
- *      Prints the string buffer to the output STREAM. The string is
- *      printed according to the format described in INFO. The CTX struct
- *      contains context information shared between calls to this function.
+ * Function: h5tools_render_element
  *
- * Return:
- *      False if a dimension end is reached, otherwise true
+ * Purpose:  Prints the string buffer to the output STREAM. The string is
+ *           printed according to the format described in INFO. The CTX struct
+ *           contains context information shared between calls to this function.
+ *
+ * Return:   False if a dimension end is reached
+ *           True otherwise
  *
  * In/Out:
- *      h5tools_context_t *ctx
- *      h5tools_str_t *buffer
- *      hsize_t *curr_pos
+ *           h5tools_context_t *ctx
+ *           h5tools_str_t *buffer
+ *           hsize_t *curr_pos
  *
  * Parameters Description:
- *      h5tools_str_t *buffer is the string into which to render
- *      hsize_t curr_pos is the total data element position
- *      size_t ncols
- *      hsize_t local_elmt_counter is the local element loop counter
- *      hsize_t elmt_count is the data element loop counter
+ *           h5tools_str_t *buffer is the string into which to render
+ *           hsize_t curr_pos is the total data element position
+ *           size_t ncols
+ *           hsize_t local_elmt_counter is the local element loop counter
+ *           hsize_t elmt_count is the data element loop counter
  *-------------------------------------------------------------------------
  */
 hbool_t
@@ -994,10 +907,10 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
         size_t ncols, hsize_t local_elmt_counter, hsize_t elmt_counter)
 {
     hbool_t  dimension_break = TRUE;
-    char    *s;
-    char    *section; /*a section of output  */
-    int      secnum; /*section sequence number */
-    int      multiline; /*datum was multiline  */
+    char    *s = NULL;
+    char    *section = NULL; /* a section of output */
+    int      secnum;         /* section sequence number */
+    int      multiline;      /* datum was multiline */
 
     if (stream == NULL)
         return dimension_break;
@@ -1120,29 +1033,28 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info,
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
- * Purpose:     Render a region element to output STREAM.
- * Description:
- *      Prints the string buffer to the output STREAM. The string is
- *      printed according to the format described in INFO. The CTX struct
- *      contains context information shared between calls to this function.
+ * Function: h5tools_render_region_element
+ *
+ * Purpose:  Prints the string buffer to the output STREAM. The string is
+ *           printed according to the format described in INFO. The CTX struct
+ *           contains context information shared between calls to this function.
  *
  * Return:
- *      False if a dimension end is reached, otherwise true
+ *           False if a dimension end is reached
+ *           True otherwise
  *
  * In/Out:
- *      h5tools_context_t *ctx
- *      h5tools_str_t *buffer
- *      hsize_t *curr_pos
+ *           h5tools_context_t *ctx
+ *           h5tools_str_t *buffer
+ *           hsize_t *curr_pos
  *
  * Parameters Description:
- *      h5tools_str_t *buffer is the string into which to render
- *      hsize_t curr_pos is the total data element position
- *      size_t ncols
- *      hsize_t *ptdata
- *      hsize_t local_elmt_counter is the local element loop counter
- *      hsize_t elmt_count is the data element loop counter
+ *           h5tools_str_t *buffer is the string into which to render
+ *           hsize_t curr_pos is the total data element position
+ *           size_t ncols
+ *           hsize_t *ptdata
+ *           hsize_t local_elmt_counter is the local element loop counter
+ *           hsize_t elmt_count is the data element loop counter
  *-------------------------------------------------------------------------
  */
 hbool_t
@@ -1151,10 +1063,10 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
         size_t ncols, hsize_t *ptdata, hsize_t local_elmt_counter, hsize_t elmt_counter)
 {
     hbool_t  dimension_break = TRUE;
-    char    *s;
-    char    *section; /*a section of output  */
-    int      secnum; /*section sequence number */
-    int      multiline; /*datum was multiline  */
+    char    *s = NULL;
+    char    *section = NULL; /* a section of output */
+    int      secnum;         /* section sequence number */
+    int      multiline;      /* datum was multiline */
 
     s = h5tools_str_fmt(buffer, (size_t)0, "%s");
 
@@ -1276,11 +1188,11 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
 }
 
 /*-------------------------------------------------------------------------
- * Function:    init_acc_pos
+ * Function: init_acc_pos
  *
- * Purpose:     initialize accumulator and matrix position
+ * Purpose:  initialize accumulator and matrix position
  *
- * Return:      void
+ * Return:   void
  *-------------------------------------------------------------------------
  */
 void
@@ -1289,22 +1201,22 @@ init_acc_pos(h5tools_context_t *ctx, hsize_t *dims)
     int i;
     unsigned j;
 
-    HDassert(ctx->ndims);
-
-    ctx->acc[ctx->ndims - 1] = 1;
-    for (i = ((int)ctx->ndims - 2); i >= 0; i--)
-        ctx->acc[i] = ctx->acc[i + 1] * dims[i + 1];
-    for (j = 0; j < ctx->ndims; j++)
-        ctx->pos[j] = 0;
+    if(ctx->ndims > 0) {
+        ctx->acc[ctx->ndims - 1] = 1;
+        for (i = ((int)ctx->ndims - 2); i >= 0; i--)
+            ctx->acc[i] = ctx->acc[i + 1] * dims[i + 1];
+        for (j = 0; j < ctx->ndims; j++)
+            ctx->pos[j] = 0;
+    }
 }
 
 /*-------------------------------------------------------------------------
  * Function: render_bin_output
  *
- * Purpose: Write one element of memory buffer to a binary file stream
+ * Purpose:  Write one element of memory buffer to a binary file stream
  *
- * Return: Success:    SUCCEED
- *         Failure:    FAIL
+ * Return:   Success:    SUCCEED
+ *           Failure:    FAIL
  *-------------------------------------------------------------------------
  */
 int
@@ -1350,7 +1262,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
             {
                 unsigned int    i;
                 H5T_str_t       pad;
-                char           *s;
+                char           *s = NULL;
                 unsigned char   tempuchar;
 
                 pad = H5Tget_strpad(tid);
@@ -1378,7 +1290,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
             break;
         case H5T_COMPOUND:
             {
-                int snmembs;
+                int      snmembs;
                 unsigned nmembs;
 
                 if((snmembs = H5Tget_nmembers(tid)) < 0)
@@ -1390,7 +1302,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
 
                     mem = ((unsigned char*)_mem) + block_index * size;
                     for (j = 0; j < nmembs; j++) {
-                        hid_t    memb;
+                        hid_t    memb = -1;
                         size_t   offset;
 
                         offset = H5Tget_member_offset(tid, j);
@@ -1410,19 +1322,23 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
             {
                 int     k, ndims;
                 hsize_t dims[H5S_MAX_RANK], temp_nelmts, nelmts;
-                hid_t   memb;
+                hid_t   memb = -1;
 
                 /* get the array's base datatype for each element */
                 memb = H5Tget_super(tid);
                 ndims = H5Tget_array_ndims(tid);
                 H5Tget_array_dims2(tid, dims);
-                HDassert(ndims >= 1 && ndims <= H5S_MAX_RANK);
-
-                /* calculate the number of array elements */
-                for (k = 0, nelmts = 1; k < ndims; k++) {
-                    temp_nelmts = nelmts;
-                    temp_nelmts *= dims[k];
-                    nelmts = (size_t) temp_nelmts;
+                if(ndims >= 1 && ndims <= H5S_MAX_RANK) {
+                    /* calculate the number of array elements */
+                    for (k = 0, nelmts = 1; k < ndims; k++) {
+                        temp_nelmts = nelmts;
+                        temp_nelmts *= dims[k];
+                        nelmts = (size_t) temp_nelmts;
+                    }
+                }
+                else {
+                    H5Tclose(memb);
+                    H5E_THROW(FAIL, H5E_tools_min_id_g, "calculate the number of array elements failed");
                 }
 
                 for (block_index = 0; block_index < block_nelmts; block_index++) {
@@ -1439,7 +1355,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
         case H5T_VLEN:
             {
                 hsize_t      nelmts;
-                hid_t        memb;
+                hid_t        memb = -1;
 
                 /* get the VL sequences's base datatype for each element */
                 memb = H5Tget_super(tid);
@@ -1464,7 +1380,8 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
                     /* if (H5Tequal(tid, H5T_STD_REF_DSETREG)) */
                     if (region_output) {
                         /* region data */
-                        hid_t   region_id, region_space;
+                        hid_t   region_id = -1;
+                        hid_t   region_space = -1;
                         H5S_sel_type region_type;
 
                         for (block_index = 0; block_index < block_nelmts; block_index++) {
@@ -1514,15 +1431,13 @@ CATCH
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
- * Purpose: Print the data values from a dataset referenced by region blocks.
+ * Function: render_bin_output_region_data_blocks
  *
- * Description:
- *      This is a special case subfunction to print the data in a region reference of type blocks.
+ * Purpose:  Print the data values from a dataset referenced by region blocks.
+ *           This is a special case subfunction to print the data in a region reference of type blocks.
  *
- * Return:
- *      The function returns FAIL if there was an error, otherwise SUCEED
+ * Return:   FAIL if there was an error
+ *           SUCCEED otherwise
  *
  *-------------------------------------------------------------------------
  */
@@ -1611,16 +1526,13 @@ render_bin_output_region_data_blocks(hid_t region_id, FILE *stream,
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
- * Purpose: Print some values from a dataset referenced by region blocks.
+ * Function: render_bin_output_region_blocks
  *
- * Description:
- *      This is a special case subfunction to dump a region reference using blocks.
- *
- * Return:
- *      The function returns False if ERROR, otherwise True
+ * Purpose:  Print some values from a dataset referenced by region blocks.
+ *           This is a special case subfunction to dump a region reference using blocks.
  *
+ * Return:   False if ERROR
+ *           True otherwise
  *-------------------------------------------------------------------------
  */
 hbool_t
@@ -1631,7 +1543,7 @@ render_bin_output_region_blocks(hid_t region_space, hid_t region_id,
     hssize_t     snblocks;
     hsize_t      nblocks;
     hsize_t      alloc_size;
-    hsize_t     *ptdata;
+    hsize_t     *ptdata = NULL;
     int          sndims;
     unsigned     ndims;
     hid_t        dtype = -1;
@@ -1647,7 +1559,6 @@ render_bin_output_region_blocks(hid_t region_space, hid_t region_id,
     ndims = (unsigned)sndims;
 
     alloc_size = nblocks * ndims * 2 * sizeof(ptdata[0]);
-    HDassert(alloc_size == (hsize_t) ((size_t) alloc_size)); /*check for overflow*/
     if((ptdata = (hsize_t*) HDmalloc((size_t) alloc_size)) == NULL)
         HGOTO_ERROR(FALSE, H5E_tools_min_id_g, "Could not allocate buffer for ptdata");
 
@@ -1678,8 +1589,7 @@ render_bin_output_region_blocks(hid_t region_space, hid_t region_id,
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
+ * Function:     H5Tools Library
  * Purpose: Print the data values from a dataset referenced by region points.
  *
  * Description:
@@ -1739,16 +1649,13 @@ render_bin_output_region_data_points(hid_t region_space, hid_t region_id,
 }
 
 /*-------------------------------------------------------------------------
- * Audience:    Public
- * Chapter:     H5Tools Library
- * Purpose: Print some values from a dataset referenced by region points.
+ * Function: render_bin_output_region_points
  *
- * Description:
- *      This is a special case subfunction to dump a region reference using points.
- *
- * Return:
- *      The function returns False if the last dimension has been reached, otherwise True
+ * Purpose:  Print some values from a dataset referenced by region points.
+ *           This is a special case function to dump a region reference using points.
  *
+ * Return:   False if the last dimension has been reached
+ *           True otherwise
  *-------------------------------------------------------------------------
  */
 hbool_t
@@ -1794,11 +1701,12 @@ CATCH
 }
 
 /*-------------------------------------------------------------------------
- * Function:    h5tools_is_zero
+ * Function: h5tools_is_zero
  *
- * Purpose: Determines if memory is initialized to all zero bytes.
+ * Purpose:  Determines if memory is initialized to all zero bytes.
  *
- * Return:  TRUE if all bytes are zero; FALSE otherwise
+ * Return:   TRUE if all bytes are zero
+ *           FALSE otherwise
  *-------------------------------------------------------------------------
  */
 hbool_t
@@ -1814,23 +1722,20 @@ h5tools_is_zero(const void *_mem, size_t size)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    h5tools_is_obj_same
+ * Function: h5tools_is_obj_same
  *
- * Purpose: Check if two given object IDs or link names point to the same object.
+ * Purpose:  Check if two given object IDs or link names point to the same object.
  *
  * Parameters:
- *             hid_t loc_id1: location of the first object
- *             char *name1:   link name of the first object.
- *                             Use "." or NULL if loc_id1 is the object to be compared.
- *             hid_t loc_id2: location of the second object
- *             char *name1:   link name of the first object.
- *                             Use "." or NULL if loc_id2 is the object to be compared.
- *
- * Return:  TRUE if it is the same object; FALSE otherwise.
+ *           hid_t loc_id1: location of the first object
+ *           char *name1:   link name of the first object.
+ *                          Use "." or NULL if loc_id1 is the object to be compared.
+ *           hid_t loc_id2: location of the second object
+ *           char *name1:   link name of the first object.
+ *                          Use "." or NULL if loc_id2 is the object to be compared.
  *
- * Programmer: Peter Cao
- *             4/27/2011
-  *
+ * Return:   TRUE if it is the same object
+ *           FALSE otherwise.
  *-------------------------------------------------------------------------
  */
 hbool_t
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index f8f1810..31c54d3 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -12,16 +12,10 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
- *              Thursday, July 23, 1998
- *
  * Purpose: A library for displaying the values of a dataset in a human
  *  readable format.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "h5tools.h"
 #include "h5tools_dump.h"
 #include "h5tools_ref.h"
@@ -29,72 +23,72 @@
 #include "H5private.h"
 
 h5tool_format_t h5tools_dataformat = {
-0, /*raw */
-
-"", /*fmt_raw */
-"%d", /*fmt_int */
-"%u", /*fmt_uint */
-"%hhd", /*fmt_schar */
-"%u", /*fmt_uchar */
-"%d", /*fmt_short */
-"%u", /*fmt_ushort */
-"%ld", /*fmt_long */
-"%lu", /*fmt_ulong */
-NULL, /*fmt_llong */
-NULL, /*fmt_ullong */
-"%g", /*fmt_double */
-"%g", /*fmt_float */
-
-0, /*ascii */
-0, /*str_locale */
-0, /*str_repeat */
-
-"[ ", /*arr_pre */
-",", /*arr_sep */
-" ]", /*arr_suf */
-1, /*arr_linebreak */
-
-"", /*cmpd_name */
-",\n", /*cmpd_sep */
-"{", /*cmpd_pre */
-"}", /*cmpd_suf */
-"\n", /*cmpd_end */
-
-", ", /*vlen_sep */
-"(", /*vlen_pre */
-")", /*vlen_suf */
-"", /*vlen_end */
-
-"%s", /*elmt_fmt */
-",", /*elmt_suf1 */
-" ", /*elmt_suf2 */
-
-"", /*idx_n_fmt */
-"", /*idx_sep */
-"", /*idx_fmt */
-
-80, /*line_ncols *//*standard default columns */
-0, /*line_per_line */
-"", /*line_pre */
-"%s", /*line_1st */
-"%s", /*line_cont */
-"", /*line_suf */
-"", /*line_sep */
-1, /*line_multi_new */
-"   ", /*line_indent */
-
-1, /*skip_first */
-
-1, /*obj_hidefileno */
-" "H5_PRINTF_HADDR_FMT, /*obj_format */
-
-1, /*dset_hidefileno */
-"DATASET %s ", /*dset_format */
-"%s", /*dset_blockformat_pre */
-"%s", /*dset_ptformat_pre */
-"%s", /*dset_ptformat */
-1, /*array indices */
-1 /*escape non printable characters */
+    0,          /*raw */
+
+    "",         /*fmt_raw */
+    "%d",       /*fmt_int */
+    "%u",       /*fmt_uint */
+    "%hhd",     /*fmt_schar */
+    "%u",       /*fmt_uchar */
+    "%d",       /*fmt_short */
+    "%u",       /*fmt_ushort */
+    "%ld",      /*fmt_long */
+    "%lu",      /*fmt_ulong */
+    NULL,       /*fmt_llong */
+    NULL,       /*fmt_ullong */
+    "%g",       /*fmt_double */
+    "%g",       /*fmt_float */
+
+    0,          /*ascii */
+    0,          /*str_locale */
+    0,          /*str_repeat */
+
+    "[ ",       /*arr_pre */
+    ",",        /*arr_sep */
+    " ]",       /*arr_suf */
+    1,          /*arr_linebreak */
+
+    "",         /*cmpd_name */
+    ",\n",      /*cmpd_sep */
+    "{",        /*cmpd_pre */
+    "}",        /*cmpd_suf */
+    "\n",       /*cmpd_end */
+
+    ", ",       /*vlen_sep */
+    "(",        /*vlen_pre */
+    ")",        /*vlen_suf */
+    "",         /*vlen_end */
+
+    "%s",       /*elmt_fmt */
+    ",",        /*elmt_suf1 */
+    " ",        /*elmt_suf2 */
+
+    "",         /*idx_n_fmt */
+    "",         /*idx_sep */
+    "",         /*idx_fmt */
+
+    80,         /*line_ncols *//*standard default columns */
+    0,          /*line_per_line */
+    "",         /*line_pre */
+    "%s",       /*line_1st */
+    "%s",       /*line_cont */
+    "",         /*line_suf */
+    "",         /*line_sep */
+    1,          /*line_multi_new */
+    "   ",      /*line_indent */
+
+    1,          /*skip_first */
+
+    1,          /*obj_hidefileno */
+    " "H5_PRINTF_HADDR_FMT, /*obj_format */
+
+    1,          /*dset_hidefileno */
+    "DATASET %s ", /*dset_format */
+    "%s",       /*dset_blockformat_pre */
+    "%s",       /*dset_ptformat_pre */
+    "%s",       /*dset_ptformat */
+    1,          /*array indices */
+    1           /*escape non printable characters */
 };
 
 const h5tools_dump_header_t h5tools_standardformat = {
@@ -631,8 +625,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id,
 
     alloc_size = nblocks * ndims * 2 * sizeof(ptdata[0]);
     HDassert(alloc_size == (hsize_t) ((size_t) alloc_size)); /*check for overflow*/
-    if((ptdata = (hsize_t*) HDmalloc((size_t) alloc_size)) == NULL)
-    {
+    if((ptdata = (hsize_t*) HDmalloc((size_t) alloc_size)) == NULL) {
         HERROR(H5E_tools_g, H5E_tools_min_id_g, "Could not allocate buffer for ptdata");
         HGOTO_DONE(dimension_break);
     }
@@ -1896,9 +1889,8 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         obj = search_obj(h5dump_type_table, oinfo.addr);
 
         if(obj) {
-            if(!obj->recorded) {
+            if(!obj->recorded)
                 h5tools_str_append(buffer,"\"/#"H5_PRINTF_HADDR_FMT"\"", obj->objno);
-            }
             else
                 h5tools_str_append(buffer, "\"%s\"", obj->objname);
         }
@@ -1915,121 +1907,86 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
 
     switch (type_class) {
     case H5T_INTEGER:
-        if (H5Tequal(type, H5T_STD_I8BE) == TRUE) {
+        if (H5Tequal(type, H5T_STD_I8BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_I8BE");
-        }
-        else if (H5Tequal(type, H5T_STD_I8LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_I8LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_I8LE");
-        }
-        else if (H5Tequal(type, H5T_STD_I16BE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_I16BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_I16BE");
-        }
-        else if (H5Tequal(type, H5T_STD_I16LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_I16LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_I16LE");
-        }
-        else if (H5Tequal(type, H5T_STD_I32BE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_I32BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_I32BE");
-        }
-        else if (H5Tequal(type, H5T_STD_I32LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_I32LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_I32LE");
-        }
-        else if (H5Tequal(type, H5T_STD_I64BE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_I64BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_I64BE");
-        }
-        else if (H5Tequal(type, H5T_STD_I64LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_I64LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_I64LE");
-        }
-        else if (H5Tequal(type, H5T_STD_U8BE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_U8BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_U8BE");
-        }
-        else if (H5Tequal(type, H5T_STD_U8LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_U8LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_U8LE");
-        }
-        else if (H5Tequal(type, H5T_STD_U16BE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_U16BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_U16BE");
-        }
-        else if (H5Tequal(type, H5T_STD_U16LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_U16LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_U16LE");
-        }
-        else if (H5Tequal(type, H5T_STD_U32BE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_U32BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_U32BE");
-        }
-        else if (H5Tequal(type, H5T_STD_U32LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_U32LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_U32LE");
-        }
-        else if (H5Tequal(type, H5T_STD_U64BE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_U64BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_U64BE");
-        }
-        else if (H5Tequal(type, H5T_STD_U64LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_U64LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_U64LE");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_SCHAR) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_SCHAR) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_SCHAR");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_UCHAR) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UCHAR) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_UCHAR");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_SHORT) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_SHORT) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_SHORT");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_USHORT) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_USHORT) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_USHORT");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_INT) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_INT");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_UINT) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_UINT");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_LONG) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_LONG) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_LONG");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_ULONG) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_ULONG) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_ULONG");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_LLONG) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_LLONG) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_LLONG");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_ULLONG) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_ULLONG) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_ULLONG");
-        }
         else {
 
             /* byte order */
             if (H5Tget_size(type) > 1) {
                 order = H5Tget_order(type);
-                if (H5T_ORDER_LE == order) {
+                if (H5T_ORDER_LE == order)
                     order_s = " little-endian";
-                }
-                else if (H5T_ORDER_BE == order) {
+                else if (H5T_ORDER_BE == order)
                     order_s = " big-endian";
-                }
-                else if (H5T_ORDER_VAX == order) {
+                else if (H5T_ORDER_VAX == order)
                     order_s = " mixed-endian";
-                }
-                else {
+                else
                     order_s = " unknown-byte-order";
-                }
             }
-            else {
+            else
                 order_s = "";
-            }
 
             /* sign */
             if ((sign = H5Tget_sign(type)) >= 0) {
-                if (H5T_SGN_NONE == sign) {
+                if (H5T_SGN_NONE == sign)
                     sign_s = " unsigned";
-                }
-                else if (H5T_SGN_2 == sign) {
+                else if (H5T_SGN_2 == sign)
                     sign_s = "";
-                }
-                else {
+                else
                     sign_s = " unknown-sign";
-                }
             }
-            else {
+            else
                 sign_s = " unknown-sign";
-            }
 
             /* print size, order, and sign  */
             h5tools_str_append(buffer, "%lu-bit%s%s integer",
@@ -2038,56 +1995,42 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         break;
 
     case H5T_FLOAT:
-        if (H5Tequal(type, H5T_IEEE_F32BE) == TRUE) {
+        if (H5Tequal(type, H5T_IEEE_F32BE) == TRUE)
             h5tools_str_append(buffer, "H5T_IEEE_F32BE");
-        }
-        else if (H5Tequal(type, H5T_IEEE_F32LE) == TRUE) {
+        else if (H5Tequal(type, H5T_IEEE_F32LE) == TRUE)
             h5tools_str_append(buffer, "H5T_IEEE_F32LE");
-        }
-        else if (H5Tequal(type, H5T_IEEE_F64BE) == TRUE) {
+        else if (H5Tequal(type, H5T_IEEE_F64BE) == TRUE)
             h5tools_str_append(buffer, "H5T_IEEE_F64BE");
-        }
-        else if (H5Tequal(type, H5T_IEEE_F64LE) == TRUE) {
+        else if (H5Tequal(type, H5T_IEEE_F64LE) == TRUE)
             h5tools_str_append(buffer, "H5T_IEEE_F64LE");
-        }
-        else if (H5Tequal(type, H5T_VAX_F32) == TRUE) {
+        else if (H5Tequal(type, H5T_VAX_F32) == TRUE)
             h5tools_str_append(buffer, "H5T_VAX_F32");
-        }
-        else if (H5Tequal(type, H5T_VAX_F64) == TRUE) {
+        else if (H5Tequal(type, H5T_VAX_F64) == TRUE)
             h5tools_str_append(buffer, "H5T_VAX_F64");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_FLOAT) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_FLOAT) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_FLOAT");
-        }
-        else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_DOUBLE");
 #if H5_SIZEOF_LONG_DOUBLE !=0
-        }
-        else if (H5Tequal(type, H5T_NATIVE_LDOUBLE) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_LDOUBLE) == TRUE)
             h5tools_str_append(buffer, "H5T_NATIVE_LDOUBLE");
 #endif
-        }
         else {
 
             /* byte order */
             if (H5Tget_size(type) > 1) {
                 order = H5Tget_order(type);
-                if (H5T_ORDER_LE == order) {
+                if (H5T_ORDER_LE == order)
                     order_s = " little-endian";
-                }
-                else if (H5T_ORDER_BE == order) {
+                else if (H5T_ORDER_BE == order)
                     order_s = " big-endian";
-                }
-                else if (H5T_ORDER_VAX == order) {
+                else if (H5T_ORDER_VAX == order)
                     order_s = " mixed-endian";
-                }
-                else {
+                else
                     order_s = " unknown-byte-order";
-                }
             }
-            else {
+            else
                 order_s = "";
-            }
 
             /* print size and byte order */
             h5tools_str_append(buffer, "%lu-bit%s floating-point",
@@ -2294,33 +2237,24 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         break;
 
     case H5T_BITFIELD:
-        if (H5Tequal(type, H5T_STD_B8BE) == TRUE) {
+        if (H5Tequal(type, H5T_STD_B8BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_B8BE");
-        }
-        else if (H5Tequal(type, H5T_STD_B8LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_B8LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_B8LE");
-        }
-        else if (H5Tequal(type, H5T_STD_B16BE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_B16BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_B16BE");
-        }
-        else if (H5Tequal(type, H5T_STD_B16LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_B16LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_B16LE");
-        }
-        else if (H5Tequal(type, H5T_STD_B32BE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_B32BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_B32BE");
-        }
-        else if (H5Tequal(type, H5T_STD_B32LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_B32LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_B32LE");
-        }
-        else if (H5Tequal(type, H5T_STD_B64BE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_B64BE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_B64BE");
-        }
-        else if (H5Tequal(type, H5T_STD_B64LE) == TRUE) {
+        else if (H5Tequal(type, H5T_STD_B64LE) == TRUE)
             h5tools_str_append(buffer, "H5T_STD_B64LE");
-        }
-        else {
+        else
             h5tools_str_append(buffer, "undefined bitfield");
-        }
         break;
 
     case H5T_OPAQUE:
@@ -2860,7 +2794,7 @@ void
 h5tools_print_fill_value(h5tools_str_t *buffer/*in,out*/, const h5tool_format_t *info, h5tools_context_t *ctx/*in,out*/, hid_t dcpl, hid_t type_id, hid_t obj_id)
 {
     size_t            size;
-    hid_t             n_type;
+    hid_t             n_type = -1;
     void             *buf = NULL;
 
     n_type = H5Tget_native_type(type_id, H5T_DIR_DEFAULT);
@@ -3501,7 +3435,8 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
         error_msg("unable to open attribute \"%s\"\n", attr_name);
     }
     else {
-        hid_t type, space;
+        hid_t type = -1;
+        hid_t space = -1;
 
         ctx->indent_level++;
 
@@ -3720,9 +3655,9 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info,
     H5S_class_t space_type;
     int         ndims;
     int         i;
-    hid_t       space;
-    hid_t       type;
-    hid_t       p_type;
+    hid_t       space = -1;
+    hid_t       type = -1;
+    hid_t       p_type = -1;
     hsize_t     size[64];
     hsize_t     alloc_size;
     hsize_t     nelmts = 1;
diff --git a/tools/lib/h5tools_error.h b/tools/lib/h5tools_error.h
index 136c5ed..2cdaf74 100644
--- a/tools/lib/h5tools_error.h
+++ b/tools/lib/h5tools_error.h
@@ -62,11 +62,19 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_id_g;
 
 
 /*
+ * H5TOOLS_INFO macro, used to facilitate error reporting .  The arguments are the major
+ * error number, the minor error number, and a description of the error.
+ */
+#define H5TOOLS_INFO(min_id, ...) {                                                                        \
+        H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, H5E_tools_g, min_id, __VA_ARGS__);     \
+}
+
+/*
  * HERROR macro, used to facilitate error reporting .  The arguments are the major
  * error number, the minor error number, and a description of the error.
  */
-#define HERROR(maj_id, min_id, str) {                                                                        \
-        H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, maj_id, min_id, str);     \
+#define HERROR(maj_id, min_id, ...) {                                                                        \
+        H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, maj_id, min_id, __VA_ARGS__);     \
         ret_value = FAIL;                                                                                    \
 }
 
@@ -95,8 +103,8 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_id_g;
  * The return value is assigned to a variable `ret_value' and control branches
  * to the `catch_except' label, if we're not already past it.
  */
-#define H5E_THROW(fail_value, min_id, str) {        \
-    H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, H5E_tools_g, min_id, str);     \
+#define H5E_THROW(fail_value, min_id, ...) {        \
+    H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, H5E_tools_g, min_id, __VA_ARGS__);     \
     H5_LEAVE(fail_value)                            \
 }
 
@@ -106,8 +114,8 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_id_g;
  * error string.  The return value is assigned to a variable `ret_value' and
  * control branches to the `done' label.
  */
-#define HGOTO_ERROR(fail_value, min_id, str) {        \
-   HERROR(H5E_tools_g, min_id, str);                 \
+#define HGOTO_ERROR(fail_value, min_id, ...) {        \
+   HERROR(H5E_tools_g, min_id, __VA_ARGS__);                 \
    HGOTO_DONE(fail_value)                          \
 }
 
diff --git a/tools/lib/h5tools_filters.c b/tools/lib/h5tools_filters.c
index 65be089..457d1af 100644
--- a/tools/lib/h5tools_filters.c
+++ b/tools/lib/h5tools_filters.c
@@ -18,191 +18,191 @@
  * print a warning message
  *-------------------------------------------------------------------------
  */
-static void print_warning(const char *dname, const char *fname)
+static void print_filter_warning(const char *dname, const char *fname)
 {
-	fprintf(stderr,
-			"warning: dataset <%s> cannot be read, %s filter is not available\n",
-			dname, fname);
+    fprintf(stderr,
+            "Warning: dataset <%s> cannot be read, %s filter is not available\n",
+            dname, fname);
 }
 
 /*-------------------------------------------------------------------------
  * Function: h5tools_canreadf
  *
- * Purpose: check if the dataset creation property list has filters that
- * are not registered in the current configuration
- * 1) the external filters GZIP and SZIP might not be available
- * 2) the internal filters might be turned off
- *
- * Return: 1, can read, 0, cannot, -1 error
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: March 1, 2004
+ * Purpose:  check if the dataset creation property list has filters that
+ *           are not registered in the current configuration
+ *               1) the external filters GZIP and SZIP might not be available
+ *               2) the internal filters might be turned off
  *
+ * Return:
+ *           1 can read,
+ *           0 cannot,
+ *           -1 error
  *-------------------------------------------------------------------------
  */
-int h5tools_canreadf(const char* name, /* object name, serves also as boolean print */
+int
+h5tools_canreadf(const char* name,     /* object name, serves also as boolean print */
                      hid_t dcpl_id)    /* dataset creation property list */
 {
+    int ret_value = 1;
+    int nfilters;       /* number of filters */
+    H5Z_filter_t filtn; /* filter identification number */
+    int i;              /* index */
+    int udfilter_avail; /* index */
+
+    /* get information about filters */
+    if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_nfilters failed");
+
+    /* if we do not have filters, we can read the dataset safely */
+    if (!nfilters)
+        HGOTO_DONE(1);
+
+    /* check availability of filters */
+    for (i = 0; i < nfilters; i++) {
+        if ((filtn = H5Pget_filter2(dcpl_id, (unsigned) i, 0, 0, 0, (size_t) 0, 0, NULL)) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pget_filter2 failed");
+
+        switch (filtn) {
+        /*-------------------------------------------------------------------------
+         * user defined filter
+         *-------------------------------------------------------------------------
+         */
+        default:
+            if ((udfilter_avail = H5Zfilter_avail(filtn)) < 0) {
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Zfilter_avail failed");
+            }
+            else if (!udfilter_avail) {
+                if (name)
+                    print_filter_warning(name, "user defined");
+                ret_value = 0;
+            }
+            break;
 
-	int nfilters; /* number of filters */
-	H5Z_filter_t filtn; /* filter identification number */
-	int i; /* index */
-	int udfilter_avail; /* index */
-
-	/* get information about filters */
-	if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
-		return -1;
-
-	/* if we do not have filters, we can read the dataset safely */
-	if (!nfilters)
-		return 1;
-
-	/* check availability of filters */
-	for (i = 0; i < nfilters; i++) {
-		if ((filtn = H5Pget_filter2(dcpl_id, (unsigned) i, 0, 0, 0, (size_t) 0, 0, NULL)) < 0)
-			return -1;
-
-		switch (filtn) {
-		/*-------------------------------------------------------------------------
-		 * user defined filter
-		 *-------------------------------------------------------------------------
-		 */
-		default:
-			if ((udfilter_avail = H5Zfilter_avail(filtn)) < 0)
-				return -1;
-			else if (udfilter_avail == 0) {
-				if (name)
-					print_warning(name, "user defined");
-				return 0;
-			}
-			break;
-
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_DEFLATE      1 , deflation like gzip
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_DEFLATE:
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_DEFLATE      1 , deflation like gzip
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_DEFLATE:
 #ifndef H5_HAVE_FILTER_DEFLATE
-			if (name)
-				print_warning(name,"deflate");
-			return 0;
+            if (name)
+                print_filter_warning(name,"deflate");
+            ret_value = 0;
 #endif
-			break;
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_SZIP       4 , szip compression
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_SZIP:
+            break;
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_SZIP       4 , szip compression
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_SZIP:
 #ifndef H5_HAVE_FILTER_SZIP
-			if (name)
-				print_warning(name,"SZIP");
-			return 0;
+            if (name)
+                print_filter_warning(name,"SZIP");
+            ret_value = 0;
 #endif
-			break;
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_SHUFFLE    2 , shuffle the data
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_SHUFFLE:
-			break;
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_FLETCHER32 3 , fletcher32 checksum of EDC
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_FLETCHER32:
-			break;
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_NBIT
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_NBIT:
-			break;
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_SCALEOFFSET
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_SCALEOFFSET:
-			break;
-		}/*switch*/
-	}/*for*/
-
-	return 1;
+            break;
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_SHUFFLE    2 , shuffle the data
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_SHUFFLE:
+            break;
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_FLETCHER32 3 , fletcher32 checksum of EDC
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_FLETCHER32:
+            break;
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_NBIT
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_NBIT:
+            break;
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_SCALEOFFSET
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_SCALEOFFSET:
+            break;
+        }/*switch*/
+    }/*for*/
+
+done:
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
  * Function: h5tools_canwritef
  *
- * Purpose: check if the filter is available and can write data.
- * At this time, all filters that are available can write data,
- * except SZIP, which may be configured decoder-only.
- *
- * Return: 1, can write, 0, cannot, -1 error
- *
- * Programmer:
- *
- * Date: October 5, 2004
+ * Purpose:  check if the filter is available and can write data.
  *
+ * Return:   1 can write,
+ *           0 cannot,
+ *           -1 error
  *-------------------------------------------------------------------------
  */
-int h5tools_can_encode(H5Z_filter_t filtn) {
-	switch (filtn) {
-	/* user defined filter     */
-	default:
-            return 0;
+int
+h5tools_can_encode(H5Z_filter_t filtn)
+{
+    int ret_value = 1;
 
-	case H5Z_FILTER_DEFLATE:
+    switch (filtn) {
+    /* user defined filter     */
+    default:
+        HGOTO_DONE(0)
+    case H5Z_FILTER_DEFLATE:
 #ifndef H5_HAVE_FILTER_DEFLATE
-            return 0;
+        HGOTO_DONE(0)
 #endif
             break;
 
-	case H5Z_FILTER_SZIP:
+    case H5Z_FILTER_SZIP:
 #ifndef H5_HAVE_FILTER_SZIP
-            return 0;
+        HGOTO_DONE(0)
 #else
-	{
+        {
             unsigned int filter_config_flags;
 
             if (H5Zget_filter_info(filtn, &filter_config_flags) < 0)
-                return -1;
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Zget_filter_info failed");
             if ((filter_config_flags
                     & (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) == 0) {
                 /* filter present but neither encode nor decode is supported (???) */
-                return -1;
-            } 
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "neither encode nor decode is supported");
+            }
             else if ((filter_config_flags
                         & (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) == H5Z_FILTER_CONFIG_DECODE_ENABLED) {
                 /* decoder only: read but not write */
-                return 0;
-            } 
+                HGOTO_DONE(0)
+            }
             else if ((filter_config_flags
                         & (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) == H5Z_FILTER_CONFIG_ENCODE_ENABLED) {
                 /* encoder only: write but not read (???) */
-                return -1;
-            } 
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "encoder only: write but not read");
+            }
             else if ((filter_config_flags
                         & (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED))
                         == (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) {
-                return 1;
+                HGOTO_DONE(1)
             }
-	}
+        }
 #endif
             break;
 
-	case H5Z_FILTER_SHUFFLE:
+    case H5Z_FILTER_SHUFFLE:
             break;
 
-	case H5Z_FILTER_FLETCHER32:
+    case H5Z_FILTER_FLETCHER32:
             break;
 
-	case H5Z_FILTER_NBIT:
+    case H5Z_FILTER_NBIT:
             break;
 
-	case H5Z_FILTER_SCALEOFFSET:
+    case H5Z_FILTER_SCALEOFFSET:
             break;
     }/*switch*/
 
-    return 1;
+done:
+    return ret_value;
 }
 
diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c
index 85850e3..d6e5f01 100644
--- a/tools/lib/h5tools_ref.c
+++ b/tools/lib/h5tools_ref.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "h5tools_ref.h"
 #include "H5private.h"
 #include "H5SLprivate.h"
@@ -109,19 +107,21 @@ static int
 init_ref_path_table(void)
 {
     /* Sanity check */
-    HDassert(thefile > 0);
-
-    /* Create skip list to store reference path information */
-    if((ref_path_table = H5SL_create(H5SL_TYPE_HADDR, NULL))==NULL)
+    if(thefile > 0) {
+        /* Create skip list to store reference path information */
+        if((ref_path_table = H5SL_create(H5SL_TYPE_HADDR, NULL))==NULL)
+            return (-1);
+
+        /* Iterate over objects in this file */
+        if(h5trav_visit(thefile, "/", TRUE, TRUE, init_ref_path_cb, NULL, NULL) < 0) {
+            error_msg("unable to construct reference path table\n");
+            h5tools_setstatus(EXIT_FAILURE);
+        } /* end if */
+
+        return(0);
+    }
+    else
         return (-1);
-
-    /* Iterate over objects in this file */
-    if(h5trav_visit(thefile, "/", TRUE, TRUE, init_ref_path_cb, NULL, NULL) < 0) {
-        error_msg("unable to construct reference path table\n");
-        h5tools_setstatus(EXIT_FAILURE);
-    } /* end if */
-
-    return(0);
 }
 
 /*-------------------------------------------------------------------------
@@ -167,6 +167,8 @@ ref_path_table_lookup(const char *thepath)
 {
     H5O_info_t  oi;
 
+    if((thepath == NULL) || (HDstrlen(thepath) == 0))
+        return HADDR_UNDEF;
     /* Allow lookups on the root group, even though it doesn't have any link info */
     if(HDstrcmp(thepath, "/")) {
         H5L_info_t  li;
@@ -213,16 +215,17 @@ ref_path_table_put(const char *path, haddr_t objno)
 {
     ref_path_node_t *new_node;
 
-    HDassert(ref_path_table);
-    HDassert(path);
+    if(ref_path_table && path) {
+        if((new_node = (ref_path_node_t *)HDmalloc(sizeof(ref_path_node_t))) == NULL)
+            return(-1);
 
-    if((new_node = (ref_path_node_t *)HDmalloc(sizeof(ref_path_node_t))) == NULL)
-        return(-1);
+        new_node->objno = objno;
+        new_node->path = HDstrdup(path);
 
-    new_node->objno = objno;
-    new_node->path = HDstrdup(path);
-
-    return(H5SL_insert(ref_path_table, new_node, &(new_node->objno)));
+        return(H5SL_insert(ref_path_table, new_node, &(new_node->objno)));
+    }
+    else
+        return (-1);
 }
 
 /*
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 1719929..fdd88ed 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -12,20 +12,12 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Bill Wendling <wendling@ncsa.uiuc.edu>
- *              Monday, 19. February 2001
- *
  * Purpose: These are string functions for us to use and abuse.
  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "H5private.h"
 #include "h5tools.h"            /* for h5tool_format_t structure */
 #include "h5tools_ref.h"
-#include "h5tools_str.h"        /*function prototypes       */
+#include "h5tools_str.h"        /* function prototypes */
 
 /*
  * If REPEAT_VERBOSE is defined then character strings will be printed so
@@ -645,10 +637,11 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 {
     size_t         nsize, offset, size=0, nelmts, start;
     H5T_sign_t     nsign;
-    char          *name;
+    char          *name = NULL;
     unsigned char *ucp_vp = (unsigned char *)vp;
     char          *cp_vp = (char *)vp;
-    hid_t          memb, obj;
+    hid_t          memb = -1;
+    hid_t          obj = -1;
     static char    fmt_llong[8], fmt_ullong[8];
     H5T_str_t      pad;
     H5T_class_t    type_class;
@@ -1184,7 +1177,8 @@ void
 h5tools_str_sprint_region(h5tools_str_t *str, const h5tool_format_t *info,
         hid_t container, void *vp)
 {
-    hid_t        obj, region;
+    hid_t        obj = -1;
+    hid_t        region = -1;
     char         ref_name[1024];
     H5S_sel_type region_type;
 
diff --git a/tools/lib/h5tools_type.c b/tools/lib/h5tools_type.c
index ae7160b..f63c228 100644
--- a/tools/lib/h5tools_type.c
+++ b/tools/lib/h5tools_type.c
@@ -21,12 +21,6 @@
  *
  * Return: Success:    datatype ID
  *         Failure:    FAIL
- *
- * Programmer: Pedro Vicente Nunes
- *             Tuesday, July 18, 2006
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 hid_t
@@ -43,40 +37,40 @@ h5tools_get_little_endian_type(hid_t tid)
 
     switch(type_class) {
         case H5T_INTEGER:
-            if ( size == 1 && sign == H5T_SGN_2)
-                p_type=H5Tcopy(H5T_STD_I8LE);
-            else if ( size == 2 && sign == H5T_SGN_2)
-                p_type=H5Tcopy(H5T_STD_I16LE);
-            else if ( size == 4 && sign == H5T_SGN_2)
-                p_type=H5Tcopy(H5T_STD_I32LE);
-            else if ( size == 8 && sign == H5T_SGN_2)
-                p_type=H5Tcopy(H5T_STD_I64LE);
-            else if ( size == 1 && sign == H5T_SGN_NONE)
-                p_type=H5Tcopy(H5T_STD_U8LE);
-            else if ( size == 2 && sign == H5T_SGN_NONE)
-                p_type=H5Tcopy(H5T_STD_U16LE);
-            else if ( size == 4 && sign == H5T_SGN_NONE)
-                p_type=H5Tcopy(H5T_STD_U32LE);
-            else if ( size == 8 && sign == H5T_SGN_NONE)
-                p_type=H5Tcopy(H5T_STD_U64LE);
+            if (size == 1 && sign == H5T_SGN_2)
+                p_type = H5Tcopy(H5T_STD_I8LE);
+            else if (size == 2 && sign == H5T_SGN_2)
+                p_type = H5Tcopy(H5T_STD_I16LE);
+            else if (size == 4 && sign == H5T_SGN_2)
+                p_type = H5Tcopy(H5T_STD_I32LE);
+            else if (size == 8 && sign == H5T_SGN_2)
+                p_type = H5Tcopy(H5T_STD_I64LE);
+            else if (size == 1 && sign == H5T_SGN_NONE)
+                p_type = H5Tcopy(H5T_STD_U8LE);
+            else if (size == 2 && sign == H5T_SGN_NONE)
+                p_type = H5Tcopy(H5T_STD_U16LE);
+            else if (size == 4 && sign == H5T_SGN_NONE)
+                p_type = H5Tcopy(H5T_STD_U32LE);
+            else if (size == 8 && sign == H5T_SGN_NONE)
+                p_type = H5Tcopy(H5T_STD_U64LE);
             break;
 
         case H5T_FLOAT:
-            if ( size == 4)
-                p_type=H5Tcopy(H5T_IEEE_F32LE);
-            else if ( size == 8)
-                p_type=H5Tcopy(H5T_IEEE_F64LE);
+            if (size == 4)
+                p_type = H5Tcopy(H5T_IEEE_F32LE);
+            else if (size == 8)
+                p_type = H5Tcopy(H5T_IEEE_F64LE);
             break;
 
         case H5T_BITFIELD:
-            if ( size == 1)
-                p_type=H5Tcopy(H5T_STD_B8LE);
-            else if ( size == 2)
-                p_type=H5Tcopy(H5T_STD_B16LE);
-            else if ( size == 4)
-                p_type=H5Tcopy(H5T_STD_B32LE);
-            else if ( size == 8)
-                p_type=H5Tcopy(H5T_STD_B64LE);
+            if (size == 1)
+                p_type = H5Tcopy(H5T_STD_B8LE);
+            else if (size == 2)
+                p_type = H5Tcopy(H5T_STD_B16LE);
+            else if (size == 4)
+                p_type = H5Tcopy(H5T_STD_B32LE);
+            else if (size == 8)
+                p_type = H5Tcopy(H5T_STD_B64LE);
             break;
 
         case H5T_TIME:
@@ -92,7 +86,6 @@ h5tools_get_little_endian_type(hid_t tid)
         case H5T_NO_CLASS:
         case H5T_NCLASSES:
         default:
-            HDassert(0);
             break;
 
     } /* end switch */
@@ -108,18 +101,12 @@ h5tools_get_little_endian_type(hid_t tid)
  *
  * Return: Success:    datatype ID
  *         Failure:    FAIL
- *
- * Programmer: Pedro Vicente Nunes
- *             Tuesday, July 18, 2006
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 hid_t
 h5tools_get_big_endian_type(hid_t tid)
 {
-    hid_t       p_type=-1;
+    hid_t       p_type = -1;
     H5T_class_t type_class;
     size_t      size;
     H5T_sign_t  sign;
@@ -130,39 +117,39 @@ h5tools_get_big_endian_type(hid_t tid)
 
     switch(type_class) {
         case H5T_INTEGER:
-            if ( size == 1 && sign == H5T_SGN_2)
-                p_type=H5Tcopy(H5T_STD_I8BE);
-            else if ( size == 2 && sign == H5T_SGN_2)
-                p_type=H5Tcopy(H5T_STD_I16BE);
-            else if ( size == 4 && sign == H5T_SGN_2)
-                p_type=H5Tcopy(H5T_STD_I32BE);
-            else if ( size == 8 && sign == H5T_SGN_2)
-                p_type=H5Tcopy(H5T_STD_I64BE);
-            else if ( size == 1 && sign == H5T_SGN_NONE)
-                p_type=H5Tcopy(H5T_STD_U8BE);
-            else if ( size == 2 && sign == H5T_SGN_NONE)
-                p_type=H5Tcopy(H5T_STD_U16BE);
-            else if ( size == 4 && sign == H5T_SGN_NONE)
-                p_type=H5Tcopy(H5T_STD_U32BE);
-            else if ( size == 8 && sign == H5T_SGN_NONE)
-                p_type=H5Tcopy(H5T_STD_U64BE);
+            if (size == 1 && sign == H5T_SGN_2)
+                p_type = H5Tcopy(H5T_STD_I8BE);
+            else if (size == 2 && sign == H5T_SGN_2)
+                p_type = H5Tcopy(H5T_STD_I16BE);
+            else if (size == 4 && sign == H5T_SGN_2)
+                p_type = H5Tcopy(H5T_STD_I32BE);
+            else if (size == 8 && sign == H5T_SGN_2)
+                p_type = H5Tcopy(H5T_STD_I64BE);
+            else if (size == 1 && sign == H5T_SGN_NONE)
+                p_type = H5Tcopy(H5T_STD_U8BE);
+            else if (size == 2 && sign == H5T_SGN_NONE)
+                p_type = H5Tcopy(H5T_STD_U16BE);
+            else if (size == 4 && sign == H5T_SGN_NONE)
+                p_type = H5Tcopy(H5T_STD_U32BE);
+            else if (size == 8 && sign == H5T_SGN_NONE)
+                p_type = H5Tcopy(H5T_STD_U64BE);
             break;
 
         case H5T_FLOAT:
-            if ( size == 4)
-                p_type=H5Tcopy(H5T_IEEE_F32BE);
-            else if ( size == 8)
-                p_type=H5Tcopy(H5T_IEEE_F64BE);
+            if (size == 4)
+                p_type = H5Tcopy(H5T_IEEE_F32BE);
+            else if (size == 8)
+                p_type = H5Tcopy(H5T_IEEE_F64BE);
             break;
 
         case H5T_BITFIELD:
-            if ( size == 1)
-                p_type=H5Tcopy(H5T_STD_B8BE);
-            else if ( size == 2)
-                p_type=H5Tcopy(H5T_STD_B16BE);
-            else if ( size == 4)
-                p_type=H5Tcopy(H5T_STD_B32BE);
-            else if ( size == 8)
+            if (size == 1)
+                p_type = H5Tcopy(H5T_STD_B8BE);
+            else if (size == 2)
+                p_type = H5Tcopy(H5T_STD_B16BE);
+            else if (size == 4)
+                p_type = H5Tcopy(H5T_STD_B32BE);
+            else if (size == 8)
                 p_type=H5Tcopy(H5T_STD_B64BE);
             break;
 
@@ -179,7 +166,6 @@ h5tools_get_big_endian_type(hid_t tid)
         case H5T_NO_CLASS:
         case H5T_NCLASSES:
         default:
-            HDassert(0);
             break;
     } /* end switch */
 
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 4084be0..3f66ef6 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -12,20 +12,10 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Bill Wendling <wendling@ncsa.uiuc.edu>
- *              Tuesday, 6. March 2001
- */
-
-/*
  * Portions of this work are derived from _Obfuscated C and Other Mysteries_,
  * by Don Libes, copyright (c) 1993 by John Wiley & Sons, Inc.
  */
 
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "h5tools.h"
 #include "h5tools_utils.h"
 #include "H5private.h"
@@ -68,15 +58,11 @@ static void add_obj(table_t *table, haddr_t objno, const char *objname, hbool_t
 /*-------------------------------------------------------------------------
  * Function: parallel_print
  *
- * Purpose: wrapper for printf for use in parallel mode.
- *
- * Programmer: Leon Arber
- *
- * Date: December 1, 2004
- *
+ * Purpose:  wrapper for printf for use in parallel mode.
  *-------------------------------------------------------------------------
  */
-void parallel_print(const char* format, ...)
+void
+parallel_print(const char* format, ...)
 {
     int  bytes_written;
     va_list ap;
@@ -113,18 +99,12 @@ void parallel_print(const char* format, ...)
 
 
 /*-------------------------------------------------------------------------
- * Function:    error_msg
+ * Function: error_msg
  *
- * Purpose: Print a nicely formatted error message to stderr flushing the
+ * Purpose:  Print a nicely formatted error message to stderr flushing the
  *              stdout stream first.
  *
- * Return:  Nothing
- *
- * Programmer:  Bill Wendling
- *              Tuesday, 20. February 2001
- *
- * Modifications:
- *
+ * Return:   Nothing
  *-------------------------------------------------------------------------
  */
 void
@@ -144,18 +124,12 @@ error_msg(const char *fmt, ...)
 
 
 /*-------------------------------------------------------------------------
- * Function:    warn_msg
+ * Function: warn_msg
  *
- * Purpose: Print a nicely formatted warning message to stderr flushing
+ * Purpose:  Print a nicely formatted warning message to stderr flushing
  *              the stdout stream first.
  *
- * Return:  Nothing
- *
- * Programmer:  Bill Wendling
- *              Tuesday, 20. February 2001
- *
- * Modifications:
- *
+ * Return:   Nothing
  *-------------------------------------------------------------------------
  */
 void
@@ -173,14 +147,11 @@ warn_msg(const char *fmt, ...)
 }
 
 /*-------------------------------------------------------------------------
- * Function:  help_ref_msg
- *
- * Purpose: Print a message to refer help page
+ * Function: help_ref_msg
  *
- * Return:  Nothing
- *
- * Modifications:
+ * Purpose:  Print a message to refer help page
  *
+ * Return:   Nothing
  *-------------------------------------------------------------------------
  */
 void
@@ -192,24 +163,16 @@ help_ref_msg(FILE *output)
 
 
 /*-------------------------------------------------------------------------
- * Function:    get_option
+ * Function: get_option
  *
- * Purpose: Determine the command-line options a user specified. We can
- *      accept both short and long type command-lines.
+ * Purpose:  Determine the command-line options a user specified. We can
+ *           accept both short and long type command-lines.
  *
  * Return:  Success:    The short valued "name" of the command line
  *              parameter or EOF if there are no more
  *              parameters to process.
  *
- *      Failure:    A question mark.
- *
- * Programmer:  Bill Wendling
- *              Friday, 5. January 2001
- *
- * Modifications: Pedro Vicente
- *                October, 27 2008
- * Wilcard "*" argument type
- *
+ *          Failure:    A question mark.
  *-------------------------------------------------------------------------
  */
 int
@@ -361,16 +324,11 @@ get_option(int argc, const char **argv, const char *opts, const struct long_opti
 
 
 /*-------------------------------------------------------------------------
- * Function:    indentation
+ * Function: indentation
  *
- * Purpose:     Print spaces for indentation
- *
- * Return:      void
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
+ * Purpose:  Print spaces for indentation
  *
+ * Return:   void
  *-------------------------------------------------------------------------
  */
 void
@@ -388,17 +346,12 @@ indentation(unsigned x)
 
 
 /*-------------------------------------------------------------------------
- * Function:    print_version
+ * Function: print_version
  *
- * Purpose:     Print the program name and the version information which is
- *      defined the same as the HDF5 library version.
- *
- * Return:      void
- *
- * Programmer:  unknown
- *
- * Modifications:
+ * Purpose:  Print the program name and the version information which is
+ *           defined the same as the HDF5 library version.
  *
+ * Return:   void
  *-------------------------------------------------------------------------
  */
 void
@@ -417,11 +370,6 @@ print_version(const char *progname)
  *              and committed types
  *
  * Return:      void
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -444,11 +392,6 @@ init_table(table_t **tbl)
  *              and committed types
  *
  * Return:      void
- *
- * Programmer:  Paul Harten
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -472,11 +415,6 @@ free_table(table_t *table)
  * Purpose:     display the contents of tables for debugging purposes
  *
  * Return:      void
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -498,11 +436,6 @@ dump_table(char* tablename, table_t *table)
  * Purpose:     display the contents of tables for debugging purposes
  *
  * Return:      void
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -523,14 +456,9 @@ dump_tables(find_objs_t *info)
  * Return:      Success:    an integer, the location of the object
  *
  *              Failure:    FAIL   if object is not found
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-obj_t *
+ obj_t *
 search_obj(table_t *table, haddr_t objno)
 {
     unsigned u;
@@ -551,11 +479,6 @@ search_obj(table_t *table, haddr_t objno)
  * Return:      Success:    SUCCEED
  *
  *              Failure:    FAIL
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -573,7 +496,7 @@ find_objs_cb(const char *name, const H5O_info_t *oinfo, const char *already_seen
 
         case H5O_TYPE_DATASET:
             if(NULL == already_seen) {
-                hid_t dset;
+                hid_t dset = -1;
 
                 /* Add the dataset to the list of objects */
                 add_obj(info->dset_table, oinfo->addr, name, TRUE);
@@ -618,7 +541,6 @@ find_objs_cb(const char *name, const H5O_info_t *oinfo, const char *already_seen
         case H5O_TYPE_UNKNOWN:
         case H5O_TYPE_NTYPES:
         default:
-            HDassert(0);
             break;
     } /* end switch */
 
@@ -634,11 +556,6 @@ find_objs_cb(const char *name, const H5O_info_t *oinfo, const char *already_seen
  * Return:      Success:    SUCCEED
  *
  *              Failure:    FAIL
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -668,11 +585,6 @@ init_objs(hid_t fid, find_objs_t *info, table_t **group_table,
  *              realloc the table if necessary
  *
  * Return:      void
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -706,11 +618,6 @@ add_obj(table_t *table, haddr_t objno, const char *objname, hbool_t record)
  *
  * Return:      a stream description when succeeds.
  *              NULL if fails.
- *
- * Programmer:  Albert Cheng, 2005/8/9
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 FILE *
@@ -734,67 +641,61 @@ tmpfile(void)
  *
  * Return:
  *   2 : given pathname is object
- *   1 : Succed to get link info.
+ *   1 : Succeed to get link info.
  *   0 : Detected as a dangling link
  *  -1 : H5 API failed.
  *
  * NOTE:
  *  link_info->trg_path must be freed out of this function
- *
- * Programmer: Jonathan Kim
- *
- * Date: Feb 8, 2010
  *-------------------------------------------------------------------------*/
 int
-H5tools_get_symlink_info(hid_t file_id, const char * linkpath, h5tool_link_info_t *link_info,
-    hbool_t get_obj_type)
+H5tools_get_symlink_info(hid_t file_id, const char * linkpath, h5tool_link_info_t *link_info, hbool_t get_obj_type)
 {
     htri_t l_ret;
     H5O_info_t trg_oinfo;
     hid_t fapl = H5P_DEFAULT;
     hid_t lapl = H5P_DEFAULT;
-    int ret = -1; /* init to fail */
+    int   ret_value = -1; /* init to fail */
 
     /* init */
     link_info->trg_type = H5O_TYPE_UNKNOWN;
 
     /* if path is root, return group type */
-    if(!HDstrcmp(linkpath,"/"))
-    {
+    if(!HDstrcmp(linkpath,"/")) {
         link_info->trg_type = H5O_TYPE_GROUP;
-        ret = 2;
-        goto out;
+        HGOTO_DONE(2);
     }
 
     /* check if link itself exist */
     if(H5Lexists(file_id, linkpath, H5P_DEFAULT) <= 0) {
         if(link_info->opt.msg_mode == 1)
             parallel_print("Warning: link <%s> doesn't exist \n",linkpath);
-        goto out;
+        HGOTO_DONE(FAIL);
     } /* end if */
 
     /* get info from link */
     if(H5Lget_info(file_id, linkpath, &(link_info->linfo), H5P_DEFAULT) < 0) {
         if(link_info->opt.msg_mode == 1)
             parallel_print("Warning: unable to get link info from <%s>\n",linkpath);
-        goto out;
+        HGOTO_DONE(FAIL);
     } /* end if */
 
     /* given path is hard link (object) */
-    if(link_info->linfo.type == H5L_TYPE_HARD) {
-        ret = 2;
-        goto out;
-    } /* end if */
+    if(link_info->linfo.type == H5L_TYPE_HARD)
+        HGOTO_DONE(2);
 
     /* trg_path must be freed out of this function when finished using */
-    link_info->trg_path = (char*)HDcalloc(link_info->linfo.u.val_size, sizeof(char));
-    HDassert(link_info->trg_path);
+    if((link_info->trg_path = (char*)HDcalloc(link_info->linfo.u.val_size, sizeof(char))) == NULL) {
+        if(link_info->opt.msg_mode == 1)
+            parallel_print("Warning: unable to allocate buffer for <%s>\n",linkpath);
+        HGOTO_DONE(FAIL);
+    } /* end if */
 
     /* get link value */
     if(H5Lget_val(file_id, linkpath, (void *)link_info->trg_path, link_info->linfo.u.val_size, H5P_DEFAULT) < 0) {
         if(link_info->opt.msg_mode == 1)
             parallel_print("Warning: unable to get link value from <%s>\n",linkpath);
-        goto out;
+        HGOTO_DONE(FAIL);
     } /* end if */
 
     /*-----------------------------------------------------
@@ -803,13 +704,13 @@ H5tools_get_symlink_info(hid_t file_id, const char * linkpath, h5tool_link_info_
      */
     if(link_info->linfo.type == H5L_TYPE_EXTERNAL) {
         if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-            goto out;
+            HGOTO_DONE(FAIL);
         if(H5Pset_fapl_sec2(fapl) < 0)
-            goto out;
+            HGOTO_DONE(FAIL);
         if((lapl = H5Pcreate(H5P_LINK_ACCESS)) < 0)
-            goto out;
+            HGOTO_DONE(FAIL);
         if(H5Pset_elink_fapl(lapl, fapl) < 0)
-            goto out;
+            HGOTO_DONE(FAIL);
     } /* end if */
 
     /* Check for retrieving object info */
@@ -822,25 +723,24 @@ H5tools_get_symlink_info(hid_t file_id, const char * linkpath, h5tool_link_info_
 
         /* detect dangling link */
         if(l_ret == FALSE) {
-            ret = 0;
-            goto out;
-        } /* end if */
-        /* function failed */
-        else if(l_ret < 0)
-            goto out;
+            HGOTO_DONE(0);
+        }
+        else if(l_ret < 0) {       /* function failed */
+            HGOTO_DONE(FAIL);
+        }
 
         /* get target object info */
         if(H5Oget_info_by_name(file_id, linkpath, &trg_oinfo, lapl) < 0) {
             if(link_info->opt.msg_mode == 1)
                 parallel_print("Warning: unable to get object information for <%s>\n", linkpath);
-            goto out;
+            HGOTO_DONE(FAIL);
         } /* end if */
 
         /* check unknown type */
         if(trg_oinfo.type < H5O_TYPE_GROUP || trg_oinfo.type >=H5O_TYPE_NTYPES) {
             if(link_info->opt.msg_mode == 1)
                 parallel_print("Warning: target object of <%s> is unknown type\n", linkpath);
-            goto out;
+            HGOTO_DONE(FAIL);
         }  /* end if */
 
         /* set target obj type to return */
@@ -852,41 +752,46 @@ H5tools_get_symlink_info(hid_t file_id, const char * linkpath, h5tool_link_info_
         link_info->trg_type = H5O_TYPE_UNKNOWN;
 
     /* succeed */
-    ret = 1;
+    ret_value = 1;
 
-out:
+done:
     if(fapl != H5P_DEFAULT)
         H5Pclose(fapl);
     if(lapl != H5P_DEFAULT)
         H5Pclose(lapl);
 
-    return ret;
+    return ret_value;
 } /* end H5tools_get_symlink_info() */
 
 /*-------------------------------------------------------------------------
  * Audience:    Public
- * Chapter:     H5Tools Library
+ *
  * Purpose:     Initialize the name and operation status of the H5 Tools library
+ *
  * Description:
  *      These are utility functions to set/get the program name and operation status.
  *-------------------------------------------------------------------------
  */
-void h5tools_setprogname(const char *Progname)
+void
+h5tools_setprogname(const char *Progname)
 {
     h5tools_progname = Progname;
 }
 
-void h5tools_setstatus(int D_status)
+void
+h5tools_setstatus(int D_status)
 {
     h5tools_d_status = D_status;
 }
 
-const char*h5tools_getprogname(void)
+const char *
+h5tools_getprogname(void)
 {
    return h5tools_progname;
 }
 
-int h5tools_getstatus(void)
+int
+h5tools_getstatus(void)
 {
    return h5tools_d_status;
 }
@@ -898,25 +803,19 @@ int h5tools_getstatus(void)
  * This can be called from each tools main() as part of initial act.
  * Note: this is more of debugging purpose for now.
  */
-int h5tools_getenv_update_hyperslab_bufsize(void)
+int
+h5tools_getenv_update_hyperslab_bufsize(void)
 {
     const char *env_str = NULL;
     long hyperslab_bufsize_mb;
+    int ret_value = 1;
 
     /* check if environment variable is set for the hyperslab buffer size */
-    if (NULL != (env_str = HDgetenv ("H5TOOLS_BUFSIZE")))
-    {
+    if (NULL != (env_str = HDgetenv ("H5TOOLS_BUFSIZE"))) {
         errno = 0;
         hyperslab_bufsize_mb = HDstrtol(env_str, (char**)NULL, 10);
         if (errno != 0 || hyperslab_bufsize_mb <= 0)
-        {
-            /* TODO: later when pubilshed
-            HDfprintf(rawerrorstream,"Error: Invalid environment variable \"H5TOOLS_BUFSIZE\" : %s\n", env_str);
-            */
-
-            goto error;
-        }
-
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "hyperslab buffer size failed");
 
         /* convert MB to byte */
         H5TOOLS_BUFSIZE = (hsize_t)hyperslab_bufsize_mb * 1024 * 1024;
@@ -924,9 +823,7 @@ int h5tools_getenv_update_hyperslab_bufsize(void)
         H5TOOLS_MALLOCSIZE = MAX(H5TOOLS_BUFSIZE, H5TOOLS_MALLOCSIZE);
     }
 
-    return (1);
-
-error:
-    return (-1);
+done:
+    return ret_value;
 }
 
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index df5ba5c..ce47f4f 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -13,6 +13,7 @@
 
 
 #include "h5trav.h"
+#include "h5tools.h"
 #include "H5private.h"
 
 /*-------------------------------------------------------------------------
@@ -81,10 +82,9 @@ static int trav_verbosity = 0;
 /*-------------------------------------------------------------------------
  * Function: h5trav_set_index
  *
- * Purpose: Set indexing properties for the objects & links in the file
- *
- * Return: none
+ * Purpose:  Set indexing properties for the objects & links in the file
  *
+ * Return:   none
  *-------------------------------------------------------------------------
  */
 void
@@ -97,10 +97,9 @@ h5trav_set_index(H5_index_t print_index_by, H5_iter_order_t print_index_order)
 /*-------------------------------------------------------------------------
  * Function: h5trav_set_verbose
  *
- * Purpose: Set verbosity of file contents 1=>attributes
- *
- * Return: none
+ * Purpose:  Set verbosity of file contents 1=>attributes
  *
+ * Return:   none
  *-------------------------------------------------------------------------
  */
 void
@@ -118,14 +117,9 @@ h5trav_set_verbose(int print_verbose)
 /*-------------------------------------------------------------------------
  * Function: trav_addr_add
  *
- * Purpose: Add a hardlink address to visited data structure
- *
- * Return: void
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 1, 2007
+ * Purpose:  Add a hardlink address to visited data structure
  *
+ * Return:   void
  *-------------------------------------------------------------------------
  */
 static void
@@ -149,14 +143,9 @@ trav_addr_add(trav_addr_t *visited, haddr_t addr, const char *path)
 /*-------------------------------------------------------------------------
  * Function: trav_addr_visited
  *
- * Purpose: Check if an address has already been visited
- *
- * Return: TRUE/FALSE
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 1, 2007
+ * Purpose:  Check if an address has already been visited
  *
+ * Return:   TRUE/FALSE
  *-------------------------------------------------------------------------
  */
 static const char *
@@ -178,12 +167,7 @@ trav_addr_visited(trav_addr_t *visited, haddr_t addr)
 /*-------------------------------------------------------------------------
  * Function: traverse_cb
  *
- * Purpose: Iterator callback for traversing objects in file
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 1, 2007
- *
+ * Purpose:  Iterator callback for traversing objects in file
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -258,26 +242,23 @@ traverse_cb(hid_t loc_id, const char *path, const H5L_info_t *linfo,
 /*-------------------------------------------------------------------------
  * Function: traverse
  *
- * Purpose: Iterate over all the objects/links in a file.  Conforms to the
- *      "visitor" pattern.
- *
- * Return: 0 on success, -1 on failure
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 1, 2007
+ * Purpose:  Iterate over all the objects/links in a file.  Conforms to the
+ *           "visitor" pattern.
  *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
 static int
 traverse(hid_t file_id, const char *grp_name, hbool_t visit_start,
-    hbool_t recurse, const trav_visitor_t *visitor)
+        hbool_t recurse, const trav_visitor_t *visitor)
 {
     H5O_info_t  oinfo;          /* Object info for starting group */
+    int         ret_value = SUCCEED;
 
     /* Get info for starting object */
     if(H5Oget_info_by_name(file_id, grp_name, &oinfo, H5P_DEFAULT) < 0)
-        return -1;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Oget_info_by_name failed");
 
     /* Visit the starting object */
     if(visit_start && visitor->visit_obj)
@@ -306,12 +287,12 @@ traverse(hid_t file_id, const char *grp_name, hbool_t visit_start,
         if(recurse) {
             /* Visit all links in group, recursively */
             if(H5Lvisit_by_name(file_id, grp_name, trav_index_by, trav_index_order, traverse_cb, &udata, H5P_DEFAULT) < 0)
-                return -1;
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Lvisit_by_name failed");
         } /* end if */
         else {
             /* Iterate over links in group */
             if(H5Literate_by_name(file_id, grp_name, trav_index_by, trav_index_order, NULL, traverse_cb, &udata, H5P_DEFAULT) < 0)
-                return -1;
+                HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Literate_by_name failed");
         } /* end else */
 
         /* Free visited addresses table */
@@ -325,21 +306,17 @@ traverse(hid_t file_id, const char *grp_name, hbool_t visit_start,
         } /* end if */
     } /* end if */
 
-    return 0;
+done:
+    return ret_value;
 }
 
 
 /*-------------------------------------------------------------------------
  * Function: trav_info_add
  *
- * Purpose: Add a link path & type to info struct
- *
- * Return: void
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 1, 2007
+ * Purpose:  Add a link path & type to info struct
  *
+ * Return:   void
  *-------------------------------------------------------------------------
  */
 void
@@ -347,18 +324,20 @@ trav_info_add(trav_info_t *info, const char *path, h5trav_type_t obj_type)
 {
     size_t idx;         /* Index of address to use  */
 
-    /* Allocate space if necessary */
-    if(info->nused == info->nalloc) {
-        info->nalloc = MAX(1, info->nalloc * 2);;
-        info->paths = (trav_path_t *)HDrealloc(info->paths, info->nalloc * sizeof(trav_path_t));
-    } /* end if */
+    if (info) {
+        /* Allocate space if necessary */
+        if(info->nused == info->nalloc) {
+            info->nalloc = MAX(1, info->nalloc * 2);;
+            info->paths = (trav_path_t *)HDrealloc(info->paths, info->nalloc * sizeof(trav_path_t));
+        } /* end if */
 
-    /* Append it */
-    idx = info->nused++;
-    info->paths[idx].path = HDstrdup(path);
-    info->paths[idx].type = obj_type;
-    info->paths[idx].fileno = 0;
-    info->paths[idx].objno = HADDR_UNDEF;
+        /* Append it */
+        idx = info->nused++;
+        info->paths[idx].path = HDstrdup(path);
+        info->paths[idx].type = obj_type;
+        info->paths[idx].fileno = 0;
+        info->paths[idx].objno = HADDR_UNDEF;
+    }
 } /* end trav_info_add() */
 
 
@@ -368,7 +347,6 @@ trav_info_add(trav_info_t *info, const char *path, h5trav_type_t obj_type)
  * Purpose: Add a file addr & fileno to info struct
  *
  * Return: void
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -390,22 +368,19 @@ trav_fileinfo_add(trav_info_t *info, hid_t loc_id)
 /*-------------------------------------------------------------------------
  * Function: trav_info_visit_obj
  *
- * Purpose: Callback for visiting object, with 'info' structure
- *
- * Return: 0 on success, -1 on failure
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 1, 2007
+ * Purpose:  Callback for visiting object, with 'info' structure
  *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
 int
 trav_info_visit_obj(const char *path, const H5O_info_t *oinfo,
-    const char H5_ATTR_UNUSED *already_visited, void *udata)
+        const char H5_ATTR_UNUSED *already_visited, void *udata)
 {
     size_t idx;
     trav_info_t *info_p;
+
     /* Add the object to the 'info' struct */
     /* (object types map directly to "traversal" types) */
     trav_info_add((trav_info_t *)udata, path, (h5trav_type_t)oinfo->type);
@@ -423,14 +398,10 @@ trav_info_visit_obj(const char *path, const H5O_info_t *oinfo,
 /*-------------------------------------------------------------------------
  * Function: trav_info_visit_lnk
  *
- * Purpose: Callback for visiting link, with 'info' structure
- *
- * Return: 0 on success, -1 on failure
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 1, 2007
+ * Purpose:  Callback for visiting link, with 'info' structure
  *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
 int
@@ -446,21 +417,18 @@ trav_info_visit_lnk(const char *path, const H5L_info_t *linfo, void *udata)
 /*-------------------------------------------------------------------------
  * Function: h5trav_getinfo
  *
- * Purpose: get an array of "trav_info_t" , containing the name and type of
- *  objects in the file
- *
- * Return: number of object names in file
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 6, 2002
+ * Purpose:  get an array of "trav_info_t" , containing the name and type of
+ *           objects in the file
  *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
 int
 h5trav_getinfo(hid_t file_id, trav_info_t *info)
 {
     trav_visitor_t info_visitor;        /* Visitor structure for trav_info_t's */
+    int            ret_value = SUCCEED;
 
     /* Init visitor structure */
     info_visitor.visit_obj = trav_info_visit_obj;
@@ -469,25 +437,21 @@ h5trav_getinfo(hid_t file_id, trav_info_t *info)
 
     /* Traverse all objects in the file, visiting each object & link */
     if(traverse(file_id, "/", TRUE, TRUE, &info_visitor) < 0)
-        return -1;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "traverse failed");
 
-    return 0;
+done:
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
  * Function: h5trav_getindex
  *
- * Purpose: get index of OBJ in list
- *
- * Return: index, -1 if not found
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
+ * Purpose:  get index of OBJ in list
  *
+ * Return:   index on success,
+ *           -1 if not found
  *-------------------------------------------------------------------------
  */
-
 ssize_t
 h5trav_getindex(const trav_info_t *info, const char *obj)
 {
@@ -511,17 +475,11 @@ h5trav_getindex(const trav_info_t *info, const char *obj)
 /*-------------------------------------------------------------------------
  * Function: trav_info_init
  *
- * Purpose: Initialize the info
- *
- * Return: void
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 6, 2007
+ * Purpose:  Initialize the info
  *
+ * Return:   void
  *-------------------------------------------------------------------------
  */
-
 void
 trav_info_init(const char *filename, hid_t fileid, trav_info_t **_info)
 {
@@ -545,11 +503,9 @@ trav_info_init(const char *filename, hid_t fileid, trav_info_t **_info)
 /*-------------------------------------------------------------------------
  * Function: trav_info_free
  *
- * Purpose: free info memory
- *
+ * Purpose:  free info memory
  *-------------------------------------------------------------------------
  */
-
 void
 trav_info_free(trav_info_t *info)
 {
@@ -557,11 +513,9 @@ trav_info_free(trav_info_t *info)
 
     if(info) {
         /* Free visited symbolic links path and file (if alloc) */
-        for(u=0; u < info->symlink_visited.nused; u++) 
-        {
+        for(u = 0; u < info->symlink_visited.nused; u++) {
             if (info->symlink_visited.objs[u].file)
                 HDfree(info->symlink_visited.objs[u].file);
-
             HDfree(info->symlink_visited.objs[u].path);
         }
         HDfree(info->symlink_visited.objs);
@@ -586,12 +540,8 @@ trav_info_free(trav_info_t *info)
  *
  * Purpose: Callback for visiting object, with 'table' sructure
  *
- * Return: 0 on success, -1 on failure
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 1, 2007
- *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
 static int
@@ -608,21 +558,17 @@ trav_table_visit_obj(const char *path, const H5O_info_t *oinfo,
         /* Add alias for object to table */
         trav_table_addlink(table, oinfo->addr, path);
 
-    return(0);
+    return 0;
 } /* end trav_table_visit_obj() */
 
 
 /*-------------------------------------------------------------------------
  * Function: trav_table_visit_lnk
  *
- * Purpose: Callback for visiting link, with 'table' sructure
- *
- * Return: 0 on success, -1 on failure
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 1, 2007
+ * Purpose:  Callback for visiting link, with 'table' sructure
  *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
 static int
@@ -631,28 +577,24 @@ trav_table_visit_lnk(const char *path, const H5L_info_t H5_ATTR_UNUSED *linfo, v
     /* Add the link to the 'table' struct */
     trav_table_add((trav_table_t *)udata, path, NULL);
 
-    return(0);
+    return 0;
 } /* end trav_table_visit_lnk() */
 
 
 /*-------------------------------------------------------------------------
  * Function: h5trav_gettable
  *
- * Purpose: get the trav_table_t struct
- *
- * Return: 0, -1 on error
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: December 17, 2003
+ * Purpose:  get the trav_table_t struct
  *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
-
 int
 h5trav_gettable(hid_t fid, trav_table_t *table)
 {
     trav_visitor_t table_visitor;       /* Visitor structure for trav_table_t's */
+    int            ret_value = SUCCEED;
 
     /* Init visitor structure */
     table_visitor.visit_obj = trav_table_visit_obj;
@@ -661,71 +603,63 @@ h5trav_gettable(hid_t fid, trav_table_t *table)
 
     /* Traverse all objects in the file, visiting each object & link */
     if(traverse(fid, "/", TRUE, TRUE, &table_visitor) < 0)
-        return -1;
-    return 0;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "traverse failed");
+
+done:
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
  * Function: h5trav_getindext
  *
- * Purpose: get index of NAME in list
- *
- * Return: index, -1 if not found
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: December 18, 2003
+ * Purpose:  get index of NAME in list
  *
+ * Return:   index on success,
+ *           -1 if not found
  *-------------------------------------------------------------------------
  */
-
 int
 h5trav_getindext(const char *name, const trav_table_t *table)
 {
     unsigned int i;
 
-    for(i = 0; i < table->nobjs; i++) {
-        /* Check for object name having full path (with leading '/') */
-        if(HDstrcmp(name, table->objs[i].name) == 0)
-            return((int)i);
-
-        /* Check for object name without leading '/' */
-        if(HDstrcmp(name, table->objs[i].name + 1) == 0)
-            return((int)i);
+    if(table) {
+        for(i = 0; i < table->nobjs; i++) {
+            /* Check for object name having full path (with leading '/') */
+            if(HDstrcmp(name, table->objs[i].name) == 0)
+                return((int)i);
 
-        /* search also in the list of links */
-        if(table->objs[i].nlinks) {
-            unsigned int j;
+            /* Check for object name without leading '/' */
+            if(HDstrcmp(name, table->objs[i].name + 1) == 0)
+                return((int)i);
 
-            for ( j=0; j<table->objs[i].nlinks; j++) {
-                /* Check for object name having full path (with leading '/') */
-                if(HDstrcmp(name, table->objs[i].links[j].new_name) == 0)
-                    return((int)i);
+            /* search also in the list of links */
+            if(table->objs[i].nlinks) {
+                unsigned int j;
 
-                /* Check for object name without leading '/' */
-                if(HDstrcmp(name, table->objs[i].links[j].new_name + 1) == 0)
-                    return((int)i);
-            } /* end for */
-        } /* end if */
-    } /* end for */
+                for ( j=0; j<table->objs[i].nlinks; j++) {
+                    /* Check for object name having full path (with leading '/') */
+                    if(HDstrcmp(name, table->objs[i].links[j].new_name) == 0)
+                        return((int)i);
 
+                    /* Check for object name without leading '/' */
+                    if(HDstrcmp(name, table->objs[i].links[j].new_name + 1) == 0)
+                        return((int)i);
+                } /* end for */
+            } /* end if */
+        } /* end for */
+    }
     return -1;
 }
 
 /*-------------------------------------------------------------------------
  * Function: trav_table_add
  *
- * Purpose: Add OBJNO, NAME and TYPE of object to table
- *
- * Return: void
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 4, 2002
+ * Purpose:  Add OBJNO, NAME and TYPE of object to table
  *
+ * Return:   void
  *-------------------------------------------------------------------------
  */
-
 static void
 trav_table_add(trav_table_t *table,
                     const char *path,
@@ -733,20 +667,22 @@ trav_table_add(trav_table_t *table,
 {
     size_t new_obj;
 
-    if(table->nobjs == table->size) {
-        table->size = MAX(1, table->size * 2);
-        table->objs = (trav_obj_t *)HDrealloc(table->objs, table->size * sizeof(trav_obj_t));
-    } /* end if */
+    if(table) {
+        if(table->nobjs == table->size) {
+            table->size = MAX(1, table->size * 2);
+            table->objs = (trav_obj_t *)HDrealloc(table->objs, table->size * sizeof(trav_obj_t));
+        } /* end if */
 
-    new_obj = table->nobjs++;
-    table->objs[new_obj].objno = oinfo ? oinfo->addr : HADDR_UNDEF;
-    table->objs[new_obj].flags[0] = table->objs[new_obj].flags[1] = 0;
-    table->objs[new_obj].is_same_trgobj = 0;
-    table->objs[new_obj].name = (char *)HDstrdup(path);
-    table->objs[new_obj].type = oinfo ? (h5trav_type_t)oinfo->type : H5TRAV_TYPE_LINK;
-    table->objs[new_obj].nlinks = 0;
-    table->objs[new_obj].sizelinks = 0;
-    table->objs[new_obj].links = NULL;
+        new_obj = table->nobjs++;
+        table->objs[new_obj].objno = oinfo ? oinfo->addr : HADDR_UNDEF;
+        table->objs[new_obj].flags[0] = table->objs[new_obj].flags[1] = 0;
+        table->objs[new_obj].is_same_trgobj = 0;
+        table->objs[new_obj].name = (char *)HDstrdup(path);
+        table->objs[new_obj].type = oinfo ? (h5trav_type_t)oinfo->type : H5TRAV_TYPE_LINK;
+        table->objs[new_obj].nlinks = 0;
+        table->objs[new_obj].sizelinks = 0;
+        table->objs[new_obj].links = NULL;
+    }
 }
 
 /*-------------------------------------------------------------------------
@@ -755,60 +691,47 @@ trav_table_add(trav_table_t *table,
  * Purpose: Add a hardlink name to the object
  *
  * Return: void
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: December 17, 2003
- *
  *-------------------------------------------------------------------------
  */
-
 static void
 trav_table_addlink(trav_table_t *table, haddr_t objno, const char *path)
 {
     size_t i;           /* Local index variable */
 
-    for(i = 0; i < table->nobjs; i++) {
-        if(table->objs[i].objno == objno) {
-            size_t n;
+    if(table) {
+        for(i = 0; i < table->nobjs; i++) {
+            if(table->objs[i].objno == objno) {
+                size_t n;
 
-            /* already inserted? */
-            if(HDstrcmp(table->objs[i].name, path) == 0)
-                return;
+                /* already inserted? */
+                if(HDstrcmp(table->objs[i].name, path) == 0)
+                    return;
 
-            /* allocate space if necessary */
-            if(table->objs[i].nlinks == (unsigned)table->objs[i].sizelinks) {
-                table->objs[i].sizelinks = MAX(1, table->objs[i].sizelinks * 2);
-                table->objs[i].links = (trav_link_t *)HDrealloc(table->objs[i].links, table->objs[i].sizelinks * sizeof(trav_link_t));
-            } /* end if */
+                /* allocate space if necessary */
+                if(table->objs[i].nlinks == (unsigned)table->objs[i].sizelinks) {
+                    table->objs[i].sizelinks = MAX(1, table->objs[i].sizelinks * 2);
+                    table->objs[i].links = (trav_link_t *)HDrealloc(table->objs[i].links, table->objs[i].sizelinks * sizeof(trav_link_t));
+                } /* end if */
 
-            /* insert it */
-            n = table->objs[i].nlinks++;
-            table->objs[i].links[n].new_name = (char *)HDstrdup(path);
+                /* insert it */
+                n = table->objs[i].nlinks++;
+                table->objs[i].links[n].new_name = (char *)HDstrdup(path);
 
-            return;
+                return;
+            } /* end for */
         } /* end for */
-    } /* end for */
-
-    HDassert(0 && "object not in table?!?");
+    }
 }
 
 
-
 /*-------------------------------------------------------------------------
  * Function: trav_table_addflags
  *
- * Purpose: Add FLAGS, NAME and TYPE of object to table
- *
- * Return: void
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 4, 2002
+ * Purpose:  Add FLAGS, NAME and TYPE of object to table
  *
+ * Return:   void
  *-------------------------------------------------------------------------
  */
-
 void trav_table_addflags(unsigned *flags,
                          char *name,
                          h5trav_type_t type,
@@ -816,92 +739,83 @@ void trav_table_addflags(unsigned *flags,
 {
     size_t new_obj;
 
-    if(table->nobjs == table->size) {
-        table->size = MAX(1, table->size * 2);
-        table->objs = (trav_obj_t *)HDrealloc(table->objs, table->size * sizeof(trav_obj_t));
-    } /* end if */
+    if(table) {
+        if(table->nobjs == table->size) {
+            table->size = MAX(1, table->size * 2);
+            table->objs = (trav_obj_t *)HDrealloc(table->objs, table->size * sizeof(trav_obj_t));
+        } /* end if */
 
-    new_obj = table->nobjs++;
-    table->objs[new_obj].objno = 0;
-    table->objs[new_obj].flags[0] = flags[0];
-    table->objs[new_obj].flags[1] = flags[1];
-    table->objs[new_obj].is_same_trgobj = 0;
-    table->objs[new_obj].name = (char *)HDstrdup(name);
-    table->objs[new_obj].type = type;
-    table->objs[new_obj].nlinks = 0;
-    table->objs[new_obj].sizelinks = 0;
-    table->objs[new_obj].links = NULL;
+        new_obj = table->nobjs++;
+        table->objs[new_obj].objno = 0;
+        table->objs[new_obj].flags[0] = flags[0];
+        table->objs[new_obj].flags[1] = flags[1];
+        table->objs[new_obj].is_same_trgobj = 0;
+        table->objs[new_obj].name = (char *)HDstrdup(name);
+        table->objs[new_obj].type = type;
+        table->objs[new_obj].nlinks = 0;
+        table->objs[new_obj].sizelinks = 0;
+        table->objs[new_obj].links = NULL;
+    }
 }
 
 
 /*-------------------------------------------------------------------------
  * Function: trav_table_init
  *
- * Purpose: Initialize the table
- *
- * Return: void
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 4, 2002
+ * Purpose:  Initialize the table
  *
+ * Return:   void
  *-------------------------------------------------------------------------
  */
-
 void trav_table_init(trav_table_t **tbl)
 {
     trav_table_t* table = (trav_table_t*) HDmalloc(sizeof(trav_table_t));
-
-    table->size = 0;
-    table->nobjs = 0;
-    table->objs = NULL;
-
+    if(table) {
+        table->size = 0;
+        table->nobjs = 0;
+        table->objs = NULL;
+    }
     *tbl = table;
 }
 
 
-
 /*-------------------------------------------------------------------------
  * Function: trav_table_free
  *
- * Purpose: free table memory
- *
- * Return: void
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 4, 2002
+ * Purpose:  free table memory
  *
+ * Return:   void
  *-------------------------------------------------------------------------
  */
-
-void trav_table_free( trav_table_t *table )
+void trav_table_free(trav_table_t *table)
 {
-    if(table->objs) {
-        unsigned int i;
+    if(table) {
+        if(table->objs) {
+            unsigned int i;
 
-        for(i = 0; i < table->nobjs; i++) {
-            HDfree(table->objs[i].name );
-            if(table->objs[i].nlinks) {
-                unsigned int j;
+            for(i = 0; i < table->nobjs; i++) {
+                HDfree(table->objs[i].name );
+                if(table->objs[i].nlinks) {
+                    unsigned int j;
 
-                for(j = 0; j < table->objs[i].nlinks; j++)
-                    HDfree(table->objs[i].links[j].new_name);
+                    for(j = 0; j < table->objs[i].nlinks; j++)
+                        HDfree(table->objs[i].links[j].new_name);
 
-                HDfree(table->objs[i].links);
-            } /* end if */
-        } /* end for */
-        HDfree(table->objs);
-    } /* end if */
-    HDfree(table);
+                    HDfree(table->objs[i].links);
+                } /* end if */
+            } /* end for */
+            HDfree(table->objs);
+        } /* end if */
+        HDfree(table);
+    }
 }
 
 static herr_t
 trav_attr(hid_t
 #ifndef H5TRAV_PRINT_SPACE
-H5_ATTR_UNUSED
+        H5_ATTR_UNUSED
 #endif /* H5TRAV_PRINT_SPACE */
-obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *_op_data)
+        obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *_op_data)
 {
     trav_path_op_data_t *op_data = (trav_path_op_data_t *)_op_data;
     const char          *buf = op_data->path;
@@ -940,7 +854,7 @@ obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *_op_da
                 case H5S_SIMPLE:
                     /* simple dataspace */
                     printf(" {");
-                    for (i=0; i<ndims; i++) {
+                    for (i = 0; i < ndims; i++) {
                         printf("%s" HSIZE_T_FORMAT, i?", ":"", size[i]);
                     }
                     printf("}\n");
@@ -970,19 +884,15 @@ obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *_op_da
 /*-------------------------------------------------------------------------
  * Function: trav_print_visit_obj
  *
- * Purpose: Callback for visiting object, when printing info
- *
- * Return: 0 on success, -1 on failure
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 6, 2007
+ * Purpose:  Callback for visiting object, when printing info
  *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
 static int
 trav_print_visit_obj(const char *path, const H5O_info_t *oinfo,
-    const char *already_visited, void *udata)
+        const char *already_visited, void *udata)
 {
     trav_print_udata_t *print_udata = (trav_print_udata_t *)udata;
     /* Print the name of the object */
@@ -1017,7 +927,7 @@ trav_print_visit_obj(const char *path, const H5O_info_t *oinfo,
         /* Finish printing line about object */
         printf("\n");
         if(trav_verbosity > 0)
-            H5Aiterate_by_name(print_udata->fid, path, trav_index_by, trav_index_order, 
+            H5Aiterate_by_name(print_udata->fid, path, trav_index_by, trav_index_order,
                                NULL, trav_attr, &op_data, H5P_DEFAULT);
     }
     else
@@ -1031,14 +941,10 @@ trav_print_visit_obj(const char *path, const H5O_info_t *oinfo,
 /*-------------------------------------------------------------------------
  * Function: trav_print_visit_lnk
  *
- * Purpose: Callback for visiting link, when printing info
- *
- * Return: 0 on success, -1 on failure
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 6, 2007
+ * Purpose:  Callback for visiting link, when printing info
  *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
 static int
@@ -1051,12 +957,12 @@ trav_print_visit_lnk(const char *path, const H5L_info_t *linfo, void *udata)
         case H5L_TYPE_SOFT:
             if(linfo->u.val_size > 0) {
                 char *targbuf = (char*)HDmalloc(linfo->u.val_size + 1);
-                HDassert(targbuf);
-
-                if(H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0)
-                    targbuf[0] = 0;
-                printf(" %-10s %s -> %s\n", "link", path, targbuf);
-                HDfree(targbuf);
+                if(targbuf) {
+                    if(H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0)
+                        targbuf[0] = 0;
+                    printf(" %-10s %s -> %s\n", "link", path, targbuf);
+                    HDfree(targbuf);
+                }
             } /* end if */
             else
                 printf(" %-10s %s ->\n", "link", path);
@@ -1064,18 +970,18 @@ trav_print_visit_lnk(const char *path, const H5L_info_t *linfo, void *udata)
 
         case H5L_TYPE_EXTERNAL:
             if(linfo->u.val_size > 0) {
-                char *targbuf;
+                char *targbuf = NULL;
                 const char *filename = NULL;
                 const char *objname = NULL;
 
                 targbuf = (char*)HDmalloc(linfo->u.val_size + 1);
-                HDassert(targbuf);
-
-                if(H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0)
-                    targbuf[0] = 0;
-                if(H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &objname) >= 0)
-                    printf(" %-10s %s -> %s %s\n", "ext link", path, filename, objname);
-                HDfree(targbuf);
+                if(targbuf) {
+                    if(H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0)
+                        targbuf[0] = 0;
+                    if(H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &objname) >= 0)
+                        printf(" %-10s %s -> %s %s\n", "ext link", path, filename, objname);
+                    HDfree(targbuf);
+                }
             } /* end if */
             else
                 printf(" %-10s %s ->\n", "ext link", path);
@@ -1099,22 +1005,18 @@ trav_print_visit_lnk(const char *path, const H5L_info_t *linfo, void *udata)
 /*-------------------------------------------------------------------------
  * Function: h5trav_print
  *
- * Purpose: Print information about the objects & links in the file
- *
- * Return: 0, -1 on error
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: September 6, 2007
+ * Purpose:  Print information about the objects & links in the file
  *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
-
 int
 h5trav_print(hid_t fid)
 {
     trav_print_udata_t print_udata;     /* User data for traversal */
     trav_visitor_t print_visitor;       /* Visitor structure for printing objects */
+    int            ret_value = SUCCEED;
 
     /* Init user data for printing */
     print_udata.fid = fid;
@@ -1126,9 +1028,10 @@ h5trav_print(hid_t fid)
 
     /* Traverse all objects in the file, visiting each object & link */
     if(traverse(fid, "/", TRUE, TRUE, &print_visitor) < 0)
-        return -1;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "traverse failed");
 
-    return 0;
+done:
+    return ret_value;
 }
 
 
@@ -1137,21 +1040,17 @@ h5trav_print(hid_t fid)
  *
  * Purpose: Generic traversal routine for visiting objects and links
  *
- * Return: 0, -1 on error
- *
- * Programmer: Quincey Koziol, koziol@hdfgroup.org
- *
- * Date: November 6, 2007
- *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
-
 int
 h5trav_visit(hid_t fid, const char *grp_name, hbool_t visit_start,
     hbool_t recurse, h5trav_obj_func_t visit_obj, h5trav_lnk_func_t visit_lnk,
     void *udata)
 {
     trav_visitor_t visitor;             /* Visitor structure for objects */
+    int            ret_value = SUCCEED;
 
     /* Init visitor structure */
     visitor.visit_obj = visit_obj;
@@ -1160,9 +1059,10 @@ h5trav_visit(hid_t fid, const char *grp_name, hbool_t visit_start,
 
     /* Traverse all objects in the file, visiting each object & link */
     if(traverse(fid, grp_name, visit_start, recurse, &visitor) < 0)
-        return -1;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "traverse failed");
 
-    return 0;
+done:
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
@@ -1170,19 +1070,15 @@ h5trav_visit(hid_t fid, const char *grp_name, hbool_t visit_start,
  *
  * Purpose: Add an symbolic link to visited data structure
  *
- * Return: 0 on success, -1 on failure
- *
- * Programmer: Neil Fortner, nfortne2@hdfgroup.org
- *             Adapted from trav_addr_add in h5trav.c by Quincey Koziol
- *
- * Date: September 5, 2008
- *
+ * Return:   0 on success,
+ *          -1 on failure
  *-------------------------------------------------------------------------
  */
 herr_t
 symlink_visit_add(symlink_trav_t *visited, H5L_type_t type, const char *file, const char *path)
 {
-    size_t  idx;         /* Index of address to use */
+    herr_t    ret_value = SUCCEED;
+    size_t    idx;         /* Index of address to use */
 
     /* Allocate space if necessary */
     if(visited->nused == visited->nalloc) {
@@ -1190,7 +1086,7 @@ symlink_visit_add(symlink_trav_t *visited, H5L_type_t type, const char *file, co
 
         visited->nalloc = MAX(1, visited->nalloc * 2);
         if(NULL == (tmp_ptr = HDrealloc(visited->objs, visited->nalloc * sizeof(symlink_trav_path_t))))
-            return -1;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "visited data structure realloc failed");
         visited->objs = (symlink_trav_path_t *)tmp_ptr;
     } /* end if */
 
@@ -1204,7 +1100,7 @@ symlink_visit_add(symlink_trav_t *visited, H5L_type_t type, const char *file, co
     if(type == H5L_TYPE_EXTERNAL) {
         if(NULL == (visited->objs[idx].file = HDstrdup(file))) {
             visited->nused--;
-            return -1;
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "visited data structure name allocation failed");
         } /* end if */
     } /* end if */
 
@@ -1212,25 +1108,20 @@ symlink_visit_add(symlink_trav_t *visited, H5L_type_t type, const char *file, co
         visited->nused--;
         if(visited->objs[idx].file)
             HDfree (visited->objs[idx].file);
-        return -1;
+        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "visited data structure path allocation failed");
     } /* end if */
 
-    return 0;
+done:
+    return ret_value;
 } /* end symlink_visit_add() */
 
 
 /*-------------------------------------------------------------------------
  * Function: symlink_is_visited
  *
- * Purpose: Check if an symbolic link has already been visited
- *
- * Return: TRUE/FALSE
- *
- * Programmer: Neil Fortner, nfortne2@hdfgroup.org
- *             Adapted from trav_addr_visited in h5trav.c by Quincey Koziol
- *
- * Date: September 5, 2008
+ * Purpose:  Check if an symbolic link has already been visited
  *
+ * Return:   TRUE/FALSE
  *-------------------------------------------------------------------------
  */
 hbool_t
diff --git a/tools/lib/io_timer.c b/tools/lib/io_timer.c
index 6a5df98..c894598 100644
--- a/tools/lib/io_timer.c
+++ b/tools/lib/io_timer.c
@@ -22,9 +22,6 @@
  * This is a module of useful timing functions for performance testing.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "H5private.h"
 #include "hdf5.h"
 
@@ -53,9 +50,9 @@ io_time_t   *timer_g;            /* timer: global for stub functions     */
 static double sub_time(struct timeval* a, struct timeval* b)
 {
     return (((double)a->tv_sec +
-     ((double)a->tv_usec) / MICROSECOND) -
+     ((double)a->tv_usec) / (double)MICROSECOND) -
   ((double)b->tv_sec +
-   ((double)b->tv_usec) / MICROSECOND));
+   ((double)b->tv_usec) / (double)MICROSECOND));
 }
 
 
@@ -195,8 +192,9 @@ set_time(io_time_t *pt, timer_type t, int start_stop)
 
             }
 	break;
+
     default:
-	HDfprintf(stderr, "Unknown time clock type (%d)\n", pt->type);
+	    HDfprintf(stderr, "Unknown time clock type (%d)\n", pt->type);
 	    return NULL;
     } /* end switch */
 
diff --git a/tools/lib/ph5diff.h b/tools/lib/ph5diff.h
index 9628d45..21d7d00 100644
--- a/tools/lib/ph5diff.h
+++ b/tools/lib/ph5diff.h
@@ -32,7 +32,7 @@ struct diff_mpi_args
 {
     char  name1[256];
     char  name2[256];
-    diff_opt_t  options;
+    diff_opt_t  opts;
     diff_args_t argdata;  /* rest args */
 };
 
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 6a54bd8..7075597 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -618,6 +618,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c
index 597b6b3..43d6bfe 100644
--- a/tools/misc/h5mkgrp.c
+++ b/tools/misc/h5mkgrp.c
@@ -15,8 +15,6 @@
 #include "H5private.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 /* Name of tool */
 #define PROGRAMNAME "h5mkgrp"
diff --git a/tools/misc/h5repart.c b/tools/misc/h5repart.c
index 911e0c6..dee0c1f 100644
--- a/tools/misc/h5repart.c
+++ b/tools/misc/h5repart.c
@@ -25,23 +25,6 @@
 /* See H5private.h for how to include system headers */
 #include "hdf5.h"
 #include "H5private.h"
-#ifdef H5_STDC_HEADERS
-#   include <ctype.h>
-#   include <errno.h>
-#   include <fcntl.h>
-#   include <stdio.h>
-#   include <stdlib.h>
-#   include <string.h>
-#endif
-
-#ifdef H5_HAVE_UNISTD_H
-#   include <sys/types.h>
-#   include <unistd.h>
-#endif
-
-#ifdef H5_HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
 
 #ifndef FALSE
 #   define FALSE	0
diff --git a/tools/misc/repart_test.c b/tools/misc/repart_test.c
index 372f46a..493f4ce 100644
--- a/tools/misc/repart_test.c
+++ b/tools/misc/repart_test.c
@@ -12,14 +12,12 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Raymond Lu <slu@ncsa.uiuc.edu>
- *              June 1, 2005
- *
  * Purpose:	This program tests family files after being repartitioned
  *              by h5repart.  It simply tries to reopen the files with
  *              correct family driver and member size.
  */
 #include "hdf5.h"
+#include "H5private.h"
 
 #define KB                      1024
 #define FAMILY_H5REPART_SIZE1   20000
@@ -42,52 +40,54 @@ herr_t test_sec2_h5repart_opens(void);
  *
  * Purpose:     Tries to reopen family files.
  *
- * Return:      Success:        exit(0)
- *
- *              Failure:        exit(1)
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:  Raymond Lu
- *              June 1, 2005
- *
- * Modifications:
  *-------------------------------------------------------------------------
  */
 herr_t
 test_family_h5repart_opens(void)
 {
-    hid_t       file=(-1), fapl=(-1);
+    hid_t       fid = -1;
+    hid_t       fapl_id = -1;
 
     /* open 1st file(single member file) with correct family size(20000 byte) */
-    if ((fapl=H5Pcreate(H5P_FILE_ACCESS))<0)
+    if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
 
-    if(H5Pset_fapl_family(fapl, (hsize_t)FAMILY_H5REPART_SIZE1, H5P_DEFAULT)<0)
+    if (H5Pset_fapl_family(fapl_id, (hsize_t)FAMILY_H5REPART_SIZE1, H5P_DEFAULT) < 0)
         goto error;
 
-    if((file=H5Fopen(FILENAME[0], H5F_ACC_RDWR, fapl))<0)
+    if ((fid = H5Fopen(FILENAME[0], H5F_ACC_RDWR, fapl_id))<0)
         goto error;
 
-    if(H5Fclose(file)<0)
+    if (H5Fclose(fid) < 0)
         goto error;
 
     /* open 2nd file(multiple member files) with correct family size(5KB) */
-    if(H5Pset_fapl_family(fapl, (hsize_t)FAMILY_H5REPART_SIZE2, H5P_DEFAULT)<0)
+    if (H5Pset_fapl_family(fapl_id, (hsize_t)FAMILY_H5REPART_SIZE2, H5P_DEFAULT) < 0)
+        goto error;
+
+    if ((fid = H5Fopen(FILENAME[1], H5F_ACC_RDWR, fapl_id)) < 0)
         goto error;
 
-    if((file=H5Fopen(FILENAME[1], H5F_ACC_RDWR, fapl))<0)
+    if (H5Pclose(fapl_id) < 0)
         goto error;
 
-    if(H5Fclose(file)<0)
+    if (H5Fclose(fid) < 0)
         goto error;
 
-    return 0;
+    return SUCCEED;
 
 error:
     H5E_BEGIN_TRY {
-        H5Fclose(file);
+        H5Pclose(fapl_id);
+        H5Fclose(fid);
     } H5E_END_TRY;
-    return -1;
-}
+
+    return FAIL;
+
+} /* end test_family_h5repart_opens() */
+
 
 
 /*-------------------------------------------------------------------------
@@ -95,36 +95,32 @@ error:
  *
  * Purpose:     Tries to reopen a sec2 file.
  *
- * Return:      Success:        exit(0)
+ * Return:      SUCCEED/FAIL
  *
- *              Failure:        exit(1)
- *
- * Programmer:  Raymond Lu
- *              June 21, 2005
- *
- * Modifications:
  *-------------------------------------------------------------------------
  */
 herr_t
 test_sec2_h5repart_opens(void)
 {
-    hid_t       file=(-1);
+    hid_t       fid = -1;
 
     /* open the sec2 file */
-    if((file=H5Fopen(FILENAME[2], H5F_ACC_RDWR, H5P_DEFAULT))<0)
+    if ((fid = H5Fopen(FILENAME[2], H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         goto error;
 
-    if(H5Fclose(file)<0)
+    if (H5Fclose(fid) < 0)
         goto error;
 
-    return 0;
+    return SUCCEED;
 
 error:
     H5E_BEGIN_TRY {
-        H5Fclose(file);
+        H5Fclose(fid);
     } H5E_END_TRY;
-    return -1;
-}
+
+    return FAIL;
+
+} /* end test_sec2_h5repart_opens() */
 
 
 /*-------------------------------------------------------------------------
@@ -132,32 +128,26 @@ error:
  *
  * Purpose:     Tests h5repart-ed family files
  *
- * Return:      Success:        exit(0)
- *
- *              Failure:        exit(1)
- *
- * Programmer:  Raymond Lu
- *              June 1, 2005
- *
- * Modifications:
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *
  *-------------------------------------------------------------------------
  */
 int
 main(void)
 {
-    int                 nerrors=0;
+    int     nerrors = 0;
 
-    nerrors += test_family_h5repart_opens()<0   ?1:0;
-    nerrors += test_sec2_h5repart_opens()<0     ?1:0;
+    nerrors += test_family_h5repart_opens() < 0     ? 1 : 0;
+    nerrors += test_sec2_h5repart_opens() < 0       ? 1 : 0;
 
-    if (nerrors) goto error;
+    if (nerrors)
+        goto error;
 
-    return 0;
+    HDexit(EXIT_SUCCESS);
 
 error:
     nerrors = MAX(1, nerrors);
-    printf("***** %d FAMILY FILE TEST%s FAILED! *****\n",
+    HDprintf("***** %d FAMILY FILE TEST%s FAILED! *****\n",
             nerrors, 1 == nerrors ? "" : "S");
-    return 1;
-}
+    HDexit(EXIT_FAILURE);
+} /* end main() */
diff --git a/tools/misc/talign.c b/tools/misc/talign.c
index 83bb92a..751dad1 100644
--- a/tools/misc/talign.c
+++ b/tools/misc/talign.c
@@ -15,9 +15,6 @@
  * Small program to illustrate the "misalignment" of members within a compound
  * datatype, in a datatype fixed by H5Tget_native_type().
  */
-#include <string.h>
-#include <stdlib.h>
-/*#include <unistd.h>    *//* Required for unlink() */
 
 #include "hdf5.h"
 #include "H5private.h"
diff --git a/tools/misc/testh5repart.sh.in b/tools/misc/testh5repart.sh.in
index e33a905..8e6fb8f 100644
--- a/tools/misc/testh5repart.sh.in
+++ b/tools/misc/testh5repart.sh.in
@@ -19,18 +19,95 @@ TESTNAME=h5repart
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
 
-REPART=h5repart             # The tool name
+REPART=./h5repart             # The tool name
 REPART_BIN=`pwd`/$REPART    # The path of the tool binary
 
 REPARTED_FAM=repart_test                # The test name
 REPARTED_FAM_BIN=`pwd`/$REPARTED_FAM    # The path of the test binary
 
+RM='rm -rf'
+CMP='cmp -s'
+DIFF='diff -c'
+CP='cp'
+DIRNAME='dirname'
+LS='ls'
+AWK='awk'
+
 nerrors=0
 verbose=yes
 
-test -d ../testfiles || mkdir ../testfiles
+# source dirs
+SRC_TOOLS="$srcdir/.."
+
+SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
-actual_dir=`pwd`/../testfiles
+TESTDIR=./testrepart
+test -d $TESTDIR || mkdir -p $TESTDIR
+
+#
+# copy test files and expected output files from source dirs to test dir
+#
+COPY_TESTFILES="
+$SRC_TOOLS_TESTFILES/family_file00000.h5
+$SRC_TOOLS_TESTFILES/family_file00001.h5
+$SRC_TOOLS_TESTFILES/family_file00002.h5
+$SRC_TOOLS_TESTFILES/family_file00003.h5
+$SRC_TOOLS_TESTFILES/family_file00004.h5
+$SRC_TOOLS_TESTFILES/family_file00005.h5
+$SRC_TOOLS_TESTFILES/family_file00006.h5
+$SRC_TOOLS_TESTFILES/family_file00007.h5
+$SRC_TOOLS_TESTFILES/family_file00008.h5
+$SRC_TOOLS_TESTFILES/family_file00009.h5
+$SRC_TOOLS_TESTFILES/family_file00010.h5
+$SRC_TOOLS_TESTFILES/family_file00011.h5
+$SRC_TOOLS_TESTFILES/family_file00012.h5
+$SRC_TOOLS_TESTFILES/family_file00013.h5
+$SRC_TOOLS_TESTFILES/family_file00014.h5
+$SRC_TOOLS_TESTFILES/family_file00015.h5
+$SRC_TOOLS_TESTFILES/family_file00016.h5
+$SRC_TOOLS_TESTFILES/family_file00017.h5
+"
+
+COPY_TESTFILES_TO_TESTDIR()
+{
+    # copy test files. Used -f to make sure get a new copy
+    for tstfile in $COPY_TESTFILES
+    do
+        # ignore '#' comment
+        echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
+        RET=$?
+        if [ $RET -eq 1 ]; then
+            # skip cp if srcdir is same as destdir
+            # this occurs when build/test performed in source dir and
+            # make cp fail
+            SDIR=`$DIRNAME $tstfile`
+            INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
+            INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
+            if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
+                $CP -f $tstfile $TESTDIR
+                if [ $? -ne 0 ]; then
+                    echo "Error: FAILED to copy $tstfile ."
+
+                    # Comment out this to CREATE expected file
+                    exit $EXIT_FAILURE
+                fi
+            fi
+        fi
+    done
+}
+
+CLEAN_TESTFILES_AND_TESTDIR()
+{
+    # skip rm if srcdir is same as destdir
+    # this occurs when build/test performed in source dir and
+    # make cp fail
+    SDIR=$SRC_TOOLS_TESTFILES
+    INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
+    INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
+    if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
+        $RM $TESTDIR
+    fi
+}
 
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
@@ -48,7 +125,7 @@ TOOLTEST() {
    TESTING $REPART $@
    (
 #      echo
-      cd $srcdir/../testfiles
+      cd $TESTDIR
       $RUNSERIAL $REPART_BIN $@
    )
 
@@ -64,7 +141,7 @@ OUTPUTTEST() {
    # Run test program.
    TESTING $REPARTED_FAM $@
    (
-      cd $actual_dir
+      cd $TESTDIR
       $RUNSERIAL $REPARTED_FAM_BIN $@
    )
 
@@ -87,19 +164,23 @@ SKIP() {
 ###              T H E   T E S T S                                ###
 ##############################################################################
 ##############################################################################
+# prepare for test
+COPY_TESTFILES_TO_TESTDIR
 
 # repartition family member size to 20,000 bytes.
-TOOLTEST -m 20000 family_file%05d.h5 $actual_dir/fst_family%05d.h5
+TOOLTEST -m 20000 family_file%05d.h5 fst_family%05d.h5
 # repartition family member size to 5 KB.
-TOOLTEST -m 5k family_file%05d.h5 $actual_dir/scd_family%05d.h5
+TOOLTEST -m 5k family_file%05d.h5 scd_family%05d.h5
 # convert family file to sec2 file of 20,000 bytes
-TOOLTEST -m 20000 -family_to_sec2 family_file%05d.h5 $actual_dir/family_to_sec2.h5
+TOOLTEST -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5
 
 # test the output files repartitioned above.
 OUTPUTTEST
 echo
 
 # Clean up output file
+CLEAN_TESTFILES_AND_TESTDIR
+
 if test -z "$HDF5_NOCLEANUP"; then
     cd $actual_dir
     rm -f fst_family*.h5 scd_family*.h5 family_to_sec2.h5
diff --git a/tools/perform/CMakeTests.cmake b/tools/perform/CMakeTests.cmake
index 5c4b54f..450667a 100644
--- a/tools/perform/CMakeTests.cmake
+++ b/tools/perform/CMakeTests.cmake
@@ -25,7 +25,7 @@ add_custom_target(zip_perf_files ALL COMMENT "Copying files needed by zip_perf t
 
 # Remove any output file left over from previous test run
 add_test (
-    NAME PERFORM_h5perform-clear-objects
+    NAME PERFORM_h5perform-clearall-objects
     COMMAND    ${CMAKE_COMMAND}
         -E remove
         chunk.h5
@@ -36,30 +36,143 @@ add_test (
         x-rowmaj-rd.dat
         x-rowmaj-wr.dat
         x-gnuplot
+        h5perf_serial.txt
+        h5perf_serial.txt.err
+        chunk.txt
+        chunk.txt.err
+        iopipe.txt
+        iopipe.txt.err
+        overhead.txt
+        overhead.txt.err
+        perf_meta.txt
+        perf_meta.txt.err
+        zip_perf-h.txt
+        zip_perf-h.txt.err
+        zip_perf.txt
+        zip_perf.txt.err
 )
 
-add_test (NAME PERFORM_h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>)
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME PERFORM_h5perf_serial COMMAND $<TARGET_FILE:h5perf_serial>)
+else ()
+  add_test (NAME PERFORM_h5perf_serial COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:h5perf_serial>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_OUTPUT=h5perf_serial.txt"
+      #-D "TEST_REFERENCE=h5perf_serial.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  )
+endif ()
 set_tests_properties (PERFORM_h5perf_serial PROPERTIES TIMEOUT 1800)
+set_tests_properties (PERFORM_h5perf_serial PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
 if (HDF5_BUILD_PERFORM_STANDALONE)
   add_test (NAME PERFORM_h5perf_serial_alone COMMAND $<TARGET_FILE:h5perf_serial_alone>)
 endif ()
 
-add_test (NAME PERFORM_chunk COMMAND $<TARGET_FILE:chunk>)
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME PERFORM_chunk COMMAND $<TARGET_FILE:chunk>)
+else ()
+  add_test (NAME PERFORM_chunk COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:chunk>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_OUTPUT=chunk.txt"
+      #-D "TEST_REFERENCE=chunk.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  )
+endif ()
+set_tests_properties (PERFORM_chunk PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
+
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME PERFORM_iopipe COMMAND $<TARGET_FILE:iopipe>)
+else ()
+  add_test (NAME PERFORM_iopipe COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:iopipe>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_OUTPUT=iopipe.txt"
+      #-D "TEST_REFERENCE=iopipe.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  )
+endif ()
+set_tests_properties (PERFORM_iopipe PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
-add_test (NAME PERFORM_iopipe COMMAND $<TARGET_FILE:iopipe>)
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME PERFORM_overhead COMMAND $<TARGET_FILE:overhead>)
+else ()
+  add_test (NAME PERFORM_overhead COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:overhead>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_OUTPUT=overhead.txt"
+      #-D "TEST_REFERENCE=overhead.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  )
+endif ()
+set_tests_properties (PERFORM_overhead PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
-add_test (NAME PERFORM_overhead COMMAND $<TARGET_FILE:overhead>)
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME PERFORM_perf_meta COMMAND $<TARGET_FILE:perf_meta>)
+else ()
+  add_test (NAME PERFORM_perf_meta COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:perf_meta>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_OUTPUT=perf_meta.txt"
+      #-D "TEST_REFERENCE=perf_meta.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  )
+endif ()
+set_tests_properties (PERFORM_perf_meta PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
-add_test (NAME PERFORM_perf_meta COMMAND $<TARGET_FILE:perf_meta>)
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME PERFORM_zip_perf_help COMMAND $<TARGET_FILE:zip_perf> "-h")
+else ()
+  add_test (NAME PERFORM_zip_perf_help COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_OUTPUT=zip_perf-h.txt"
+      #-D "TEST_REFERENCE=zip_perf-h.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  )
+endif ()
+set_tests_properties (PERFORM_zip_perf_help PROPERTIES DEPENDS "PERFORM_h5perform-clearall-objects")
 
-add_test (NAME PERFORM_zip_perf_help COMMAND $<TARGET_FILE:zip_perf> "-h")
-add_test (NAME PERFORM_zip_perf COMMAND $<TARGET_FILE:zip_perf> tfilters.h5)
+if (HDF5_ENABLE_USING_MEMCHECKER)
+  add_test (NAME PERFORM_zip_perf COMMAND $<TARGET_FILE:zip_perf> tfilters.h5)
+else ()
+  add_test (NAME PERFORM_zip_perf COMMAND "${CMAKE_COMMAND}"
+      -D "TEST_PROGRAM=$<TARGET_FILE:zip_perf>"
+      -D "TEST_ARGS:STRING="
+      -D "TEST_EXPECT=0"
+      -D "TEST_SKIP_COMPARE=TRUE"
+      -D "TEST_OUTPUT=zip_perf.txt"
+      #-D "TEST_REFERENCE=zip_perf.out"
+      -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+      -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+  )
+endif ()
+set_tests_properties (PERFORM_zip_perf PROPERTIES DEPENDS "PERFORM_zip_perf_help;PERFORM_h5perform-clearall-objects")
 
 if (H5_HAVE_PARALLEL)
-  add_test (NAME PERFORM_h5perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf>)
+  add_test (NAME PERFORM_h5perf COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:h5perf> ${MPIEXEC_POSTFLAGS})
 
   if (HDF5_BUILD_PERFORM_STANDALONE)
-    add_test (NAME PERFORM_h5perf_alone COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:h5perf_alone>)
+    add_test (NAME PERFORM_h5perf_alone COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:h5perf_alone> ${MPIEXEC_POSTFLAGS})
   endif ()
 endif ()
diff --git a/tools/perform/Makefile.in b/tools/perform/Makefile.in
index 5dbe4e9..1baa196 100644
--- a/tools/perform/Makefile.in
+++ b/tools/perform/Makefile.in
@@ -622,6 +622,7 @@ dvidir = @dvidir@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
 exec_prefix = @exec_prefix@
+fortran_linux_linker_option = @fortran_linux_linker_option@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
diff --git a/tools/testfiles/test35.nc b/tools/testfiles/test35.nc
new file mode 100644
index 0000000..4bd5d7f
--- /dev/null
+++ b/tools/testfiles/test35.nc
diff --git a/tools/testfiles/test35.nc.xml b/tools/testfiles/test35.nc.xml
new file mode 100644
index 0000000..a38ed8a
--- /dev/null
+++ b/tools/testfiles/test35.nc.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:RootGroup OBJ-XID="xid_48" H5Path="/">
+   <hdf5:Attribute Name="aaa">
+      <hdf5:Dataspace>
+         <hdf5:ScalarDataspace />
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="14108" StrPad="H5T_STR_NULLTERM"/>
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+      <hdf5:Data>
+         <hdf5:DataFromFile>
+         "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaa&gt;aaaa&lt;aaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaa&gt;aaaa&lt;aaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaa&gt;a&lt;aaaaaa&gt;aaaaaaaa&lt;aaaaaa&gt;a&lt;aaaaaa&gt;aaaaaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&apos;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaa&gt;aaaaaaaaaaaaa&lt;aaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&apos;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"aaaaa\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaaaaa&lt;aaaa&gt;aaaa&lt;aaaa&gt;&gt;aaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaa&gt;aaaaaaaaaaaaaaaaaa&lt;aaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;a&gt;aaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaaaaaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaaaaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaa&lt;&gt;aaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaa&lt;aa&gt;aaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaa&lt;aa&gt;aaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaa&lt;aa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaaaaaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaa&gt;aaaaa&lt;aaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&lt;aaaaaaa&gt;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+         </hdf5:DataFromFile>
+      </hdf5:Data>
+   </hdf5:Attribute>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>
diff --git a/tools/testfiles/tgrpnullspace.ddl b/tools/testfiles/tgrpnullspace.ddl
new file mode 100644
index 0000000..2b91527
--- /dev/null
+++ b/tools/testfiles/tgrpnullspace.ddl
@@ -0,0 +1,33 @@
+HDF5 "tgrpnullspace.h5" {
+GROUP "/" {
+   GROUP "g1" {
+      ATTRIBUTE "attr" {
+         DATATYPE  H5T_STD_U32LE
+         DATASPACE  NULL
+         DATA {
+         }
+      }
+      DATASET "dset" {
+         DATATYPE  H5T_STD_I32BE
+         DATASPACE  NULL
+         STORAGE_LAYOUT {
+            CONTIGUOUS
+            SIZE 0
+            OFFSET 18446744073709551615
+         }
+         FILTERS {
+            NONE
+         }
+         FILLVALUE {
+            FILL_TIME H5D_FILL_TIME_IFSET
+            VALUE  H5D_FILL_VALUE_DEFAULT
+         }
+         ALLOCATION_TIME {
+            H5D_ALLOC_TIME_LATE
+         }
+         DATA {
+         }
+      }
+   }
+}
+}
diff --git a/tools/testfiles/tgrpnullspace.h5 b/tools/testfiles/tgrpnullspace.h5
new file mode 100644
index 0000000..82a405e
--- /dev/null
+++ b/tools/testfiles/tgrpnullspace.h5
diff --git a/tools/testfiles/tgrpnullspace.ls b/tools/testfiles/tgrpnullspace.ls
new file mode 100644
index 0000000..439414c
--- /dev/null
+++ b/tools/testfiles/tgrpnullspace.ls
@@ -0,0 +1,7 @@
+Opened "tgrpnullspace.h5" with sec2 driver.
+g1                       Group
+    Attribute: attr null
+        Type:      32-bit little-endian unsigned integer
+
+    Location:  1:800
+    Links:     1
diff --git a/tools/testfiles/tnullspace.h5.xml b/tools/testfiles/tnullspace.h5.xml
new file mode 100644
index 0000000..b1c1974
--- /dev/null
+++ b/tools/testfiles/tnullspace.h5.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
+   <hdf5:Attribute Name="attr">
+      <hdf5:Dataspace>
+         <!-- unknown dataspace -->
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:IntegerType ByteOrder="LE" Sign="false" Size="4" />
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+      <hdf5:Data>
+         <hdf5:NoData/>
+      </hdf5:Data>
+   </hdf5:Attribute>
+   <hdf5:Dataset Name="dset" OBJ-XID="xid_976" H5Path= "/dset" Parents="xid_928" H5ParentPaths="/">
+      <hdf5:StorageLayout>
+         <hdf5:ContiguousLayout/>
+      </hdf5:StorageLayout>
+      <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+         <hdf5:FillValue>
+            <hdf5:NoFill/>
+         </hdf5:FillValue>
+      </hdf5:FillValueInfo>
+      <hdf5:Dataspace>
+         <!-- unknown dataspace -->
+      </hdf5:Dataspace>
+      <hdf5:DataType>
+         <hdf5:AtomicType>
+            <hdf5:IntegerType ByteOrder="BE" Sign="true" Size="4" />
+         </hdf5:AtomicType>
+      </hdf5:DataType>
+      <hdf5:Data>
+         <hdf5:NoData/>
+      </hdf5:Data>
+   </hdf5:Dataset>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>