Merge all of my changes from merge-back-to-feature-vfd_swmr-attempt-1,

including the merge of `hdffv/hdf5/develop`, back to the branch that Vailin and
I share.

Now I need to put this branch on a fork with a less confusing name than
vchoi_fork!

36 files changed, 2652 insertions, 2941 deletions

diff --git a/tools/src/h5copy/CMakeLists.txt b/tools/src/h5copy/CMakeLists.txt
index 10b3f3d..85233ef 100644
--- a/tools/src/h5copy/CMakeLists.txt
+++ b/tools/src/h5copy/CMakeLists.txt
@@ -4,18 +4,20 @@ project (HDF5_TOOLS_SRC_H5COPY C)
 # --------------------------------------------------------------------
 # Add the h5copy and test executables
 # --------------------------------------------------------------------
-add_executable (h5copy ${HDF5_TOOLS_SRC_H5COPY_SOURCE_DIR}/h5copy.c)
-target_include_directories(h5copy PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5copy STATIC)
-target_link_libraries (h5copy PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5copy PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5copy")
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (h5copy ${HDF5_TOOLS_SRC_H5COPY_SOURCE_DIR}/h5copy.c)
+  target_include_directories (h5copy PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5copy STATIC)
+  target_link_libraries (h5copy PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5copy PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5copy")
 
-set (H5_DEP_EXECUTABLES h5copy)
+  set (H5_DEP_EXECUTABLES h5copy)
+endif ()
 
 if (BUILD_SHARED_LIBS)
   add_executable (h5copy-shared ${HDF5_TOOLS_SRC_H5COPY_SOURCE_DIR}/h5copy.c)
-  target_include_directories(h5copy-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5copy-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h5copy-shared SHARED)
   target_link_libraries (h5copy-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5copy-shared PROPERTIES FOLDER tools)
diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c
index 1800810..9490cd9 100644
--- a/tools/src/h5copy/h5copy.c
+++ b/tools/src/h5copy/h5copy.c
@@ -381,10 +381,10 @@ main (int argc, const char *argv[])
     *-------------------------------------------------------------------------*/
 
     if (verbose) {
-        printf("Copying file <%s> and object <%s> to file <%s> and object <%s>\n",
+        HDprintf("Copying file <%s> and object <%s> to file <%s> and object <%s>\n",
         fname_src, oname_src, fname_dst, oname_dst);
         if (flag) {
-            printf("Using %s flag\n", str_flag);
+            HDprintf("Using %s flag\n", str_flag);
         }
     }
 
@@ -419,7 +419,7 @@ main (int argc, const char *argv[])
 
         /* Display some output if requested */
         if(verbose)
-            printf("%s: Creating parent groups\n", h5tools_getprogname());
+            HDprintf("%s: Creating parent groups\n", h5tools_getprogname());
     } /* end if */
     else {
         /* error, if parent groups doesn't already exist in destination file */
@@ -490,7 +490,7 @@ main (int argc, const char *argv[])
     leave(EXIT_SUCCESS);
 
 done:
-    printf("Error in copy...Exiting\n");
+    HDprintf("Error in copy...Exiting\n");
 
     /* free link info path */
     if (linkinfo.trg_path)
diff --git a/tools/src/h5diff/CMakeLists.txt b/tools/src/h5diff/CMakeLists.txt
index 671e6b6..96ed6ad 100644
--- a/tools/src/h5diff/CMakeLists.txt
+++ b/tools/src/h5diff/CMakeLists.txt
@@ -4,24 +4,25 @@ project (HDF5_TOOLS_SRC_H5DIFF C)
 # --------------------------------------------------------------------
 # Add the h5diff executables
 # --------------------------------------------------------------------
-add_executable (h5diff
-    ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
-    ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
-)
-target_include_directories(h5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5diff STATIC)
-target_link_libraries (h5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5diff PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5diff")
-
-set (H5_DEP_EXECUTABLES h5diff)
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (h5diff
+      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
+      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
+  )
+  target_include_directories (h5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5diff STATIC)
+  target_link_libraries (h5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5diff PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5diff")
 
+  set (H5_DEP_EXECUTABLES h5diff)
+endif ()
 if (BUILD_SHARED_LIBS)
   add_executable (h5diff-shared
       ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
       ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_main.c
   )
-  target_include_directories(h5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h5diff-shared SHARED)
   target_link_libraries (h5diff-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5diff-shared PROPERTIES FOLDER tools)
@@ -31,15 +32,30 @@ if (BUILD_SHARED_LIBS)
 endif ()
 
 if (H5_HAVE_PARALLEL)
-  add_executable (ph5diff
-      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
-      ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/ph5diff_main.c
-  )
-  target_include_directories(ph5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-  TARGET_C_PROPERTIES (ph5diff STATIC)
-  target_link_libraries (ph5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
-  set_target_properties (ph5diff PROPERTIES FOLDER tools)
-  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};ph5diff")
+  if (NOT ONLY_SHARED_LIBS)
+    add_executable (ph5diff
+        ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
+        ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/ph5diff_main.c
+    )
+    target_include_directories (ph5diff PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+    TARGET_C_PROPERTIES (ph5diff STATIC)
+    target_link_libraries (ph5diff PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
+    set_target_properties (ph5diff PROPERTIES FOLDER tools)
+    set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};ph5diff")
+    set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} ph5diff)
+  endif ()
+  if (BUILD_SHARED_LIBS)
+    add_executable (ph5diff-shared
+        ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/h5diff_common.c
+        ${HDF5_TOOLS_SRC_H5DIFF_SOURCE_DIR}/ph5diff_main.c
+    )
+    target_include_directories (ph5diff-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+    TARGET_C_PROPERTIES (ph5diff-shared SHARED)
+    target_link_libraries (ph5diff-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>")
+    set_target_properties (ph5diff-shared PROPERTIES FOLDER tools)
+    set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};ph5diff-shared")
+    set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} ph5diff-shared)
+  endif ()
 endif ()
 
 ##############################################################################
@@ -63,16 +79,4 @@ if (HDF5_EXPORTED_TARGETS)
           ${HDF5_EXPORTED_TARGETS}
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
   )
-
-  if (H5_HAVE_PARALLEL)
-    #INSTALL_PROGRAM_PDB (ph5diff ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-
-    install (
-        TARGETS
-            ph5diff
-        EXPORT
-            ${HDF5_EXPORTED_TARGETS}
-        RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
-    )
-  endif ()
 endif ()
diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c
index 0c1521e..362e3f2 100644
--- a/tools/src/h5diff/h5diff_common.c
+++ b/tools/src/h5diff/h5diff_common.c
@@ -62,9 +62,9 @@ static void check_options(diff_opt_t* opts)
      * These options are mutually exclusive.
      */
     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);
+        HDprintf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME);
+        HDprintf("use no more than one.\n");
+        HDprintf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 Reference Manual'.\n", PROGRAMNAME);
         h5diff_exit(EXIT_FAILURE);
     }
 }
@@ -186,7 +186,7 @@ void parse_command_line(int argc,
 
             /* create linked list of excluding objects */
             if( (exclude_node = (struct exclude_path_list*) HDmalloc(sizeof(struct exclude_path_list))) == NULL) {
-                printf("Error: lack of memory!\n");
+                HDprintf("Error: lack of memory!\n");
                 h5diff_exit(EXIT_FAILURE);
             }
 
@@ -212,7 +212,7 @@ void parse_command_line(int argc,
             opts->d=1;
 
             if (check_d_input(opt_arg) == - 1) {
-                printf("<-d %s> is not a valid option\n", opt_arg);
+                HDprintf("<-d %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
@@ -226,7 +226,7 @@ void parse_command_line(int argc,
         case 'p':
             opts->p=1;
             if (check_p_input(opt_arg) == -1) {
-                printf("<-p %s> is not a valid option\n", opt_arg);
+                HDprintf("<-p %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
@@ -240,7 +240,7 @@ void parse_command_line(int argc,
         case 'n':
             opts->n=1;
             if ( check_n_input(opt_arg) == -1) {
-                printf("<-n %s> is not a valid option\n", opt_arg);
+                HDprintf("<-n %s> is not a valid option\n", opt_arg);
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
@@ -309,20 +309,20 @@ void parse_command_line(int argc,
          return;
 
      if (opts->cmn_objs == 0) {
-         printf("No common objects found. Files are not comparable.\n");
+         HDprintf("No common objects found. Files are not comparable.\n");
          if (!opts->m_verbose)
-             printf("Use -v for a list of objects.\n");
+             HDprintf("Use -v for a list of objects.\n");
      }
 
      if (opts->not_cmp == 1) {
          if (opts->m_list_not_cmp == 0) {
-             printf("--------------------------------\n");
-             printf("Some objects are not comparable\n");
-             printf("--------------------------------\n");
+             HDprintf("--------------------------------\n");
+             HDprintf("Some objects are not comparable\n");
+             HDprintf("--------------------------------\n");
              if (opts->m_verbose)
-                 printf("Use -c for a list of objects without details of differences.\n");
+                 HDprintf("Use -c for a list of objects without details of differences.\n");
              else
-                 printf("Use -c for a list of objects.\n");
+                 HDprintf("Use -c for a list of objects.\n");
          }
      }
  }
diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c
index 83240cb..380ab3b 100644
--- a/tools/src/h5diff/ph5diff_main.c
+++ b/tools/src/h5diff/ph5diff_main.c
@@ -68,7 +68,7 @@ int main(int argc, const char *argv[])
 
     if(g_nTasks == 1)
     {
-        printf("Only 1 task available...doing serial diff\n");
+        HDprintf("Only 1 task available...doing serial diff\n");
 
         g_Parallel = 0;
 
@@ -148,12 +148,12 @@ ph5diff_worker(int nID)
                 /* Open the files */
                 if ((file1_id = H5Fopen (filenames[0], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
                 {
-                    printf ("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[0]);
+                    HDprintf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[0]);
                     MPI_Abort(MPI_COMM_WORLD, 0);
                 }
                 if ((file2_id = H5Fopen (filenames[1], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
                 {
-                    printf ("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[1]);
+                    HDprintf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[1]);
                     MPI_Abort(MPI_COMM_WORLD, 0);
                 }
                 /* enable error reporting */
@@ -170,7 +170,7 @@ ph5diff_worker(int nID)
             /* Make certain we've received the filenames and opened the files already */
             if(file1_id < 0 || file2_id < 0)
             {
-                printf("ph5diff_worker: ERROR: work received before/without filenames\n");
+                HDprintf("ph5diff_worker: ERROR: work received before/without filenames\n");
                 break;
             }
 
@@ -199,7 +199,7 @@ ph5diff_worker(int nID)
                     char out_data[PRINT_DATA_MAX_SIZE];
                     int tmp;
 
-                    memset(out_data, 0, PRINT_DATA_MAX_SIZE);
+                    HDmemset(out_data, 0, PRINT_DATA_MAX_SIZE);
                     i=0;
 
                     rewind(overflow_file);
@@ -210,7 +210,7 @@ ph5diff_worker(int nID)
                         {
                             MPI_Send(out_data, PRINT_DATA_MAX_SIZE, MPI_BYTE, 0, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD);
                             i=0;
-                            memset(out_data, 0, PRINT_DATA_MAX_SIZE);
+                            HDmemset(out_data, 0, PRINT_DATA_MAX_SIZE);
                         }
                     }
 
@@ -221,8 +221,8 @@ ph5diff_worker(int nID)
                     overflow_file = NULL;
                 }
 
-                fflush(stdout);
-                memset(outBuff, 0, OUTBUFF_SIZE);
+                HDfflush(stdout);
+                HDmemset(outBuff, 0, OUTBUFF_SIZE);
                 outBuffOffset = 0;
 
                 MPI_Send(&diffs, sizeof(diffs), MPI_BYTE, 0, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD);
@@ -238,7 +238,7 @@ ph5diff_worker(int nID)
         }
         else
         {
-            printf("ph5diff_worker: ERROR: invalid tag (%d) received\n", Status.MPI_TAG);
+            HDprintf("ph5diff_worker: ERROR: invalid tag (%d) received\n", Status.MPI_TAG);
             break;
         }
 
@@ -266,14 +266,14 @@ void print_manager_output(void)
     /* If there was something we buffered, let's print it now */
     if( (outBuffOffset>0) && g_Parallel)
     {
-        printf("%s", outBuff);
+        HDprintf("%s", outBuff);
 
         if(overflow_file)
         {
             int     tmp;
             rewind(overflow_file);
-            while((tmp = getc(overflow_file)) >= 0)
-                putchar(tmp);
+            while((tmp = HDgetc(overflow_file)) >= 0)
+                HDputchar(tmp);
             fclose(overflow_file);
             overflow_file = NULL;
         }
@@ -321,6 +321,6 @@ void h5diff_exit(int status)
     /* Always exit(0), since MPI implementations do weird stuff when they
      *  receive a non-zero exit value. - QAK
      */
-    exit(0);
+    HDexit(0);
 }
 
diff --git a/tools/src/h5dump/CMakeLists.txt b/tools/src/h5dump/CMakeLists.txt
index 25166c7..383b04e 100644
--- a/tools/src/h5dump/CMakeLists.txt
+++ b/tools/src/h5dump/CMakeLists.txt
@@ -4,18 +4,20 @@ project (HDF5_TOOLS_SRC_H5DUMP C)
 # --------------------------------------------------------------------
 # Add the h5dump executables
 # --------------------------------------------------------------------
-add_executable (h5dump
-    ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.c
-    ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c
-    ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c
-)
-target_include_directories(h5dump PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5dump STATIC)
-target_link_libraries (h5dump PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5dump PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump")
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (h5dump
+      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.c
+      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c
+      ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c
+  )
+  target_include_directories (h5dump PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5dump STATIC)
+  target_link_libraries (h5dump PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5dump PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump")
 
-set (H5_DEP_EXECUTABLES h5dump)
+  set (H5_DEP_EXECUTABLES h5dump)
+endif ()
 
 if (BUILD_SHARED_LIBS)
   add_executable (h5dump-shared
@@ -23,7 +25,7 @@ if (BUILD_SHARED_LIBS)
       ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c
       ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c
   )
-  target_include_directories(h5dump-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5dump-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h5dump-shared SHARED)
   target_link_libraries (h5dump-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5dump-shared PROPERTIES FOLDER tools)
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index b9e37e8..19ed013 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -24,6 +24,27 @@ static int           doxml = 0;
 static int           useschema = 1;
 static const char   *xml_dtd_uri = NULL;
 
+#ifdef H5_HAVE_ROS3_VFD
+static H5FD_ros3_fapl_t ros3_fa = {
+    1,     /* version           */
+    false, /* authenticate      */
+    "",    /* aws region        */
+    "",    /* access key id     */
+    "",    /* secret access key */
+};
+#endif /* H5_HAVE_ROS3_VFD */
+
+#ifdef H5_HAVE_LIBHDFS
+static H5FD_hdfs_fapl_t hdfs_fa = {
+    1,           /* fapl version          */
+    "localhost", /* namenode name         */
+    0,           /* namenode port         */
+    "",          /* kerberos ticket cache */
+    "",          /* user name             */
+    2048,        /* stream buffer size    */
+};
+#endif /* H5_HAVE_LIBHDFS */
+
 /* module-scoped variables for XML option */
 #define DEFAULT_XSD     "http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd"
 #define DEFAULT_DTD     "http://www.hdfgroup.org/HDF5/XML/DTD/HDF5-File.dtd"
@@ -188,6 +209,8 @@ static struct long_options l_opts[] = {
     { "any_path", require_arg, 'N' },
     { "vds-view-first-missing", no_arg, 'v' },
     { "vds-gap-size", require_arg, 'G' },
+    { "s3-cred", require_arg, '$' },
+    { "hdfs-attrs", require_arg, '#' },
     { NULL, 0, '\0' }
 };
 
@@ -198,12 +221,6 @@ static struct long_options l_opts[] = {
  * Purpose:     Shutdown MPI & HDF5 and call exit()
  *
  * Return:      Does not return
- *
- * Programmer:  Quincey Koziol
- *              Saturday, 31. January 2004
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -241,6 +258,16 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "     -b B, --binary=B     Binary file output, of form B\n");
     PRINTVALSTREAM(rawoutstream, "     -O F, --ddl=F        Output ddl text into file F\n");
     PRINTVALSTREAM(rawoutstream, "                          Use blank(empty) filename F to suppress ddl display\n");
+    PRINTVALSTREAM(rawoutstream, "     --s3-cred=<cred>     Supply S3 authentication information to \"ros3\" vfd.\n");
+    PRINTVALSTREAM(rawoutstream, "                          <cred> :: \"(<aws-region>,<access-id>,<access-key>)\"\n");
+    PRINTVALSTREAM(rawoutstream, "                          If absent or <cred> -> \"(,,)\", no authentication.\n");
+    PRINTVALSTREAM(rawoutstream, "                          Has no effect is filedriver is not `ros3'.\n");
+    PRINTVALSTREAM(rawoutstream, "     --hdfs-attrs=<attrs> Supply configuration information for HDFS file access.\n");
+    PRINTVALSTREAM(rawoutstream, "                          For use with \"--filedriver=hdfs\"\n");
+    PRINTVALSTREAM(rawoutstream, "                          <attrs> :: (<namenode name>,<namenode port>,\n");
+    PRINTVALSTREAM(rawoutstream, "                                      <kerberos cache path>,<username>,\n");
+    PRINTVALSTREAM(rawoutstream, "                                      <buffer size>)\n");
+    PRINTVALSTREAM(rawoutstream, "                          Any absent attribute will use a default value.\n");
     PRINTVALSTREAM(rawoutstream, "--------------- Object Options ---------------\n");
     PRINTVALSTREAM(rawoutstream, "     -a P, --attribute=P  Print the specified attribute\n");
     PRINTVALSTREAM(rawoutstream, "                          If an attribute name contains a slash (/), escape the\n");
@@ -368,17 +395,11 @@ usage(const char *prog)
 
 
 /*-------------------------------------------------------------------------
- * Function: table_list_add
- *
- * Purpose: Add a new set of tables
- *
- * Return: index of added table on success, -1 on failure
- *
- * Programmer: Neil Fortner, nfortne2@hdfgroup.org
- *             Adapted from trav_addr_add in h5trav.c by Quincey Koziol
+ * Function:    table_list_add
  *
- * Date: October 13, 2008
+ * Purpose:     Add a new set of tables
  *
+ * Return:      index of added table on success, -1 on failure
  *-------------------------------------------------------------------------
  */
 ssize_t
@@ -405,8 +426,7 @@ table_list_add(hid_t oid, unsigned long file_no)
         table_list.nused--;
         return -1;
     }
-    if(init_objs(oid, &info, &table_list.tables[idx].group_table,
-                 &table_list.tables[idx].dset_table, &table_list.tables[idx].type_table) < 0) {
+    if(init_objs(oid, &info, &table_list.tables[idx].group_table, &table_list.tables[idx].dset_table, &table_list.tables[idx].type_table) < 0) {
         H5Idec_ref(oid);
         table_list.nused--;
         return -1;
@@ -421,17 +441,11 @@ table_list_add(hid_t oid, unsigned long file_no)
 
 
 /*-------------------------------------------------------------------------
- * Function: table_list_visited
+ * Function:    table_list_visited
  *
- * Purpose: Check if a table already exists for the specified fileno
- *
- * Return: The index of the matching table, or -1 if no matches found
- *
- * Programmer: Neil Fortner, nfortne2@hdfgroup.org
- *             Adapted from trav_addr_visited in h5trav.c by Quincey Koziol
- *
- * Date: October 13, 2008
+ * Purpose:     Check if a table already exists for the specified fileno
  *
+ * Return:      The index of the matching table, or -1 if no matches found
  *-------------------------------------------------------------------------
  */
 H5_ATTR_PURE ssize_t
@@ -451,16 +465,11 @@ table_list_visited(unsigned long file_no)
 
 
 /*-------------------------------------------------------------------------
- * Function: table_list_free
- *
- * Purpose: Frees the table list
- *
- * Return: void
+ * Function:    table_list_free
  *
- * Programmer: Neil Fortner, nfortne2@hdfgroup.org
- *
- * Date: October 13, 2008
+ * Purpose:     Frees the table list
  *
+ * Return:      void
  *-------------------------------------------------------------------------
  */
 static void
@@ -492,16 +501,10 @@ table_list_free(void)
 /*-------------------------------------------------------------------------
  * Function:    set_binary_form
  *
- * Purpose: set the binary form of output by translating from a string input
- *          parameter to a integer return value
- *
- * Return: integer form of binary output or -1 if none found
- *
- * Programmer:  Pedro Vicente Nunes
- *             June 28, 2006
- *
- * Modifications:
+ * Purpose:     set the binary form of output by translating from a string input
+ *              parameter to a integer return value
  *
+ * Return:      integer form of binary output or -1 if none found
  *-------------------------------------------------------------------------
  */
 static int
@@ -526,17 +529,11 @@ set_binary_form(const char *form)
 /*-------------------------------------------------------------------------
  * Function:    set_sort_by
  *
- * Purpose: set the "by" form of sorting by translating from a string input
- *          parameter to a H5_index_t return value
- *          current sort values are [creation_order | name]
- *
- * Return: H5_index_t form of sort or H5_INDEX_UNKNOWN if none found
- *
- * Programmer:  Pedro Vicente Nunes
- *              October 1, 2007
- *
- * Modifications:
+ * Purpose:     set the "by" form of sorting by translating from a string input
+ *              parameter to a H5_index_t return value
+ *              current sort values are [creation_order | name]
  *
+ * Return:      H5_index_t form of sort or H5_INDEX_UNKNOWN if none found
  *-------------------------------------------------------------------------
  */
 static H5_index_t
@@ -555,17 +552,11 @@ set_sort_by(const char *form)
 /*-------------------------------------------------------------------------
  * Function:    set_sort_order
  *
- * Purpose: set the order of sorting by translating from a string input
- *          parameter to a H5_iter_order_t return value
- *          current order values are [ascending | descending ]
- *
- * Return: H5_iter_order_t form of order or H5_ITER_UNKNOWN if none found
- *
- * Programmer:  Pedro Vicente Nunes
- *              October 1, 2007
- *
- * Modifications:
+ * Purpose:     set the order of sorting by translating from a string input
+ *              parameter to a H5_iter_order_t return value
+ *              current order values are [ascending | descending ]
  *
+ * Return:      H5_iter_order_t form of order or H5_ITER_UNKNOWN if none found
  *-------------------------------------------------------------------------
  */
 static H5_iter_order_t
@@ -594,10 +585,6 @@ set_sort_order(const char *form)
  *              either commas (,) or white spaces.
  *
  * Return:      <none>
- *
- * Programmer:  Bill Wendling
- *              Tuesday, 6. February 2001
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -652,12 +639,6 @@ parse_hsize_list(const char *h_list, subset_d *d)
  *
  * Return:      Success:    struct subset_t object
  *              Failure:    NULL
- *
- * Programmer:  Bill Wendling
- *              Tuesday, 6. February 2001
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static struct subset_t *
@@ -675,21 +656,24 @@ parse_subset_params(char *dset)
         while (*brace && *brace != ';')
             brace++;
 
-        if (*brace) brace++;
+        if (*brace)
+            brace++;
 
         parse_hsize_list(brace, &s->stride);
 
         while (*brace && *brace != ';')
             brace++;
 
-        if (*brace) brace++;
+        if (*brace)
+            brace++;
 
         parse_hsize_list(brace, &s->count);
 
         while (*brace && *brace != ';')
             brace++;
 
-        if (*brace) brace++;
+        if (*brace)
+            brace++;
 
         parse_hsize_list(brace, &s->block);
     }
@@ -705,9 +689,7 @@ parse_subset_params(char *dset)
  *              should be at the start of the list you want to parse.
  *
  * Return:      Success:        SUCCEED
- *
  *              Failure:        FAIL
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -826,12 +808,6 @@ parse_mask_list(const char *h_list)
  *              to free
  *
  * Return:      Nothing
- *
- * Programmer:  Bill Wendling
- *              Tuesday, 20. February 2001
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -874,15 +850,7 @@ free_handler(struct handler_t *hand, int len)
  * Return:      Success:    A pointer to an array of handler_t structures.
  *                          These contain all the information needed to dump
  *                          the necessary object.
- *
  *              Failure:    Exits program with EXIT_FAILURE value.
- *
- * Programmer:  Bill Wendling
- *              Tuesday, 20. February 2001
- *
- * Modifications:
- *  pvn June, 1, 2006. Add a switch for binary output
- *
  *-------------------------------------------------------------------------
  */
 static struct handler_t *
@@ -1282,6 +1250,110 @@ end_collect:
             hand = NULL;
             h5tools_setstatus(EXIT_SUCCESS);
             goto done;
+
+        case '$':
+#ifndef H5_HAVE_ROS3_VFD
+            error_msg("Read-Only S3 VFD not enabled.\n");
+            h5tools_setstatus(EXIT_FAILURE);
+            goto done;
+#else
+            /* s3 credential */
+            {
+                char       **s3_cred = NULL;
+                char        *s3_cred_string = NULL;
+                const char  *ccred[3];
+                unsigned     nelems = 0;
+                if (FAIL == parse_tuple(opt_arg, ',', &s3_cred_string, &nelems, &s3_cred)) {
+                    error_msg("unable to parse malformed s3 credentials\n");
+                    usage(h5tools_getprogname());
+                    free_handler(hand, argc);
+                    hand = NULL;
+                    h5tools_setstatus(EXIT_FAILURE);
+                    goto done;
+                }
+                if (nelems != 3) {
+                    error_msg("s3 credentials expects 3 elements\n");
+                    usage(h5tools_getprogname());
+                    free_handler(hand, argc);
+                    hand = NULL;
+                    h5tools_setstatus(EXIT_FAILURE);
+                    goto done;
+                }
+                ccred[0] = (const char *)s3_cred[0];
+                ccred[1] = (const char *)s3_cred[1];
+                ccred[2] = (const char *)s3_cred[2];
+                if (0 == h5tools_populate_ros3_fapl(&ros3_fa, ccred)) {
+                    error_msg("Invalid S3 credentials\n");
+                    usage(h5tools_getprogname());
+                    free_handler(hand, argc);
+                    hand = NULL;
+                    h5tools_setstatus(EXIT_FAILURE);
+                    goto done;
+                }
+                HDfree(s3_cred);
+                HDfree(s3_cred_string);
+            } /* s3 credential block */
+            break;
+#endif /* H5_HAVE_ROS3_VFD */
+
+        case '#':
+#ifndef H5_HAVE_LIBHDFS
+            error_msg("HDFS VFD is not enabled.\n");
+            goto error;
+#else
+            {
+                /* read hdfs properties tuple and store values in `hdfs_fa` */
+                unsigned         nelems    = 0;
+                char            *props_src = NULL;
+                char           **props     = NULL;
+                unsigned long    k         = 0;
+                if (FAIL == parse_tuple((const char *)opt_arg, ',', &props_src, &nelems, &props)) {
+                    error_msg("unable to parse hdfs properties tuple\n");
+                    goto error;
+                }
+                /* sanity-check tuple count
+                 */
+                if (nelems != 5) {
+                    h5tools_setstatus(EXIT_FAILURE);
+                    goto error;
+                }
+                /* Populate fapl configuration structure with given
+                 * properties.
+                 * WARNING: No error-checking is done on length of input
+                 *          strings... Silent overflow is possible, albeit
+                 *          unlikely.
+                 */
+                if (strncmp(props[0], "", 1))
+                    HDstrncpy(hdfs_fa.namenode_name, (const char *)props[0], HDstrlen(props[0]));
+
+                if (strncmp(props[1], "", 1)) {
+                    k = strtoul((const char *)props[1], NULL, 0);
+                    if (errno == ERANGE) {
+                        h5tools_setstatus(EXIT_FAILURE);
+                        goto error;
+                    }
+                    hdfs_fa.namenode_port = (int32_t)k;
+                }
+                if (strncmp(props[2], "", 1))
+                    HDstrncpy(hdfs_fa.kerberos_ticket_cache, (const char *)props[2], HDstrlen(props[2]));
+
+                if (strncmp(props[3], "", 1))
+                    HDstrncpy(hdfs_fa.user_name, (const char *)props[3], HDstrlen(props[3]));
+
+                if (strncmp(props[4], "", 1)) {
+                    k = strtoul((const char *)props[4], NULL, 0);
+                    if (errno == ERANGE) {
+                        h5tools_setstatus(EXIT_FAILURE);
+                        goto error;
+                    }
+                    hdfs_fa.stream_buffer_size = (int32_t)k;
+                }
+                HDfree(props);
+                HDfree(props_src);
+            }
+#endif /* H5_HAVE_LIBHDFS */
+            break;
+
         case '?':
         default:
             usage(h5tools_getprogname());
@@ -1317,36 +1389,6 @@ error:
  *
  * Return:      Success:    0
  *              Failure:    1
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *        Albert Cheng
- *        30. September 2000
- *        Add the -o option--output file for datasets raw data
- *
- *        REMcG
- *        November 2000
- *        Changes to support XML.
- *
- *        Bill Wendling
- *        Wednesday, 10. January 2001
- *        Modified the way command line parameters are interpreted. They go
- *        through one function call now (get_option).
- *
- *        Bill Wendling
- *        Tuesday, 20. February 2001
- *        Moved command line parsing to separate function. Made various
- *        "display_*" flags global.
- *
- *        REMcG
- *        August 2003
- *        Major upgrade to XML support.
- *
- *        Pedro Vicente
- *        September 2007
- *        list objects in requested order (creation order or alphabetically)
- *
  *-------------------------------------------------------------------------
  */
 int
@@ -1354,6 +1396,7 @@ main(int argc, const char *argv[])
 {
     hid_t               fid = -1;
     hid_t               gid = -1;
+    hid_t               fapl_id = H5P_DEFAULT;
     H5E_auto2_t         func;
     H5E_auto2_t         tools_func;
     H5O_info_t          oi;
@@ -1399,8 +1442,7 @@ main(int argc, const char *argv[])
     /* Check for conflicting options */
     if (doxml) {
         if (!display_all) {
-            error_msg("option \"%s\" not available for XML\n",
-                    "to display selected objects");
+            error_msg("option \"%s\" not available for XML\n", "to display selected objects");
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
         }
@@ -1440,10 +1482,54 @@ main(int argc, const char *argv[])
     /* Initialize indexing options */
     h5trav_set_index(sort_by, sort_order);
 
+    if (driver != NULL) {
+        void *conf_fa = NULL;
+
+        if (!strcmp(driver, "ros3")) {
+#ifndef H5_HAVE_ROS3_VFD
+            error_msg("Read-Only S3 VFD not enabled.\n");
+            h5tools_setstatus(EXIT_FAILURE);
+            goto done;
+#else
+            conf_fa = (void *)&ros3_fa;
+#endif /* H5_HAVE_ROS3_VFD */
+        }
+        else if (!HDstrcmp(driver, "hdfs")) {
+#ifndef H5_HAVE_LIBHDFS
+            error_msg("HDFS VFD is not enabled.\n");
+            h5tools_setstatus(EXIT_FAILURE);
+            goto done;
+#else
+            conf_fa = (void *)&hdfs_fa;
+#endif /* H5_HAVE_LIBHDFS */
+        }
+
+        if (conf_fa != NULL) {
+            fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+            if (fapl_id < 0) {
+                error_msg("unable to create fapl entry\n");
+                h5tools_setstatus(EXIT_FAILURE);
+                goto done;
+            }
+            /* driver guaranteed "ros3" or "hdfs" */
+            /* conf_fa appropriate to driver */
+            if (0 == h5tools_set_configured_fapl(fapl_id, driver, conf_fa)) {
+                error_msg("unable to set fapl\n");
+                h5tools_setstatus(EXIT_FAILURE);
+                goto done;
+            }
+        }
+    } /* driver defined */
+
     while(opt_ind < argc) {
         fname = HDstrdup(argv[opt_ind++]);
 
-        fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, driver, NULL, 0);
+        if (fapl_id != H5P_DEFAULT) {
+            fid = H5Fopen(fname, H5F_ACC_RDONLY, fapl_id);
+        }
+        else {
+            fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, driver, NULL, 0);
+        }
 
         if (fid < 0) {
             error_msg("unable to open file \"%s\"\n", fname);
@@ -1515,8 +1601,7 @@ main(int argc, const char *argv[])
             /* alternative first element, depending on schema or DTD. */
             if (useschema) {
                 if (HDstrcmp(xmlnsprefix,"") == 0) {
-                    PRINTSTREAM(rawoutstream, "<HDF5-File xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"%s\">\n",
-                            xml_dtd_uri);
+                    PRINTSTREAM(rawoutstream, "<HDF5-File xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"%s\">\n", xml_dtd_uri);
                 }
                 else {
                     /*  TO DO: make -url option work in this case (may need new option) */
@@ -1525,7 +1610,8 @@ main(int argc, const char *argv[])
 
                     ns = HDstrdup(xmlnsprefix);
                     indx = HDstrrchr(ns,(int)':');
-                    if (indx) *indx = '\0';
+                    if (indx)
+                        *indx = '\0';
 
                     PRINTSTREAM(rawoutstream, "<%sHDF5-File xmlns:%s=\"http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd\" "
                             "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
@@ -1624,6 +1710,11 @@ done:
     /* Free tables for objects */
     table_list_free();
 
+    if (fapl_id != H5P_DEFAULT && 0 < H5Pclose(fapl_id)) {
+        error_msg("Can't close fapl entry\n");
+        h5tools_setstatus(EXIT_FAILURE);
+    }
+
     if(fid >=0)
         if (H5Fclose(fid) < 0)
             h5tools_setstatus(EXIT_FAILURE);
@@ -1645,127 +1736,7 @@ done:
     H5Eset_auto2(H5E_DEFAULT, func, edata);
 
     leave(h5tools_getstatus());
-}
-
-/*-------------------------------------------------------------------------
- * Function:    h5_fileaccess
- *
- * Purpose: Returns a file access template which is the default template
- *      but with a file driver set according to the constant or
- *      environment variable HDF5_DRIVER
- *
- * Return:  Success:    A file access property list
- *
- *      Failure:    -1
- *
- * Programmer:  Robb Matzke
- *              Thursday, November 19, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-hid_t
-h5_fileaccess(void)
-{
-    static const char *multi_letters = "msbrglo";
-    const char  *val = NULL;
-    const char  *name;
-    char         s[1024];
-    hid_t        fapl = -1;
-
-    /* First use the environment variable, then the constant */
-    val = HDgetenv("HDF5_DRIVER");
-#ifdef HDF5_DRIVER
-    if (!val) val = HDF5_DRIVER;
-#endif
-
-    if ((fapl=H5Pcreate(H5P_FILE_ACCESS))<0) return -1;
-    if (!val || !*val) return fapl; /*use default*/
-
-    HDstrncpy(s, val, sizeof s);
-    s[sizeof(s)-1] = '\0';
-    if (NULL==(name=HDstrtok(s, " \t\n\r"))) return fapl;
-
-    if (!HDstrcmp(name, "sec2")) {
-        /* Unix read() and write() system calls */
-        if (H5Pset_fapl_sec2(fapl)<0) return -1;
-    }
-    else if (!HDstrcmp(name, "stdio")) {
-        /* Standard C fread() and fwrite() system calls */
-        if (H5Pset_fapl_stdio(fapl)<0) return -1;
-    }
-    else if (!HDstrcmp(name, "core")) {
-        /* In-core temporary file with 1MB increment */
-        if (H5Pset_fapl_core(fapl, 1024*1024, FALSE)<0) return -1;
-    }
-    else if (!HDstrcmp(name, "split")) {
-        /* Split meta data and raw data each using default driver */
-        if (H5Pset_fapl_split(fapl, "-m.h5", H5P_DEFAULT, "-r.h5", H5P_DEFAULT) < 0)
-            return -1;
-    }
-    else if (!HDstrcmp(name, "multi")) {
-        /* Multi-file driver, general case of the split driver */
-        H5FD_mem_t      memb_map[H5FD_MEM_NTYPES];
-        hid_t           memb_fapl[H5FD_MEM_NTYPES];
-        const char     *memb_name[H5FD_MEM_NTYPES];
-        char            sv[H5FD_MEM_NTYPES][1024];
-        haddr_t         memb_addr[H5FD_MEM_NTYPES];
-        H5FD_mem_t      mt;
-
-        HDmemset(memb_map, 0, sizeof memb_map);
-        HDmemset(memb_fapl, 0, sizeof memb_fapl);
-        HDmemset(memb_name, 0, sizeof memb_name);
-        HDmemset(memb_addr, 0, sizeof memb_addr);
-
-        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)
-            return -1;
-    }
-    else if (!HDstrcmp(name, "family")) {
-        hsize_t fam_size = 100*1024*1024; /*100 MB*/
-
-        /* Family of files, each 1MB and using the default driver */
-        if ((val=HDstrtok(NULL, " \t\n\r")))
-            fam_size = (hsize_t)(HDstrtod(val, NULL) * 1024*1024);
-        if (H5Pset_fapl_family(fapl, fam_size, H5P_DEFAULT)<0)
-            return -1;
-    }
-    else if (!HDstrcmp(name, "log")) {
-        long log_flags = H5FD_LOG_LOC_IO;
-
-        /* Log file access */
-        if ((val = HDstrtok(NULL, " \t\n\r")))
-            log_flags = HDstrtol(val, NULL, 0);
-
-        if (H5Pset_fapl_log(fapl, NULL, (unsigned)log_flags, 0) < 0)
-            return -1;
-    }
-    else if (!HDstrcmp(name, "direct")) {
-        /* Substitute Direct I/O driver with sec2 driver temporarily because
-         * some output has sec2 driver as the standard. */
-        if (H5Pset_fapl_sec2(fapl)<0) return -1;
-    }
-    else {
-        /* Unknown driver */
-        return -1;
-    }
-
-    return fapl;
-}
+} /* main */
 
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c
index 9b3a4ca..2702665 100644
--- a/tools/src/h5dump/h5dump_ddl.c
+++ b/tools/src/h5dump/h5dump_ddl.c
@@ -393,6 +393,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
             }
             break;
 
+        case H5O_TYPE_MAP:
         case H5O_TYPE_UNKNOWN:
         case H5O_TYPE_NTYPES:
         default:
@@ -864,7 +865,7 @@ dump_group(hid_t gid, const char *name)
             if(!type_table->objs[u].recorded) {
                 dset = H5Dopen2(gid, type_table->objs[u].objname, H5P_DEFAULT);
                 type = H5Dget_type(dset);
-                sprintf(type_name, "#%" PRIuHADDR, type_table->objs[u].objno);
+                HDsprintf(type_name, "#%" PRIuHADDR, type_table->objs[u].objno);
                 dump_function_table->dump_named_datatype_function(type, type_name);
                 H5Tclose(type);
                 H5Dclose(dset);
@@ -1404,6 +1405,7 @@ obj_search(const char *path, const H5O_info_t *oi, const char H5_ATTR_UNUSED *al
                 handle_datatypes(handle_data->fid, path, NULL, 0, NULL);
                 break;
 
+            case H5O_TYPE_MAP:
             case H5O_TYPE_UNKNOWN:
             case H5O_TYPE_NTYPES:
             default:
@@ -1941,9 +1943,6 @@ handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_AT
             break;
 
         case H5L_TYPE_EXTERNAL:
-            begin_obj(h5tools_dump_header_format->udlinkbegin, links, h5tools_dump_header_format->udlinkblockbegin);
-            PRINTVALSTREAM(rawoutstream, "\n");
-            indentation(COL);
             begin_obj(h5tools_dump_header_format->extlinkbegin, links, h5tools_dump_header_format->extlinkblockbegin);
             PRINTVALSTREAM(rawoutstream, "\n");
             if(H5Lget_val(fid, links, buf, linfo.u.val_size, H5P_DEFAULT) >= 0) {
@@ -1952,8 +1951,6 @@ handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_AT
 
                 if(H5Lunpack_elink_val(buf, linfo.u.val_size, NULL, &elink_file, &elink_path)>=0) {
                     indentation(COL);
-                    PRINTSTREAM(rawoutstream, "LINKCLASS %d\n", linfo.type);
-                    indentation(COL);
                     PRINTSTREAM(rawoutstream, "TARGETFILE \"%s\"\n", elink_file);
                     indentation(COL);
                     PRINTSTREAM(rawoutstream, "TARGETPATH \"%s\"\n", elink_path);
@@ -1977,9 +1974,6 @@ handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_AT
             begin_obj(h5tools_dump_header_format->udlinkbegin, links, h5tools_dump_header_format->udlinkblockbegin);
             PRINTVALSTREAM(rawoutstream, "\n");
             indentation(COL);
-            begin_obj(h5tools_dump_header_format->udlinkbegin, links, h5tools_dump_header_format->udlinkblockbegin);
-            PRINTVALSTREAM(rawoutstream, "\n");
-            indentation(COL);
             PRINTSTREAM(rawoutstream, "LINKCLASS %d\n", linfo.type);
             end_obj(h5tools_dump_header_format->udlinkend, h5tools_dump_header_format->udlinkblockend);
             break;
@@ -2022,7 +2016,7 @@ handle_datatypes(hid_t fid, const char *type, void H5_ATTR_UNUSED * data, int pe
 
             if(!type_table->objs[idx].recorded) {
                 /* unamed datatype */
-                sprintf(name, "/#%" PRIuHADDR, type_table->objs[idx].objno);
+                HDsprintf(name, "/#%" PRIuHADDR, type_table->objs[idx].objno);
 
                 if(!HDstrcmp(name, real_name))
                     break;
@@ -2143,6 +2137,7 @@ dump_extlink(hid_t group, const char *linkname, const char *objname)
                 handle_datatypes(group, linkname, NULL, 0, objname);
                 break;
 
+            case H5O_TYPE_MAP:
             case H5O_TYPE_UNKNOWN:
             case H5O_TYPE_NTYPES:
             default:
diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index 854f4a5..7e5d4be 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -346,6 +346,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
             }
             break;
 
+        case H5O_TYPE_MAP:
         case H5O_TYPE_UNKNOWN:
         case H5O_TYPE_NTYPES:
         default:
@@ -587,7 +588,7 @@ xml_name_to_XID(const char *str , char *outstr, int outlen, int gen)
             if (objno == HADDR_UNDEF) {
                 if (gen) {
                     objno = ref_path_table_gen_fake(str);
-                    sprintf(outstr, "xid_%" PRIuHADDR, objno);
+                    HDsprintf(outstr, "xid_%" PRIuHADDR, objno);
                     return 0;
                 }
                 else {
@@ -598,7 +599,7 @@ xml_name_to_XID(const char *str , char *outstr, int outlen, int gen)
         else {
             if (gen) {
                 objno = ref_path_table_gen_fake(str);
-                sprintf(outstr, "xid_%" PRIuHADDR, objno);
+                HDsprintf(outstr, "xid_%" PRIuHADDR, objno);
                 return 0;
             }
             else {
@@ -607,7 +608,7 @@ xml_name_to_XID(const char *str , char *outstr, int outlen, int gen)
         }
     }
 
-    sprintf(outstr, "xid_%" PRIuHADDR, objno);
+    HDsprintf(outstr, "xid_%" PRIuHADDR, objno);
 
     return(0);
 }
@@ -1918,7 +1919,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
                     }
                     /* Reclaim any VL memory, if necessary */
                     if (vl_data)
-                        H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
+                        H5Treclaim(p_type, space, H5P_DEFAULT, buf);
 
                     HDfree(buf);
                 }
@@ -2685,7 +2686,7 @@ xml_dump_group(hid_t gid, const char *name)
                         if(!type_table->objs[u].recorded) {
                             dset = H5Dopen2(gid, type_table->objs[u].objname, H5P_DEFAULT);
                             type = H5Dget_type(dset);
-                            sprintf(type_name, "#%" PRIuHADDR, type_table->objs[u].objno);
+                            HDsprintf(type_name, "#%" PRIuHADDR, type_table->objs[u].objno);
                             dump_function_table->dump_named_datatype_function(type, type_name);
                             H5Tclose(type);
                             H5Dclose(dset);
@@ -2767,7 +2768,7 @@ xml_dump_group(hid_t gid, const char *name)
                 if(!type_table->objs[u].recorded) {
                     dset = H5Dopen2(gid, type_table->objs[u].objname, H5P_DEFAULT);
                     type = H5Dget_type(dset);
-                    sprintf(type_name, "#%" PRIuHADDR, type_table->objs[u].objno);
+                    HDsprintf(type_name, "#%" PRIuHADDR, type_table->objs[u].objno);
                     dump_function_table->dump_named_datatype_function(type, type_name);
                     H5Tclose(type);
                     H5Dclose(dset);
@@ -2881,7 +2882,7 @@ xml_print_refs(hid_t did, int source)
             goto error;
     }
 
-    refbuf = (hobj_ref_t *) buf;
+    refbuf = (hobj_ref_t *)((void *)buf);
 
     /* setup */
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -3057,7 +3058,7 @@ xml_print_strs(hid_t did, int source)
 
     for (i = 0; i < (hsize_t)ssiz; i++) {
         if (is_vlstr) {
-            onestring = *(char **) bp;
+            onestring = *(char **)((void *)bp);
             if (onestring)
                 str_size = HDstrlen(onestring);
         }
@@ -3098,7 +3099,7 @@ xml_print_strs(hid_t did, int source)
             HDfree(onestring);
     if (buf) {
         if (is_vlstr)
-            H5Dvlen_reclaim(type, space, H5P_DEFAULT, buf);
+            H5Treclaim(type, space, H5P_DEFAULT, buf);
         HDfree(buf);
     }
     H5Tclose(type);
@@ -3438,8 +3439,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "\"");
             for (i = 0; i < sz; i++) {
-                h5tools_str_append(&buffer, "%x ", *(unsigned int *) buf);
-                buf = (char *) buf + sizeof(unsigned int);
+                h5tools_str_append(&buffer, "%x ", *(unsigned int *) buf + (i * sizeof(unsigned int)));
             }
             h5tools_str_append(&buffer, "\"");
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
diff --git a/tools/src/h5format_convert/CMakeLists.txt b/tools/src/h5format_convert/CMakeLists.txt
index 62f269b..540be8c 100644
--- a/tools/src/h5format_convert/CMakeLists.txt
+++ b/tools/src/h5format_convert/CMakeLists.txt
@@ -4,14 +4,26 @@ project (HDF5_TOOLS_SRC_H5FC C)
 # --------------------------------------------------------------------
 # Add the h5format_convert executables
 # --------------------------------------------------------------------
-add_executable (h5format_convert ${HDF5_TOOLS_SRC_H5FC_SOURCE_DIR}/h5format_convert.c)
-target_include_directories(h5format_convert PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5format_convert STATIC)
-target_link_libraries (h5format_convert PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5format_convert PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5format_convert")
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (h5format_convert ${HDF5_TOOLS_SRC_H5FC_SOURCE_DIR}/h5format_convert.c)
+  target_include_directories (h5format_convert PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5format_convert STATIC)
+  target_link_libraries (h5format_convert PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5format_convert PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5format_convert")
 
-set (H5_DEP_EXECUTABLES h5format_convert)
+  set (H5_DEP_EXECUTABLES h5format_convert)
+endif ()
+if (BUILD_SHARED_LIBS)
+  add_executable (h5format_convert-shared ${HDF5_TOOLS_SRC_H5FC_SOURCE_DIR}/h5format_convert.c)
+  target_include_directories (h5format_convert-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5format_convert-shared SHARED)
+  target_link_libraries (h5format_convert-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  set_target_properties (h5format_convert-shared PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5format_convert-shared")
+
+  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5format_convert-shared)
+endif ()
 
 ##############################################################################
 ##############################################################################
@@ -34,4 +46,4 @@ if (HDF5_EXPORTED_TARGETS)
           ${HDF5_EXPORTED_TARGETS}
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
   )
-endif ()
\ No newline at end of file
+endif ()
diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index b9ed9ce..257a047 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -259,7 +259,7 @@ convert(hid_t fid, const char *dname)
             error_msg("unable to get the chunk indexing type for \"%s\"\n", dname);
             h5tools_setstatus(EXIT_FAILURE);
             goto error;
-	    }
+        }
         else if(verbose_g)
             HDfprintf(stdout, "Retrieve the dataset's chunk indexing type\n");
 
@@ -268,11 +268,11 @@ convert(hid_t fid, const char *dname)
                 HDfprintf(stdout, "Dataset's chunk indexing type is already version 1 B-tree: no further action\n");
             h5tools_setstatus(EXIT_SUCCESS);
             goto done;
-	    }
+        }
         else if (verbose_g)
             HDfprintf(stdout, "Dataset's chunk indexing type is not version 1 B-tree\n");
 
-	    break;
+        break;
 
     case H5D_CONTIGUOUS:
         if(verbose_g)
@@ -302,8 +302,8 @@ convert(hid_t fid, const char *dname)
     if(noop_g) {
         if(verbose_g)
             HDfprintf(stdout, "Not converting the dataset\n");
-            h5tools_setstatus(EXIT_SUCCESS);
-            goto done;
+        h5tools_setstatus(EXIT_SUCCESS);
+        goto done;
     }
 
     if(verbose_g)
diff --git a/tools/src/h5import/CMakeLists.txt b/tools/src/h5import/CMakeLists.txt
index 7b38420..dd7921d 100644
--- a/tools/src/h5import/CMakeLists.txt
+++ b/tools/src/h5import/CMakeLists.txt
@@ -4,15 +4,29 @@ project (HDF5_TOOLS_SRC_H5IMPORT C)
 # --------------------------------------------------------------------
 # Add the h5import executables
 # --------------------------------------------------------------------
-add_executable (h5import ${HDF5_TOOLS_SRC_H5IMPORT_SOURCE_DIR}/h5import.c)
-target_include_directories(h5import PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5import STATIC)
-target_link_libraries (h5import PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-#set_target_properties (h5import PROPERTIES COMPILE_DEFINITIONS H5DEBUGIMPORT)
-set_target_properties (h5import PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5import")
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (h5import ${HDF5_TOOLS_SRC_H5IMPORT_SOURCE_DIR}/h5import.c)
+  target_include_directories (h5import PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5import STATIC)
+  target_link_libraries (h5import PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  #set_target_properties (h5import PROPERTIES COMPILE_DEFINITIONS H5DEBUGIMPORT)
+  set_target_properties (h5import PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5import")
 
-set (H5_DEP_EXECUTABLES h5import)
+  set (H5_DEP_EXECUTABLES h5import)
+endif ()
+
+if (BUILD_SHARED_LIBS)
+  add_executable (h5import-shared ${HDF5_TOOLS_SRC_H5IMPORT_SOURCE_DIR}/h5import.c)
+  target_include_directories (h5import-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5import-shared SHARED)
+  target_link_libraries (h5import-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  #set_target_properties (h5import-shared PROPERTIES COMPILE_DEFINITIONS H5DEBUGIMPORT)
+  set_target_properties (h5import-shared PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5import-shared")
+
+  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5import-shared)
+endif ()
 
 ##############################################################################
 ##############################################################################
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index 3b64a0e..1eef5ab 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -88,6 +88,7 @@ int main(int argc, char *argv[])
     const char     *err7 = "Invalid type of data - %s.\n";
     const char     *err8 = "Invalid size of data - %s.\n";
     const char     *err9 = "Cannot specify more than 30 input files in one call to h5import.\n";
+    const char     *err10 = "Length of output file name limited to 255 chars.\n";
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
@@ -98,6 +99,9 @@ int main(int argc, char *argv[])
     (void) HDsetvbuf(stderr, (char *) NULL, _IOLBF, 0);
     (void) HDsetvbuf(stdout, (char *) NULL, _IOLBF, 0);
 
+    /* Initialize the file structure to 0 */
+    HDmemset(&opt, 0, sizeof(struct Options));
+
     if (argv[1] && (HDstrcmp("-V", argv[1]) == 0)) {
         print_version(PROGRAMNAME);
         HDexit(EXIT_SUCCESS);
@@ -112,9 +116,6 @@ int main(int argc, char *argv[])
         goto err;
     }
 
-    /* Initialize the file structure to 0 */
-    HDmemset(&opt, 0, sizeof(struct Options));
-
     /*
      * parse the command line
      */
@@ -155,6 +156,10 @@ int main(int argc, char *argv[])
             break;
 
         case 5: /* get outfile found */
+            if (HDstrlen(argv[i]) > MAX_PATH_NAME_LENGTH) {
+                (void) HDfprintf(stderr, err10, argv[i]);
+                goto err;
+            }
             (void) HDstrcpy(opt.outfile, argv[i]);
             outfile_named = TRUE;
             break;
@@ -1366,9 +1371,9 @@ static int allocateFloatStorage(struct Input *in)
 static int processConfigurationFile(char *infile, struct Input *in)
 {
     FILE       *strm = NULL;
-    char        key[255];
+    char        key[MAX_PATH_NAME_LENGTH];
     int         kindex;
-    char        temp[255];
+    char        temp[MAX_PATH_NAME_LENGTH];
     int         ival;
     int         scanret;
     int         retval = -1;
@@ -1446,16 +1451,16 @@ static int processConfigurationFile(char *infile, struct Input *in)
         goto error;
     }
 
-    scanret = fscanf(strm, "%s", key);
+    scanret = fscanf(strm, "%254s", key);
     if((scanret == 1) && !HDstrcmp("HDF5", key)) {
 #ifdef H5DEBUGIMPORT
         int pndx;
         HDprintf("\nh5dump file\n");
 #endif
         in->h5dumpInput = 1;
-        scanret = fscanf(strm, "%s", temp); /* filename */
-        scanret = fscanf(strm, "%s", temp); /* start bracket */
-        scanret = fscanf(strm, "%s", key); /* DATASET */
+        scanret = fscanf(strm, "%254s", temp); /* filename */
+        scanret = fscanf(strm, "%254s", temp); /* start bracket */
+        scanret = fscanf(strm, "%254s", key); /* DATASET */
         while (scanret == 1) {
             if(!HDstrcmp("DATASET", key)) { /* PATH */
 #ifdef H5DEBUGIMPORT
@@ -1465,7 +1470,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     (void) HDfprintf(stderr, err3a, infile);
                     goto error;
                 }
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1477,7 +1482,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     goto error;
                 }
                 in->configOptionVector[PATH] = 1;
-                scanret = fscanf(strm, "%s", temp); /* start bracket */
+                scanret = fscanf(strm, "%254s", temp); /* start bracket */
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump DATASET %s found\n", temp);
 #endif
@@ -1491,7 +1496,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     goto error;
                 }
 
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1528,20 +1533,20 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump DATATYPE STRING found\n");
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* start bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump DATATYPE STRING %s found\n", temp);
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* string properties */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* string properties */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
                     while (get_next_prop) {
                         if(!HDstrcmp("STRSIZE", temp)) { /* STRSIZE */
-                            if (fscanf(strm, "%s", temp) != 1) {
+                            if (fscanf(strm, "%254s", temp) != 1) {
                                 (void) HDfprintf(stderr, "%s", err19);
                                 goto error;
                             }
@@ -1561,7 +1566,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             }
                         }
                         else if(!HDstrcmp("STRPAD", temp)) { /* STRPAD */
-                            if (fscanf(strm, "%s", temp) != 1) { /* STRPAD type */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* STRPAD type */
                                 (void) HDfprintf(stderr, "%s", err18);
                                 goto error;
                             }
@@ -1570,7 +1575,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #endif
                         }
                         else if(!HDstrcmp("CSET", key)) { /* CSET */
-                            if (fscanf(strm, "%s", temp) != 1) { /* CSET type */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* CSET type */
                                 (void) HDfprintf(stderr, "%s", err18);
                                 goto error;
                             }
@@ -1580,7 +1585,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 
                         }
                         else if(!HDstrcmp("CTYPE", temp)) { /* CTYPE */
-                            if (fscanf(strm, "%s", temp) != 1) { /* CTYPE type */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* CTYPE type */
                                 (void) HDfprintf(stderr, "%s", err18);
                                 goto error;
                             }
@@ -1588,7 +1593,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             HDprintf("h5dump DATATYPE STRING  CTYPE %s found\n", temp);
 #endif
                         } /* if(!HDstrcmp("CSET", key)) */
-                        if (fscanf(strm, "%s", temp) != 1) {
+                        if (fscanf(strm, "%254s", temp) != 1) {
                             (void) HDfprintf(stderr, "%s", err18);
                             goto error;
                         }
@@ -1607,7 +1612,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump DATASPACE key\n");
 #endif
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1623,14 +1628,14 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump DATASPACE SIMPLE found\n");
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* start bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                         (void) HDfprintf(stderr, err6b, infile);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                         (void) HDfprintf(stderr, err6b, infile);
                         goto error;
                     }
@@ -1641,7 +1646,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         int get_next_dim = 1;
                         int i = 0;
 
-                        if (fscanf(strm, "%s", temp) != 1) { /* Dimension with optional comma */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                             (void) HDfprintf(stderr, err16c, infile);
                             goto error;
                         }
@@ -1651,7 +1656,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         while (get_next_dim) {
                             char *more = temp;
                             temp_dims[icount] = HDstrtoull(more, &more, 10);
-                            if (fscanf(strm, "%s", temp) != 1) { /* Dimension or end paren */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                 (void) HDfprintf(stderr, err6b, infile);
                                 goto error;
                             }
@@ -1694,7 +1699,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         (void) HDfprintf(stderr, err5b, infile);
                         goto error;
                     }
-                    if (fscanf(strm, "%s", temp) != 1) {
+                    if (fscanf(strm, "%254s", temp) != 1) {
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
@@ -1705,7 +1710,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         if ((in->maxsizeOfDimension = (hsize_t *) HDmalloc ((size_t) in->rank * sizeof(hsize_t))) == NULL) {
                             goto error;
                         }
-                        if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                             (void) HDfprintf(stderr, err6b, infile);
                             goto error;
                         }
@@ -1719,7 +1724,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                             HDprintf("h5dump DATASPACE SIMPLE process max dim values\n");
 #endif
-                            if (fscanf(strm, "%s", temp) != 1) { /* max dim with optional comma */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* max dim with optional comma */
                                 (void) HDfprintf(stderr, err16c, infile);
                                 goto error;
                             }
@@ -1738,7 +1743,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                                     char *more = temp;
                                     in->maxsizeOfDimension[i] = HDstrtoull(more, &more, 10);
                                 }
-                                if (fscanf(strm, "%s", temp) != 1) { /* max dim or end paren */
+                                if (fscanf(strm, "%254s", temp) != 1) { /* max dim or end paren */
                                     (void) HDfprintf(stderr, err16c, infile);
                                     goto error;
                                 }
@@ -1750,7 +1755,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                                 }
                                 else { /* comma */
                                     i++;
-                                    if (i > MAX_NUM_DIMENSION) {
+                                    if (i >= MAX_NUM_DIMENSION) {
                                         (void) HDfprintf(stderr, "Invalid value for rank.\n");
                                         goto error;
                                     }
@@ -1769,7 +1774,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             (void) HDfprintf(stderr, err16c, infile);
                             goto error;
                         }
-                        scanret = fscanf(strm, "%s", temp); /* end bracket */
+                        scanret = fscanf(strm, "%254s", temp); /* end bracket */
 #ifdef H5DEBUGIMPORT
                         HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
@@ -1784,14 +1789,14 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump STORAGE_LAYOUT key\n");
 #endif
-                if (fscanf(strm, "%s", temp) != 1) { /* start bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                     (void) HDfprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump STORAGE_LAYOUT %s found\n", temp);
 #endif
-                if (fscanf(strm, "%s", temp) != 1) { /* CHUNKED */
+                if (fscanf(strm, "%254s", temp) != 1) { /* CHUNKED */
                     (void) HDfprintf(stderr, err6b, infile);
                     goto error;
                 }
@@ -1803,7 +1808,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         (void) HDfprintf(stderr, "Unable to allocate dynamic memory.\n");
                         goto error;
                     }
-                    if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                         (void) HDfprintf(stderr, err6b, infile);
                         goto error;
                     }
@@ -1814,7 +1819,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         int get_next_dim = 1;
                         int icount = 0;
 
-                        if (fscanf(strm, "%s", temp) != 1) { /* Dimension with optional comma */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                             (void) HDfprintf(stderr, err16c, infile);
                             goto error;
                         }
@@ -1824,7 +1829,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         while (get_next_dim) {
                             char *more = temp;
                             in->sizeOfChunk[icount] = HDstrtoull(more, &more, 10);
-                            if (fscanf(strm, "%s", temp) != 1) { /* Dimension or end paren */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                 (void) HDfprintf(stderr, err6b, infile);
                                 goto error;
                             }
@@ -1856,7 +1861,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                         (void) HDfprintf(stderr, err5b, infile);
                         goto error;
                     }
-                    if (fscanf(strm, "%s", temp) != 1) { /* SIZE */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* SIZE */
                         (void) HDfprintf(stderr, err6b, infile);
                         goto error;
                     }
@@ -1873,7 +1878,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #endif
                     }
                     while (HDstrcmp("}", temp)) {
-                        if (fscanf(strm, "%s", temp) != 1) { /* end bracket */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* end bracket */
                             (void) HDfprintf(stderr, "%s", err18);
                             goto error;
                         }
@@ -1888,14 +1893,14 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump FILTERS key\n");
 #endif
-                if (fscanf(strm, "%s", temp) != 1) { /* start bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                     (void) HDfprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump FILTERS %s found\n", temp);
 #endif
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, err6b, infile);
                     goto error;
                 }
@@ -1906,21 +1911,21 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump FILTERS COMPRESSION found\n");
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* DEFLATE */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* DEFLATE */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp);
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* bgin bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* bgin bracket */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp);
 #endif
-                    if (fscanf(strm, "%s", temp) != 1) { /* LEVEL */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* LEVEL */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
@@ -1935,7 +1940,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     HDprintf("h5dump FILTERS COMPRESSION LEVEL %d found\n", ival);
 #endif
                     in->compressionParam = ival;
-                    if (fscanf(strm, "%s", temp) != 1) { /* end bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* end bracket */
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
@@ -1957,7 +1962,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #endif
                     in->configOptionVector[COMPRESS] = 0;
                 }
-                if (fscanf(strm, "%s", temp) != 1) { /* end bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* end bracket */
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1971,14 +1976,14 @@ static int processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump SUBSET key\n");
 #endif
-                if (fscanf(strm, "%s", temp) != 1) { /* start bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                     (void) HDfprintf(stderr, err20, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
                 HDprintf("h5dump SUBSET %s found\n", temp);
 #endif
-                if (fscanf(strm, "%s", temp) != 1) { /* SUBSET keyword */
+                if (fscanf(strm, "%254s", temp) != 1) { /* SUBSET keyword */
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1988,7 +1993,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                 while (get_next_prop) {
                     if(!HDstrcmp("COUNT", temp)) { /* COUNT */
                         int icount = 0;
-                        if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                             (void) HDfprintf(stderr, err6b, infile);
                             goto error;
                         }
@@ -1999,7 +2004,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             int get_next_dim = 1;
                             int i = 0;
 
-                            if (fscanf(strm, "%s", temp) != 1) { /* Dimension with optional comma */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                                 (void) HDfprintf(stderr, err16c, infile);
                                 goto error;
                             }
@@ -2009,7 +2014,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             while (get_next_dim) {
                                 char *more = temp;
                                 temp_dims[icount] = HDstrtoull(more, &more, 10);
-                                if (fscanf(strm, "%s", temp) != 1) { /* Dimension or end paren */
+                                if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                     (void) HDfprintf(stderr, err6b, infile);
                                     goto error;
                                 }
@@ -2023,7 +2028,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                                 }
                                 else { /* Dimension */
                                     icount++;
-                                    if (icount > MAX_NUM_DIMENSION) {
+                                    if (icount >= MAX_NUM_DIMENSION) {
                                         (void) HDfprintf(stderr, "Invalid value for rank.\n");
                                         goto error;
                                     }
@@ -2044,7 +2049,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     } /* if(!HDstrcmp("COUNT", temp))  COUNT */
                     if(!HDstrcmp("BLOCK", temp)) { /* BLOCK */
                         int icount = 0;
-                        if (fscanf(strm, "%s", temp) != 1) { /* start paren */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                             (void) HDfprintf(stderr, err6b, infile);
                             goto error;
                         }
@@ -2055,7 +2060,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             int get_next_dim = 1;
                             int i = 0;
 
-                            if (fscanf(strm, "%s", temp) != 1) { /* Dimension with optional comma */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                                 (void) HDfprintf(stderr, err16c, infile);
                                 goto error;
                             }
@@ -2065,7 +2070,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             while (get_next_dim) {
                                 char *more = temp;
                                 temp_dims[icount] = HDstrtoull(more, &more, 10);
-                                if (fscanf(strm, "%s", temp) != 1) { /* Dimension or end paren */
+                                if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                     (void) HDfprintf(stderr, err6b, infile);
                                     goto error;
                                 }
@@ -2098,7 +2103,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             in->configOptionVector[DIM] = 1;
                         } /* if(!HDstrcmp("(", key))  start paren */
                     } /* if(!HDstrcmp("BLOCK", temp))  BLOCK */
-                    if (fscanf(strm, "%s", temp) != 1) {
+                    if (fscanf(strm, "%254s", temp) != 1) {
                         (void) HDfprintf(stderr, "%s", err18);
                         goto error;
                     }
@@ -2117,7 +2122,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                 scanret = 0;
                 break;
             }
-            scanret = fscanf(strm, "%s", key);
+            scanret = fscanf(strm, "%254s", key);
         }
 #ifdef H5DEBUGIMPORT
         HDprintf("h5dump path");
@@ -2158,7 +2163,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     (void) HDfprintf(stderr, err3a, infile);
                     goto error;
                 }
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -2175,7 +2180,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     goto error;
                 }
 
-                if (fscanf(strm, "%s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void) HDfprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -2203,7 +2208,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                     (void) HDfprintf(stderr, err5a, infile);
                     goto error;
                 }
-                if (fscanf(strm, "%d", (&ival)) != 1) {
+                if (fscanf(strm, "%254d", (&ival)) != 1) {
                     (void) HDfprintf(stderr, "%s", err19);
                     goto error;
                 }
@@ -2400,7 +2405,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
             default:
                 break;
             }
-            scanret = fscanf(strm, "%s", key);
+            scanret = fscanf(strm, "%254s", key);
         }
 
         /*
@@ -2571,7 +2576,7 @@ static int getOutputClass(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for output class.\n";
 
-    if (fscanf(strm, "%s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3464,7 +3469,7 @@ static int getInputByteOrder(struct Input *in, FILE *strm)
     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) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3595,7 +3600,7 @@ static int getOutputArchitecture(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for output architecture.\n";
 
-    if (fscanf(strm, "%s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3627,7 +3632,7 @@ static int getOutputByteOrder(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for output byte-order.\n";
 
-    if (fscanf(strm, "%s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3658,7 +3663,7 @@ static int getCompressionType(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for compression.\n";
 
-    if (fscanf(strm, "%s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3722,7 +3727,7 @@ static int getExternalFilename(struct Input *in, FILE *strm)
     char        temp[255];
     const char *err1 = "Unable to get 'string' value.\n";
 
-    if (fscanf(strm, "%s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void) HDfprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3748,7 +3753,7 @@ void setDefaultValues(struct Input *in, int count)
     in->path.count = 1;
 
     HDstrcpy(temp, "dataset");
-    sprintf(num, "%d", count);
+    HDsprintf(num, "%d", count);
     HDstrcat(temp, num);
     HDstrcpy(in->path.group[0], temp);
 
diff --git a/tools/src/h5import/h5import.h b/tools/src/h5import/h5import.h
index c55717d..00c41f6 100644
--- a/tools/src/h5import/h5import.h
+++ b/tools/src/h5import/h5import.h
@@ -102,8 +102,8 @@ struct Input
 
 struct infilesformat
 {
-    char datafile[255];
-    char configfile[255];
+    char datafile[MAX_PATH_NAME_LENGTH];
+    char configfile[MAX_PATH_NAME_LENGTH];
     struct Input in;
     int config; /* Configfile present? No - 0. Yes - 1 */
 };
diff --git a/tools/src/h5jam/CMakeLists.txt b/tools/src/h5jam/CMakeLists.txt
index c455b2f..f430417 100644
--- a/tools/src/h5jam/CMakeLists.txt
+++ b/tools/src/h5jam/CMakeLists.txt
@@ -4,24 +4,47 @@ project (HDF5_TOOLS_SRC_H5JAM C)
 # --------------------------------------------------------------------
 # Add the h5jam executables
 # --------------------------------------------------------------------
-add_executable (h5jam ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5jam.c)
-target_include_directories(h5jam PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5jam STATIC)
-target_link_libraries (h5jam PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5jam PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5jam")
-
-add_executable (h5unjam ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5unjam.c)
-target_include_directories(h5unjam PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5unjam STATIC)
-target_link_libraries (h5unjam PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5unjam PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5unjam")
-
-set (H5_DEP_EXECUTABLES
-    h5jam
-    h5unjam
-)
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (h5jam ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5jam.c)
+  target_include_directories (h5jam PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5jam STATIC)
+  target_link_libraries (h5jam PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5jam PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5jam")
+
+  add_executable (h5unjam ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5unjam.c)
+  target_include_directories (h5unjam PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5unjam STATIC)
+  target_link_libraries (h5unjam PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5unjam PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5unjam")
+
+  set (H5_DEP_EXECUTABLES
+      h5jam
+      h5unjam
+  )
+endif ()
+
+if (BUILD_SHARED_LIBS)
+  add_executable (h5jam-shared ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5jam.c)
+  target_include_directories (h5jam-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5jam-shared SHARED)
+  target_link_libraries (h5jam-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  set_target_properties (h5jam-shared PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5jam-shared")
+
+  add_executable (h5unjam-shared ${HDF5_TOOLS_SRC_H5JAM_SOURCE_DIR}/h5unjam.c)
+  target_include_directories (h5unjam-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5unjam-shared SHARED)
+  target_link_libraries (h5unjam-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  set_target_properties (h5unjam-shared PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5unjam-shared")
+
+  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES}
+      h5jam-shared
+      h5unjam-shared
+  )
+endif ()
 
 ##############################################################################
 ##############################################################################
diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c
index 4f3e7a4..8222e06 100644
--- a/tools/src/h5jam/h5jam.c
+++ b/tools/src/h5jam/h5jam.c
@@ -230,7 +230,7 @@ main (int argc, const char *argv[])
         leave (EXIT_FAILURE);
     }
 
-    testval = H5Fis_hdf5 (ub_file);
+    testval = H5Fis_accessible(ub_file, H5P_DEFAULT);
 
     if (testval > 0) {
         error_msg("-u <user_file> cannot be HDF5 file, but it appears to be an HDF5 file.\n");
@@ -244,7 +244,7 @@ main (int argc, const char *argv[])
         leave (EXIT_FAILURE);
     }
 
-    testval = H5Fis_hdf5 (input_file);
+    testval = H5Fis_accessible(input_file, H5P_DEFAULT);
 
     if (testval <= 0) {
         error_msg("Input HDF5 file \"%s\" is not HDF5 format.\n", input_file);
diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c
index ffe2aca..aa893f9 100644
--- a/tools/src/h5jam/h5unjam.c
+++ b/tools/src/h5jam/h5unjam.c
@@ -229,7 +229,7 @@ main(int argc, const char *argv[])
         goto done;
     }
 
-    testval = H5Fis_hdf5(input_file);
+    testval = H5Fis_accessible(input_file, H5P_DEFAULT);
 
     if (testval <= 0) {
         error_msg("Input HDF5 file \"%s\" is not HDF\n", input_file);
diff --git a/tools/src/h5ls/CMakeLists.txt b/tools/src/h5ls/CMakeLists.txt
index 5b31b84..f2470fb 100644
--- a/tools/src/h5ls/CMakeLists.txt
+++ b/tools/src/h5ls/CMakeLists.txt
@@ -4,18 +4,20 @@ project (HDF5_TOOLS_SRC_H5LS C)
 #-----------------------------------------------------------------------------
 # Add the h5ls executable
 #-----------------------------------------------------------------------------
-add_executable (h5ls ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c)
-target_include_directories(h5ls PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5ls STATIC)
-target_link_libraries (h5ls PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5ls PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5ls")
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (h5ls ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c)
+  target_include_directories (h5ls PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5ls STATIC)
+  target_link_libraries (h5ls PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5ls PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5ls")
 
-set (H5_DEP_EXECUTABLES h5ls)
+  set (H5_DEP_EXECUTABLES h5ls)
+endif ()
 
 if (BUILD_SHARED_LIBS)
   add_executable (h5ls-shared ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c)
-  target_include_directories(h5ls-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5ls-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h5ls-shared SHARED)
   target_link_libraries (h5ls-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5ls-shared PROPERTIES FOLDER tools)
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 0a69550..ffbb4af 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -158,19 +158,13 @@ static hbool_t print_int_type(h5tools_str_t *buffer, hid_t type, int ind);
 static hbool_t print_float_type(h5tools_str_t *buffer, hid_t type, int ind);
 static herr_t visit_obj(hid_t file, const char *oname, iter_t *iter);
 
-
+
 /*-------------------------------------------------------------------------
  * Function: usage
  *
  * Purpose: Prints a usage message on stderr and then returns.
  *
  * Return: void
- *
- * Programmer: Robb Matzke
- *              Thursday, July 16, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -218,6 +212,15 @@ usage (void)
     PRINTVALSTREAM(rawoutstream, "   -V, --version   Print version number and exit\n");
     PRINTVALSTREAM(rawoutstream, "   --vfd=DRIVER    Use the specified virtual file driver\n");
     PRINTVALSTREAM(rawoutstream, "   -x, --hexdump   Show raw data in hexadecimal format\n");
+    PRINTVALSTREAM(rawoutstream, "   --s3-cred=C     Supply S3 authentication information to \"ros3\" vfd.\n");
+    PRINTVALSTREAM(rawoutstream, "                   Accepts tuple of \"(<aws-region>,<access-id>,<access-key>)\".\n");
+    PRINTVALSTREAM(rawoutstream, "                   If absent or C->\"(,,)\", defaults to no-authentication.\n");
+    PRINTVALSTREAM(rawoutstream, "                   Has no effect if vfd flag not set to \"ros3\".\n");
+    PRINTVALSTREAM(rawoutstream, "   --hdfs-attrs=A  Supply configuration information to Hadoop VFD.\n");
+    PRINTVALSTREAM(rawoutstream, "                   Accepts tuple of (<namenode name>,<namenode port>,\n");
+    PRINTVALSTREAM(rawoutstream, "                   ...<kerberos cache path>,<username>,<buffer size>)\n");
+    PRINTVALSTREAM(rawoutstream, "                   If absent or A == '(,,,,)', all default values are used.\n");
+    PRINTVALSTREAM(rawoutstream, "                   Has no effect if vfd flag is not 'hdfs'.\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "  file/OBJECT\n");
     PRINTVALSTREAM(rawoutstream, "    Each object consists of an HDF5 file name optionally followed by a\n");
@@ -239,22 +242,14 @@ usage (void)
     PRINTVALSTREAM(rawoutstream, "                      Replaced by --enable-error-stack.\n");
 }
 
-
 
 /*-------------------------------------------------------------------------
- * Function: print_string
- *
- * Purpose: Print a string value by escaping unusual characters. If
- *  STREAM is null then we only count how large the output would
- *  be.
- *
- * Return: Number of characters printed.
+ * Function:    print_string
  *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
+ * Purpose:     Print a string value by escaping unusual characters. If
+ *              STREAM is null then we only count how large the output would be.
  *
+ * Return:      Number of characters printed.
  *-------------------------------------------------------------------------
  */
 static int
@@ -265,50 +260,61 @@ print_string(h5tools_str_t *buffer, const char *s, hbool_t escape_spaces)
     for (/*void*/; s && *s; s++) {
         switch (*s) {
             case '"':
-                if (buffer) h5tools_str_append(buffer, "\\\"");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\\"");
                 nprint += 2;
                 break;
             case '\\':
-                if (buffer) h5tools_str_append(buffer, "\\\\");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\\\");
                 nprint += 2;
                 break;
             case '\b':
-                if (buffer) h5tools_str_append(buffer, "\\b");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\b");
                 nprint += 2;
                 break;
             case '\f':
-                if (buffer) h5tools_str_append(buffer, "\\f");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\f");
                 nprint += 2;
                 break;
             case '\n':
-                if (buffer) h5tools_str_append(buffer, "\\n");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\n");
                 nprint += 2;
                 break;
             case '\r':
-                if (buffer) h5tools_str_append(buffer, "\\r");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\r");
                 nprint += 2;
                 break;
             case '\t':
-                if (buffer) h5tools_str_append(buffer, "\\t");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\t");
                 nprint += 2;
                 break;
             case ' ':
                 if (escape_spaces) {
-                    if (buffer) h5tools_str_append(buffer, "\\ ");
+                    if (buffer)
+                        h5tools_str_append(buffer, "\\ ");
                     nprint += 2;
                 }
                 else {
-                    if (buffer) h5tools_str_append(buffer, " ");
+                    if (buffer)
+                        h5tools_str_append(buffer, " ");
                     nprint++;
                 }
                 break;
             default:
                 if (isprint((int)*s)) {
-                    if (buffer) h5tools_str_append(buffer, "%c", *s);
+                    if (buffer)
+                        h5tools_str_append(buffer, "%c", *s);
                     nprint++;
                 }
                 else {
-                    if (buffer) h5tools_str_append(buffer, "\\%03o", *((const unsigned char*)s));
+                    if (buffer)
+                        h5tools_str_append(buffer, "\\%03o", *((const unsigned char*)s));
                     nprint += 4;
                 }
                 break;
@@ -317,44 +323,36 @@ print_string(h5tools_str_t *buffer, const char *s, hbool_t escape_spaces)
     return nprint;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_obj_name
- *
- * Purpose: Print an object name and another string.
- *
- * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
+ * Function:    print_obj_name
  *
- * Programmer: Quincey Koziol
- *              Tuesday, November  6, 2007
- *
- * Modifications:
+ * Purpose:     Print an object name and another string.
  *
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static int
-print_obj_name(h5tools_str_t *buffer, const iter_t *iter, const char *oname,
-    const char *s)
+print_obj_name(h5tools_str_t *buffer, const iter_t *iter, const char *oname, const char *s)
 {
     static char fullname[NAME_BUF_SIZE];     /* Buffer for file and/or object name */
     const char *name = fullname;                /* Pointer to buffer for printing */
     int  n;
 
-    if(show_file_name_g)
+    if (show_file_name_g)
         HDsnprintf(fullname, sizeof(fullname), "%s/%s", iter->fname, oname + iter->name_start);
     else
         name = oname + iter->name_start;
 
     /* Print the object name, either full name or base name */
-    if(fullname_g)
+    if (fullname_g)
         n = print_string(buffer, name, TRUE);
     else {
         const char *last_sep;   /* The location of the last group separator */
 
         /* Find the last component of the path name */
-        if(NULL == (last_sep = HDstrrchr(name, '/')))
+        if (NULL == (last_sep = HDstrrchr(name, '/')))
             last_sep = name;
         else {
             last_sep++;
@@ -366,161 +364,190 @@ print_obj_name(h5tools_str_t *buffer, const iter_t *iter, const char *oname,
     return TRUE;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_native_type
- *
- * Purpose: Prints the name of a native C data type.
- *
- * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed.
+ * Function:    print_native_type
  *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *   Robb Matzke, 1999-06-11
- *  Added the C9x types, but we still prefer to display the types
- *  from the C language itself (like `int' vs. `int32_t').
+ * Purpose:     Prints the name of a native C data type.
  *
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed.
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_native_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    if(!simple_output_g) {
-        if (H5Tequal(type, H5T_NATIVE_SCHAR)==TRUE) {
+    if (!simple_output_g) {
+        if (H5Tequal(type, H5T_NATIVE_SCHAR) == TRUE) {
             h5tools_str_append(buffer, "native signed char");
-        } else if (H5Tequal(type, H5T_NATIVE_UCHAR)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UCHAR) == TRUE) {
             h5tools_str_append(buffer, "native unsigned char");
-        } else if (H5Tequal(type, H5T_NATIVE_INT)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT) == TRUE) {
             h5tools_str_append(buffer, "native int");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT) == TRUE) {
             h5tools_str_append(buffer, "native unsigned int");
-        } else if (H5Tequal(type, H5T_NATIVE_SHORT)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_SHORT) == TRUE) {
             h5tools_str_append(buffer, "native short");
-        } else if (H5Tequal(type, H5T_NATIVE_USHORT)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_USHORT) == TRUE) {
             h5tools_str_append(buffer, "native unsigned short");
-        } else if (H5Tequal(type, H5T_NATIVE_LONG)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_LONG) == TRUE) {
             h5tools_str_append(buffer, "native long");
-        } else if (H5Tequal(type, H5T_NATIVE_ULONG)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_ULONG) == TRUE) {
             h5tools_str_append(buffer, "native unsigned long");
-        } else if (H5Tequal(type, H5T_NATIVE_LLONG)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_LLONG) == TRUE) {
             h5tools_str_append(buffer, "native long long");
-        } else if (H5Tequal(type, H5T_NATIVE_ULLONG)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_ULLONG) == TRUE) {
             h5tools_str_append(buffer, "native unsigned long long");
-        } else if (H5Tequal(type, H5T_NATIVE_FLOAT)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_FLOAT) == TRUE) {
             h5tools_str_append(buffer, "native float");
-        } else if (H5Tequal(type, H5T_NATIVE_DOUBLE)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == TRUE) {
             h5tools_str_append(buffer, "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, "native long double");
+        }
 #endif
-        } else if (H5Tequal(type, H5T_NATIVE_INT8)==TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT8) == TRUE) {
             h5tools_str_append(buffer, "native int8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT8) == TRUE) {
             h5tools_str_append(buffer, "native uint8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT16) == TRUE) {
             h5tools_str_append(buffer, "native int16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT16) == TRUE) {
             h5tools_str_append(buffer, "native uint16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT32) == TRUE) {
             h5tools_str_append(buffer, "native int32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT32) == TRUE) {
             h5tools_str_append(buffer, "native uint32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT64) == TRUE) {
             h5tools_str_append(buffer, "native int64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT64) == TRUE) {
             h5tools_str_append(buffer, "native uint64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_LEAST8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST8) == TRUE) {
             h5tools_str_append(buffer, "native int_least8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST8) == TRUE) {
             h5tools_str_append(buffer, "native uint_least8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_LEAST16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST16) == TRUE) {
             h5tools_str_append(buffer, "native int_least16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST16) == TRUE) {
             h5tools_str_append(buffer, "native uint_least16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_LEAST32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST32) == TRUE) {
             h5tools_str_append(buffer, "native int_least32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST32) == TRUE) {
             h5tools_str_append(buffer, "native uint_least32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_LEAST64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST64) == TRUE) {
             h5tools_str_append(buffer, "native int_least64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST64) == TRUE) {
             h5tools_str_append(buffer, "native uint_least64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_FAST8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST8) == TRUE) {
             h5tools_str_append(buffer, "native int_fast8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_FAST8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST8) == TRUE) {
             h5tools_str_append(buffer, "native uint_fast8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_FAST16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST16) == TRUE) {
             h5tools_str_append(buffer, "native int_fast16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_FAST16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST16) == TRUE) {
             h5tools_str_append(buffer, "native uint_fast16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_FAST32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST32) == TRUE) {
             h5tools_str_append(buffer, "native int_fast32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_FAST32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST32) == TRUE) {
             h5tools_str_append(buffer, "native uint_fast32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_FAST64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST64) == TRUE) {
             h5tools_str_append(buffer, "native int_fast64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_FAST64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST64) == TRUE) {
             h5tools_str_append(buffer, "native uint_fast64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_B8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_B8) == TRUE) {
             h5tools_str_append(buffer, "native 8-bit field");
-        } else if (H5Tequal(type, H5T_NATIVE_B16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_B16) == TRUE) {
             h5tools_str_append(buffer, "native 16-bit field");
-        } else if (H5Tequal(type, H5T_NATIVE_B32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_B32) == TRUE) {
             h5tools_str_append(buffer, "native 32-bit field");
-        } else if (H5Tequal(type, H5T_NATIVE_B64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_B64) == TRUE) {
             h5tools_str_append(buffer, "native 64-bit field");
-        } else if (H5Tequal(type, H5T_NATIVE_HSIZE)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_HSIZE) == TRUE) {
             h5tools_str_append(buffer, "native hsize_t");
-        } else if (H5Tequal(type, H5T_NATIVE_HSSIZE)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_HSSIZE) == TRUE) {
             h5tools_str_append(buffer, "native hssize_t");
-        } else if (H5Tequal(type, H5T_NATIVE_HERR)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_HERR) == TRUE) {
             h5tools_str_append(buffer, "native herr_t");
-        } else if (H5Tequal(type, H5T_NATIVE_HBOOL)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_HBOOL) == TRUE) {
             h5tools_str_append(buffer, "native hbool_t");
-        } else {
+        }
+        else {
             return print_int_type(buffer, type, ind);
         }
-    } else {
+    }
+    else {
         return print_int_type(buffer, type, ind);
     }
     return TRUE;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_ieee_type
- *
- * Purpose: Print the name of an IEEE floating-point data type.
- *
- * Return: Success: TRUE
+ * Function:    print_ieee_type
  *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
+ * Purpose:     Print the name of an IEEE floating-point data type.
  *
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_ieee_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    if (H5Tequal(type, H5T_IEEE_F32BE)==TRUE) {
+    if (H5Tequal(type, H5T_IEEE_F32BE) == TRUE) {
         h5tools_str_append(buffer, "IEEE 32-bit big-endian float");
     }
-    else if (H5Tequal(type, H5T_IEEE_F32LE)==TRUE) {
+    else if (H5Tequal(type, H5T_IEEE_F32LE) == TRUE) {
         h5tools_str_append(buffer, "IEEE 32-bit little-endian float");
     }
-    else if (H5Tequal(type, H5T_IEEE_F64BE)==TRUE) {
+    else if (H5Tequal(type, H5T_IEEE_F64BE) == TRUE) {
         h5tools_str_append(buffer, "IEEE 64-bit big-endian float");
     }
-    else if (H5Tequal(type, H5T_IEEE_F64LE)==TRUE) {
+    else if (H5Tequal(type, H5T_IEEE_F64LE) == TRUE) {
         h5tools_str_append(buffer, "IEEE 64-bit little-endian float");
     }
     else {
@@ -529,21 +556,15 @@ print_ieee_type(h5tools_str_t *buffer, hid_t type, int ind)
     return TRUE;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_precision
- *
- * Purpose: Prints information on the next line about precision and
- *  padding if the precision is less than the total data type
- *  size.
- *
- * Return: void
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
+ * Function:    print_precision
  *
- * Modifications:
+ * Purpose:     Prints information on the next line about precision and
+ *              padding if the precision is less than the total data type
+ *              size.
  *
+ * Return:      void
  *-------------------------------------------------------------------------
  */
 static void
@@ -558,13 +579,12 @@ print_precision(h5tools_str_t *buffer, hid_t type, int ind)
     /* If the precision is less than the total size then show the precision
      * and offset on the following line.  Also display the padding
      * information. */
-    if(8 * H5Tget_size(type) != (prec = H5Tget_precision(type))) {
+    if (8 * H5Tget_size(type) != (prec = H5Tget_precision(type))) {
         h5tools_str_append(buffer, "\n%*s(%lu bit%s of precision beginning at bit %lu)",
-            ind, "", (unsigned long)prec, 1 == prec ? "" : "s",
-            (unsigned long)H5Tget_offset(type));
+                ind, "", (unsigned long)prec, 1 == prec ? "" : "s", (unsigned long)H5Tget_offset(type));
 
         H5Tget_pad(type, &plsb, &pmsb);
-        if(H5Tget_offset(type) > 0) {
+        if (H5Tget_offset(type) > 0) {
             switch(plsb) {
                 case H5T_PAD_ZERO:
                     plsb_s = "zero";
@@ -583,7 +603,7 @@ print_precision(h5tools_str_t *buffer, hid_t type, int ind)
                     break;
             }
         }
-        if((unsigned)H5Tget_offset(type) + prec < 8 * H5Tget_size(type)) {
+        if ((unsigned)H5Tget_offset(type) + prec < 8 * H5Tget_size(type)) {
             switch(pmsb) {
                 case H5T_PAD_ZERO:
                     pmsb_s = "zero";
@@ -606,61 +626,53 @@ print_precision(h5tools_str_t *buffer, hid_t type, int ind)
             h5tools_str_append(buffer, "\n%*s(", ind, "");
             if (plsb_s) {
                 nbits = (unsigned)H5Tget_offset(type);
-                h5tools_str_append(buffer, "%lu %s bit%s at bit 0",
-                        (unsigned long)nbits, plsb_s, 1 == nbits ? "" : "s");
+                h5tools_str_append(buffer, "%lu %s bit%s at bit 0", (unsigned long)nbits, plsb_s, 1 == nbits ? "" : "s");
             }
-            if (plsb_s && pmsb_s) h5tools_str_append(buffer, ", ");
+            if (plsb_s && pmsb_s)
+                h5tools_str_append(buffer, ", ");
             if (pmsb_s) {
                 nbits = (8 * H5Tget_size(type)) - ((unsigned)H5Tget_offset(type) + prec);
-                h5tools_str_append(buffer, "%lu %s bit%s at bit %lu",
-                        (unsigned long)nbits, pmsb_s, 1 == nbits ? "" : "s",
-                        (unsigned long)(8 * H5Tget_size(type) - nbits));
+                h5tools_str_append(buffer, "%lu %s bit%s at bit %lu", (unsigned long)nbits, pmsb_s, 1 == nbits ? "" : "s", (unsigned long)(8 * H5Tget_size(type) - nbits));
             }
             h5tools_str_append(buffer, ")");
         }
     }
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_int_type
- *
- * Purpose: Print the name of an integer data type.  Common information
- *  like number of bits, byte order, and sign scheme appear on
- *  the first line. Additional information might appear in
- *  parentheses on the following lines.
- *
- * Return: Success: TRUE
+ * Function:    print_int_type
  *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
+ * Purpose:     Print the name of an integer data type.  Common information
+ *              like number of bits, byte order, and sign scheme appear on
+ *              the first line. Additional information might appear in
+ *              parentheses on the following lines.
  *
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_int_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    H5T_order_t order;          /* byte order value */
-    const char  *order_s=NULL;  /* byte order string */
-    H5T_sign_t  sign;           /* sign scheme value */
-    const char  *sign_s=NULL;   /* sign scheme string */
+    H5T_order_t order;            /* byte order value */
+    const char  *order_s = NULL;  /* byte order string */
+    H5T_sign_t  sign;             /* sign scheme value */
+    const char  *sign_s = NULL;   /* sign scheme string */
 
-    if (H5T_INTEGER!=H5Tget_class(type)) return FALSE;
+    if (H5T_INTEGER != H5Tget_class(type))
+        return FALSE;
 
     /* Byte order */
-    if (H5Tget_size(type)>1) {
+    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 {
@@ -672,11 +684,11 @@ print_int_type(h5tools_str_t *buffer, hid_t type, int ind)
     }
 
     /* Sign */
-    if ((sign=H5Tget_sign(type))>=0) {
-        if (H5T_SGN_NONE==sign) {
+    if ((sign = H5Tget_sign(type)) >= 0) {
+        if (H5T_SGN_NONE == sign) {
             sign_s = " unsigned";
         }
-        else if (H5T_SGN_2==sign) {
+        else if (H5T_SGN_2 == sign) {
             sign_s = "";
         }
         else {
@@ -689,27 +701,19 @@ print_int_type(h5tools_str_t *buffer, hid_t type, int ind)
 
     /* Print size, order, and sign on first line, precision and padding
      * information on the subsequent lines */
-    h5tools_str_append(buffer, "%lu-bit%s%s integer",
-            (unsigned long)(8*H5Tget_size(type)), order_s, sign_s);
+    h5tools_str_append(buffer, "%lu-bit%s%s integer", (unsigned long)(8*H5Tget_size(type)), order_s, sign_s);
     print_precision(buffer, type, ind);
     return TRUE;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_float_type
- *
- * Purpose: Print info about a floating point data type.
- *
- * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
+ * Function:    print_float_type
  *
- * Modifications:
+ * Purpose:     Print info about a floating point data type.
  *
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -726,18 +730,19 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
     H5T_pad_t   pad;            /* internal padding value */
     const char  *pad_s=NULL;    /* internal padding string */
 
-    if (H5T_FLOAT!=H5Tget_class(type)) return FALSE;
+    if (H5T_FLOAT != H5Tget_class(type))
+        return FALSE;
 
     /* Byte order */
-    if (H5Tget_size(type)>1) {
+    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 {
@@ -750,8 +755,7 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
 
     /* Print size and byte order on first line, precision and padding on
      * subsequent lines. */
-    h5tools_str_append(buffer, "%lu-bit%s floating-point",
-        (unsigned long)(8*H5Tget_size(type)), order_s);
+    h5tools_str_append(buffer, "%lu-bit%s floating-point", (unsigned long)(8*H5Tget_size(type)), order_s);
     print_precision(buffer, type, ind);
 
     /* Print sizes, locations, and other information about each field */
@@ -776,15 +780,13 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
         break;
     }
     h5tools_str_append(buffer, "\n%*s(significant for %lu bit%s at bit %lu%s)", ind, "",
-            (unsigned long)msize, 1==msize?"":"s", (unsigned long)mpos,
-            norm_s);
+            (unsigned long)msize, 1==msize?"":"s", (unsigned long)mpos, norm_s);
     h5tools_str_append(buffer, "\n%*s(exponent for %lu bit%s at bit %lu, bias is 0x%lx)",
-            ind, "", (unsigned long)esize, 1==esize?"":"s",
-            (unsigned long)epos, (unsigned long)ebias);
+            ind, "", (unsigned long)esize, 1==esize?"":"s", (unsigned long)epos, (unsigned long)ebias);
     h5tools_str_append(buffer, "\n%*s(sign bit at %lu)", ind, "", (unsigned long)spos);
 
     /* Display internal padding */
-    if (1+esize+msize<H5Tget_precision(type)) {
+    if ((1 + esize + msize) < H5Tget_precision(type)) {
         pad = H5Tget_inpad(type);
         switch (pad) {
             case H5T_PAD_ZERO:
@@ -809,25 +811,20 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
     return TRUE;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_cmpd_type
- *
- * Purpose: Print info about a compound data type.
- *
- * Return: Success: TRUE
+ * Function:    print_cmpd_type
  *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
+ * Purpose:     Print info about a compound data type.
  *
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    char        *name=NULL;     /* member name */
+    char       *name = NULL;    /* member name */
     size_t      size;           /* total size of type in bytes */
     hid_t       subtype;        /* member data type */
     int         nmembs;         /* number of members */
@@ -840,14 +837,12 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
         return FALSE;
 
     h5tools_str_append(buffer, "struct {");
-    for(i = 0; i < (unsigned)nmembs; i++) {
-
+    for (i = 0; i < (unsigned)nmembs; i++) {
         /* Name and offset */
         name = H5Tget_member_name(type, i);
         h5tools_str_append(buffer, "\n%*s\"", ind+4, "");
         n = print_string(buffer, name, FALSE);
-        h5tools_str_append(buffer, "\"%*s +%-4lu ", MAX(0, 16-n), "",
-               (unsigned long)H5Tget_member_offset(type, i));
+        h5tools_str_append(buffer, "\"%*s +%-4lu ", MAX(0, 16-n), "", (unsigned long)H5Tget_member_offset(type, i));
         H5free_memory(name);
 
         /* Member's type */
@@ -856,27 +851,19 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
         H5Tclose(subtype);
     }
     size = H5Tget_size(type);
-    h5tools_str_append(buffer, "\n%*s} %lu byte%s",
-                ind, "", (unsigned long)size, 1==size?"":"s");
+    h5tools_str_append(buffer, "\n%*s} %lu byte%s", ind, "", (unsigned long)size, 1==size?"":"s");
 
     return TRUE;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_enum_type
- *
- * Purpose: Print info about an enumeration data type.
- *
- * Return: Success: TRUE
+ * Function:    print_enum_type
  *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Wednesday, December 23, 1998
- *
- * Modifications:
+ * Purpose:     Print info about an enumeration data type.
  *
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -885,9 +872,9 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
     int         nmembs;         /* number of members */
     hid_t       super;          /* enum base integer type */
 
-    if(H5T_ENUM != H5Tget_class(type))
+    if (H5T_ENUM != H5Tget_class(type))
         return FALSE;
-    if((nmembs = H5Tget_nmembers(type)) < 0)
+    if ((nmembs = H5Tget_nmembers(type)) < 0)
         return FALSE;
 
     super = H5Tget_super(type);
@@ -895,7 +882,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
     print_type(buffer, super, ind + 4);
     h5tools_str_append(buffer, " {");
 
-    if(nmembs > 0) {
+    if (nmembs > 0) {
         char        **name;         /* member names */
         unsigned char *value;       /* value array */
         hid_t       native = -1;    /* native integer data type */
@@ -907,9 +894,9 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
          *  1. long long -- the largest native signed integer
          *  2. unsigned long long -- the largest native unsigned integer
          *  3. raw format */
-        if(H5Tget_size(type) <= sizeof(long long)) {
+        if (H5Tget_size(type) <= sizeof(long long)) {
             dst_size = sizeof(long long);
-            if(H5T_SGN_NONE == H5Tget_sign(type))
+            if (H5T_SGN_NONE == H5Tget_sign(type))
                 native = H5T_NATIVE_ULLONG;
             else
                 native = H5T_NATIVE_LLONG;
@@ -920,16 +907,16 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
         /* Get the names and raw values of all members */
         name = (char **)HDcalloc((size_t)nmembs, sizeof(char *));
         value = (unsigned char *)HDcalloc((size_t)nmembs, MAX(H5Tget_size(type), dst_size));
-        for(i = 0; i < (unsigned)nmembs; i++) {
+        for (i = 0; i < (unsigned)nmembs; i++) {
             name[i] = H5Tget_member_name(type, i);
             H5Tget_member_value(type, i, value + i * H5Tget_size(type));
         }
 
         /* Convert values to native data type */
-        if(native > 0)
-            if(H5Tconvert(super, native, (size_t)nmembs, value, NULL, H5P_DEFAULT) < 0) {
+        if (native > 0)
+            if (H5Tconvert(super, native, (size_t)nmembs, value, NULL, H5P_DEFAULT) < 0) {
                 /* Release resources */
-                for(i = 0; i < (unsigned)nmembs; i++)
+                for (i = 0; i < (unsigned)nmembs; i++)
                     H5free_memory(name[i]);
                 HDfree(name);
                 HDfree(value);
@@ -941,7 +928,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
         /*not implemented yet*/
 
         /* Print members */
-        for(i = 0; i < (unsigned)nmembs; i++) {
+        for (i = 0; i < (unsigned)nmembs; i++) {
             unsigned char *copy;        /* a pointer to value array */
             int         nchars;         /* number of output characters */
 
@@ -949,14 +936,14 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
             nchars = print_string(buffer, name[i], TRUE);
             h5tools_str_append(buffer, "%*s = ", MAX(0, 16 - nchars), "");
 
-            if(native < 0) {
+            if (native < 0) {
                 size_t j;
 
                 h5tools_str_append(buffer, "0x");
-                for(j = 0; j < dst_size; j++)
+                for (j = 0; j < dst_size; j++)
                     h5tools_str_append(buffer, "%02x", value[i*dst_size+j]);
             }
-            else if(H5T_SGN_NONE == H5Tget_sign(native)) {
+            else if (H5T_SGN_NONE == H5Tget_sign(native)) {
                 /*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
                  *strangely, unless use another pointer "copy".*/
                 copy = value + i * dst_size;
@@ -966,8 +953,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
                 /*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
                  *strangely, unless use another pointer "copy".*/
                 copy = value + i * dst_size;
-                h5tools_str_append(buffer, "%"H5_PRINTF_LL_WIDTH"d",
-                        *((long long*)((void*)copy)));
+                h5tools_str_append(buffer, "%"H5_PRINTF_LL_WIDTH"d", *((long long*)((void*)copy)));
             }
         }
 
@@ -987,21 +973,14 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
     return TRUE;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_string_type
- *
- * Purpose: Print information about a string data type.
+ * Function:    print_string_type
  *
- * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
+ * Purpose:     Print information about a string data type.
  *
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -1012,7 +991,8 @@ print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
     H5T_cset_t  cset;
     const char  *cset_s=NULL;
 
-    if (H5T_STRING!=H5Tget_class(type)) return FALSE;
+    if (H5T_STRING != H5Tget_class(type))
+        return FALSE;
 
     /* Padding */
     pad = H5Tget_strpad(type);
@@ -1088,59 +1068,43 @@ print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
     return TRUE;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_reference_type
+ * Function:    print_reference_type
  *
- * Purpose: Prints information about a reference data type.
- *
- * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *   Robb Matzke, 1999-06-04
- *  Knows about object and dataset region references.
+ * Purpose:     Prints information about a reference data type.
  *
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_reference_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
 {
-    if (H5T_REFERENCE!=H5Tget_class(type)) return FALSE;
+    if (H5T_REFERENCE != H5Tget_class(type))
+        return FALSE;
 
-    if (H5Tequal(type, H5T_STD_REF_OBJ)==TRUE) {
+    if (H5Tequal(type, H5T_STD_REF_OBJ) == TRUE) {
         h5tools_str_append(buffer, "object reference");
     }
-    else if (H5Tequal(type, H5T_STD_REF_DSETREG)==TRUE) {
+    else if (H5Tequal(type, H5T_STD_REF_DSETREG) == TRUE) {
         h5tools_str_append(buffer, "dataset region reference");
     }
     else {
-        h5tools_str_append(buffer, "%lu-byte unknown reference",
-                (unsigned long)H5Tget_size(type));
+        h5tools_str_append(buffer, "%lu-byte unknown reference", (unsigned long)H5Tget_size(type));
     }
 
     return TRUE;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_opaque_type
- *
- * Purpose: Prints information about an opaque data type.
- *
- * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Monday, June  7, 1999
+ * Function:    print_opaque_type
  *
- * Modifications:
+ * Purpose:     Prints information about an opaque data type.
  *
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -1149,11 +1113,12 @@ print_opaque_type(h5tools_str_t *buffer, hid_t type, int ind)
     char *tag;
     size_t size;
 
-    if (H5T_OPAQUE!=H5Tget_class(type)) return FALSE;
+    if (H5T_OPAQUE != H5Tget_class(type))
+        return FALSE;
 
     size = H5Tget_size(type);
     h5tools_str_append(buffer, "%lu-byte opaque type", (unsigned long)size);
-    if ((tag=H5Tget_tag(type))) {
+    if ((tag = H5Tget_tag(type))) {
         h5tools_str_append(buffer, "\n%*s(tag = \"", ind, "");
         print_string(buffer, tag, FALSE);
         h5tools_str_append(buffer, "\")");
@@ -1162,20 +1127,14 @@ print_opaque_type(h5tools_str_t *buffer, hid_t type, int ind)
     return TRUE;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    print_vlen_type
  *
  * Purpose:     Print information about a variable-length type
  *
  * Return:      Success:        TRUE
- *
  *              Failure:        FALSE
- *
- * Programmer:  Robb Matzke
- *              Friday, December  1, 2000
- *
- * Modifications:
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -1183,27 +1142,22 @@ print_vlen_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
     hid_t       super;
 
-    if (H5T_VLEN!=H5Tget_class(type)) return FALSE;
+    if (H5T_VLEN != H5Tget_class(type))
+        return FALSE;
 
-    h5tools_str_append(buffer, "variable length of\n%*s", ind+4, "");
+    h5tools_str_append(buffer, "variable length of\n%*s", ind + 4, "");
     super = H5Tget_super(type);
-    print_type(buffer, super, ind+4);
+    print_type(buffer, super, ind + 4);
     H5Tclose(super);
     return TRUE;
 }
 
-
+
 /*---------------------------------------------------------------------------
  * Purpose:     Print information about an array type
  *
  * Return:      Success:        TRUE
- *
  *              Failure:        FALSE
- *
- * Programmer:  Robb Matzke
- *              Thursday, January 31, 2002
- *
- * Modifications:
  *---------------------------------------------------------------------------
  */
 static hbool_t
@@ -1213,7 +1167,7 @@ print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
     int         ndims, i;
     hsize_t     *dims=NULL;
 
-    if (H5T_ARRAY!=H5Tget_class(type))
+    if (H5T_ARRAY != H5Tget_class(type))
         return FALSE;
     ndims = H5Tget_array_ndims(type);
     if (ndims) {
@@ -1221,7 +1175,7 @@ print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
         H5Tget_array_dims2(type, dims);
 
         /* Print dimensions */
-        for (i=0; i<ndims; i++)
+        for (i = 0; i < ndims; i++)
             h5tools_str_append(buffer, "%s" HSIZE_T_FORMAT , i?",":"[", dims[i]);
         h5tools_str_append(buffer, "]");
 
@@ -1239,72 +1193,60 @@ print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
     return TRUE;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: print_bitfield_type
- *
- * Purpose: Print information about a bitfield type.
- *
- * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
+ * Function:    print_bitfield_type
  *
- * Programmer: Pedro Vicente
- *              Tuesday, May  20, 2003
+ * Purpose:     Print information about a bitfield type.
  *
- * Modifications:
- *              Robb Matzke, LLNL 2003-06-05
- *              Generalized Pedro's original if/then/else.  Also display
- *              precision/offset information.
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_bitfield_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    H5T_order_t order;          /* byte order value */
-    const char  *order_s=NULL;  /* byte order string */
+    H5T_order_t order;            /* byte order value */
+    const char  *order_s = NULL;  /* byte order string */
 
-    if (H5T_BITFIELD!=H5Tget_class(type)) return FALSE;
+    if (H5T_BITFIELD != H5Tget_class(type))
+        return FALSE;
     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 = "";
     }
 
-    h5tools_str_append(buffer, "%lu-bit%s bitfield",
-           (unsigned long)(8*H5Tget_size(type)), order_s);
+    h5tools_str_append(buffer, "%lu-bit%s bitfield", (unsigned long)(8*H5Tget_size(type)), order_s);
     print_precision(buffer, type, ind);
     return TRUE;
 }
 
 
 /*-------------------------------------------------------------------------
- * Function: print_type
+ * Function:    print_type
  *
- * Purpose: Prints a data type definition.  The definition is printed
- *  without any leading space or trailing line-feed (although
- *  there might be line-feeds inside the type definition).  The
- *  first line is assumed to have IND characters before it on
- *  the same line (printed by the caller).
- *
- * Return: void
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *   Robb Matzke, 1999-06-11
- *  Prints the OID of shared data types.
+ * Purpose:     Prints a data type definition.  The definition is printed
+ *              without any leading space or trailing line-feed (although
+ *              there might be line-feeds inside the type definition).  The
+ *              first line is assumed to have IND characters before it on
+ *              the same line (printed by the caller).
+ *              Prints the OID of shared data types.
  *
+ * Return:      void
  *-------------------------------------------------------------------------
  */
 static void
@@ -1313,16 +1255,16 @@ print_type(h5tools_str_t *buffer, hid_t type, int ind)
     H5T_class_t  data_class = H5Tget_class(type);
 
     /* Bad data type */
-    if (type<0) {
+    if (type < 0) {
         h5tools_str_append(buffer,"<ERROR>");
         return;
     }
 
     /* Shared? If so then print the type's OID */
-    if(H5Tcommitted(type)) {
+    if (H5Tcommitted(type)) {
         H5O_info_t  oi;
 
-        if(H5Oget_info2(type, &oi, H5O_INFO_BASIC) >= 0)
+        if (H5Oget_info2(type, &oi, H5O_INFO_BASIC) >= 0)
             h5tools_str_append(buffer,"shared-%lu:%" PRIuHADDR " ",
                     oi.fileno, oi.addr);
         else
@@ -1330,7 +1272,7 @@ print_type(h5tools_str_t *buffer, hid_t type, int ind)
     } /* end if */
 
     /* Print the type */
-    if(print_native_type(buffer, type, ind) ||
+    if (print_native_type(buffer, type, ind) ||
             print_ieee_type(buffer, type, ind) ||
             print_cmpd_type(buffer, type, ind) ||
             print_enum_type(buffer, type, ind) ||
@@ -1343,25 +1285,16 @@ print_type(h5tools_str_t *buffer, hid_t type, int ind)
         return;
 
     /* Unknown type */
-    h5tools_str_append(buffer,"%lu-byte class-%u unknown",
-            (unsigned long)H5Tget_size(type), (unsigned)data_class);
+    h5tools_str_append(buffer,"%lu-byte class-%u unknown", (unsigned long)H5Tget_size(type), (unsigned)data_class);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: dump_dataset_values
- *
- * Purpose: Prints all values of a dataset.
+ * Function:    dump_dataset_values
  *
- * Return: void
- *
- * Programmer: Robb Matzke
- *              Tuesday, July 21, 1998
+ * Purpose:     Prints all values of a dataset.
  *
- * Modifications:
- *  Robb Matzke, 1999-09-27
- *  Understands the simple_output_g switch which causes data to
- *  be displayed in a more machine-readable format.
+ * Return:      void
  *-------------------------------------------------------------------------
  */
 static void
@@ -1370,7 +1303,7 @@ dump_dataset_values(hid_t dset)
     char                string_prefix[64];
     static char         fmt_double[16];
     static char         fmt_float[16];
-    hsize_t             curr_pos = 0;        /* total data element position   */
+    hsize_t             curr_pos = 0;    /* total data element position   */
     h5tools_str_t       buffer;          /* string into which to render   */
     h5tools_context_t   ctx;             /* print context  */
     h5tool_format_t     outputformat;
@@ -1401,7 +1334,8 @@ dump_dataset_values(hid_t dset)
         }
         outputformat.cmpd_sep = " ";
 
-        if (label_g) outputformat.cmpd_name = "%s=";
+        if (label_g)
+            outputformat.cmpd_name = "%s=";
 
         outputformat.elmt_suf1 = " ";
         outputformat.str_locale = ESCAPE_HTML;
@@ -1444,7 +1378,7 @@ dump_dataset_values(hid_t dset)
          * command line switch was given. */
         outputformat.raw = TRUE;
     }
-    else if (string_g && 1==size && H5T_INTEGER==H5Tget_class(f_type)) {
+    else if (string_g && 1 == size && H5T_INTEGER == H5Tget_class(f_type)) {
         /* Print 1-byte integer data as an ASCI character string instead of
          * integers if the `-s' or `--string' command-line option was given. */
         outputformat.ascii = TRUE;
@@ -1479,31 +1413,24 @@ dump_dataset_values(hid_t dset)
     PRINTVALSTREAM(rawoutstream, "\n");
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: list_attr
- *
- * Purpose: Prints information about attributes.
- *
- * Return: Success: 0
- *
- *  Failure: -1
+ * Function:    list_attr
  *
- * Programmer: Robb Matzke
- *              Friday, June  5, 1998
- *
- * Modifications:
+ * Purpose:     Prints information about attributes.
  *
+ * Return:      Success: 0
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ainfo,
     void H5_ATTR_UNUSED *op_data)
 {
-    hid_t               attr = -1;
-    hid_t               space = -1;
-    hid_t               type = -1;
-    hid_t               p_type = -1;
+    hid_t               attr = H5I_INVALID_HID;
+    hid_t               space = H5I_INVALID_HID;
+    hid_t               type = H5I_INVALID_HID;
+    hid_t               p_type = H5I_INVALID_HID;
     hsize_t             size[H5S_MAX_RANK];
     hsize_t             nelmts = 1;
     hsize_t             temp_need;
@@ -1526,7 +1453,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
 
     print_string(&buffer, attr_name, TRUE);
 
-    if((attr = H5Aopen(obj, attr_name, H5P_DEFAULT))) {
+    if ((attr = H5Aopen(obj, attr_name, H5P_DEFAULT))) {
         space = H5Aget_space(attr);
         type = H5Aget_type(attr);
 
@@ -1543,7 +1470,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
             case H5S_SIMPLE:
                 /* simple dataspace */
                 h5tools_str_append(&buffer, " {");
-                for (i=0; i<ndims; i++) {
+                for (i = 0; i < ndims; i++) {
                     h5tools_str_append(&buffer, "%s" HSIZE_T_FORMAT, i?", ":"", size[i]);
                     nelmts *= size[i];
                 }
@@ -1575,7 +1502,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
         /* Data */
         outputformat = *info;
 
-        if(nelmts < 5) {
+        if (nelmts < 5) {
             outputformat.idx_fmt = "";
             outputformat.line_1st  = "        Data:  ";
             outputformat.line_pre  = "               ";
@@ -1594,10 +1521,9 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
         }
 
         outputformat.line_ncols = (unsigned)width_g;
-        if(label_g)
+        if (label_g)
             outputformat.cmpd_name = "%s=";
-        if(string_g && 1==H5Tget_size(type) &&
-                H5T_INTEGER==H5Tget_class(type)) {
+        if (string_g && 1 == H5Tget_size(type) && H5T_INTEGER == H5Tget_class(type)) {
             outputformat.ascii = TRUE;
             outputformat.elmt_suf1 = "";
             outputformat.elmt_suf2 = "";
@@ -1621,13 +1547,13 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
 
         info = &outputformat;
 
-        if(space_type != H5S_NULL && space_type != H5S_NO_CLASS) {
-            if(hexdump_g)
+        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) {
+            if (p_type >= 0) {
                 /* VL data special information */
                 unsigned int        vl_data = 0; /* contains VL datatypes */
 
@@ -1647,7 +1573,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
 
                     /* Reclaim any VL memory, if necessary */
                     if (vl_data)
-                        H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
+                        H5Treclaim(p_type, space, H5P_DEFAULT, buf);
 
                     HDfree(buf);
                 }
@@ -1666,24 +1592,17 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
     return 0;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: dataset_list1
- *
- * Purpose: List information about a dataset which should appear on the
- *  same line as the dataset name.  This information will precede
- *  information which is applicable to all objects which will be
- *  printed by the caller.
- *
- * Return: Success: 0
+ * Function:    dataset_list1
  *
- *  Failure: -1
- *
- * Programmer: Robb Matzke
- *              Thursday, August 27, 1998
- *
- * Modifications:
+ * Purpose:     List information about a dataset which should appear on the
+ *              same line as the dataset name.  This information will precede
+ *              information which is applicable to all objects which will be
+ *              printed by the caller.
  *
+ * Return:      Success: 0
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1691,13 +1610,13 @@ dataset_list1(hid_t dset)
 {
     hsize_t     cur_size[H5S_MAX_RANK];   /* current dataset dimensions */
     hsize_t     max_size[H5S_MAX_RANK];   /* maximum dataset dimensions */
-    hid_t       space;          /* data space                 */
-    int         ndims;          /* dimensionality             */
-    H5S_class_t space_type;     /* type of dataspace          */
-    int   i;
-    hsize_t             curr_pos = 0;        /* total data element position   */
-    h5tools_str_t       buffer;          /* string into which to render   */
-    h5tools_context_t   ctx;             /* print context  */
+    hid_t       space;                    /* data space                 */
+    int         ndims;                    /* dimensionality             */
+    H5S_class_t space_type;               /* type of dataspace          */
+    int         i;
+    hsize_t             curr_pos = 0;     /* total data element position   */
+    h5tools_str_t       buffer;           /* string into which to render   */
+    h5tools_context_t   ctx;              /* print context  */
     h5tool_format_t    *info = &ls_dataformat;
 
     HDmemset(&ctx, 0, sizeof(ctx));
@@ -1711,17 +1630,19 @@ dataset_list1(hid_t dset)
     space_type = H5Sget_simple_extent_type(space);
     ndims = H5Sget_simple_extent_dims(space, cur_size, max_size);
     h5tools_str_append(&buffer, " {");
-    for (i=0; i<ndims; i++) {
+    for (i = 0; i < ndims; i++) {
         h5tools_str_append(&buffer, "%s"HSIZE_T_FORMAT, i?", ":"", cur_size[i]);
         if (max_size[i]==H5S_UNLIMITED) {
             h5tools_str_append(&buffer, "/%s", "Inf");
         }
-        else if (max_size[i]!=cur_size[i] || verbose_g>0) {
+        else if (max_size[i] != cur_size[i] || verbose_g > 0) {
             h5tools_str_append(&buffer, "/"HSIZE_T_FORMAT, max_size[i]);
         }
     }
-    if (space_type==H5S_SCALAR) h5tools_str_append(&buffer, "SCALAR");
-    else if (space_type==H5S_NULL) h5tools_str_append(&buffer, "NULL");
+    if (space_type == H5S_SCALAR)
+        h5tools_str_append(&buffer, "SCALAR");
+    else if (space_type == H5S_NULL)
+        h5tools_str_append(&buffer, "NULL");
     h5tools_str_append(&buffer, "}");
     h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
     H5Sclose (space);
@@ -1731,22 +1652,15 @@ dataset_list1(hid_t dset)
     return 0;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: dataset_list2
- *
- * Purpose: List information about a dataset which should appear after
- *  information which is general to all objects.
- *
- * Return: Success: 0
- *
- *  Failure: -1
+ * Function:    dataset_list2
  *
- * Programmer: Robb Matzke
- *              Thursday, August 27, 1998
- *
- * Modifications:
+ * Purpose:     List information about a dataset which should appear after
+ *              information which is general to all objects.
  *
+ * Return:      Success: 0
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1771,8 +1685,8 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
     double      utilization;    /* percent utilization of storage */
     H5T_class_t tclass;         /* datatype class identifier */
     int         i;
-    H5D_layout_t     stl;
-    hsize_t             curr_pos = 0;        /* total data element position   */
+    H5D_layout_t        stl;
+    hsize_t             curr_pos = 0;    /* total data element position   */
     h5tools_str_t       buffer;          /* string into which to render   */
     h5tools_context_t   ctx;             /* print context  */
     h5tool_format_t    *info = &ls_dataformat;
@@ -1782,7 +1696,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
 
     h5tools_str_reset(&buffer);
 
-    if(verbose_g > 0) {
+    if (verbose_g > 0) {
         dcpl = H5Dget_create_plist(dset);
         space = H5Dget_space(dset);
         type = H5Dget_type(dset);
@@ -1796,7 +1710,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                     ndims = H5Pget_chunk(dcpl, (int)NELMTS(chsize), chsize/*out*/);
                     h5tools_str_append(&buffer, "    %-10s {", "Chunks:");
                     total = H5Tget_size(type);
-                    for (i=0; i<ndims; i++) {
+                    for (i = 0; i < ndims; i++) {
                         h5tools_str_append(&buffer, "%s"HSIZE_T_FORMAT, i?", ":"", chsize[i]);
                         total *= chsize[i];
                     }
@@ -1807,29 +1721,25 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                 break;
             case H5D_CONTIGUOUS:
                 /* Print information about external storage */
-                if((nf = H5Pget_external_count(dcpl)) > 0) {
-                    for(i = 0, max_len = 0; i < nf; i++) {
-                        if(H5Pget_external(dcpl, (unsigned)i, sizeof(f_name), f_name, NULL, NULL) < 0)
+                if ((nf = H5Pget_external_count(dcpl)) > 0) {
+                    for (i = 0, max_len = 0; i < nf; i++) {
+                        if (H5Pget_external(dcpl, (unsigned)i, sizeof(f_name), f_name, NULL, NULL) < 0)
                             continue;
                         n = print_string(NULL, f_name, TRUE);
                         max_len = MAX(max_len, n);
                     } /* end for */
-                    h5tools_str_append(&buffer, "    %-10s %d external file%s\n",
-                            "Extern:", nf, 1==nf?"":"s");
-                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s %s\n",
-                            "ID", "DSet-Addr", "File-Addr", "Bytes", "File");
-                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s ",
-                            "----", "----------", "----------", "----------");
-                    for (i=0; i<max_len; i++) h5tools_str_append(&buffer, "-");
+                    h5tools_str_append(&buffer, "    %-10s %d external file%s\n", "Extern:", nf, 1==nf?"":"s");
+                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s %s\n", "ID", "DSet-Addr", "File-Addr", "Bytes", "File");
+                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s ", "----", "----------", "----------", "----------");
+                    for (i = 0; i < max_len; i++)
+                        h5tools_str_append(&buffer, "-");
                     h5tools_str_append(&buffer, "\n");
-                    for (i=0, total=0; i<nf; i++) {
+                    for (i = 0, total=0; i < nf; i++) {
                         if (H5Pget_external(dcpl, (unsigned)i, sizeof(f_name), f_name, &f_offset, &f_size)<0) {
-                            h5tools_str_append(&buffer,
-                                    "        #%03d %10"H5_PRINTF_LL_WIDTH"u %10s %10s ***ERROR*** %s\n",
-                                    i, total, "", "",
-                                    i+1<nf?"Following addresses are incorrect":"");
+                            h5tools_str_append(&buffer, "        #%03d %10"H5_PRINTF_LL_WIDTH"u %10s %10s ***ERROR*** %s\n",
+                                    i, total, "", "", i+1<nf?"Following addresses are incorrect":"");
                         }
-                        else if (H5S_UNLIMITED==f_size) {
+                        else if (H5S_UNLIMITED == f_size) {
                             h5tools_str_append(&buffer, "        #%03d %10"H5_PRINTF_LL_WIDTH"u %10"H5_PRINTF_LL_WIDTH"u %10s ",
                                     i, total, (hsize_t)f_offset, "INF");
                             print_string(&buffer, f_name, TRUE);
@@ -1842,9 +1752,8 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                         h5tools_str_append(&buffer, "\n");
                         total += f_size;
                     }
-                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s ",
-                            "----", "----------", "----------", "----------");
-                    for (i=0; i<max_len; i++)
+                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s ", "----", "----------", "----------", "----------");
+                    for (i = 0; i < max_len; i++)
                         h5tools_str_append(&buffer, "-");
                     h5tools_str_append(&buffer, "\n");
                 } /* end if */
@@ -1886,16 +1795,13 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
         used = H5Dget_storage_size(dset);
         tclass = H5Tget_class(type);
         h5tools_str_append(&buffer, "    %-10s ", "Storage:");
-        switch (tclass)
-        {
-
+        switch (tclass) {
         case H5T_VLEN:
             h5tools_str_append(&buffer, "information not available");
             break;
 
         case H5T_REFERENCE:
-            if ( H5Tequal(type, H5T_STD_REF_DSETREG))
-            {
+            if (H5Tequal(type, H5T_STD_REF_DSETREG)) {
                 h5tools_str_append(&buffer, "information not available");
             }
             break;
@@ -1912,11 +1818,8 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
         case H5T_ARRAY:
         case H5T_NCLASSES:
         default:
-            h5tools_str_append(&buffer, HSIZE_T_FORMAT" logical byte%s, "HSIZE_T_FORMAT" allocated byte%s",
-                total, 1==total?"":"s",
-                used, 1==used?"":"s");
-            if (used>0)
-            {
+            h5tools_str_append(&buffer, HSIZE_T_FORMAT" logical byte%s, "HSIZE_T_FORMAT" allocated byte%s", total, 1==total?"":"s", used, 1==used?"":"s");
+            if (used > 0) {
                 utilization = ((double)total * (double)100.0f) / (double)used;
                 h5tools_str_append(&buffer, ", %1.2f%% utilization", utilization);
             }
@@ -1925,18 +1828,14 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
         h5tools_str_append(&buffer, "\n");
 
         /* Print information about raw data filters */
-        if((nf = H5Pget_nfilters(dcpl)) > 0) {
-            for(i = 0; i < nf; i++) {
+        if ((nf = H5Pget_nfilters(dcpl)) > 0) {
+            for (i = 0; i < nf; i++) {
                 cd_nelmts = NELMTS(cd_values);
-                filt_id = H5Pget_filter2(dcpl, (unsigned)i, &filt_flags, &cd_nelmts,
-                        cd_values, sizeof(f_name), f_name, NULL);
+                filt_id = H5Pget_filter2(dcpl, (unsigned)i, &filt_flags, &cd_nelmts, cd_values, sizeof(f_name), f_name, NULL);
                 f_name[sizeof(f_name) - 1] = '\0';
                 HDsnprintf(s, sizeof(s), "Filter-%d:", i);
-                h5tools_str_append(&buffer, "    %-10s %s-%u %s {", s,
-                        (f_name[0] ? f_name : "method"),
-                        (unsigned)filt_id,
-                        ((filt_flags & H5Z_FLAG_OPTIONAL) ? "OPT" : ""));
-                for(cd_num = 0; cd_num < cd_nelmts; cd_num++)
+                h5tools_str_append(&buffer, "    %-10s %s-%u %s {", s, (f_name[0] ? f_name : "method"), (unsigned)filt_id, ((filt_flags & H5Z_FLAG_OPTIONAL) ? "OPT" : ""));
+                for (cd_num = 0; cd_num < cd_nelmts; cd_num++)
                     h5tools_str_append(&buffer, "%s%u", (cd_num ? ", " : ""), cd_values[cd_num]);
                 h5tools_str_append(&buffer, "}\n");
             } /* end for */
@@ -1949,7 +1848,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
         h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
         /* Print address information */
-        if(address_g)
+        if (address_g)
             H5Ddebug(dset);
 
         /* Close stuff */
@@ -1960,35 +1859,28 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
 
     h5tools_str_close(&buffer);
 
-    if(data_g)
+    if (data_g)
         dump_dataset_values(dset);
 
     return 0;
 } /* end dataset_list2() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function: datatype_list2
- *
- * Purpose: List information about a datatype which should appear after
- *  information which is general to all objects.
- *
- * Return: Success: 0
+ * Function:    datatype_list2
  *
- *  Failure: -1
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
+ * Purpose:     List information about a datatype which should appear after
+ *              information which is general to all objects.
  *
+ * Return:      Success: 0
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 datatype_list2(hid_t type, const char H5_ATTR_UNUSED *name)
 {
-    if (verbose_g>0) {
-        hsize_t             curr_pos = 0;        /* total data element position   */
+    if (verbose_g > 0) {
+        hsize_t             curr_pos = 0;    /* total data element position   */
         h5tools_str_t       buffer;          /* string into which to render   */
         h5tools_context_t   ctx;             /* print context  */
         h5tool_format_t    *info = &ls_dataformat;
@@ -2008,19 +1900,14 @@ datatype_list2(hid_t type, const char H5_ATTR_UNUSED *name)
     return 0;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: list_obj
- *
- * Purpose: Prints information about an object
- *
- * Return: Success: 0
+ * Function:    list_obj
  *
- *  Failure: -1
- *
- * Programmer: Quincey Koziol
- *              Tuesday, November 6, 2007
+ * Purpose:     Prints information about an object
  *
+ * Return:      Success: 0
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -2028,7 +1915,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
 {
     H5O_type_t          obj_type = oinfo->type;          /* Type of the object */
     iter_t             *iter = (iter_t*)_iter;
-    hsize_t             curr_pos = 0;        /* total data element position   */
+    hsize_t             curr_pos = 0;    /* total data element position   */
     h5tools_str_t       buffer;          /* string into which to render   */
     h5tools_context_t   ctx;             /* print context  */
     h5tool_format_t    *info = &ls_dataformat;
@@ -2039,37 +1926,37 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
     h5tools_str_reset(&buffer);
 
     /* Print the link's name, either full name or base name */
-    if(!iter->symlink_target)
+    if (!iter->symlink_target)
         print_obj_name(&buffer, iter, name, "");
 
     /* Check object information */
-    if(oinfo->type < 0 || oinfo->type >= H5O_TYPE_NTYPES) {
+    if (oinfo->type < 0 || oinfo->type >= H5O_TYPE_NTYPES) {
         h5tools_str_append(&buffer, "Unknown type(%d)", (int)oinfo->type);
         obj_type = H5O_TYPE_UNKNOWN;
     }
-    if(iter->symlink_target)
+    if (iter->symlink_target)
         h5tools_str_append(&buffer, "{");
-    if(obj_type >= 0 && dispatch_g[obj_type].name)
+    if (obj_type >= 0 && dispatch_g[obj_type].name)
         h5tools_str_append(&buffer, "%s", dispatch_g[obj_type].name);
     h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
     /* Check if we've seen this object before */
-    if(first_seen) {
+    if (first_seen) {
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, ", same as ");
         print_string(&buffer, first_seen, TRUE);
-        if(!iter->symlink_target) {
+        if (!iter->symlink_target) {
             h5tools_str_append(&buffer, "\n");
         }
         h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
     } /* end if */
     else {
-        hid_t obj = (-1);               /* ID of object opened */
+        hid_t obj = H5I_INVALID_HID;               /* ID of object opened */
 
         /* Open the object.  Not all objects can be opened.  If this is the case
          * then return right away.
          */
-        if(obj_type >= 0 && (obj = H5Oopen(iter->fid, name, H5P_DEFAULT)) < 0) {
+        if (obj_type >= 0 && (obj = H5Oopen(iter->fid, name, H5P_DEFAULT)) < 0) {
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, " *ERROR*\n");
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -2077,9 +1964,9 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         } /* end if */
 
         /* List the first line of information for the object. */
-        if(obj_type >= 0 && dispatch_g[obj_type].list1)
+        if (obj_type >= 0 && dispatch_g[obj_type].list1)
             (dispatch_g[obj_type].list1)(obj);
-        if(!iter->symlink_target || (verbose_g > 0)) {
+        if (!iter->symlink_target || (verbose_g > 0)) {
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "\n");
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -2087,13 +1974,13 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
 
         /* Show detailed information about the object, beginning with information
          * which is common to all objects. */
-        if(verbose_g > 0) {
+        if (verbose_g > 0) {
             size_t buf_size = 0;
             char* comment = NULL;
             ssize_t cmt_bufsize = -1;
 
             /* Display attributes */
-            if(obj_type >= 0)
+            if (obj_type >= 0)
                 H5Aiterate2(obj, H5_INDEX_NAME, H5_ITER_INC, NULL, list_attr, NULL);
 
             /* Object location & reference count */
@@ -2103,7 +1990,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
             /* Modification time */
-            if(oinfo->mtime > 0) {
+            if (oinfo->mtime > 0) {
                 char buf[256];
                 struct tm *tm;
 
@@ -2111,7 +1998,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
                     tm = HDgmtime(&(oinfo->mtime));
                 else
                     tm = HDlocaltime(&(oinfo->mtime));
-                if(tm) {
+                if (tm) {
                     HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "    %-10s %s\n", "Modified:", buf);
@@ -2127,9 +2014,9 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
              * If the call to H5Oget_comment returned an error, skip this block */
             if (cmt_bufsize > 0) {
                 comment = (char *)HDmalloc((size_t)cmt_bufsize + 1); /* new_size including null terminator */
-                if(comment) {
+                if (comment) {
                     cmt_bufsize = H5Oget_comment(obj, comment, (size_t)cmt_bufsize);
-                    if(cmt_bufsize > 0) {
+                    if (cmt_bufsize > 0) {
                         comment[cmt_bufsize] = 0;
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "    %-10s \"", "Comment:");
@@ -2143,16 +2030,16 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         } /* end if */
 
         /* Detailed list for object */
-        if(obj_type >= 0 && dispatch_g[obj_type].list2)
+        if (obj_type >= 0 && dispatch_g[obj_type].list2)
             (dispatch_g[obj_type].list2)(obj, name);
 
         /* Close the object. */
-        if(obj_type >= 0)
+        if (obj_type >= 0)
             H5Oclose(obj);
     } /* end else */
 
 done:
-    if(iter->symlink_target) {
+    if (iter->symlink_target) {
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "}\n");
         h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -2164,29 +2051,23 @@ done:
 } /* end list_obj() */
 
 
-
 /*-------------------------------------------------------------------------
  * Function: list_lnk
  *
  * Purpose: Prints information about a link
  *
  * Return: Success: 0
- *
- *  Failure: -1
- *
- * Programmer: Quincey Koziol
- *              Thursday, November 8, 2007
- *
+ *         Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
 {
-    char *buf=NULL;
+    char   *buf = NULL;
     iter_t *iter = (iter_t*)_iter;
-    int ret;
-    hsize_t             curr_pos = 0;        /* total data element position   */
-    h5tool_link_info_t lnk_info;
+    int     ret;
+    hsize_t             curr_pos = 0;    /* total data element position   */
+    h5tool_link_info_t  lnk_info;
     h5tools_str_t       buffer;          /* string into which to render   */
     h5tools_context_t   ctx;             /* print context  */
     h5tool_format_t    *info = &ls_dataformat;
@@ -2223,15 +2104,13 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
             h5tools_str_append(&buffer, buf);
             h5tools_str_append(&buffer, "}");
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
-            if(follow_symlink_g)
-            {
+            if (follow_symlink_g) {
                 hbool_t orig_grp_literal = grp_literal_g;
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, " ");
 
                 /* Check if we have already seen this softlink */
-                if(symlink_is_visited(iter->symlink_list, linfo->type, NULL, buf))
-                {
+                if (symlink_is_visited(iter->symlink_list, linfo->type, NULL, buf)) {
                     h5tools_str_append(&buffer, "{Already Visited}\n");
                     h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                     goto done;
@@ -2239,7 +2118,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 /* Add this link to the list of seen softlinks */
-                if(symlink_visit_add(iter->symlink_list, linfo->type, NULL, buf) < 0)
+                if (symlink_visit_add(iter->symlink_list, linfo->type, NULL, buf) < 0)
                     goto done;
 
                 /* Adjust user data to specify that we are operating on the
@@ -2248,11 +2127,10 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
 
                 /* Prevent recursive listing of soft link target if
                  * recursive_g is off */
-                if(!recursive_g)
+                if (!recursive_g)
                     grp_literal_g = TRUE;
                 /* Recurse through the soft link */
-                if(visit_obj(iter->fid, name, iter) < 0)
-                {
+                if (visit_obj(iter->fid, name, iter) < 0) {
                     grp_literal_g = orig_grp_literal;
                     goto done;
                 }
@@ -2284,7 +2162,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
             else if (no_dangling_link_g && ret == 0)
                 iter->symlink_list->dangle_link = TRUE;
 
-            if(H5Lunpack_elink_val(buf, linfo->u.val_size, NULL, &filename, &path) < 0)
+            if (H5Lunpack_elink_val(buf, linfo->u.val_size, NULL, &filename, &path) < 0)
                 goto done;
 
             h5tools_str_append(&buffer, "External Link {");
@@ -2292,21 +2170,19 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
             h5tools_str_append(&buffer, "/");
             if(*path != '/')
                 h5tools_str_append(&buffer, "/");
-                        h5tools_str_append(&buffer, path);
+            h5tools_str_append(&buffer, path);
             h5tools_str_append(&buffer, "}");
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
             /* Recurse through the external link */
             /* keep the follow_elink_g for backward compatibility with -E */
-            if(follow_link)
-            {
+            if (follow_link) {
                 hbool_t orig_grp_literal = grp_literal_g;
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, " ");
 
                 /* Check if we have already seen this elink */
-                if(symlink_is_visited(iter->symlink_list, linfo->type, filename, path))
-                {
+                if (symlink_is_visited(iter->symlink_list, linfo->type, filename, path)) {
                     h5tools_str_append(&buffer, "{Already Visited}\n");
                     h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                     goto done;
@@ -2314,8 +2190,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 /* Add this link to the list of seen elinks */
-                if(symlink_visit_add(iter->symlink_list, linfo->type, filename, path) < 0)
-                {
+                if (symlink_visit_add(iter->symlink_list, linfo->type, filename, path) < 0) {
                     goto done;
                 }
 
@@ -2325,11 +2200,11 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
 
                 /* Prevent recursive listing of external link target if
                  * recursive_g is off */
-                if(!recursive_g)
+                if (!recursive_g)
                     grp_literal_g = TRUE;
 
                 /* Recurse through the external link */
-                if(visit_obj(iter->fid, name, iter) < 0) {
+                if (visit_obj(iter->fid, name, iter) < 0) {
                     grp_literal_g = orig_grp_literal;
                     goto done;
                 }
@@ -2358,28 +2233,22 @@ done:
     return 0;
 } /* end list_lnk() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function: visit_obj
- *
- * Purpose: Begins iteration on an object
- *
- * Return:
- *  Success: 0
- *  Failure: -1
+ * Function:    visit_obj
  *
- * Programmer: Neil Fortner
- *              Wednesday, August 21, 2008
- *             Mostly copied from main()
+ * Purpose:     Begins iteration on an object
  *
+ * Return:      Success: 0
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 visit_obj(hid_t file, const char *oname, iter_t *iter)
 {
-    int retval = 0;
-    H5O_info_t oi;              /* Information for object */
-    hsize_t             curr_pos = 0;        /* total data element position   */
+    int                 retval = 0;
+    H5O_info_t          oi;              /* Information for object */
+    hsize_t             curr_pos = 0;    /* total data element position   */
     h5tools_str_t       buffer;          /* string into which to render   */
     h5tools_context_t   ctx;             /* print context  */
     h5tool_format_t    *info = &ls_dataformat;
@@ -2390,8 +2259,8 @@ visit_obj(hid_t file, const char *oname, iter_t *iter)
     h5tools_str_reset(&buffer);
 
     /* Retrieve info for object to list */
-    if(H5Oget_info_by_name2(file, oname, &oi, H5O_INFO_BASIC|H5O_INFO_TIME, H5P_DEFAULT) < 0) {
-        if(iter->symlink_target) {
+    if (H5Oget_info_by_name2(file, oname, &oi, H5O_INFO_BASIC|H5O_INFO_TIME, H5P_DEFAULT) < 0) {
+        if (iter->symlink_target) {
             h5tools_str_append(&buffer, "{**NOT FOUND**}\n");
             iter->symlink_target = FALSE;
         }
@@ -2403,9 +2272,9 @@ visit_obj(hid_t file, const char *oname, iter_t *iter)
     } /* end if */
 
     /* Check for group iteration */
-    if(H5O_TYPE_GROUP == oi.type && !grp_literal_g) {
+    if (H5O_TYPE_GROUP == oi.type && !grp_literal_g) {
         /* Get ID for group */
-        if(!iter->symlink_target && (iter->gid = H5Gopen2(file, oname, H5P_DEFAULT)) < 0) {
+        if (!iter->symlink_target && (iter->gid = H5Gopen2(file, oname, H5P_DEFAULT)) < 0) {
             h5tools_str_append(&buffer, "%s: unable to open '%s' as group\n", iter->fname, oname);
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
             goto done;   /* Previously "continue", when this code was in main().
@@ -2421,7 +2290,7 @@ visit_obj(hid_t file, const char *oname, iter_t *iter)
         h5trav_visit(file, oname, (hbool_t) (display_root_g || iter->symlink_target), recursive_g, list_obj, list_lnk, iter, H5O_INFO_BASIC|H5O_INFO_TIME);
 
         /* Close group */
-        if(!iter->symlink_target)
+        if (!iter->symlink_target)
             H5Gclose(iter->gid);
     } /* end if */
     else {
@@ -2438,35 +2307,28 @@ done:
     return retval;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: get_width
- *
- * Purpose: Figure out how wide the screen is.  This is highly
- *  unportable, but the user can always override the width we
- *  detect by giving a command-line option. These code snippets
- *  were borrowed from the GNU less(1).
- *
- * Return: Success: Number of columns.
- *
- *  Failure: Some default number of columms.
- *
- * Programmer: Robb Matzke
- *              Friday, November  6, 1998
+ * Function:    get_width
  *
- * Modifications:
+ * Purpose:     Figure out how wide the screen is.  This is highly
+ *              unportable, but the user can always override the width we
+ *              detect by giving a command-line option. These code snippets
+ *              were borrowed from the GNU less(1).
  *
+ * Return:      Success: Number of columns.
+ *              Failure: Some default number of columms.
  *-------------------------------------------------------------------------
  */
 static int
 get_width(void)
 {
-    int  width = 80;  /*the default   */
+    int   width = 80;  /*the default   */
     char *s;
 
     /* Try to get it from the COLUMNS environment variable first since it's
      * value is sometimes wrong. */
-    if ((s=HDgetenv("COLUMNS")) && *s && isdigit((int)*s))
+    if ((s = HDgetenv("COLUMNS")) && *s && isdigit((int)*s))
         width = (int)HDstrtol(s, NULL, 0);
 
 #if defined(H5_HAVE_STRUCT_VIDEOCONFIG) && defined(H5_HAVE__GETVIDEOCONFIG)
@@ -2514,37 +2376,31 @@ get_width(void)
 #endif
 
     /* Set to at least 1 */
-    if (width<1) width = 1;
+    if (width < 1)
+        width = 1;
     return width;
 }
 
 /*-------------------------------------------------------------------------
- * Function: is_valid_args
+ * Function:    is_valid_args
  *
- * Purpose: check if command line arguments are valid
- *
- * Return:
- *  Success: TRUE (1)
- *  Failure: FALSE (0)
- *
- * Programmer:
- *  Jonathan Kim  (06/15/2010)
+ * Purpose:     check if command line arguments are valid
  *
+ * Return:      Success: TRUE (1)
+ *              Failure: FALSE (0)
  *-------------------------------------------------------------------------*/
 static hbool_t
 is_valid_args(void)
 {
     hbool_t ret = TRUE;
 
-    if(recursive_g && grp_literal_g)
-    {
+    if (recursive_g && grp_literal_g) {
         HDfprintf(rawerrorstream, "Error: 'recursive' option not compatible with 'group info' option!\n\n");
         ret = FALSE;
         goto out;
     }
 
-    if(no_dangling_link_g && !follow_symlink_g)
-    {
+    if (no_dangling_link_g && !follow_symlink_g) {
         HDfprintf(rawerrorstream, "Error: --no-dangling-links must be used along with --follow-symlinks option!\n\n");
         ret = FALSE;
         goto out;
@@ -2554,19 +2410,13 @@ out:
     return ret;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: leave
+ * Function:    leave
  *
- * Purpose: Close HDF5 and MPI and call exit()
- *
- * Return: Does not return
- *
- * Programmer: Quincey Koziol
- *              Saturday, January 31, 2004
- *
- * Modifications:
+ * Purpose:     Close HDF5 and MPI and call exit()
  *
+ * Return:      Does not return
  *-------------------------------------------------------------------------
  */
 static void
@@ -2577,36 +2427,53 @@ leave(int ret)
     HDexit(ret);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function: main
- *
- * Purpose: Opens a file and lists the specified group
- *
- * Return: Success: 0
- *
- *  Failure: 1
- *
- * Programmer: Robb Matzke
- *              Monday, March 23, 1998
+ * Function:    main
  *
- * Modifications:
+ * Purpose:     Opens a file and lists the specified group
  *
+ * Return:      Success: 0
+ *              Failure: 1
  *-------------------------------------------------------------------------
  */
 int
 main(int argc, const char *argv[])
 {
-    hid_t file = -1;
-    char *fname = NULL, *oname = NULL, *x;
+    hid_t       file = H5I_INVALID_HID;
+    char       *fname = NULL, *oname = NULL, *x;
     const char *s = NULL;
-    char *rest;
-    int  argno, times;
+    char       *rest;
+    int         argno, times;
     static char root_name[] = "/";
     char        drivername[50];
     const char *preferred_driver = NULL;
     int err_exit = 0;
     uint64_t poll_nanosecs = 1000;
+    hid_t       fapl_id = H5P_DEFAULT;
+
+#ifdef H5_HAVE_ROS3_VFD
+    /* default "anonymous" s3 configuration */
+    H5FD_ros3_fapl_t ros3_fa = {
+        1,     /* fapl version      */
+        false, /* authenticate      */
+        "",    /* aws region        */
+        "",    /* access key id     */
+        "",    /* secret access key */
+    };
+#endif /* H5_HVAE_ROS3_VFD */
+
+#ifdef H5_HAVE_LIBHDFS
+    /* "default" HDFS configuration */
+    H5FD_hdfs_fapl_t hdfs_fa = {
+        1,           /* fapl version          */
+        "localhost", /* namenode name         */
+        0,           /* namenode port         */
+        "",          /* kerberos ticket cache */
+        "",          /* user name             */
+        2048,        /* stream buffer size    */
+    };
+#endif /* H5_HAVE_LIBHDFS */
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
@@ -2623,30 +2490,39 @@ main(int argc, const char *argv[])
     width_g = get_width();
 
     /* Switches come before non-switch arguments */
-    for(argno = 1; argno < argc && '-' == argv[argno][0]; argno++) {
-        if(!HDstrcmp(argv[argno], "--")) {
+    for (argno = 1; argno < argc && '-' == argv[argno][0]; argno++) {
+        if (!HDstrcmp(argv[argno], "--")) {
             /* Last switch */
             argno++;
             break;
-        } else if(!HDstrcmp(argv[argno], "--help")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--help")) {
             usage();
             leave(EXIT_SUCCESS);
-        } else if(!HDstrcmp(argv[argno], "--address")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--address")) {
             address_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--data")) {
+        }
+        else if(!HDstrcmp(argv[argno], "--data")) {
             data_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--enable-error-stack")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--enable-error-stack")) {
             show_errors_g = TRUE;
         /* deprecated --errors */
-        } else if(!HDstrcmp(argv[argno], "--errors")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--errors")) {
             show_errors_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--follow-symlinks")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--follow-symlinks")) {
             follow_symlink_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--no-dangling-links")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--no-dangling-links")) {
             no_dangling_link_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--external")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--external")) {
             follow_elink_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--full")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--full")) {
             fullname_g = TRUE;
         } else if(!HDstrncmp(argv[argno], "--poll=", strlen("--poll="))) {
             int nscanned = 0, rc;
@@ -2661,65 +2537,222 @@ main(int argc, const char *argv[])
             vfd_swmr_poll_g = TRUE;
         } else if(!HDstrcmp(argv[argno], "--poll")) {
             vfd_swmr_poll_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--group")) {
+        } else if (!HDstrcmp(argv[argno], "--group")) {
             grp_literal_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--label")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--label")) {
             label_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--recursive")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--recursive")) {
             recursive_g = TRUE;
             fullname_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--simple")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--simple")) {
             simple_output_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--string")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--string")) {
             string_g = TRUE;
-        } else if(!HDstrncmp(argv[argno], "--vfd=", (size_t)6)) {
+        }
+        else if (!HDstrncmp(argv[argno], "--vfd=", (size_t)6)) {
             preferred_driver = argv[argno]+6;
-        } else if(!HDstrncmp(argv[argno], "--width=", (size_t)8)) {
+        }
+        else if (!HDstrncmp(argv[argno], "--width=", (size_t)8)) {
             width_g = (int)HDstrtol(argv[argno]+8, &rest, 0);
 
-            if(0 == width_g)
+            if (0 == width_g)
                 no_line_wrap_g = TRUE;
-            else if(width_g < 0 || *rest) {
+            else if (width_g < 0 || *rest) {
                 usage();
                 leave(EXIT_FAILURE);
             }
-        } else if(!HDstrcmp(argv[argno], "--width")) {
-            if((argno + 1) >= argc) {
+        }
+        else if (!HDstrcmp(argv[argno], "--width")) {
+            if ((argno + 1) >= argc) {
                 usage();
                 leave(EXIT_FAILURE);
-            } else {
+            }
+            else {
                 s = argv[++argno];
             }
             width_g = (int)HDstrtol(s, &rest, 0);
-            if(width_g <= 0 || *rest) {
+            if (width_g <= 0 || *rest) {
                 usage();
                 leave(EXIT_FAILURE);
             }
-        } else if(!HDstrcmp(argv[argno], "--verbose")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--verbose")) {
             verbose_g++;
-        } else if(!HDstrcmp(argv[argno], "--version")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--version")) {
             print_version(h5tools_getprogname());
             leave(EXIT_SUCCESS);
-        } else if(!HDstrcmp(argv[argno], "--hexdump")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--hexdump")) {
             hexdump_g = TRUE;
-        } else if(!HDstrncmp(argv[argno], "-w", (size_t)2)) {
-            if(argv[argno][2]) {
+        }
+        else if (!HDstrncmp(argv[argno], "-w", (size_t)2)) {
+            if (argv[argno][2]) {
                 s = argv[argno] + 2;
-            } else if((argno + 1) >= argc) {
+            }
+            else if ((argno + 1) >= argc) {
                 usage();
                 leave(EXIT_FAILURE);
-            } else {
+            }
+            else {
                 s = argv[++argno];
             }
             width_g = (int)HDstrtol(s, &rest, 0);
 
-            if(0 == width_g)
+            if(0 == width_g) {
                 no_line_wrap_g = TRUE;
+            }
             else if(width_g < 0 || *rest) {
                 usage();
                 leave(EXIT_FAILURE);
             }
-        } else if('-'!=argv[argno][1]) {
+
+        }
+        else if (!HDstrncmp(argv[argno], "--s3-cred=", (size_t)10)) {
+#ifndef H5_HAVE_ROS3_VFD
+            HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n");
+            usage();
+            leave(EXIT_FAILURE);
+#else
+            unsigned           nelems     = 0;
+            char              *start      = NULL;
+            char              *s3cred_src = NULL;
+            char             **s3cred     = NULL;
+            char const        *ccred[3];
+            /* try to parse s3 credentials tuple
+             */
+            start = strchr(argv[argno], '=');
+            if (start == NULL) {
+                HDfprintf(rawerrorstream, "Error: Unable to parse null credentials tuple\n"
+                          "    For anonymous access, omit \"--s3-cred\" and use only \"--vfd=ros3\"\n\n");
+                usage();
+                leave(EXIT_FAILURE);
+            }
+            start++;
+            if (FAIL == parse_tuple((const char *)start, ',', &s3cred_src, &nelems, &s3cred)) {
+                HDfprintf(rawerrorstream, "Error: Unable to parse S3 credentials\n\n");
+                usage();
+                leave(EXIT_FAILURE);
+            }
+            /* sanity-check tuple count
+             */
+            if (nelems != 3) {
+                HDfprintf(rawerrorstream, "Error: Invalid S3 credentials\n\n");
+                usage();
+                leave(EXIT_FAILURE);
+            }
+            ccred[0] = (const char *)s3cred[0];
+            ccred[1] = (const char *)s3cred[1];
+            ccred[2] = (const char *)s3cred[2];
+            if (0 == h5tools_populate_ros3_fapl(&ros3_fa, ccred)) {
+                HDfprintf(rawerrorstream, "Error: Invalid S3 credentials\n\n");
+                usage();
+                leave(EXIT_FAILURE);
+            }
+            HDfree(s3cred);
+            HDfree(s3cred_src);
+#endif /* H5_HAVE_ROS3_VFD */
+
+        }
+        else if (!HDstrncmp(argv[argno], "--hdfs-attrs=", (size_t)13)) {
+#ifndef H5_HAVE_LIBHDFS
+            PRINTVALSTREAM(rawoutstream, "The HDFS VFD is not enabled.\n");
+            leave(EXIT_FAILURE);
+#else
+            /* Parse received configuration data and set fapl config struct */
+
+            hbool_t            _debug    = FALSE;
+            unsigned           nelems    = 0;
+            char const        *start     = NULL;
+            char              *props_src = NULL;
+            char             **props     = NULL;
+            unsigned long      k         = 0;
+
+            /* try to parse tuple
+             */
+            if (_debug) {
+                HDfprintf(stderr, "configuring hdfs...\n");
+            }
+            start = argv[argno]+13; /* should never segfault: worst case of */
+            if (*start != '(') {    /* null-termintor after '='.            */
+
+                if (_debug) {
+                    HDfprintf(stderr, "    no tuple.\n");
+                }
+                usage();
+                leave(EXIT_FAILURE);
+            }
+            if (FAIL == parse_tuple((const char *)start, ',', &props_src, &nelems, &props)) {
+                HDfprintf(stderr, "    unable to parse tuple.\n");
+                usage();
+                leave(EXIT_FAILURE);
+            }
+
+            /* sanity-check tuple count
+             */
+            if (nelems != 5) {
+                HDfprintf(stderr, "    expected 5-ple, got `%d`\n", nelems);
+                usage();
+                leave(EXIT_FAILURE);
+            }
+            if (_debug) {
+                HDfprintf(stderr, "    got hdfs-attrs tuple: `(%s,%s,%s,%s,%s)`\n", props[0], props[1], props[2], props[3], props[4]);
+            }
+
+            /* Populate fapl configuration structure with given properties.
+             * WARNING: No error-checking is done on length of input strings...
+             *          Silent overflow is possible, albeit unlikely.
+             */
+            if (HDstrncmp(props[0], "", 1)) {
+                if (_debug) {
+                    HDfprintf(stderr, "    setting namenode name: %s\n", props[0]);
+                }
+                HDstrncpy(hdfs_fa.namenode_name, (const char *)props[0], HDstrlen(props[0]));
+            }
+            if (HDstrncmp(props[1], "", 1)) {
+                k = strtoul((const char *)props[1], NULL, 0);
+                if (errno == ERANGE) {
+                    HDfprintf(stderr, "    supposed port number wasn't.\n");
+                    leave(EXIT_FAILURE);
+                }
+                if (_debug) {
+                    HDfprintf(stderr, "    setting namenode port: %lu\n", k);
+                }
+                hdfs_fa.namenode_port = (int32_t)k;
+            }
+            if (HDstrncmp(props[2], "", 1)) {
+                if (_debug) {
+                    HDfprintf(stderr, "    setting kerb cache path: %s\n", props[2]);
+                }
+                HDstrncpy(hdfs_fa.kerberos_ticket_cache, (const char *)props[2], HDstrlen(props[2]));
+            }
+            if (HDstrncmp(props[3], "", 1)) {
+                if (_debug) {
+                    HDfprintf(stderr, "    setting username: %s\n", props[3]);
+                }
+                HDstrncpy(hdfs_fa.user_name, (const char *)props[3], HDstrlen(props[3]));
+            }
+            if (HDstrncmp(props[4], "", 1)) {
+                k = HDstrtoul((const char *)props[4], NULL, 0);
+                if (errno == ERANGE) {
+                    HDfprintf(stderr, "    supposed buffersize number wasn't.\n");
+                    leave(EXIT_FAILURE);
+                }
+                if (_debug) {
+                    HDfprintf(stderr, "    setting stream buffer size: %lu\n", k);
+                }
+                hdfs_fa.stream_buffer_size = (int32_t)k;
+            }
+            HDfree(props);
+            HDfree(props_src);
+#endif /* H5_HAVE_LIBHDFS */
+
+        }
+        else if('-'!=argv[argno][1]) {
             /* Single-letter switches */
             for(s = argv[argno] + 1; *s; s++) {
                 switch(*s) {
@@ -2793,7 +2826,9 @@ main(int argc, const char *argv[])
                         leave(EXIT_FAILURE);
                 } /* end switch */
             } /* end for */
-        } else {
+        }
+        else {
+            HDfprintf(stderr, "Unknown argument: %s\n", argv[argno]);
             usage();
             leave(EXIT_FAILURE);
         }
@@ -2801,7 +2836,7 @@ main(int argc, const char *argv[])
 
     /* If no arguments remain then print a usage message (instead of doing
      * absolutely nothing ;-) */
-    if(argno >= argc) {
+    if (argno >= argc) {
         usage();
         leave(EXIT_FAILURE);
     } /* end if */
@@ -2811,12 +2846,48 @@ main(int argc, const char *argv[])
             leave(EXIT_FAILURE);
     }
     /* Check for conflicting arguments */
-    if (!is_valid_args())
-    {
+    if (!is_valid_args()) {
         usage();
         leave(EXIT_FAILURE);
     }
 
+    if (preferred_driver) {
+        void *conf_fa = NULL;
+
+        if (!HDstrcmp(preferred_driver, "ros3")) {
+#ifndef H5_HAVE_ROS3_VFD
+            HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD not enabled.\n\n");
+            usage();
+            leave(EXIT_FAILURE);
+#else
+            conf_fa = (void *)&ros3_fa;
+#endif /* H5_HAVE_ROS3_VFD */
+
+        }
+        else if (!HDstrcmp(preferred_driver, "hdfs")) {
+#ifndef H5_HAVE_LIBHDFS
+            PRINTVALSTREAM(rawoutstream, "The HDFS VFD is not enabled.\n");
+            leave(EXIT_FAILURE);
+#else
+            conf_fa = (void *)&hdfs_fa;
+#endif /* H5_HAVE_LIBHDFS */
+        }
+
+        if (conf_fa != NULL) {
+            HDassert(fapl_id == H5P_DEFAULT);
+            fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+            if (fapl_id < 0) {
+                HDfprintf(rawerrorstream, "Error: Unable to create fapl entry\n\n");
+                leave(EXIT_FAILURE);
+            }
+            if (0 == h5tools_set_configured_fapl(fapl_id, preferred_driver, conf_fa)) {
+                HDfprintf(rawerrorstream, "Error: Unable to set fapl\n\n");
+                usage();
+                leave(EXIT_FAILURE);
+            }
+        }
+    } /* preferred_driver defined */
+
     /* Turn off HDF5's automatic error printing unless you're debugging h5ls */
     if(!show_errors_g)
         H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
@@ -2849,11 +2920,16 @@ main(int argc, const char *argv[])
         oname = NULL;
         file = -1;
 
-        while(fname && *fname) {
-            file = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, preferred_driver, drivername, sizeof drivername);
+        while (fname && *fname) {
+            if (fapl_id != H5P_DEFAULT) {
+                file = H5Fopen(fname, H5F_ACC_RDONLY, fapl_id);
+            }
+            else {
+                file = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, preferred_driver, drivername, sizeof drivername);
+            }
 
-            if(file >= 0) {
-                if(verbose_g)
+            if (file >= 0) {
+                if (verbose_g)
                     PRINTSTREAM(rawoutstream, "Opened \"%s\" with %s driver.\n", fname, drivername);
                 break; /*success*/
             } else if (vfd_swmr_poll_g)
@@ -2861,27 +2937,27 @@ main(int argc, const char *argv[])
             /* Shorten the file name; lengthen the object name */
             x = oname;
             oname = HDstrrchr(fname, '/');
-            if(x)
+            if (x)
                 *x = '/';
-            if(!oname)
+            if (!oname)
                 break;
             *oname = '\0';
         } /* end while */
 
-        if(file < 0) {
+        if (file < 0) {
             HDfprintf(rawerrorstream, "%s: unable to open file\n", argv[argno-1]);
             HDfree(fname);
             err_exit = 1;
             continue;
         } /* end if */
-        if(oname) {
+        if (oname) {
             /* Always use absolute paths to avoid confusion, keep track of where
              * to begin path name output */
             *oname = '/';
             iter.base_len = HDstrlen(oname);
             iter.base_len -= oname[iter.base_len-1] == '/';
             x = oname;
-            if(NULL == (oname = HDstrdup(oname))) {
+            if (NULL == (oname = HDstrdup(oname))) {
                 HDfprintf(rawerrorstream, "memory allocation failed\n");
                 leave(EXIT_FAILURE);
             }
@@ -2890,9 +2966,9 @@ main(int argc, const char *argv[])
              * is displayed if it is a link or non-group object */
             iter.name_start = 1;
         }
-        if(!oname || !*oname) {
+        if (!oname || !*oname) {
             oname = root_name;
-            if(recursive_g)
+            if (recursive_g)
                 display_root_g = TRUE;
             iter.base_len = 0;
             iter.name_start = 0;
@@ -2913,9 +2989,9 @@ main(int argc, const char *argv[])
         symlink_list.objs = NULL;
 
         /* Check for root group as object name */
-        if(HDstrcmp(oname, root_name)) {
+        if (HDstrcmp(oname, root_name)) {
             /* Check the type of link given */
-            if(H5Lget_info(file, oname, &li, H5P_DEFAULT) < 0) {
+            if (H5Lget_info(file, oname, &li, H5P_DEFAULT) < 0) {
                 hsize_t             curr_pos = 0;        /* total data element position   */
                 h5tools_str_t       buffer;          /* string into which to render   */
                 h5tools_context_t   ctx;             /* print context  */
@@ -2940,8 +3016,8 @@ main(int argc, const char *argv[])
                     printf("\n");
             }
             /* Open the object and display it's information */
-            if(li.type == H5L_TYPE_HARD) {
-                if(visit_obj(file, oname, &iter) < 0)
+            if (li.type == H5L_TYPE_HARD) {
+                if (visit_obj(file, oname, &iter) < 0)
                     leave(EXIT_FAILURE);
             } /* end if(li.type == H5L_TYPE_HARD) */
             else {
@@ -2956,11 +3032,10 @@ main(int argc, const char *argv[])
         }
         H5Fclose(file);
         HDfree(fname);
-        if(x)
+        if (x)
             HDfree(oname);
 
-        for(u=0; u < symlink_list.nused; u++)
-        {
+        for (u = 0; u < symlink_list.nused; u++) {
             if (symlink_list.objs[u].type == H5L_TYPE_EXTERNAL)
                 HDfree(symlink_list.objs[u].file);
 
@@ -2973,6 +3048,13 @@ main(int argc, const char *argv[])
             err_exit = 1;
     } /* end while */
 
+    if (fapl_id != H5P_DEFAULT) {
+        if (0 < H5Pclose(fapl_id)) {
+            HDfprintf(rawerrorstream, "Error: Unable to set close fapl entry\n\n");
+            leave(EXIT_FAILURE);
+        }
+    }
+
     if (err_exit)
         leave(EXIT_FAILURE);
     else
diff --git a/tools/src/h5repack/CMakeLists.txt b/tools/src/h5repack/CMakeLists.txt
index c0cd558..4a1430e 100644
--- a/tools/src/h5repack/CMakeLists.txt
+++ b/tools/src/h5repack/CMakeLists.txt
@@ -14,18 +14,20 @@ set (REPACK_COMMON_SOURCES
     ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack.c
 )
 
-add_executable (h5repack ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_main.c)
-target_include_directories(h5repack PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5repack STATIC)
-target_link_libraries (h5repack PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5repack PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repack")
-
-set (H5_DEP_EXECUTABLES h5repack)
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (h5repack ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_main.c)
+  target_include_directories (h5repack PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5repack STATIC)
+  target_link_libraries (h5repack PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5repack PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repack")
+
+  set (H5_DEP_EXECUTABLES h5repack)
+endif ()
 
 if (BUILD_SHARED_LIBS)
   add_executable (h5repack-shared ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_main.c)
-  target_include_directories(h5repack-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5repack-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h5repack-shared SHARED)
   target_link_libraries (h5repack-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5repack-shared PROPERTIES FOLDER tools)
diff --git a/tools/src/h5repack/Makefile.am b/tools/src/h5repack/Makefile.am
index c71e65b..925b8a7 100644
--- a/tools/src/h5repack/Makefile.am
+++ b/tools/src/h5repack/Makefile.am
@@ -28,7 +28,7 @@ libh5repack_la_SOURCES=h5repack.c h5repack_copy.c h5repack_filters.c \
                        h5repack_opttable.c h5repack_parse.c h5repack_refs.c \
                        h5repack_verify.c
 libh5repack_la_LDFLAGS = $(AM_LDFLAGS)
-libh5repack_la_LIBADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
+libh5repack_la_LIBADD=$(LIBH5TOOLS) $(LIBHDF5)
 
 
 # Our main target, h5repack tool
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index a63e56f..5f688d9 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -41,7 +41,9 @@ static int have_request(pack_opt_t *options);
  * Return: 0, ok, -1, fail
  *-------------------------------------------------------------------------
  */
-int h5repack(const char* infile, const char* outfile, pack_opt_t *options) {
+int
+h5repack(const char* infile, const char* outfile, pack_opt_t *options)
+{
     /* check input */
     if (check_options(options) < 0)
         return -1;
@@ -55,7 +57,7 @@ int h5repack(const char* infile, const char* outfile, pack_opt_t *options) {
         return -1;
 
     return 0;
-}
+} /* end h5repack() */
 
 /*-------------------------------------------------------------------------
  * Function: h5repack_init
@@ -86,7 +88,7 @@ h5repack_init(pack_opt_t *options, int verbose, hbool_t latest)
     }
 
     return (options_table_init(&(options->op_tbl)));
-}
+} /* end h5repack_init() */
 
 /*-------------------------------------------------------------------------
  * Function: h5repack_end
@@ -95,9 +97,11 @@ h5repack_init(pack_opt_t *options, int verbose, hbool_t latest)
  *-------------------------------------------------------------------------
  */
 
-int h5repack_end(pack_opt_t *options) {
+int
+h5repack_end(pack_opt_t *options)
+{
     return options_table_free(options->op_tbl);
-}
+} /* end h5repack_end() */
 
 /*-------------------------------------------------------------------------
  * Function: h5repack_addfilter
@@ -138,7 +142,7 @@ h5repack_addfilter(const char *str, pack_opt_t *options)
 
     HDfree(obj_list);
     return 0;
-}
+} /* end h5repack_addfilter() */
 
 /*-------------------------------------------------------------------------
  * Function: h5repack_addlayout
@@ -175,7 +179,7 @@ h5repack_addlayout(const char *str, pack_opt_t *options)
             if (pack.layout == H5D_CHUNKED) {
                 /* -2 means the NONE option, remove chunking
                  and set the global layout to contiguous */
-                if (pack.chunk.rank == -2)
+                if (pack.chunk.rank == -2) /* TODO: fix 'magic number' */
                     options->layout_g = H5D_CONTIGUOUS;
                 /* otherwise set the global chunking type */
                 else {
@@ -192,10 +196,10 @@ h5repack_addlayout(const char *str, pack_opt_t *options)
 
         HDfree(obj_list);
         ret_value = 0;
-    }
+    } /* end if obj_list exists */
 
     return ret_value;
-}
+} /* end h5repack_addlayout() */
 
 /* Note: The below copy_named_datatype(), named_datatype_free(), copy_attr()
  * were located in h5repack_copy.c as static prior to bugfix1726.
@@ -215,8 +219,9 @@ h5repack_addlayout(const char *str, pack_opt_t *options)
  *          to free the stack.
  *-------------------------------------------------------------------------
  */
-hid_t copy_named_datatype(hid_t type_in, hid_t fidout,
-        named_dt_t **named_dt_head_p, trav_table_t *travt, pack_opt_t *options) {
+hid_t
+copy_named_datatype(hid_t type_in, hid_t fidout, named_dt_t **named_dt_head_p, trav_table_t *travt, pack_opt_t *options)
+{
     named_dt_t *dt = *named_dt_head_p; /* Stack pointer */
     named_dt_t *dt_ret = NULL;         /* Datatype to return */
     H5O_info_t  oinfo;                 /* Object info of input dtype */
@@ -250,13 +255,14 @@ 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) {
                     dt_ret = dt;
-                } /* end if */
-            } /* end if */
-        } /* end for */
-    } /* end else */
+                }
+            } /* end if named datatype */
+        } /* end for each object in traversal table */
+    } /* end else (create the stack) */
 
     /* Handle the case that the requested datatype was not found.  This is
-    * possible if the datatype was committed anonymously in the input file. */
+     * possible if the datatype was committed anonymously in the input file.
+     */
     if (!dt_ret) {
         /* Push the new datatype onto the stack */
         if (NULL == (dt_ret = (named_dt_t *)HDmalloc(sizeof(named_dt_t))))
@@ -267,10 +273,11 @@ hid_t copy_named_datatype(hid_t type_in, hid_t fidout,
         /* Update the address and id */
         dt_ret->addr_in = oinfo.addr;
         dt_ret->id_out = -1;
-    } /* end if */
+    } /* end if requested datatype not found */
 
     /* If the requested datatype does not yet exist in the output file, copy it
-    * anonymously */
+     * anonymously
+     */
     if (dt_ret->id_out < 0) {
         if (options->use_native == 1)
             dt_ret->id_out = H5Tget_native_type(type_in, H5T_DIR_DEFAULT);
@@ -280,18 +287,20 @@ hid_t copy_named_datatype(hid_t type_in, hid_t fidout,
             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)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tcommit_anon failed");
-    } /* end if */
+    } /* end if named datatype not yet in output file */
 
     /* 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 */
-    if(H5Iinc_ref(ret_value) < 0)
+    /* Increment the ref count on id_out, because the calling function will try
+     * to close it. (TODO: fix scope envy)
+     */
+    if (H5Iinc_ref(ret_value) < 0)
         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Iinc_ref failed");
 
 done:
     return ret_value;
-} /* end copy_named_datatype */
+} /* end copy_named_datatype() */
 
 /*-------------------------------------------------------------------------
  * Function: named_datatype_free
@@ -299,7 +308,9 @@ done:
  * Purpose: Frees the stack of named datatypes.
  *-------------------------------------------------------------------------
  */
-int named_datatype_free(named_dt_t **named_dt_head_p, int ignore_err) {
+int
+named_datatype_free(named_dt_t **named_dt_head_p, int ignore_err)
+{
     named_dt_t *dt = *named_dt_head_p;
     int         ret_value = -1;
 
@@ -310,13 +321,13 @@ int named_datatype_free(named_dt_t **named_dt_head_p, int ignore_err) {
         dt = dt->next;
         HDfree(*named_dt_head_p);
         *named_dt_head_p = dt;
-    } /* end while */
+    }
 
     ret_value = 0;
 
 done:
     return (ret_value);
-} /* end named_datatype_free */
+} /* end named_datatype_free() */
 
 /*-------------------------------------------------------------------------
  * Function: copy_attr
@@ -330,8 +341,7 @@ done:
  *-------------------------------------------------------------------------
  */
 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)
+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;
     hid_t       attr_id = -1;  /* attr ID */
@@ -364,7 +374,6 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
         if ((attr_id = H5Aopen_by_idx(loc_in, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t) u, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aopen_by_idx failed");
 
-        /* get name */
         if (H5Aget_name(attr_id, (size_t) 255, name) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
 
@@ -386,17 +395,17 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
             if ((wtype_id = copy_named_datatype(ftype_id, fidout, named_dt_head_p, travt, options)) < 0) {
                 H5Fclose(fidout);
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "copy_named_datatype failed");
-            } /* end if */
+            }
 
             if (H5Fclose(fidout) < 0)
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Fclose failed");
-        } /* end if */
+        } /* end if datatype is committed and we have a traversal table */
         else {
             if (options->use_native == 1)
                 wtype_id = H5Tget_native_type(ftype_id, H5T_DIR_DEFAULT);
             else
                 wtype_id = H5Tcopy(ftype_id);
-        } /* end else */
+        } /* end else: uncommitted datatype and/or no traversal table */
 
         /* get the dataspace handle  */
         if ((space_id = H5Aget_space(attr_id)) < 0)
@@ -413,12 +422,12 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
         if ((msize = H5Tget_size(wtype_id)) == 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_size failed");
 
-        /*-------------------------------------------------------------------------
-         * object references are a special case. We cannot just copy the buffers,
-         * but instead we recreate the reference.
-         * This is done on a second sweep of the file that just copies the referenced
-         * objects at copy_refs_attr()
-         *-------------------------------------------------------------------------
+        /*---------------------------------------------------------------------
+         * object references are a special case. We cannot just copy the
+         * buffers, but instead we recreate the reference.
+         * This is done on a second sweep of the file that just copies the
+         * referenced objects at copy_refs_attr().
+         *---------------------------------------------------------------------
          */
         type_class = H5Tget_class(wtype_id);
         is_ref = (type_class == H5T_REFERENCE);
@@ -429,7 +438,7 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
             is_ref = (is_ref || (H5Tget_class(base_type) == H5T_REFERENCE));
             if (H5Tclose(base_type) < 0)
                 H5TOOLS_INFO(H5E_tools_min_id_g, "H5Tclose base_type failed");
-        }
+        } /* end if type_class is variable length or array */
 
         if (type_class == H5T_COMPOUND) {
             int nmembers = H5Tget_nmembers(wtype_id);
@@ -444,13 +453,13 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
                     is_ref = 1;
                     break;
                 }
-            } /* for (j=0; i<nmembers; j++) */
-        } /* if (type_class == H5T_COMPOUND) */
+            } /* end for each member */
+        } /* end if type_class is H5T_COMPOUND */
 
         if (!is_ref) {
-            /*-------------------------------------------------------------------------
+            /*-----------------------------------------------------------------
              * read to memory
-             *-------------------------------------------------------------------------
+             *-----------------------------------------------------------------
              */
 
             buf = (void *)HDmalloc((size_t)(nelmts * msize));
@@ -460,9 +469,9 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
             if (H5Aread(attr_id, wtype_id, buf) < 0)
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aread failed");
 
-            /*-------------------------------------------------------------------------
+            /*-----------------------------------------------------------------
              * copy
-             *-------------------------------------------------------------------------
+             *-----------------------------------------------------------------
              */
 
             if ((attr_out = H5Acreate2(loc_out, name, wtype_id, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -477,17 +486,17 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
             /* Check if we have VL data and string in the attribute's  datatype that must
              * be reclaimed */
             if (TRUE == h5tools_detect_vlen(wtype_id))
-                H5Dvlen_reclaim(wtype_id, space_id, H5P_DEFAULT, buf);
+                H5Treclaim(wtype_id, space_id, H5P_DEFAULT, buf);
             HDfree(buf);
             buf = NULL;
         } /*H5T_REFERENCE*/
 
         if (options->verbose)
-            printf(FORMAT_OBJ_ATTR, "attr", name);
+            HDprintf(FORMAT_OBJ_ATTR, "attr", name);
 
-        /*-------------------------------------------------------------------------
+        /*---------------------------------------------------------------------
          * close
-         *-------------------------------------------------------------------------
+         *---------------------------------------------------------------------
          */
         if (H5Sclose(space_id) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sclose failed");
@@ -501,19 +510,20 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
         if (H5Aclose(attr_id) < 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Aclose failed");
         attr_id = -1;
-    } /* for u */
+    } /* for u (each attribute) */
 
 done:
     H5E_BEGIN_TRY {
         if (buf) {
-            /* Check if we have VL data and string in the attribute's  datatype that must
-            * be reclaimed */
+            /* Check if we have VL data and string in the attribute's
+             * datatype that must be reclaimed
+             */
             if (TRUE == h5tools_detect_vlen(wtype_id))
-                H5Dvlen_reclaim(wtype_id, space_id, H5P_DEFAULT, buf);
+                H5Treclaim(wtype_id, space_id, H5P_DEFAULT, buf);
 
             /* Free buf */
             HDfree(buf);
-        } /* end if */
+        }
 
         H5Aclose(attr_out);
         H5Sclose(space_id);
@@ -525,27 +535,29 @@ done:
     return ret_value;
 } /* end copy_attr() */
 
-/*-------------------------------------------------------------------------
+/*-----------------------------------------------------------------------------
  * Function: check_options
  *
  * Purpose: print options, checks for invalid options
  *
  * Return: void, return -1 on error
- *-------------------------------------------------------------------------
+ *-----------------------------------------------------------------------------
  */
-static int check_options(pack_opt_t *options) {
+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];
 
     /*-------------------------------------------------------------------------
-    * objects to layout
-    *-------------------------------------------------------------------------
-    */
-    if (options->verbose && have_request(options) /* only print if requested */) {
+     * Objects to layout
+     *-------------------------------------------------------------------------
+     */
+    if (options->verbose && have_request(options)) {
         if (options->all_layout == 1) {
-            printf("All objects to modify layout are...\n");
+            HDprintf("All objects to modify layout are...\n");
             switch (options->layout_g) {
             case H5D_COMPACT:
                 strcpy(slayout, "compact");
@@ -566,76 +578,76 @@ static int check_options(pack_opt_t *options) {
                 strcpy(slayout, "invalid layout\n");
                 HGOTO_DONE(FAIL);
             }
-            printf(" Apply %s layout to all", slayout);
+            HDprintf(" Apply %s layout to all", slayout);
             if (H5D_CHUNKED == options->layout_g) {
-                printf("with dimension [ ");
+                HDprintf("with dimension [ ");
                 for (j = 0; j < options->chunk_g.rank; j++)
-                    printf("%d ", (int) options->chunk_g.chunk_lengths[j]);
-                printf("]");
+                    HDprintf("%d ", (int) options->chunk_g.chunk_lengths[j]);
+                HDprintf("]");
             }
-            printf("\n");
+            HDprintf("\n");
         }
         else
-            printf("No all objects to modify layout\n");
-    }/* verbose */
+            HDprintf("No all objects to modify layout\n");
+    } /* end if verbose */
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
         char* name = options->op_tbl->objs[i].path;
 
         if (options->op_tbl->objs[i].chunk.rank > 0) {
             if (options->verbose) {
-                printf(" <%s> with chunk size ", name);
+                HDprintf(" <%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("\n");
+                    HDprintf("%d ", (int) options->op_tbl->objs[i].chunk.chunk_lengths[k]);
+                HDprintf("\n");
             }
             has_ck = 1;
         }
-        else if (options->op_tbl->objs[i].chunk.rank == -2) {
+        else if (options->op_tbl->objs[i].chunk.rank == -2) { /* TODO: replace 'magic number' */
             if (options->verbose)
-                printf(" <%s> %s\n", name, "NONE (contiguous)");
+                HDprintf(" <%s> %s\n", name, "NONE (contiguous)");
             has_ck = 1;
         }
-    }
+    } /* end for each object in options */
 
     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
-    *-------------------------------------------------------------------------
-    */
+     * Objects to filter
+     *-------------------------------------------------------------------------
+     */
 
-    if (options->verbose && have_request(options) /* only print if requested */) {
+    if (options->verbose && have_request(options)) {
         if (options->all_filter == 1) {
-            printf("All objects to apply filter are...\n");
+            HDprintf("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");
+                    HDprintf(" Unknown\n");
                     continue;
                 }
                 switch (filtn) {
                 case H5Z_FILTER_NONE:
-                    printf(" Uncompress all\n");
+                    HDprintf(" Uncompress all\n");
                     break;
                 case H5Z_FILTER_SHUFFLE:
                 case H5Z_FILTER_FLETCHER32:
-                    printf(" All with %s\n", get_sfilter(filtn));
+                    HDprintf(" All with %s\n", get_sfilter(filtn));
                     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]);
+                    HDprintf(" All with %s, parameter %d\n", get_sfilter(filtn), options->filter_g[k].cd_values[0]);
                     break;
                 default:
-                    printf(" User Defined %d\n", filtn);
+                    HDprintf(" User Defined %d\n", filtn);
                     break;
-                } /* k */
-            };
-        }
+                } /* end switch */
+            } /* end for each filter */
+        } /* end if options->all_filter == 1 (TODO: meaning) */
         else
-            printf("No all objects to apply filter\n");
-    } /* verbose */
+            HDprintf("No all objects to apply filter\n");
+    } /* end if verbose */
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
         pack_info_t pack = options->op_tbl->objs[i];
@@ -643,24 +655,26 @@ static int check_options(pack_opt_t *options) {
 
         for (j = 0; j < pack.nfilters; j++) {
             if (options->verbose) {
-                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));
+                if (pack.filter[j].filtn >= 0) {
+                    if (pack.filter[j].filtn > H5Z_FILTER_SCALEOFFSET) {
+                        HDprintf(" <%s> with %s filter %d\n", name, get_sfilter(pack.filter[j].filtn), pack.filter[j].filtn);
+                    }
+                    else {
+                        HDprintf(" <%s> with %s filter\n", name, get_sfilter(pack.filter[j].filtn));
+                    }
                 }
             }
             has_cp = 1;
-        } /* j */
-    } /* i */
+        } /* end for each filter */
+    } /* end for each object in options table */
 
     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
-    *-------------------------------------------------------------------------
-    */
+     * Check options for the latest format
+     *-------------------------------------------------------------------------
+     */
 
     if (options->grp_compact < 0)
         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "invalid maximum number of links to store as header messages");
@@ -672,13 +686,13 @@ static int check_options(pack_opt_t *options) {
         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
-    *---------------------------------------------------------------------------------
-    */
+    /*------------------------------------------------------------------------
+     * Verify new user userblock options; file name must be present
+     *------------------------------------------------------------------------
+     */
     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);
+            HDprintf("Warning: user block size missing for file %s. Assigning a default size of 1024...\n", options->ublock_filename);
             options->ublock_size = 1024;
         }
     }
@@ -686,35 +700,37 @@ static int check_options(pack_opt_t *options) {
     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
-    *---------------------------------------------------------------------------------
-    */
+    /*------------------------------------------------------------------------
+     * Verify alignment options; threshold is zero default but alignment not
+     *------------------------------------------------------------------------
+     */
 
     if (options->alignment == 0 && options->threshold != 0)
         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "alignment for H5Pset_alignment missing");
 
 done:
     return ret_value;
-}
+} /* end check_options() */
 
 /*-------------------------------------------------------------------------
  * Function: check_objects
  *
- * Purpose: locate all HDF5 objects in the file and compare with user
- *  supplied list
+ * Purpose: Locate all HDF5 objects in the file and compare with user-supplied
+ *          list.
  *
  * Return: 0, ok, -1 no
  *-------------------------------------------------------------------------
  */
-static int check_objects(const char* fname, pack_opt_t *options) {
-    int           ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
+static int
+check_objects(const char* fname, pack_opt_t *options)
+{
     hid_t         fid = -1;
     hid_t         did = -1;
     hid_t         sid = -1;
     unsigned int  i;
-    unsigned int  uf;
+    int  ifil;
     trav_table_t *travt = NULL;
+    int           ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
 
     /* nothing to do */
     if (options->op_tbl->nelems == 0)
@@ -747,38 +763,40 @@ static int check_objects(const char* fname, pack_opt_t *options) {
      */
 
     if (options->verbose)
-        printf("Opening file. Searching %d objects to modify ...\n", travt->nobjs);
+        HDprintf("Opening file. Searching %zu objects to modify ...\n", travt->nobjs);
 
     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];
+        char* name = obj.path;
+
         if (options->verbose)
-            printf(" <%s>", name);
+            HDprintf(" <%s>", name);
 
         /* the input object names are present in the file and are valid */
         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);
         if (options->verbose)
-            printf("...Found\n");
+            HDprintf("...Found\n");
 
-        for (uf = 0; uf < options->op_tbl->objs[i].nfilters; uf++) {
-            if (options->op_tbl->objs[i].filter[uf].filtn < 0)
+        for (ifil = 0; ifil < obj.nfilters; ifil++) {
+            if (obj.filter[ifil].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) {
+            switch (obj.filter[ifil].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];
+                    unsigned ppb = obj.filter[ifil].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;
+                    if (obj.chunk.rank > 0) {
+                        rank = obj.chunk.rank;
                         for (j = 0; j < rank; j++)
-                            csize *= options->op_tbl->objs[i].chunk.chunk_lengths[j];
+                            csize *= obj.chunk.chunk_lengths[j];
                     }
                     else {
                         if ((did = H5Dopen2(fid, name, H5P_DEFAULT)) < 0)
@@ -799,16 +817,16 @@ static int check_objects(const char* fname, pack_opt_t *options) {
                     }
 
                     if (csize < ppb) {
-                        printf(" <warning: SZIP settings, chunk size is smaller than pixels per block>\n");
+                        HDprintf(" <warning: SZIP settings, chunk size is smaller than pixels per block>\n");
                         HGOTO_DONE(0);
                     }
-                }
+                } /* end case SZIP */
                 break;
             default:
                 break;
-            }
-        } /* for uf */
-    } /* for i */
+            } /* end switch */
+        } /* for ifil (each user-defined filter) */
+    } /* for i (each object in options traversal table) */
 
 done:
     H5E_BEGIN_TRY {
@@ -819,7 +837,7 @@ done:
     if (travt)
         trav_table_free(travt);
     return ret_value;
-}
+} /* end check_objects() */
 
 /*-------------------------------------------------------------------------
  * Function: have_request
@@ -829,14 +847,15 @@ done:
  * Return: 1 yes, 0 no
  *-------------------------------------------------------------------------
  */
-static int have_request(pack_opt_t *options) {
+static int
+have_request(pack_opt_t *options)
+{
 
     if (options->all_filter || options->all_layout || options->op_tbl->nelems)
         return 1;
 
     return 0;
-
-}
+} /* end have_request() */
 
 /*-------------------------------------------------------------------------
  * Function: get_sfilter
@@ -846,8 +865,9 @@ static int have_request(pack_opt_t *options) {
  * Return: name of filter, exit on error
  *-------------------------------------------------------------------------
  */
-
-static const char* get_sfilter(H5Z_filter_t filtn) {
+static const char *
+get_sfilter(H5Z_filter_t filtn)
+{
     if (filtn < 0)
         return NULL;
     else if (filtn == H5Z_FILTER_NONE)
@@ -866,5 +886,5 @@ static const char* get_sfilter(H5Z_filter_t filtn) {
         return "SOFF";
     else
         return "UD";
-}
+} /* end get_sfilter() */
 
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index b279cf9..24f67db 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -33,25 +33,11 @@
 /* size of buffer/# of bytes to xfer at a time when copying userblock */
 #define USERBLOCK_XFER_SIZE     512
 
-/* check H5Dread()/H5Dwrite() error, e.g. memory allocation error inside the library. */
-#define CHECK_H5DRW_ERROR(_fun, _fail, _did, _mtid, _msid, _fsid, _pid, _buf)  {  \
-    H5E_BEGIN_TRY {  \
-        if(_fun(_did, _mtid, _msid, _fsid, _pid, _buf) < 0) {  \
-            hid_t _err_num = 0; \
-            char _msg[80]; \
-            H5Ewalk2(H5E_DEFAULT, H5E_WALK_DOWNWARD, walk_error_callback, &_err_num); \
-            H5Eget_msg(_err_num, NULL, _msg, (size_t)80); \
-            error_msg("%s %s -- %s\n", #_fun, "failed", _msg); \
-            HGOTO_DONE(_fail) \
-        } \
-    } H5E_END_TRY; \
-}
-
 /*-------------------------------------------------------------------------
  * local functions
  *-------------------------------------------------------------------------
  */
-static int Get_hyperslab(hid_t dcpl_id, int rank_dset, hsize_t dims_dset[],
+static 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);
 static void print_dataset_info(hid_t dcpl_id, char *objname, double per, int pr);
 static int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
@@ -61,15 +47,7 @@ static int copy_user_block(const char *infile, const char *outfile,
 #if defined (H5REPACK_DEBUG_USER_BLOCK)
 static void print_user_block(const char *filename, hid_t fid);
 #endif
-static herr_t walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void *udata);
-
-/* get the major number from the error stack. */
-static herr_t walk_error_callback(H5_ATTR_UNUSED unsigned n, const H5E_error2_t *err_desc, void *udata) {
-    if (err_desc)
-        *((hid_t *) udata) = err_desc->maj_num;
 
-    return 0;
-}
 
 /*-------------------------------------------------------------------------
  * Function: copy_objects
@@ -80,8 +58,8 @@ static herr_t walk_error_callback(H5_ATTR_UNUSED unsigned n, const H5E_error2_t
  *          -1 no
  *-------------------------------------------------------------------------
  */
-
-int copy_objects(const char* fnamein, const char* fnameout, pack_opt_t *options)
+int
+copy_objects(const char* fnamein, const char* fnameout, pack_opt_t *options)
 {
     int           ret_value = 0;
     hid_t         fidin = -1;
@@ -167,8 +145,7 @@ 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)
+            if (H5Pset_link_phase_change(fcpl, (unsigned) options->grp_compact, (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++) {
@@ -318,7 +295,7 @@ print_user_block(fnamein, fidin);
      *-------------------------------------------------------------------------
      */
     if (options->verbose)
-        printf("Making new file ...\n");
+        HDprintf("Making new file ...\n");
 
     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);
@@ -387,10 +364,10 @@ done:
         trav_table_free(travt);
 
     return ret_value;
-}
+} /* end copy_objects() */
 
 /*-------------------------------------------------------------------------
- * Function: Get_hyperslab
+ * Function: get_hyperslab
  *
  * Purpose: Calulate a hyperslab from a dataset for higher performance.
  *          The size of hyperslab is limitted by H5TOOLS_BUFSIZE.
@@ -422,7 +399,7 @@ done:
  *-----------------------------------------*/
 
 int
-Get_hyperslab(hid_t dcpl_id, int rank_dset, hsize_t dims_dset[],
+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;
@@ -543,7 +520,7 @@ Get_hyperslab(hid_t dcpl_id, int rank_dset, hsize_t dims_dset[],
 
 done:
     return ret_value;
-}
+} /* end get_hyperslab() */
 
 /*-------------------------------------------------------------------------
  * Function: do_copy_objects
@@ -591,7 +568,7 @@ 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.
  *
- *  1. figure out a hyperslab (dimentions) and size  (refer to Get_hyperslab()).
+ *  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
  *     of the dataset. The code take care of the remaining portion if exist.
@@ -599,7 +576,8 @@ done:
  *-------------------------------------------------------------------------
  */
 
-int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
+int
+do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
         pack_opt_t *options) /* repack options */
 {
     int   ret_value = 0;
@@ -634,7 +612,7 @@ 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 ifil;
     int is_ref = 0;
     htri_t is_named;
     hbool_t limit_maxdims;
@@ -646,9 +624,9 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
      */
 
     if (options->verbose) {
-        printf("-----------------------------------------\n");
-        printf(" Type     Filter (Compression)     Name\n");
-        printf("-----------------------------------------\n");
+        HDprintf("-----------------------------------------\n");
+        HDprintf(" Type     Filter (Compression)     Name\n");
+        HDprintf("-----------------------------------------\n");
     }
 
     if (travt->objs) {
@@ -667,7 +645,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                  */
             case H5TRAV_TYPE_GROUP:
                 if (options->verbose)
-                    printf(FORMAT_OBJ, "group", travt->objs[i].name);
+                    HDprintf(FORMAT_OBJ, "group", travt->objs[i].name);
 
                 /* open input group */
                 if ((grp_in = H5Gopen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0)
@@ -740,8 +718,8 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                 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)
+                            for (ifil = 0; ifil < options->op_tbl->objs[ifil].nfilters; ifil++) {
+                                if (options->op_tbl->objs[u].filter[ifil].filtn > 0)
                                     req_filter = 1;
                             }
                     }
@@ -799,8 +777,6 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_type failed");
                     if ((dcpl_in = H5Dget_create_plist(dset_in)) < 0)
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_create_plist failed");
-                    if ((dcpl_out = H5Pcopy(dcpl_in)) < 0)
-                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcopy failed");
                     if ((rank = H5Sget_simple_extent_ndims(f_space_id)) < 0)
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sget_simple_extent_ndims failed");
                     HDmemset(dims, 0, sizeof dims);
@@ -809,6 +785,19 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                     if (H5Dget_space_status(dset_in, &space_status) < 0)
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_space_status failed");
 
+                    /* If the input dataset has external storage, it must be contiguous.
+                     * Accordingly, there would be no filter or chunk properties to preserve,
+                     * so create a new DCPL.
+                     * Otherwise, copy dcpl_in.
+                     */
+                    if (H5Pget_external_count(dcpl_in)) {
+                        if ((dcpl_out = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcreate failed");
+                    }
+                    else if ((dcpl_out = H5Pcopy(dcpl_in)) < 0) {
+                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pcopy failed");
+                    }
+
                     nelmts = 1;
                     for (j = 0; j < rank; j++)
                         nelmts *= dims[j];
@@ -819,7 +808,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                             wtype_id = H5Tget_native_type(ftype_id, H5T_DIR_DEFAULT);
                         else
                             wtype_id = H5Tcopy(ftype_id);
-                    } /* end if */
+                    }
 
                     if ((msize = H5Tget_size(wtype_id)) == 0)
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_size failed");
@@ -863,7 +852,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
 
                             /* only if layout change requested for entire file or
                              * individual obj */
-                            if (options->all_layout > 0 || req_obj_layout == 1)
+                            if (options->all_layout > 0 || req_obj_layout == 1) {
                                 /*-------------------------------------------------
                                  * Unset the unlimited max dims if convert to other
                                  * than chunk layouts, because unlimited max dims
@@ -883,14 +872,14 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
 
                                     /* if convert to COMPACT */
                                     if (options->layout_g == H5D_COMPACT)
-                                        /* should be smaller than 64K */
                                         if (size_dset > MAX_COMPACT_DSIZE)
                                             limit_maxdims = FALSE;
 
                                     /* unset unlimited max dims */
                                     if (limit_maxdims)
                                         H5Sset_extent_simple(f_space_id, rank, dims, NULL);
-                                }
+                                } /* end if not chunked */
+                            } /* end if layout change requested for entire file or individual object */
 
                             /*-------------------------------------------------------------------------
                              * create the output dataset;
@@ -902,12 +891,12 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                             if (dset_out == FAIL) {
                                 H5Epush2(H5tools_ERR_STACK_g, __FILE__, FUNC, __LINE__, H5tools_ERR_CLS_g, H5E_tools_g, H5E_tools_min_id_g, "H5Dcreate2 failed");
                                 if (options->verbose)
-                                    printf(" warning: could not create dataset <%s>. Applying original settings\n", travt->objs[i].name);
+                                    HDprintf(" warning: could not create dataset <%s>. Applying original settings\n", travt->objs[i].name);
 
                                 if ((dset_out = H5Dcreate2(fidout, travt->objs[i].name, wtype_id, f_space_id, H5P_DEFAULT, dcpl_in, H5P_DEFAULT)) < 0)
                                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dcreate2 failed");
                                 apply_f = 0;
-                            }
+                            } /* end if retry dataset create */
 
                             /*-------------------------------------------------------------------------
                              * read/write
@@ -929,10 +918,10 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                     /* 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) {
+                                        if (H5Treclaim(wtype_id, f_space_id, H5P_DEFAULT, buf) < 0)
+                                            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Treclaim failed");
+
+                                    if (buf != NULL) { /* TODO: is buf potentially released by H5Dvlen_reclaim()? */
                                         HDfree(buf);
                                         buf = NULL;
                                     }
@@ -968,17 +957,19 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                     dset_layout = H5Pget_layout(dcpl_out);
                                     if (dset_layout == H5D_CHUNKED)
                                         dcpl_tmp = dcpl_out; /* writing dataset */
-                                    else { /* if reading dataset is chunked */
+                                    else {
                                         dset_layout = H5Pget_layout(dcpl_in);
                                         if (dset_layout == H5D_CHUNKED)
                                             dcpl_tmp = dcpl_in; /* reading dataset */
                                     }
 
                                     /* get hyperslab dims and size in byte */
-                                    if (Get_hyperslab(dcpl_tmp, rank, dims, p_type_nbytes, hslab_dims, &hslab_nbytes) < 0)
-                                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Get_hyperslab failed");
+                                    if (get_hyperslab(dcpl_tmp, rank, dims, p_type_nbytes, hslab_dims, &hslab_nbytes) < 0)
+                                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "get_hyperslab failed");
 
                                     hslab_buf = HDmalloc((size_t)hslab_nbytes);
+                                    if (hslab_buf == NULL)
+                                        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "can't allocate space for hyperslab");
 
                                     hslab_nelmts = hslab_nbytes / p_type_nbytes;
                                     hslab_space = H5Screate_simple(1, &hslab_nelmts, NULL);
@@ -1005,12 +996,12 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sselect_hyperslab failed");
                                             if (H5Sselect_hyperslab(hslab_space, H5S_SELECT_SET, zero, NULL, &hs_select_nelmts, NULL) < 0)
                                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sselect_hyperslab failed");
-                                        }
+                                        } /* end if rank > 0 */
                                         else {
                                             H5Sselect_all(f_space_id);
                                             H5Sselect_all(hslab_space);
                                             hs_select_nelmts = 1;
-                                        } /* rank */
+                                        } /* end (else) rank  == 0 */
 
                                         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");
@@ -1019,7 +1010,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
 
                                         /* reclaim any VL memory, if necessary */
                                         if (vl_data)
-                                            H5Dvlen_reclaim(wtype_id, hslab_space, H5P_DEFAULT, hslab_buf);
+                                            H5Treclaim(wtype_id, hslab_space, H5P_DEFAULT, hslab_buf);
 
                                         /* calculate the next hyperslab offset */
                                         for (k = rank, carry = 1; k > 0 && carry; --k) {
@@ -1029,20 +1020,19 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                                 hs_sel_offset[k - 1] = 0;
                                             else
                                                 carry = 0;
-                                        } /* k */
-                                    } /* elmtno */
+                                        }
+                                    } /* end for (hyperslab selection loop) */
 
                                     H5Sclose(hslab_space);
-                                    /* free */
                                     if (hslab_buf != NULL) {
                                         HDfree(hslab_buf);
                                         hslab_buf = NULL;
                                     }
-                                } /* hyperslab read */
-                            } /* if (nelmts>0 && space_status==H5D_SPACE_STATUS_NOT_ALLOCATED) */
+                                } /* end if reading/writing by hyperslab */
+                            } /* end if (nelmts > 0 && space_status != H5D_SPACE_STATUS_NOT_ALLOCATED) */
 
                             /*-------------------------------------------------------------------------
-                             * amount of compression used
+                             * print amount of compression used
                              *-------------------------------------------------------------------------
                              */
                             if (options->verbose) {
@@ -1062,14 +1052,14 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                                     print_dataset_info(dcpl_in, travt->objs[i].name, ratio, 0);
 
                                 /* print a message that the filter was not applied
-                                 (in case there was a filter)
+                                 * (in case there was a filter)
                                  */
                                 if (has_filter && apply_s == 0)
-                                    printf(" <warning: filter not applied to %s. dataset smaller than %d bytes>\n", travt->objs[i].name, (int) options->min_comp);
+                                    HDprintf(" <warning: filter not applied to %s. dataset smaller than %d bytes>\n", travt->objs[i].name, (int) options->min_comp);
 
                                 if (has_filter && apply_f == 0)
-                                    printf(" <warning: could not apply the filter to %s>\n", travt->objs[i].name);
-                            } /* verbose */
+                                    HDprintf(" <warning: could not apply the filter to %s>\n", travt->objs[i].name);
+                            } /* end if verbose (print compression) */
 
                             /*-------------------------------------------------------------------------
                              * copy attrs
@@ -1078,14 +1068,13 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                             if (copy_attr(dset_in, dset_out, &named_dt_head, travt, options) < 0)
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "copy_attr failed");
 
-                            /*close */
                             if (H5Dclose(dset_out) < 0)
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dclose failed");
-                        }/*!H5T_REFERENCE*/
-                    }/*h5tools_canreadf*/
+                        } /* end if not a reference */
+                    } /* end if h5tools_canreadf (filter availability check) */
 
                     /*-------------------------------------------------------------------------
-                     * close
+                     * Close
                      *-------------------------------------------------------------------------
                      */
                     if (H5Tclose(ftype_id) < 0)
@@ -1102,7 +1091,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dclose failed");
                 }
                 /*-------------------------------------------------------------------------
-                 * we do not have request for filter/chunking use H5Ocopy instead
+                 * We do not have request for filter/chunking; use H5Ocopy instead
                  *-------------------------------------------------------------------------
                  */
                 else {
@@ -1116,11 +1105,6 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                     if (H5Pset_copy_object(pid, H5O_COPY_WITHOUT_ATTR_FLAG) < 0)
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pset_copy_object failed");
 
-                    /*-------------------------------------------------------------------------
-                     * do the copy
-                     *-------------------------------------------------------------------------
-                     */
-
                     if (H5Ocopy(fidin, /* Source file or group identifier */
                             travt->objs[i].name, /* Name of the source object to be copied */
                             fidout, /* Destination file or group identifier  */
@@ -1129,12 +1113,11 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                             H5P_DEFAULT) < 0) /* Properties which apply to the new hard link */
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Ocopy failed");
 
-                    /* close property */
                     if (H5Pclose(pid) < 0)
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Pclose failed");
 
                     /*-------------------------------------------------------------------------
-                     * copy attrs manually
+                     * Copy attrs manually
                      *-------------------------------------------------------------------------
                      */
                     if ((dset_in = H5Dopen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0)
@@ -1149,9 +1132,9 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dclose failed");
 
                     if (options->verbose)
-                        printf(FORMAT_OBJ, "dset", travt->objs[i].name);
+                        HDprintf(FORMAT_OBJ, "dset", travt->objs[i].name);
 
-                } /* end do we have request for filter/chunking */
+                } /* end whether we have request for filter/chunking */
                 break;
 
             /*-------------------------------------------------------------------------
@@ -1160,7 +1143,7 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
              */
             case H5TRAV_TYPE_NAMED_DATATYPE:
                 if (options->verbose)
-                    printf(FORMAT_OBJ, "type", travt->objs[i].name);
+                    HDprintf(FORMAT_OBJ, "type", travt->objs[i].name);
 
                 if ((type_in = H5Topen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Topen2 failed");
@@ -1199,20 +1182,20 @@ int do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt,
             case H5TRAV_TYPE_LINK:
             case H5TRAV_TYPE_UDLINK:
                 if (options->verbose)
-                    printf(FORMAT_OBJ, "link", travt->objs[i].name);
+                    HDprintf(FORMAT_OBJ, "link", travt->objs[i].name);
 
                 if (H5Lcopy(fidin, travt->objs[i].name, fidout, travt->objs[i].name, H5P_DEFAULT, H5P_DEFAULT) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Lcopy failed");
 
                 if (options->verbose)
-                    printf(FORMAT_OBJ, "link", travt->objs[i].name);
+                    HDprintf(FORMAT_OBJ, "link", travt->objs[i].name);
                 break;
 
             default:
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Object type not found");
             } /* switch */
-        } /* end for */
-    } /* end if */
+        } /* end for each object to traverse */
+    } /* end if there are objects */
 
 done:
 
@@ -1250,7 +1233,7 @@ done:
         HDfree(hslab_buf);
 
     return ret_value;
-}
+} /* end do_copy_objects() */
 
 /*-------------------------------------------------------------------------
  * Function: print_dataset_info
@@ -1300,7 +1283,7 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
                 {
                     unsigned level = cd_values[0];
 
-                    sprintf(temp,"(%d)", level);
+                    HDsprintf(temp,"(%d)", level);
                     HDstrcat(strfilter, temp);
                 }
 #endif
@@ -1314,7 +1297,7 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
                     unsigned options_mask = cd_values[0]; /* from dcpl, not filt*/
                     unsigned ppb = cd_values[1];
 
-                    sprintf(temp,"(%d,", ppb);
+                    HDsprintf(temp,"(%d,", ppb);
                     HDstrcat(strfilter, temp);
                     if (options_mask & H5_SZIP_EC_OPTION_MASK)
                         HDstrcpy(temp, "EC) ");
@@ -1344,21 +1327,21 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr)
             default:
                 HDstrcat(strfilter, "UD ");
                 break;
-        } /* switch */
-    }/*i*/
+        } /* end switch */
+    } /* end for each filter */
 
     if (!pr)
-        printf(FORMAT_OBJ, "dset", objname);
+        HDprintf(FORMAT_OBJ, "dset", objname);
     else {
-        char str[255], temp[28];
+        char str[512], temp[512];
 
         HDstrcpy(str, "dset     ");
         HDstrcat(str, strfilter);
-        sprintf(temp, "  (%.3f:1)", ratio);
+        HDsprintf(temp, "  (%.3f:1)", ratio);
         HDstrcat(str, temp);
-        printf(FORMAT_OBJ, str, objname);
+        HDprintf(FORMAT_OBJ, str, objname);
     }
-}
+} /* end print_dataset_info() */
 
 /*-------------------------------------------------------------------------
  * Function: copy_user_block
@@ -1422,13 +1405,13 @@ copy_user_block(const char *infile, const char *outfile, hsize_t size)
     } /* end while */
 
 done:
-    if (infid > 0)
+    if (infid >= 0)
         HDclose(infid);
-    if (outfid > 0)
+    if (outfid >= 0)
         HDclose(outfid);
 
     return ret_value;
-}
+} /* end copy_user_block() */
 
 /*-------------------------------------------------------------------------
  * Function: print_user_block
@@ -1483,10 +1466,10 @@ print_user_block(const char *filename, hid_t fid)
 
         for (i = 0; i < nread; i++) {
 
-            printf("%c ", rbuf[i]);
+            HDprintf("%c ", rbuf[i]);
 
         }
-        printf("\n");
+        HDprintf("\n");
 
         if (nread < 0) {
             HGOTO_ERROR(H5E_tools_g, H5E_tools_min_id_g, "nread < 0");
@@ -1497,10 +1480,10 @@ print_user_block(const char *filename, hid_t fid)
     }
 
 done:
-    if (fh > 0)
+    if (fh >= 0)
         HDclose(fh);
 
     return;
-}
+} /* end print_user_block() */
 #endif
 
diff --git a/tools/src/h5repack/h5repack_filters.c b/tools/src/h5repack/h5repack_filters.c
index 0092abc..7e32def 100644
--- a/tools/src/h5repack/h5repack_filters.c
+++ b/tools/src/h5repack/h5repack_filters.c
@@ -42,7 +42,8 @@ static int aux_copy_obj(hid_t dcpl_id, /* dataset creation property list */
     H5D_layout_t layout;
     int          rank;           /* rank of dataset */
     hsize_t      chsize[64];     /* chunk size in elements */
-    unsigned int i;
+    int i;
+    unsigned u;
 
     /* get information about input filters */
     if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
@@ -65,8 +66,8 @@ static int aux_copy_obj(hid_t dcpl_id, /* dataset creation property list */
         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];
+        for (u = 0; u < (unsigned)rank; u++)
+            objout->chunk.chunk_lengths[u] = chsize[u];
     }
 
 done:
@@ -85,8 +86,7 @@ static int aux_find_obj(const char* name, /* object name from traverse list */
         pack_info_t *obj                  /*OUT*/) /* info about object to filter */
 {
     char         *pdest = NULL;
-    char         *pname = NULL;
-    int          result;
+    const char   *pname = NULL;
     unsigned int i;
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
@@ -338,12 +338,14 @@ int apply_filters(const char* name, /* object name from traverse list */
 
             sm_nbytes = msize;
             for (i = rank; i > 0; --i) {
-                hsize_t size = H5TOOLS_BUFSIZE / sm_nbytes;
+                hsize_t size = 0;
+                if(sm_nbytes == 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "number of bytes per stripmine must be > 0");
+                size = H5TOOLS_BUFSIZE / sm_nbytes;
                 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++) {
diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c
index 8f0178f..c628beb 100644
--- a/tools/src/h5repack/h5repack_main.c
+++ b/tools/src/h5repack/h5repack_main.c
@@ -23,7 +23,8 @@ static void leave(int ret) H5_ATTR_NORETURN;
 
 
 /* module-scoped variables */
-static int has_i_o = 0;
+static int has_i = 0;
+static int has_o = 0;
 const char *infile = NULL;
 const char *outfile = NULL;
 
@@ -33,34 +34,34 @@ const char *outfile = NULL;
  */
 static const char *s_opts = "hVvf:l:m:e:nLj:k:c:d:s:u:b:M:t:a:i:o:S:P:T:G:q:z:E";
 static struct long_options l_opts[] = {
-    { "help", no_arg, 'h' },
-    { "version", no_arg, 'V' },
-    { "verbose", no_arg, 'v' },
-    { "filter", require_arg, 'f' },
-    { "layout", require_arg, 'l' },
-    { "minimum", require_arg, 'm' },
-    { "file", require_arg, 'e' },
-    { "native", no_arg, 'n' },
-    { "latest", no_arg, 'L' },
-    { "low", require_arg, 'j' },
-    { "high", require_arg, 'k' },
-    { "compact", require_arg, 'c' },
-    { "indexed", require_arg, 'd' },
-    { "ssize", require_arg, 's' },
-    { "ublock", require_arg, 'u' },
-    { "block", require_arg, 'b' },
+    { "help",                no_arg,      'h' },
+    { "version",             no_arg,      'V' },
+    { "verbose",             no_arg,      'v' },
+    { "filter",              require_arg, 'f' },
+    { "layout",              require_arg, 'l' },
+    { "minimum",             require_arg, 'm' },
+    { "file",                require_arg, 'e' },
+    { "native",              no_arg,      'n' },
+    { "latest",              no_arg,      'L' },
+    { "low",                 require_arg, 'j' },
+    { "high",                require_arg, 'k' },
+    { "compact",             require_arg, 'c' },
+    { "indexed",             require_arg, 'd' },
+    { "ssize",               require_arg, 's' },
+    { "ublock",              require_arg, 'u' },
+    { "block",               require_arg, 'b' },
     { "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 */
-    { "fs_strategy", require_arg, 'S' },
-    { "fs_persist", require_arg, 'P' },
-    { "fs_threshold", require_arg, 'T' },
-    { "fs_pagesize", require_arg, 'G' },
-    { "sort_by", require_arg, 'q' },
-    { "sort_order", require_arg, 'z' },
-    { "enable-error-stack", no_arg, 'E' },
+    { "threshold",           require_arg, 't' },
+    { "alignment",           require_arg, 'a' },
+    { "infile",              require_arg, 'i' }, /* for backward compability */
+    { "outfile",             require_arg, 'o' }, /* for backward compability */
+    { "fs_strategy",         require_arg, 'S' },
+    { "fs_persist",          require_arg, 'P' },
+    { "fs_threshold",        require_arg, 'T' },
+    { "fs_pagesize",         require_arg, 'G' },
+    { "sort_by",             require_arg, 'q' },
+    { "sort_order",          require_arg, 'z' },
+    { "enable-error-stack",  no_arg,      'E' },
     { NULL, 0, '\0' }
 };
 
@@ -83,13 +84,17 @@ static void usage(const char *prog) {
     PRINTVALSTREAM(rawoutstream, "   -v, --verbose           Verbose mode, print object information\n");
     PRINTVALSTREAM(rawoutstream, "   -V, --version           Print version number and exit\n");
     PRINTVALSTREAM(rawoutstream, "   -n, --native            Use a native HDF5 type when repacking\n");
-    PRINTVALSTREAM(rawoutstream, "   --enable-error-stack    Prints messages from the HDF5 error stack as they occur\n");
+    PRINTVALSTREAM(rawoutstream, "   --enable-error-stack    Prints messages from the HDF5 error stack as they\n");
+    PRINTVALSTREAM(rawoutstream, "                           occur\n");
     PRINTVALSTREAM(rawoutstream, "   -L, --latest            Use latest version of file format\n");
-    PRINTVALSTREAM(rawoutstream, "                           This option will take precedence over the -j and -k options\n");
-    PRINTVALSTREAM(rawoutstream, "   --low=BOUND             The low bound for library release versions to use when creating\n");
-    PRINTVALSTREAM(rawoutstream, "                           objects in the file (default is H5F_LIBVER_EARLIEST)\n");
-    PRINTVALSTREAM(rawoutstream, "   --high=BOUND            The high bound for library release versions to use when creating\n");
-    PRINTVALSTREAM(rawoutstream, "                           objects in the file (default is H5F_LIBVER_LATEST)\n");
+    PRINTVALSTREAM(rawoutstream, "                           This option will take precedence over the options\n");
+    PRINTVALSTREAM(rawoutstream, "                           --low and --high\n");
+    PRINTVALSTREAM(rawoutstream, "   --low=BOUND             The low bound for library release versions to use\n");
+    PRINTVALSTREAM(rawoutstream, "                           when creating objects in the file\n");
+    PRINTVALSTREAM(rawoutstream, "                           (default is H5F_LIBVER_EARLIEST)\n");
+    PRINTVALSTREAM(rawoutstream, "   --high=BOUND            The high bound for library release versions to use\n");
+    PRINTVALSTREAM(rawoutstream, "                           when creating objects in the file\n");
+    PRINTVALSTREAM(rawoutstream, "                           (default is H5F_LIBVER_LATEST)\n");
     PRINTVALSTREAM(rawoutstream, "   -c L1, --compact=L1     Maximum number of links in header messages\n");
     PRINTVALSTREAM(rawoutstream, "   -d L2, --indexed=L2     Minimum number of links in the indexed format\n");
     PRINTVALSTREAM(rawoutstream, "   -s S[:F], --ssize=S[:F] Shared object header message minimum size\n");
@@ -104,10 +109,14 @@ static void usage(const char *prog) {
     PRINTVALSTREAM(rawoutstream, "   -z Z, --sort_order=Z    Sort groups and attributes by order Z\n");
     PRINTVALSTREAM(rawoutstream, "   -f FILT, --filter=FILT  Filter type\n");
     PRINTVALSTREAM(rawoutstream, "   -l LAYT, --layout=LAYT  Layout type\n");
-    PRINTVALSTREAM(rawoutstream, "   -S FS_STRATEGY, --fs_strategy=FS_STRATEGY  File space management strategy for H5Pset_file_space_strategy\n");
-    PRINTVALSTREAM(rawoutstream, "   -P FS_PERSIST, --fs_persist=FS_PERSIST  Persisting or not persisting free-space for H5Pset_file_space_strategy\n");
-    PRINTVALSTREAM(rawoutstream, "   -T FS_THRESHOLD, --fs_threshold=FS_THRESHOLD   Free-space section threshold for H5Pset_file_space_strategy\n");
-    PRINTVALSTREAM(rawoutstream, "   -G FS_PAGESIZE, --fs_pagesize=FS_PAGESIZE   File space page size for H5Pset_file_space_page_size\n");
+    PRINTVALSTREAM(rawoutstream, "   -S FS_STRATEGY, --fs_strategy=FS_STRATEGY  File space management strategy for\n");
+    PRINTVALSTREAM(rawoutstream, "                           H5Pset_file_space_strategy\n");
+    PRINTVALSTREAM(rawoutstream, "   -P FS_PERSIST, --fs_persist=FS_PERSIST  Persisting or not persisting free-\n");
+    PRINTVALSTREAM(rawoutstream, "                           space for H5Pset_file_space_strategy\n");
+    PRINTVALSTREAM(rawoutstream, "   -T FS_THRESHOLD, --fs_threshold=FS_THRESHOLD   Free-space section threshold\n");
+    PRINTVALSTREAM(rawoutstream, "                           for H5Pset_file_space_strategy\n");
+    PRINTVALSTREAM(rawoutstream, "   -G FS_PAGESIZE, --fs_pagesize=FS_PAGESIZE   File space page size for\n");
+    PRINTVALSTREAM(rawoutstream, "                           H5Pset_file_space_page_size\n");
     PRINTVALSTREAM(rawoutstream, "\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");
@@ -115,40 +124,51 @@ static void usage(const char *prog) {
     PRINTVALSTREAM(rawoutstream, "    U - is a filename.\n");
     PRINTVALSTREAM(rawoutstream, "    T - is an integer\n");
     PRINTVALSTREAM(rawoutstream, "    A - is an integer greater than zero\n");
-    PRINTVALSTREAM(rawoutstream, "    Q - is the sort index type for the input file. It can be \"name\" or \"creation_order\" (default)\n");
-    PRINTVALSTREAM(rawoutstream, "    Z - is the sort order type for the input file. It can be \"descending\" or \"ascending\" (default)\n");
+    PRINTVALSTREAM(rawoutstream, "    Q - is the sort index type for the input file. It can be \"name\" or\n");
+    PRINTVALSTREAM(rawoutstream, "        \"creation_order\" (default)\n");
+    PRINTVALSTREAM(rawoutstream, "    Z - is the sort order type for the input file. It can be \"descending\" or\n");
+    PRINTVALSTREAM(rawoutstream, "        \"ascending\" (default)\n");
     PRINTVALSTREAM(rawoutstream, "    B - is the user block size, any value that is 512 or greater and is\n");
     PRINTVALSTREAM(rawoutstream, "        a power of 2 (1024 default)\n");
     PRINTVALSTREAM(rawoutstream, "    F - is the shared object header message type, any of <dspace|dtype|fill|\n");
     PRINTVALSTREAM(rawoutstream, "        pline|attr>. If F is not specified, S applies to all messages\n");
     PRINTVALSTREAM(rawoutstream, "\n");
-    PRINTVALSTREAM(rawoutstream, "    BOUND is an integer indicating the library release versions to use when creating\n");
-    PRINTVALSTREAM(rawoutstream, "          objects in the file (see H5Pset_libver_bounds()):\n");
+    PRINTVALSTREAM(rawoutstream, "    BOUND is an integer indicating the library release versions to use when\n");
+    PRINTVALSTREAM(rawoutstream, "          creating objects in the file (see H5Pset_libver_bounds()):\n");
     PRINTVALSTREAM(rawoutstream, "        0: This is H5F_LIBVER_EARLIEST in H5F_libver_t struct\n");
     PRINTVALSTREAM(rawoutstream, "        1: This is H5F_LIBVER_V18 in H5F_libver_t struct\n");
     PRINTVALSTREAM(rawoutstream, "        2: This is H5F_LIBVER_V110 in H5F_libver_t struct\n");
-    PRINTVALSTREAM(rawoutstream, "           (H5F_LIBVER_LATEST is aliased to H5F_LIBVER_V110 for this release\n");
+    PRINTVALSTREAM(rawoutstream, "        3: This is H5F_LIBVER_V112 in H5F_libver_t struct\n");
+    PRINTVALSTREAM(rawoutstream, "        4: This is H5F_LIBVER_V114 in H5F_libver_t struct\n");
+    PRINTVALSTREAM(rawoutstream, "           (H5F_LIBVER_LATEST is aliased to H5F_LIBVER_V114 for this release\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "    FS_STRATEGY is a string indicating the file space strategy used:\n");
     PRINTVALSTREAM(rawoutstream, "        FSM_AGGR:\n");
-    PRINTVALSTREAM(rawoutstream, "               The mechanisms used in managing file space are free-space managers, aggregators and virtual file driver.\n");
+    PRINTVALSTREAM(rawoutstream, "               The mechanisms used in managing file space are free-space\n");
+    PRINTVALSTREAM(rawoutstream, "               managers, aggregators and virtual file driver.\n");
     PRINTVALSTREAM(rawoutstream, "        PAGE:\n");
-    PRINTVALSTREAM(rawoutstream, "               The mechanisms used in managing file space are free-space managers with embedded paged aggregation and virtual file driver.\n");
+    PRINTVALSTREAM(rawoutstream, "               The mechanisms used in managing file space are free-space\n");
+    PRINTVALSTREAM(rawoutstream, "               managers with embedded paged aggregation and virtual file driver.\n");
     PRINTVALSTREAM(rawoutstream, "        AGGR:\n");
-    PRINTVALSTREAM(rawoutstream, "               The mechanisms used in managing file space are aggregators and virtual file driver.\n");
+    PRINTVALSTREAM(rawoutstream, "               The mechanisms used in managing file space are aggregators and\n");
+    PRINTVALSTREAM(rawoutstream, "               virtual file driver.\n");
     PRINTVALSTREAM(rawoutstream, "        NONE:\n");
-    PRINTVALSTREAM(rawoutstream, "               The mechanisms used in managing file space are virtual file driver.\n");
-    PRINTVALSTREAM(rawoutstream, "        The default strategy when not set is FSM_AGGR without persisting free-space.\n");
+    PRINTVALSTREAM(rawoutstream, "               The mechanisms used in managing file space are virtual file\n");
+    PRINTVALSTREAM(rawoutstream, "               driver.\n");
+    PRINTVALSTREAM(rawoutstream, "        The default strategy when not set is FSM_AGGR without persisting free-\n");
+    PRINTVALSTREAM(rawoutstream, "        space.\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "    FS_PERSIST is 1 to persisting free-space or 0 to not persisting free-space.\n");
     PRINTVALSTREAM(rawoutstream, "      The default when not set is not persisting free-space.\n");
     PRINTVALSTREAM(rawoutstream, "      The value is ignored for AGGR and NONE strategies.\n");
     PRINTVALSTREAM(rawoutstream, "\n");
-    PRINTVALSTREAM(rawoutstream, "    FS_THRESHOLD is the minimum size (in bytes) of free-space sections to be tracked by the library.\n");
+    PRINTVALSTREAM(rawoutstream, "    FS_THRESHOLD is the minimum size (in bytes) of free-space sections to be\n");
+    PRINTVALSTREAM(rawoutstream, "        tracked by the library.\n");
     PRINTVALSTREAM(rawoutstream, "      The default when not set is 1.\n");
     PRINTVALSTREAM(rawoutstream, "      The value is ignored for AGGR and NONE strategies.\n");
     PRINTVALSTREAM(rawoutstream, "\n");
-    PRINTVALSTREAM(rawoutstream, "    FS_PAGESIZE is the size (in bytes) >=512 that is used by the library when the file space strategy PAGE is used.\n");
+    PRINTVALSTREAM(rawoutstream, "    FS_PAGESIZE is the size (in bytes) >=512 that is used by the library when\n");
+    PRINTVALSTREAM(rawoutstream, "        the file space strategy PAGE is used.\n");
     PRINTVALSTREAM(rawoutstream, "      The default when not set is 4096.\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "    FILT - is a string with the format:\n");
@@ -176,9 +196,9 @@ 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,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, "        UD=<filter_number,filter_flag,cd_value_count,value1[,value2,...,valueN]>\n");
+    PRINTVALSTREAM(rawoutstream, "            Required values: filter_number, filter_flag, cd_value_count, value1\n");
+    PRINTVALSTREAM(rawoutstream, "            Optional values: value2 to valueN\n");
     PRINTVALSTREAM(rawoutstream, "        NONE (no parameter)\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "    LAYT - is a string with the format:\n");
@@ -215,12 +235,7 @@ static void usage(const char *prog) {
     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 --low=0 --high=1 file1 file2\n");
-    PRINTVALSTREAM(rawoutstream, "\n");
-    PRINTVALSTREAM(rawoutstream, "   Set low=H5F_LIBVER_EARLIEST and high=H5F_LIBVER_V18 via H5Pset_libver_bounds() when\n");
-    PRINTVALSTREAM(rawoutstream, "   creating the repacked file: file2\n");
+    PRINTVALSTREAM(rawoutstream, "   minimum shared datatype size of 20\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "5) h5repack -f SHUF -f GZIP=1 file1 file2\n");
     PRINTVALSTREAM(rawoutstream, "\n");
@@ -230,6 +245,11 @@ static void usage(const char *prog) {
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "   Add bzip2 filter to all datasets\n");
     PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "7) h5repack --low=0 --high=1 file1 file2\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "   Set low=H5F_LIBVER_EARLIEST and high=H5F_LIBVER_V18 via\n");
+    PRINTVALSTREAM(rawoutstream, "   H5Pset_libver_bounds() when creating the repacked file, file2\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
 }
 
 /*-------------------------------------------------------------------------
@@ -264,7 +284,7 @@ int read_info(const char *filename, pack_opt_t *options)
     int i, rc = 1;
     int ret_value = EXIT_SUCCESS;
 
-    if ((fp = HDfopen(filename, "r")) == (FILE *) NULL) {
+    if (NULL == (fp = HDfopen(filename, "r"))) {
         error_msg("cannot open options file %s\n", filename);
         h5tools_setstatus(EXIT_FAILURE);
         ret_value = EXIT_FAILURE;
@@ -273,90 +293,46 @@ int read_info(const char *filename, pack_opt_t *options)
 
     /* cycle until end of file reached */
     while (1) {
-        rc = fscanf(fp, "%s", stype);
-        if (rc == -1)
-            break;
-
-        /*-------------------------------------------------------------------------
-         * filter
-         *-------------------------------------------------------------------------
-         */
-        if (HDstrcmp(stype,"-f") == 0) {
-            /* find begining of info */
-            i = 0;
-            c = '0';
-            while (c != ' ') {
-                if(fscanf(fp, "%c", &c) < 0 && HDferror(fp)) {
-                    error_msg("fscanf error\n");
-                    h5tools_setstatus(EXIT_FAILURE);
-                    ret_value = EXIT_FAILURE;
-                    goto done;
-                } /* end if */
-                if (HDfeof(fp))
-                    break;
-            }
-            c = '0';
-            /* go until end */
-            while (c != ' ') {
-                if(fscanf(fp, "%c", &c) < 0 && HDferror(fp)) {
-                    error_msg("fscanf error\n");
-                    h5tools_setstatus(EXIT_FAILURE);
-                    ret_value = EXIT_FAILURE;
-                    goto done;
-                } /* end if */
-                comp_info[i] = c;
-                i++;
-                if (HDfeof(fp))
-                    break;
-                if (c == 10 /*eol*/)
-                    break;
-            }
-            comp_info[i - 1] = '\0'; /*cut the last " */
 
-            if (h5repack_addfilter(comp_info, options) == -1) {
-                error_msg("could not add compression option\n");
+        /* Info indicator must be for layout or filter */
+        if (HDstrcmp(stype,"-l") && HDstrcmp(stype, "-f")) {
+            error_msg("bad file format for %s", filename);
+            h5tools_setstatus(EXIT_FAILURE);
+            ret_value = EXIT_FAILURE;
+            goto done;
+        }
+
+        /* find begining of info */
+        i = 0;
+        c = '0';
+        while (c != ' ') {
+            if (fscanf(fp, "%c", &c) < 0 && HDferror(fp)) {
+                error_msg("fscanf error\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret_value = EXIT_FAILURE;
                 goto done;
             }
+            if (HDfeof(fp))
+                break;
         }
-        /*-------------------------------------------------------------------------
-         * layout
-         *-------------------------------------------------------------------------
-         */
-        else if (HDstrcmp(stype,"-l") == 0) {
-
-            /* find begining of info */
-            i = 0;
-            c = '0';
-            while (c != ' ') {
-                if(fscanf(fp, "%c", &c) < 0 && HDferror(fp)) {
-                    error_msg("fscanf error\n");
-                    h5tools_setstatus(EXIT_FAILURE);
-                    ret_value = EXIT_FAILURE;
-                    goto done;
-                } /* end if */
-                if (HDfeof(fp))
-                    break;
-            }
-            c = '0';
-            /* go until end */
-            while (c != ' ') {
-                if(fscanf(fp, "%c", &c) < 0 && HDferror(fp)) {
-                    error_msg("fscanf error\n");
-                    h5tools_setstatus(EXIT_FAILURE);
-                    ret_value = EXIT_FAILURE;
-                    goto done;
-                } /* end if */
-                comp_info[i] = c;
-                i++;
-                if (HDfeof(fp))
-                    break;
-                if (c == 10 /*eol*/)
-                    break;
+        c = '0';
+        /* go until end */
+        while (c != ' ') {
+            if (fscanf(fp, "%c", &c) < 0 && HDferror(fp)) {
+                error_msg("fscanf error\n");
+                h5tools_setstatus(EXIT_FAILURE);
+                ret_value = EXIT_FAILURE;
+                goto done;
             }
-            comp_info[i - 1] = '\0'; /*cut the last " */
+            comp_info[i++] = c;
+            if (HDfeof(fp))
+                break;
+            if (c == 10 /*eol*/)
+                break;
+        }
+        comp_info[i - 1] = '\0'; /*cut the last " */
 
+        if (!HDstrcmp(stype, "-l")) {
             if (h5repack_addlayout(comp_info, options) == -1) {
                 error_msg("could not add chunck option\n");
                 h5tools_setstatus(EXIT_FAILURE);
@@ -364,17 +340,15 @@ int read_info(const char *filename, pack_opt_t *options)
                 goto done;
             }
         }
-        /*-------------------------------------------------------------------------
-         * not valid
-         *-------------------------------------------------------------------------
-         */
         else {
-            error_msg("bad file format for %s", filename);
-            h5tools_setstatus(EXIT_FAILURE);
-            ret_value = EXIT_FAILURE;
-            goto done;
+            if (h5repack_addfilter(comp_info, options) == -1) {
+                error_msg("could not add compression option\n");
+                h5tools_setstatus(EXIT_FAILURE);
+                ret_value = EXIT_FAILURE;
+                goto done;
+            }
         }
-    }
+    } /* end while info-read cycling */
 
 done:
     if (fp)
@@ -398,9 +372,9 @@ set_sort_by(const char *form)
 {
     H5_index_t idx_type = H5_INDEX_UNKNOWN;
 
-    if (HDstrcmp(form,"name")==0) /* H5_INDEX_NAME */
+    if (!HDstrcmp(form, "name"))
         idx_type = H5_INDEX_NAME;
-    else if (HDstrcmp(form,"creation_order")==0) /* H5_INDEX_CRT_ORDER */
+    else if (!HDstrcmp(form, "creation_order"))
         idx_type = H5_INDEX_CRT_ORDER;
 
     return idx_type;
@@ -421,9 +395,9 @@ set_sort_order(const char *form)
 {
     H5_iter_order_t iter_order = H5_ITER_UNKNOWN;
 
-    if (HDstrcmp(form,"ascending")==0) /* H5_ITER_INC */
+    if (!HDstrcmp(form, "ascending"))
         iter_order = H5_ITER_INC;
-    else if (HDstrcmp(form,"descending")==0) /* H5_ITER_DEC */
+    else if (!HDstrcmp(form, "descending"))
         iter_order = H5_ITER_DEC;
 
     return iter_order;
@@ -442,19 +416,19 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
     int ret_value = 0;
 
     /* parse command line options */
-    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
+    while (EOF != (opt = get_option(argc, argv, s_opts, l_opts))) {
         switch ((char) opt) {
 
             /* -i for backward compatibility */
             case 'i':
                 infile = opt_arg;
-                has_i_o = 1;
+                has_i++;
                 break;
 
             /* -o for backward compatibility */
             case 'o':
                 outfile = opt_arg;
-                has_i_o = 1;
+                has_o++;
                 break;
 
             case 'h':
@@ -519,7 +493,7 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
 
             case 'j':
                 options->low_bound = (H5F_libver_t)HDatoi(opt_arg);
-                if(options->low_bound < H5F_LIBVER_EARLIEST || options->low_bound > H5F_LIBVER_LATEST) {
+                if (options->low_bound < H5F_LIBVER_EARLIEST || options->low_bound > H5F_LIBVER_LATEST) {
                     error_msg("in parsing low bound\n");
                     goto done;
                 }
@@ -527,7 +501,7 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
 
             case 'k':
                 options->high_bound = (H5F_libver_t)HDatoi(opt_arg);
-                if(options->high_bound < H5F_LIBVER_EARLIEST || options->high_bound > H5F_LIBVER_LATEST) {
+                if (options->high_bound < H5F_LIBVER_EARLIEST || options->high_bound > H5F_LIBVER_LATEST) {
                     error_msg("in parsing high bound\n");
                     goto done;
                 }
@@ -549,10 +523,10 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
                 {
                     int idx = 0;
                     int ssize = 0;
-                    char *msgPtr = HDstrchr( opt_arg, ':');
+                    char *msgPtr = HDstrchr(opt_arg, ':');
                     options->latest = TRUE; /* must use latest format */
                     if (msgPtr == NULL) {
-                        ssize = HDatoi( opt_arg );
+                        ssize = HDatoi(opt_arg);
                         for (idx = 0; idx < 5; idx++)
                             options->msg_size[idx] = ssize;
                     }
@@ -562,15 +536,15 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
                         HDstrcpy(msgType, msgPtr + 1);
                         msgPtr[0] = '\0';
                         ssize = HDatoi( opt_arg );
-                        if (HDstrncmp(msgType, "dspace",6) == 0)
+                        if (!HDstrncmp(msgType, "dspace", 6))
                             options->msg_size[0] = ssize;
-                        else if (HDstrncmp(msgType, "dtype", 5) == 0)
+                        else if (!HDstrncmp(msgType, "dtype", 5))
                             options->msg_size[1] = ssize;
-                        else if (HDstrncmp(msgType, "fill", 4) == 0)
+                        else if (!HDstrncmp(msgType, "fill", 4))
                             options->msg_size[2] = ssize;
-                        else if (HDstrncmp(msgType, "pline", 5) == 0)
+                        else if (!HDstrncmp(msgType, "pline", 5))
                             options->msg_size[3] = ssize;
-                        else if (HDstrncmp(msgType, "attr", 4) == 0)
+                        else if (!HDstrncmp(msgType, "attr", 4))
                             options->msg_size[4] = ssize;
                     }
                 }
@@ -607,13 +581,13 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
                     char strategy[MAX_NC_NAME];
 
                     HDstrcpy(strategy, opt_arg);
-                    if(!HDstrcmp(strategy, "FSM_AGGR"))
+                    if (!HDstrcmp(strategy, "FSM_AGGR"))
                         options->fs_strategy = H5F_FSPACE_STRATEGY_FSM_AGGR;
-                    else if(!HDstrcmp(strategy, "PAGE"))
+                    else if (!HDstrcmp(strategy, "PAGE"))
                         options->fs_strategy = H5F_FSPACE_STRATEGY_PAGE;
-                    else if(!HDstrcmp(strategy, "AGGR"))
+                    else if (!HDstrcmp(strategy, "AGGR"))
                         options->fs_strategy = H5F_FSPACE_STRATEGY_AGGR;
-                    else if(!HDstrcmp(strategy, "NONE"))
+                    else if (!HDstrcmp(strategy, "NONE"))
                         options->fs_strategy = H5F_FSPACE_STRATEGY_NONE;
                     else {
                         error_msg("invalid file space management strategy\n", opt_arg);
@@ -621,7 +595,7 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
                         ret_value = -1;
                         goto done;
                     }
-                    if(options->fs_strategy == (H5F_fspace_strategy_t)0)
+                    if (options->fs_strategy == (H5F_fspace_strategy_t)0)
                         /* To distinguish the "specified" zero value */
                         options->fs_strategy = (H5F_fspace_strategy_t)-1;
                 }
@@ -629,27 +603,27 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
 
             case 'P':
                 options->fs_persist = HDatoi(opt_arg);
-                if(options->fs_persist == 0)
+                if (options->fs_persist == 0)
                     /* To distinguish the "specified" zero value */
                     options->fs_persist = -1;
                 break;
 
             case 'T':
                 options->fs_threshold = HDatol(opt_arg);
-                if(options->fs_threshold == 0)
+                if (options->fs_threshold == 0)
                     /* To distinguish the "specified" zero value */
                     options->fs_threshold = -1;
                 break;
 
             case 'G':
                 options->fs_pagesize = HDstrtoll(opt_arg, NULL, 0);
-                if(options->fs_pagesize == 0)
+                if (options->fs_pagesize == 0)
                     /* To distinguish the "specified" zero value */
                    options->fs_pagesize = -1;
                 break;
 
             case 'q':
-                if((sort_by = set_sort_by(opt_arg)) < 0) {
+                if (H5_INDEX_UNKNOWN == set_sort_by(opt_arg)) {
                     error_msg(" failed to set sort by form <%s>\n", opt_arg);
                     h5tools_setstatus(EXIT_FAILURE);
                     ret_value = -1;
@@ -658,7 +632,7 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
                 break;
 
             case 'z':
-                if((sort_order = set_sort_order(opt_arg)) < 0) {
+                if (set_sort_order(opt_arg) == H5_ITER_UNKNOWN) {
                     error_msg(" failed to set sort order form <%s>\n", opt_arg);
                     h5tools_setstatus(EXIT_FAILURE);
                     ret_value = -1;
@@ -672,18 +646,35 @@ int parse_command_line(int argc, const char **argv, pack_opt_t* options)
 
             default:
                 break;
-        } /* switch */
-    } /* while */
-
-    if (has_i_o == 0) {
-        /* check for file names to be processed */
-        if (argc <= opt_ind || argv[opt_ind + 1] == NULL) {
-            error_msg("missing file names\n");
-            usage(h5tools_getprogname());
-            h5tools_setstatus(EXIT_FAILURE);
-            ret_value = -1;
-        }
-    }
+        } /* end switch */
+    } /* end while there are more options to parse */
+
+    /* If neither -i nor -o given, get in and out files positionally */
+    if (0 == (has_i + has_o)) {
+         if (argv[opt_ind] != NULL && argv[opt_ind + 1] != NULL) {
+             infile = argv[opt_ind];
+             outfile = argv[opt_ind + 1];
+
+             if (!HDstrcmp(infile, outfile)) {
+                 error_msg("file names cannot be the same\n");
+                 usage(h5tools_getprogname());
+                 h5tools_setstatus(EXIT_FAILURE);
+                 ret_value = -1;
+             }
+         }
+         else {
+             error_msg("file names missing\n");
+             usage(h5tools_getprogname());
+             h5tools_setstatus(EXIT_FAILURE);
+             ret_value = -1;
+         }
+     }
+     else if (has_i != 1 || has_o != 1) {
+         error_msg("filenames must be either both -i -o or both positional\n");
+         usage(h5tools_getprogname());
+         h5tools_setstatus(EXIT_FAILURE);
+         ret_value = -1;
+     }
 
 done:
     return ret_value;
@@ -707,6 +698,8 @@ int main(int argc, const char **argv)
     void               *edata;
     void               *tools_edata;
 
+    HDmemset(&options, 0, sizeof(pack_opt_t));
+
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
@@ -738,28 +731,6 @@ int main(int argc, const char **argv)
     if (parse_command_line(argc, argv, &options) < 0)
         goto done;
 
-    /* get file names if they were not yet got */
-    if (has_i_o == 0) {
-
-        if (argv[opt_ind] != NULL && argv[opt_ind + 1] != NULL) {
-            infile = argv[opt_ind];
-            outfile = argv[opt_ind + 1];
-
-            if ( HDstrcmp( infile, outfile ) == 0) {
-                error_msg("file names cannot be the same\n");
-                usage(h5tools_getprogname());
-                h5tools_setstatus(EXIT_FAILURE);
-                goto done;
-            }
-        }
-        else {
-            error_msg("file names missing\n");
-            usage(h5tools_getprogname());
-            h5tools_setstatus(EXIT_FAILURE);
-            goto done;
-        }
-    }
-
     if (enable_error_stack > 0) {
         H5Eset_auto2(H5E_DEFAULT, func, edata);
         H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c
index a275443..bfc376f 100644
--- a/tools/src/h5repack/h5repack_refs.c
+++ b/tools/src/h5repack/h5repack_refs.c
@@ -22,7 +22,7 @@
  */
 
 static const char* MapIdToName(hid_t refobj_id,trav_table_t *travt);
-static int copy_refs_attr(hid_t loc_in, hid_t loc_out, pack_opt_t *options,
+static int copy_refs_attr(hid_t loc_in, hid_t loc_out, 
                           trav_table_t *travt, hid_t fidout);
 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);
@@ -81,7 +81,7 @@ int do_copy_refobjs(hid_t fidin,
                 if((grp_in = H5Gopen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Gopen2 failed");
 
-                if(copy_refs_attr(grp_in, grp_out, options, travt, fidout) < 0)
+                if(copy_refs_attr(grp_in, grp_out, travt, fidout) < 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "copy_refs_attr failed");
 
                 if(H5Gclose(grp_out) < 0)
@@ -158,7 +158,7 @@ int do_copy_refobjs(hid_t fidin,
                         if(nelmts) {
                             buf = (hobj_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                             if(buf==NULL) {
-                                printf("cannot read into memory\n" );
+                                HDprintf("cannot read into memory\n" );
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                             } /* end if */
                             if(H5Dread(dset_in, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
@@ -166,7 +166,7 @@ int do_copy_refobjs(hid_t fidin,
 
                             refbuf = (hobj_ref_t*) HDcalloc((unsigned)nelmts, msize);
                             if(refbuf == NULL){
-                                printf("cannot allocate memory\n" );
+                                HDprintf("cannot allocate memory\n" );
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                             } /* end if */
                             for(u = 0; u < nelmts; u++) {
@@ -183,8 +183,8 @@ int do_copy_refobjs(hid_t fidin,
                                     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) {
-                                        printf(FORMAT_OBJ,"dset",travt->objs[i].name );
-                                        printf("object <%s> object reference created to <%s>\n",
+                                        HDprintf(FORMAT_OBJ,"dset",travt->objs[i].name );
+                                        HDprintf("object <%s> object reference created to <%s>\n",
                                             travt->objs[i].name,
                                             refname);
                                     }
@@ -234,7 +234,7 @@ int do_copy_refobjs(hid_t fidin,
                         if(nelmts) {
                             buf = (hdset_reg_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                             if(buf == NULL) {
-                                printf("cannot read into memory\n");
+                                HDprintf("cannot read into memory\n");
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                             } /* end if */
                             if(H5Dread(dset_in, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
@@ -246,7 +246,7 @@ int do_copy_refobjs(hid_t fidin,
                              */
                             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");
+                                HDprintf("cannot allocate memory\n");
                                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                             } /* end if */
 
@@ -271,8 +271,8 @@ int do_copy_refobjs(hid_t fidin,
                                     if(H5Sclose(region_id) < 0)
                                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Sclose failed");
                                     if(options->verbose) {
-                                        printf(FORMAT_OBJ,"dset",travt->objs[i].name );
-                                        printf("object <%s> region reference created to <%s>\n",
+                                        HDprintf(FORMAT_OBJ,"dset",travt->objs[i].name );
+                                        HDprintf("object <%s> region reference created to <%s>\n",
                                             travt->objs[i].name,
                                             refname);
                                     }
@@ -316,7 +316,7 @@ int do_copy_refobjs(hid_t fidin,
                      * copy referenced objects in attributes
                      *-------------------------------------------------------------------------
                      */
-                    if(copy_refs_attr(dset_in, dset_out, options, travt, fidout) < 0)
+                    if(copy_refs_attr(dset_in, dset_out, travt, fidout) < 0)
                         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "copy_refs_attr failed");
 
                     /*-------------------------------------------------------------------------
@@ -426,7 +426,6 @@ done:
 
 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 */
 {
@@ -450,7 +449,6 @@ static int copy_refs_attr(hid_t loc_in,
                 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;
@@ -592,7 +590,7 @@ static int copy_refs_attr(hid_t loc_in,
             if((is_ref || is_ref_array) && (H5R_OBJ_REF_BUF_SIZE==msize)) {
                 buf = (hobj_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                 if(buf == NULL) {
-                    printf("cannot read into memory\n");
+                    HDprintf("cannot read into memory\n");
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
                 if(H5Aread(attr_id, mtype_id, buf) < 0)
@@ -600,23 +598,20 @@ static int copy_refs_attr(hid_t loc_in,
 
                 refbuf = (hobj_ref_t *)HDcalloc((unsigned)nelmts, msize);
                 if(refbuf == NULL) {
-                    printf("cannot allocate memory\n");
+                    HDprintf("cannot allocate memory\n");
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                 } /* end if */
 
-                for(i = 0; i < (unsigned)nelmts; i++) {
-                    if (update_ref_value(attr_id, H5R_OBJECT, &((hobj_ref_t *)buf)[i], fidout, &((hobj_ref_t *)refbuf)[i], travt)<0)
+                for(i = 0; i < (unsigned)nelmts; i++)
+                    if(update_ref_value(attr_id, H5R_OBJECT, &((hobj_ref_t *)buf)[i], fidout, &((hobj_ref_t *)refbuf)[i], travt) < 0)
                         continue;
-                    if(options->verbose)
-                        printf("object <%s> reference created to <%s>\n", name, refname);
-                } /* i */
             } /* H5T_STD_REF_OBJ */
             /* handle region references */
             else if((is_ref || is_ref_array) && (H5R_DSET_REG_REF_BUF_SIZE == msize)) {
                 buf = (hdset_reg_ref_t *)HDmalloc((unsigned)(nelmts * msize));
 
                 if(buf == NULL) {
-                    printf( "cannot read into memory\n" );
+                    HDprintf( "cannot read into memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
                 if(H5Aread(attr_id, mtype_id, buf) < 0)
@@ -628,16 +623,13 @@ static int copy_refs_attr(hid_t loc_in,
                  */
                 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" );
+                    HDprintf( "cannot allocate memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDcalloc failed");
                 } /* end if */
 
-                for(i = 0; i < (unsigned)nelmts; i++) {
-                    if (update_ref_value(attr_id, H5R_DATASET_REGION, &((hdset_reg_ref_t *)buf)[i], fidout, &((hdset_reg_ref_t *)refbuf)[i], travt)<0)
+                for(i = 0; i < (unsigned)nelmts; i++)
+                    if(update_ref_value(attr_id, H5R_DATASET_REGION, &((hdset_reg_ref_t *)buf)[i], fidout, &((hdset_reg_ref_t *)refbuf)[i], travt) < 0)
                         continue;
-                    if(options->verbose)
-                        printf("object <%s> region reference created to <%s>\n", name, refname);
-                }
             } /* H5T_STD_REF_DSETREG */
             else if (is_ref_vlen) {
                 /* handle VLEN of references */
@@ -646,7 +638,7 @@ static int copy_refs_attr(hid_t loc_in,
                 refbuf = buf; /* reuse the read buffer for write */
 
                 if(buf == NULL) {
-                    printf( "cannot read into memory\n" );
+                    HDprintf( "cannot read into memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
 
@@ -687,7 +679,7 @@ static int copy_refs_attr(hid_t loc_in,
                 refbuf = buf; /* reuse the read buffer for write */
 
                 if(buf == NULL) {
-                    printf( "cannot read into memory\n" );
+                    HDprintf( "cannot read into memory\n" );
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "HDmalloc failed");
                 } /* end if */
 
@@ -700,7 +692,7 @@ static int copy_refs_attr(hid_t loc_in,
                             size_t idx = (i * msize) + H5Tget_member_offset(mtype_id, ref_comp_index[j]);
                             hobj_ref_t ref_out;
 
-                            if (update_ref_value(attr_id, H5R_OBJECT, (hobj_ref_t *)(((char *)buf)+idx), fidout, &ref_out, travt)<0)
+                            if (update_ref_value(attr_id, H5R_OBJECT, (hobj_ref_t *)((void *)(((char *)buf)+idx)), fidout, &ref_out, travt) < 0) /* Extra (void *) cast to quiet "cast to create alignment" warning - 2019/07/05, QAK */
                                 continue;
                             HDmemcpy(((char *)buf)+idx, &ref_out, ref_comp_size[j]);
                         } /* if */
@@ -720,7 +712,7 @@ static int copy_refs_attr(hid_t loc_in,
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Awrite failed");
 
             if (is_ref_vlen && buf)
-                H5Dvlen_reclaim (mtype_id, space_id, H5P_DEFAULT, buf);
+                H5Treclaim (mtype_id, space_id, H5P_DEFAULT, buf);
         } /* if (nelmts) */
 
         if (refbuf == buf)
diff --git a/tools/src/h5stat/CMakeLists.txt b/tools/src/h5stat/CMakeLists.txt
index 56c172c..55c675f 100644
--- a/tools/src/h5stat/CMakeLists.txt
+++ b/tools/src/h5stat/CMakeLists.txt
@@ -4,18 +4,20 @@ project (HDF5_TOOLS_SRC_H5STAT C)
 # --------------------------------------------------------------------
 # Add the h5stat executables
 # --------------------------------------------------------------------
-add_executable (h5stat ${HDF5_TOOLS_SRC_H5STAT_SOURCE_DIR}/h5stat.c)
-target_include_directories(h5stat PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5stat STATIC)
-target_link_libraries (h5stat PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5stat PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5stat")
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (h5stat ${HDF5_TOOLS_SRC_H5STAT_SOURCE_DIR}/h5stat.c)
+  target_include_directories (h5stat PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5stat STATIC)
+  target_link_libraries (h5stat PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5stat PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5stat")
 
-set (H5_DEP_EXECUTABLES h5stat)
+  set (H5_DEP_EXECUTABLES h5stat)
+endif ()
 
 if (BUILD_SHARED_LIBS)
   add_executable (h5stat-shared ${HDF5_TOOLS_SRC_H5STAT_SOURCE_DIR}/h5stat.c)
-  target_include_directories(h5stat-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_include_directories (h5stat-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h5stat-shared SHARED)
   target_link_libraries (h5stat-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_target_properties (h5stat-shared PROPERTIES FOLDER tools)
diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index dc1dc4a..3eea368 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -74,14 +74,14 @@ typedef struct iter_t {
     ohdr_info_t group_ohdr_info;        /* Object header information for groups */
 
     hsize_t  max_attrs;                 /* Maximum attributes from a group */
-    unsigned long *num_small_attrs;        /* Size of small attributes tracked */
+    unsigned long *num_small_attrs;     /* Size of small attributes tracked */
     unsigned attr_nbins;                /* Number of bins for attribute counts */
     unsigned long *attr_bins;           /* Pointer to array of bins for attribute counts */
 
     unsigned max_dset_rank;             /* Maximum rank of dataset */
     unsigned long dset_rank_count[H5S_MAX_RANK];   /* Number of datasets of each rank */
     hsize_t max_dset_dims;              /* Maximum dimension size of dataset */
-    unsigned long *small_dset_dims;    /* Size of dimensions of small datasets tracked */
+    unsigned long *small_dset_dims;     /* Size of dimensions of small datasets tracked */
     unsigned long dset_layouts[H5D_NLAYOUTS];           /* Type of storage for each dataset */
     unsigned long dset_comptype[H5_NFILTERS_IMPL];     /* Number of currently implemented filters */
     unsigned long dset_ntypes;          /* Number of diff. dataset datatypes found */
@@ -118,6 +118,33 @@ typedef struct iter_t {
 } iter_t;
 
 
+static const char *drivername = "";
+
+#ifdef H5_HAVE_ROS3_VFD
+/* default "anonymous" s3 configuration
+ */
+static H5FD_ros3_fapl_t ros3_fa = {
+    1,     /* fapl version      */
+    false, /* authenticate      */
+    "",    /* aws region        */
+    "",    /* access key id     */
+    "",    /* secret access key */
+};
+#endif /* H5_HAVE_ROS3_VFD */
+
+#ifdef H5_HAVE_LIBHDFS
+/* default HDFS access configuration
+ */
+static H5FD_hdfs_fapl_t hdfs_fa = {
+    1,           /* fapl version          */
+    "localhost", /* namenode name         */
+    0,           /* namenode port         */
+    "",          /* kerberos ticket cache */
+    "",          /* user name             */
+    2048,        /* stream buffer size    */
+};
+#endif /* H5_HAVE_LIBHDFS */
+
 static int        display_all = TRUE;
 
 /* Enable the printing of selected statistics */
@@ -146,7 +173,7 @@ struct handler_t {
     char **obj;
 };
 
-static const char *s_opts ="Aa:Ddm:EFfhGgl:sSTO:V";
+static const char *s_opts ="Aa:Ddm:EFfhGgl:sSTO:Vw:H:";
 /* e.g. "filemetadata" has to precede "file"; "groupmetadata" has to precede "group" etc. */
 static struct long_options l_opts[] = {
     {"help", no_arg, 'h'},
@@ -246,6 +273,8 @@ static struct long_options l_opts[] = {
     { "summ", no_arg, 'S' },
     { "sum", no_arg, 'S' },
     { "su", no_arg, 'S' },
+    { "s3-cred", require_arg, 'w' },
+    { "hdfs-attrs", require_arg, 'H' },
     { NULL, 0, '\0' }
 };
 
@@ -295,6 +324,16 @@ static void usage(const char *prog)
      HDfprintf(stdout, "     -s, --freespace       Print free space information\n");
      HDfprintf(stdout, "     -S, --summary         Print summary of file space information\n");
      HDfprintf(stdout, "     --enable-error-stack  Prints messages from the HDF5 error stack as they occur\n");
+     HDfprintf(stdout, "     --s3-cred=<cred>      Access file on S3, using provided credential\n");
+     HDfprintf(stdout, "                           <cred> :: (region,id,key)\n");
+     HDfprintf(stdout, "                           If <cred> == \"(,,)\", no authentication is used.\n");
+     HDfprintf(stdout, "     --hdfs-attrs=<attrs>  Access a file on HDFS with given configuration\n");
+     HDfprintf(stdout, "                           attributes.\n");
+     HDfprintf(stdout, "                           <attrs> :: (<namenode name>,<namenode port>,\n");
+     HDfprintf(stdout, "                                       <kerberos cache path>,<username>,\n");
+     HDfprintf(stdout, "                                       <buffer size>)\n");
+     HDfprintf(stdout, "                           If an attribute is empty, a default value will be\n");
+     HDfprintf(stdout, "                           used.\n");
 }
 
 
@@ -357,12 +396,12 @@ attribute_stats(iter_t *iter, const H5O_info_t *oi)
     /* Add attribute count to proper bin */
     bin = ceil_log10((unsigned long)oi->num_attrs);
     if((bin + 1) > iter->attr_nbins) {
-  iter->attr_bins = (unsigned long *)HDrealloc(iter->attr_bins, (bin + 1) * sizeof(unsigned long));
+        iter->attr_bins = (unsigned long *)HDrealloc(iter->attr_bins, (bin + 1) * sizeof(unsigned long));
         HDassert(iter->attr_bins);
 
   /* Initialize counts for intermediate bins */
         while(iter->attr_nbins < bin)
-      iter->attr_bins[iter->attr_nbins++] = 0;
+            iter->attr_bins[iter->attr_nbins++] = 0;
         iter->attr_nbins++;
 
         /* Initialize count for new bin */
@@ -509,8 +548,8 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "attribute_stats() failed");
 
     /* Get storage info */
-    if((storage = H5Dget_storage_size(did)) < 0)
-        HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Dget_storage_size() failed");
+    /* Failure 0 indistinguishable from no-data-stored 0 */
+    storage = H5Dget_storage_size(did);
 
     /* Gather layout statistics */
     if((dcpl = H5Dget_create_plist(did)) < 0)
@@ -535,7 +574,8 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     if(num_ext) {
         iter->nexternal += (unsigned long)num_ext;
         iter->dset_external_storage_size += (unsigned long)storage;
-    } else
+    }
+    else
         iter->dset_storage_size += storage;
 
     /* Gather dataspace statistics */
@@ -723,6 +763,7 @@ obj_stats(const char *path, const H5O_info_t *oi, const char *already_visited,
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "datatype_stats failed");
                 break;
 
+            case H5O_TYPE_MAP:
             case H5O_TYPE_UNKNOWN:
             case H5O_TYPE_NTYPES:
             default:
@@ -931,7 +972,8 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                         error_msg("Invalid threshold for small groups\n");
                         goto error;
                     }
-                } else
+                }
+                else
                     error_msg("Missing threshold for small groups\n");
 
                 break;
@@ -953,7 +995,8 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                         error_msg("Invalid threshold for small datasets\n");
                         goto error;
                     }
-                } else
+                }
+                else
                     error_msg("Missing threshold for small datasets\n");
 
                 break;
@@ -975,7 +1018,8 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                         error_msg("Invalid threshold for small # of attributes\n");
                         goto error;
                     }
-                } else
+                }
+                else
                     error_msg("Missing threshold for small # of attributes\n");
 
                 break;
@@ -1015,6 +1059,105 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                     } /* end if */
                 break;
 
+            case 'w':
+#ifndef H5_HAVE_ROS3_VFD
+                error_msg("Read-Only S3 VFD not enabled.\n");
+                goto error;
+#else
+                {
+                    char        *cred_str = NULL;
+                    unsigned     nelems   = 0;
+                    char       **cred     = NULL;
+                    char const  *ccred[3];
+
+                    if (FAIL == parse_tuple((const char *)opt_arg, ',', &cred_str, &nelems, &cred)) {
+                        error_msg("Unable to parse s3 credential\n");
+                        goto error;
+                    }
+                    if (nelems != 3) {
+                        error_msg("s3 credential must have three elements\n");
+                        goto error;
+                    }
+                    ccred[0] = (const char *)cred[0];
+                    ccred[1] = (const char *)cred[1];
+                    ccred[2] = (const char *)cred[2];
+                    if (0 == h5tools_populate_ros3_fapl(&ros3_fa, ccred)) {
+                        error_msg("Unable to set ros3 fapl config\n");
+                        goto error;
+                    }
+                    HDfree(cred);
+                    HDfree(cred_str);
+                } /* parse s3-cred block */
+                drivername = "ros3";
+                break;
+#endif /* H5_HAVE_ROS3_VFD */
+
+            case 'H':
+#ifndef H5_HAVE_LIBHDFS
+                error_msg("HDFS VFD is not enabled.\n");
+                goto error;
+#else
+                {
+                    unsigned         nelems    = 0;
+                    char            *props_src = NULL;
+                    char           **props     = NULL;
+                    unsigned long    k         = 0;
+                    if (FAIL == parse_tuple((const char *)opt_arg,
+                            ',', &props_src, &nelems, &props)) {
+                        error_msg("unable to parse hdfs properties tuple\n");
+                        goto error;
+                    }
+                    /* sanity-check tuple count
+                     */
+                    if (nelems != 5) {
+                        char str[64] = "";
+                        HDsprintf(str,
+                                "expected 5 elements in hdfs properties tuple "
+                                "but found %u\n",
+                                nelems);
+                        HDfree(props);
+                        HDfree(props_src);
+                        error_msg(str);
+                        goto error;
+                    }
+                    /* Populate fapl configuration structure with given
+                     * properties.
+                     * TODO/WARNING: No error-checking is done on length of
+                     *         input strings... Silent overflow is possible,
+                     *         albeit unlikely.
+                     */
+                    if (HDstrncmp(props[0], "", 1)) {
+                        HDstrncpy(hdfs_fa.namenode_name,(const char *)props[0], HDstrlen(props[0]));
+                    }
+                    if (HDstrncmp(props[1], "", 1)) {
+                        k = strtoul((const char *)props[1], NULL, 0);
+                        if (errno == ERANGE) {
+                            error_msg("supposed port number wasn't.\n");
+                            goto error;
+                        }
+                        hdfs_fa.namenode_port = (int32_t)k;
+                    }
+                    if (HDstrncmp(props[2], "", 1)) {
+                        HDstrncpy(hdfs_fa.kerberos_ticket_cache, (const char *)props[2], HDstrlen(props[2]));
+                    }
+                    if (HDstrncmp(props[3], "", 1)) {
+                        HDstrncpy(hdfs_fa.user_name, (const char *)props[3], HDstrlen(props[3]));
+                    }
+                    if (strncmp(props[4], "", 1)) {
+                        k = HDstrtoul((const char *)props[4], NULL, 0);
+                        if (errno == ERANGE) {
+                            error_msg("supposed buffersize number wasn't.\n");
+                            goto error;
+                        }
+                        hdfs_fa.stream_buffer_size = (int32_t)k;
+                    }
+                    HDfree(props);
+                    HDfree(props_src);
+                    drivername = "hdfs";
+                }
+                break;
+#endif /* H5_HAVE_LIBHDFS */
+
             default:
                 usage(h5tools_getprogname());
                 goto error;
@@ -1126,13 +1269,13 @@ iter_free(iter_t *iter)
 static herr_t
 print_file_info(const iter_t *iter)
 {
-    printf("File information\n");
-    printf("\t# of unique groups: %lu\n", iter->uniq_groups);
-    printf("\t# of unique datasets: %lu\n", iter->uniq_dsets);
-    printf("\t# of unique named datatypes: %lu\n", iter->uniq_dtypes);
-    printf("\t# of unique links: %lu\n", iter->uniq_links);
-    printf("\t# of unique other: %lu\n", iter->uniq_others);
-    printf("\tMax. # of links to object: %lu\n", iter->max_links);
+    HDprintf("File information\n");
+    HDprintf("\t# of unique groups: %lu\n", iter->uniq_groups);
+    HDprintf("\t# of unique datasets: %lu\n", iter->uniq_dsets);
+    HDprintf("\t# of unique named datatypes: %lu\n", iter->uniq_dtypes);
+    HDprintf("\t# of unique links: %lu\n", iter->uniq_links);
+    HDprintf("\t# of unique other: %lu\n", iter->uniq_others);
+    HDprintf("\tMax. # of links to object: %lu\n", iter->max_links);
     HDfprintf(stdout, "\tMax. # of objects in group: %Hu\n", iter->max_fanout);
 
     return 0;
@@ -1162,15 +1305,12 @@ print_file_metadata(const iter_t *iter)
     HDfprintf(stdout, "\tUser block: %Hu\n", iter->ublk_size);
 
     HDfprintf(stdout, "\tObject headers: (total/unused)\n");
-    HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n",
-                iter->group_ohdr_info.total_size,
-    iter->group_ohdr_info.free_size);
+    HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n", iter->group_ohdr_info.total_size,
+            iter->group_ohdr_info.free_size);
     HDfprintf(stdout, "\t\tDatasets(exclude compact data): %Hu/%Hu\n",
-    iter->dset_ohdr_info.total_size,
-    iter->dset_ohdr_info.free_size);
-    HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n",
-                iter->dtype_ohdr_info.total_size,
-    iter->dtype_ohdr_info.free_size);
+            iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
+    HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n", iter->dtype_ohdr_info.total_size,
+            iter->dtype_ohdr_info.free_size);
 
     HDfprintf(stdout, "\tGroups:\n");
     HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
@@ -1225,32 +1365,32 @@ print_group_info(const iter_t *iter)
     unsigned long total;        /* Total count for various statistics */
     unsigned u;                 /* Local index variable */
 
-    printf("Small groups (with 0 to %u links):\n", sgroups_threshold-1);
+    HDprintf("Small groups (with 0 to %u links):\n", sgroups_threshold-1);
     total = 0;
     for(u = 0; u < (unsigned)sgroups_threshold; u++) {
         if(iter->num_small_groups[u] > 0) {
-            printf("\t# of groups with %u link(s): %lu\n", u, iter->num_small_groups[u]);
+            HDprintf("\t# of groups with %u link(s): %lu\n", u, iter->num_small_groups[u]);
             total += iter->num_small_groups[u];
         } /* end if */
     } /* end for */
-    printf("\tTotal # of small groups: %lu\n", total);
+    HDprintf("\tTotal # of small groups: %lu\n", total);
 
-    printf("Group bins:\n");
+    HDprintf("Group bins:\n");
     total = 0;
     if((iter->group_nbins > 0) && (iter->group_bins[0] > 0)) {
-       printf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]);
+       HDprintf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]);
        total = iter->group_bins[0];
     } /* end if */
     power = 1;
     for(u = 1; u < iter->group_nbins; u++) {
         if(iter->group_bins[u] > 0) {
-           printf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1,
+           HDprintf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1,
                     iter->group_bins[u]);
            total += iter->group_bins[u];
         } /* end if */
         power *= 10;
     } /* end for */
-    printf("\tTotal # of groups: %lu\n", total);
+    HDprintf("\tTotal # of groups: %lu\n", total);
 
     return 0;
 } /* print_group_info() */
@@ -1271,7 +1411,7 @@ print_group_info(const iter_t *iter)
 static herr_t
 print_group_metadata(const iter_t *iter)
 {
-    printf("File space information for groups' metadata (in bytes):\n");
+    HDprintf("File space information for groups' metadata (in bytes):\n");
 
     HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
             iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size);
@@ -1304,66 +1444,66 @@ print_dataset_info(const iter_t *iter)
     unsigned u;                 /* Local index variable */
 
     if(iter->uniq_dsets > 0) {
-        printf("Dataset dimension information:\n");
-        printf("\tMax. rank of datasets: %u\n", iter->max_dset_rank);
-        printf("\tDataset ranks:\n");
+        HDprintf("Dataset dimension information:\n");
+        HDprintf("\tMax. rank of datasets: %u\n", iter->max_dset_rank);
+        HDprintf("\tDataset ranks:\n");
         for(u = 0; u < H5S_MAX_RANK; u++)
             if(iter->dset_rank_count[u] > 0)
-                printf("\t\t# of dataset with rank %u: %lu\n", u, iter->dset_rank_count[u]);
+                HDprintf("\t\t# of dataset with rank %u: %lu\n", u, iter->dset_rank_count[u]);
 
-        printf("1-D Dataset information:\n");
+        HDprintf("1-D Dataset information:\n");
         HDfprintf(stdout, "\tMax. dimension size of 1-D datasets: %Hu\n", iter->max_dset_dims);
-        printf("\tSmall 1-D datasets (with dimension sizes 0 to %u):\n", sdsets_threshold - 1);
+        HDprintf("\tSmall 1-D datasets (with dimension sizes 0 to %u):\n", sdsets_threshold - 1);
         total = 0;
         for(u = 0; u < (unsigned)sdsets_threshold; u++) {
             if(iter->small_dset_dims[u] > 0) {
-                printf("\t\t# of datasets with dimension sizes %u: %lu\n", u,
+                HDprintf("\t\t# of datasets with dimension sizes %u: %lu\n", u,
                          iter->small_dset_dims[u]);
                 total += iter->small_dset_dims[u];
             } /* end if */
         } /* end for */
-        printf("\t\tTotal # of small datasets: %lu\n", total);
+        HDprintf("\t\tTotal # of small datasets: %lu\n", total);
 
         /* Protect against no datasets in file */
         if(iter->dset_dim_nbins > 0) {
-            printf("\t1-D Dataset dimension bins:\n");
+            HDprintf("\t1-D Dataset dimension bins:\n");
             total = 0;
             if(iter->dset_dim_bins[0] > 0) {
-                printf("\t\t# of datasets with dimension size 0: %lu\n", iter->dset_dim_bins[0]);
+                HDprintf("\t\t# of datasets with dimension size 0: %lu\n", iter->dset_dim_bins[0]);
                 total = iter->dset_dim_bins[0];
             } /* end if */
             power = 1;
             for(u = 1; u < iter->dset_dim_nbins; u++) {
                 if(iter->dset_dim_bins[u] > 0) {
-                    printf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power, (power * 10) - 1,
+                    HDprintf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power, (power * 10) - 1,
                              iter->dset_dim_bins[u]);
                     total += iter->dset_dim_bins[u];
                 } /* end if */
                 power *= 10;
             } /* end for */
-            printf("\t\tTotal # of datasets: %lu\n", total);
+            HDprintf("\t\tTotal # of datasets: %lu\n", total);
         } /* end if */
 
-        printf("Dataset storage information:\n");
+        HDprintf("Dataset storage information:\n");
         HDfprintf(stdout, "\tTotal raw data size: %Hu\n", iter->dset_storage_size);
         HDfprintf(stdout, "\tTotal external raw data size: %Hu\n", iter->dset_external_storage_size);
 
-        printf("Dataset layout information:\n");
+        HDprintf("Dataset layout information:\n");
         for(u = 0; u < H5D_NLAYOUTS; u++)
-            printf("\tDataset layout counts[%s]: %lu\n", (u == H5D_COMPACT ? "COMPACT" :
+            HDprintf("\tDataset layout counts[%s]: %lu\n", (u == H5D_COMPACT ? "COMPACT" :
                 (u == H5D_CONTIGUOUS ? "CONTIG" : (u == H5D_CHUNKED ? "CHUNKED" : "VIRTUAL"))), iter->dset_layouts[u]);
-        printf("\tNumber of external files : %lu\n", iter->nexternal);
-
-        printf("Dataset filters information:\n");
-        printf("\tNumber of datasets with:\n");
-        printf("\t\tNO filter: %lu\n", iter->dset_comptype[H5Z_FILTER_ERROR+1]);
-        printf("\t\tGZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_DEFLATE]);
-        printf("\t\tSHUFFLE filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SHUFFLE]);
-        printf("\t\tFLETCHER32 filter: %lu\n", iter->dset_comptype[H5Z_FILTER_FLETCHER32]);
-        printf("\t\tSZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SZIP]);
-        printf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]);
-        printf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]);
-        printf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL-1]);
+        HDprintf("\tNumber of external files : %lu\n", iter->nexternal);
+
+        HDprintf("Dataset filters information:\n");
+        HDprintf("\tNumber of datasets with:\n");
+        HDprintf("\t\tNO filter: %lu\n", iter->dset_comptype[H5Z_FILTER_ERROR+1]);
+        HDprintf("\t\tGZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_DEFLATE]);
+        HDprintf("\t\tSHUFFLE filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SHUFFLE]);
+        HDprintf("\t\tFLETCHER32 filter: %lu\n", iter->dset_comptype[H5Z_FILTER_FLETCHER32]);
+        HDprintf("\t\tSZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SZIP]);
+        HDprintf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]);
+        HDprintf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]);
+        HDprintf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL-1]);
     } /* end if */
 
     return 0;
@@ -1386,7 +1526,7 @@ print_dataset_info(const iter_t *iter)
 static herr_t
 print_dset_metadata(const iter_t *iter)
 {
-    printf("File space information for datasets' metadata (in bytes):\n");
+    HDprintf("File space information for datasets' metadata (in bytes):\n");
 
     HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
             iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
@@ -1420,20 +1560,20 @@ print_dset_dtype_meta(const iter_t *iter)
     unsigned u;                 /* Local index variable */
 
     if(iter->dset_ntypes) {
-        printf("Dataset datatype information:\n");
-        printf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
+        HDprintf("Dataset datatype information:\n");
+        HDprintf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
         total = 0;
         for(u = 0; u < iter->dset_ntypes; u++) {
             H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
-            printf("\tDataset datatype #%u:\n", u);
-            printf("\t\tCount (total/named) = (%lu/%lu)\n",
+            HDprintf("\tDataset datatype #%u:\n", u);
+            HDprintf("\t\tCount (total/named) = (%lu/%lu)\n",
                     iter->dset_type_info[u].count, iter->dset_type_info[u].named);
-            printf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
+            HDprintf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
                     (unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
             H5Tclose(iter->dset_type_info[u].tid);
             total += iter->dset_type_info[u].count;
         } /* end for */
-        printf("\tTotal dataset datatype count: %lu\n", total);
+        HDprintf("\tTotal dataset datatype count: %lu\n", total);
     } /* end if */
 
     return 0;
@@ -1461,29 +1601,29 @@ print_attr_info(const iter_t *iter)
     unsigned long total;        /* Total count for various statistics */
     unsigned u;                 /* Local index variable */
 
-    printf("Small # of attributes (objects with 1 to %u attributes):\n", sattrs_threshold);
+    HDprintf("Small # of attributes (objects with 1 to %u attributes):\n", sattrs_threshold);
     total = 0;
     for(u = 1; u <= (unsigned)sattrs_threshold; u++) {
         if(iter->num_small_attrs[u] > 0) {
-            printf("\t# of objects with %u attributes: %lu\n", u, iter->num_small_attrs[u]);
+            HDprintf("\t# of objects with %u attributes: %lu\n", u, iter->num_small_attrs[u]);
             total += iter->num_small_attrs[u];
         } /* end if */
     } /* end for */
-    printf("\tTotal # of objects with small # of attributes: %lu\n", total);
+    HDprintf("\tTotal # of objects with small # of attributes: %lu\n", total);
 
-    printf("Attribute bins:\n");
+    HDprintf("Attribute bins:\n");
     total = 0;
     power = 1;
     for(u = 1; u < iter->attr_nbins; u++) {
         if(iter->attr_bins[u] > 0) {
-           printf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1,
+           HDprintf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1,
                     iter->attr_bins[u]);
            total += iter->attr_bins[u];
         } /* end if */
         power *= 10;
     } /* end for */
-    printf("\tTotal # of objects with attributes: %lu\n", total);
-    printf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs);
+    HDprintf("\tTotal # of objects with attributes: %lu\n", total);
+    HDprintf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs);
 
     return 0;
 } /* print_attr_info() */
@@ -1511,29 +1651,29 @@ print_freespace_info(const iter_t *iter)
 
     HDfprintf(stdout, "Free-space persist: %s\n", iter->fs_persist ? "TRUE" : "FALSE");
     HDfprintf(stdout, "Free-space section threshold: %Hu bytes\n", iter->fs_threshold);
-    printf("Small size free-space sections (< %u bytes):\n", (unsigned)SIZE_SMALL_SECTS);
+    HDprintf("Small size free-space sections (< %u bytes):\n", (unsigned)SIZE_SMALL_SECTS);
     total = 0;
     for(u = 0; u < SIZE_SMALL_SECTS; u++) {
         if(iter->num_small_sects[u] > 0) {
-            printf("\t# of sections of size %u: %lu\n", u, iter->num_small_sects[u]);
+            HDprintf("\t# of sections of size %u: %lu\n", u, iter->num_small_sects[u]);
             total += iter->num_small_sects[u];
         } /* end if */
     } /* end for */
-    printf("\tTotal # of small size sections: %lu\n", total);
+    HDprintf("\tTotal # of small size sections: %lu\n", total);
 
-    printf("Free-space section bins:\n");
+    HDprintf("Free-space section bins:\n");
 
     total = 0;
     power = 1;
     for(u = 1; u < iter->sect_nbins; u++) {
         if(iter->sect_bins[u] > 0) {
-           printf("\t# of sections of size %lu - %lu: %lu\n", power, (power * 10) - 1,
+           HDprintf("\t# of sections of size %lu - %lu: %lu\n", power, (power * 10) - 1,
                     iter->sect_bins[u]);
            total += iter->sect_bins[u];
         } /* end if */
         power *= 10;
     } /* end for */
-    printf("\tTotal # of sections: %lu\n", total);
+    HDprintf("\tTotal # of sections: %lu\n", total);
 
     return 0;
 } /* print_freespace_info() */
@@ -1561,7 +1701,7 @@ print_storage_summary(const iter_t *iter)
 
     HDfprintf(stdout, "File space management strategy: %s\n", FS_STRATEGY_NAME[iter->fs_strategy]);
     HDfprintf(stdout, "File space page size: %Hu bytes\n", iter->fsp_size);
-    printf("Summary of file space information:\n");
+    HDprintf("Summary of file space information:\n");
     total_meta =
             iter->super_size + iter->super_ext_size + iter->ublk_size +
             iter->group_ohdr_info.total_size +
@@ -1669,7 +1809,7 @@ print_file_statistics(const iter_t *iter)
 static void
 print_object_statistics(const char *name)
 {
-    printf("Object name %s\n", name);
+    HDprintf("Object name %s\n", name);
 } /* print_object_statistics() */
 
 
@@ -1719,6 +1859,7 @@ main(int argc, const char *argv[])
     void               *edata;
     void               *tools_edata;
     struct handler_t   *hand = NULL;
+    hid_t               fapl_id = H5P_DEFAULT;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
@@ -1739,6 +1880,42 @@ main(int argc, const char *argv[])
     if(parse_command_line(argc, argv, &hand) < 0)
         goto done;
 
+    /* if drivername is not null, probably need to set the fapl */
+    if (HDstrcmp(drivername, "")) {
+        void *conf_fa = NULL;
+
+        if (!HDstrcmp(drivername, "ros3")) {
+#ifndef H5_HAVE_ROS3_VFD
+            error_msg("Read-Only S3 VFD not enabled.\n\n");
+            goto done;
+#else
+            conf_fa = (void *)&ros3_fa;
+#endif /* H5_HAVE_ROS3_VFD */
+
+        }
+        else if (!HDstrcmp(drivername, "hdfs")) {
+#ifndef H5_HAVE_LIBHDFS
+            error_msg("HDFS VFD not enabled.\n\n");
+            goto done;
+#else
+            conf_fa = (void *)&hdfs_fa;
+#endif /* H5_HAVE_LIBHDFS */
+        }
+
+        if (conf_fa != NULL) {
+            HDassert(fapl_id == H5P_DEFAULT);
+            fapl_id = H5Pcreate(H5P_FILE_ACCESS);
+            if (fapl_id < 0) {
+                error_msg("Unable to create fapl entry\n");
+                goto done;
+            }
+            if (1 > h5tools_set_configured_fapl(fapl_id, drivername, conf_fa)) {
+                error_msg("Unable to set fapl\n");
+                goto done;
+            }
+        }
+    } /* drivername set */
+
     fname = argv[opt_ind];
 
     if(enable_error_stack > 0) {
@@ -1751,9 +1928,9 @@ main(int argc, const char *argv[])
         hid_t               fcpl;
         H5F_info2_t         finfo;
 
-        printf("Filename: %s\n", fname);
+        HDprintf("Filename: %s\n", fname);
 
-        fid = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
+        fid = H5Fopen(fname, H5F_ACC_RDONLY, fapl_id);
         if(fid < 0) {
             error_msg("unable to open file \"%s\"\n", fname);
             h5tools_setstatus(EXIT_FAILURE);
@@ -1780,15 +1957,15 @@ main(int argc, const char *argv[])
             iter.free_hdr = finfo.free.meta_size;
         } /* end else */
 
-    iter.num_small_groups = (unsigned long *)HDcalloc((size_t)sgroups_threshold, sizeof(unsigned long));
-    iter.num_small_attrs = (unsigned long *)HDcalloc((size_t)(sattrs_threshold+1), sizeof(unsigned long));
-    iter.small_dset_dims = (unsigned long *)HDcalloc((size_t)sdsets_threshold, sizeof(unsigned long));
+        iter.num_small_groups = (unsigned long *)HDcalloc((size_t)sgroups_threshold, sizeof(unsigned long));
+        iter.num_small_attrs = (unsigned long *)HDcalloc((size_t)(sattrs_threshold+1), sizeof(unsigned long));
+        iter.small_dset_dims = (unsigned long *)HDcalloc((size_t)sdsets_threshold, sizeof(unsigned long));
 
-    if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
-        error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
+        if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
+            error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
             h5tools_setstatus(EXIT_FAILURE);
-        goto done;
-    }
+            goto done;
+        }
 
         if((fcpl = H5Fget_create_plist(fid)) < 0)
             warn_msg("Unable to retrieve file creation property\n");
@@ -1815,7 +1992,8 @@ main(int argc, const char *argv[])
                 if(h5trav_visit(fid, hand->obj[u], TRUE, TRUE, obj_stats, lnk_stats, &iter, H5O_INFO_ALL) < 0) {
                     error_msg("unable to traverse object \"%s\"\n", hand->obj[u]);
                     h5tools_setstatus(EXIT_FAILURE);
-                } else
+                }
+                else
                     print_statistics(hand->obj[u], &iter);
             } /* end for */
         } /* end if */
@@ -1823,7 +2001,8 @@ main(int argc, const char *argv[])
             if(h5trav_visit(fid, "/", TRUE, TRUE, obj_stats, lnk_stats, &iter, H5O_INFO_ALL) < 0) {
                 error_msg("unable to traverse objects/links in file \"%s\"\n", fname);
                 h5tools_setstatus(EXIT_FAILURE);
-            } else
+            }
+            else
                 print_statistics("/", &iter);
         } /* end else */
     } /* end if */
@@ -1834,6 +2013,13 @@ done:
     /* Free iter structure */
     iter_free(&iter);
 
+    if (fapl_id != H5P_DEFAULT) {
+        if (H5Pclose(fapl_id) < 0) {
+            error_msg("unable to close fapl entry\n");
+            h5tools_setstatus(EXIT_FAILURE);
+        }
+    }
+
     if(fid >= 0 && H5Fclose(fid) < 0) {
         error_msg("unable to close file \"%s\"\n", fname);
         h5tools_setstatus(EXIT_FAILURE);
diff --git a/tools/src/misc/CMakeLists.txt b/tools/src/misc/CMakeLists.txt
index 937799f..6b41d7f 100644
--- a/tools/src/misc/CMakeLists.txt
+++ b/tools/src/misc/CMakeLists.txt
@@ -5,47 +5,78 @@ project (HDF5_TOOLS_SRC_MISC C)
 # Add the misc executables
 # --------------------------------------------------------------------
 #-- Misc Executables
-add_executable (h5debug ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5debug.c)
-target_include_directories(h5debug PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5debug STATIC)
-target_link_libraries (h5debug PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
-set_target_properties (h5debug PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5debug")
+if (NOT ONLY_SHARED_LIBS)
+  add_executable (h5debug ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5debug.c)
+  target_include_directories (h5debug PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5debug STATIC)
+  target_link_libraries (h5debug PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5debug PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5debug")
 
-add_executable (h5repart ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5repart.c)
-target_include_directories(h5repart PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5repart STATIC)
-target_link_libraries (h5repart PRIVATE ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
-set_target_properties (h5repart PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repart")
+  add_executable (h5repart ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5repart.c)
+  target_include_directories (h5repart PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5repart STATIC)
+  target_link_libraries (h5repart PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5repart PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repart")
 
-add_executable (h5mkgrp ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5mkgrp.c)
-target_include_directories(h5mkgrp PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5mkgrp STATIC)
-target_link_libraries (h5mkgrp PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5mkgrp PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5mkgrp")
+  add_executable (h5mkgrp ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5mkgrp.c)
+  target_include_directories (h5mkgrp PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5mkgrp STATIC)
+  target_link_libraries (h5mkgrp PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5mkgrp PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5mkgrp")
 
-add_executable (h5clear ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5clear.c)
-target_include_directories(h5clear PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
-TARGET_C_PROPERTIES (h5clear STATIC)
-target_link_libraries (h5clear PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5clear PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5clear")
+  add_executable (h5clear ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5clear.c)
+  target_include_directories (h5clear PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5clear STATIC)
+  target_link_libraries (h5clear PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  set_target_properties (h5clear PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5clear")
 
-set (H5_DEP_EXECUTABLES
-    h5debug
-    h5repart
-    h5mkgrp
-    h5clear
-)
+  set (H5_DEP_EXECUTABLES
+      h5debug
+      h5repart
+      h5mkgrp
+     h5clear
+  )
+endif ()
+if (BUILD_SHARED_LIBS)
+  add_executable (h5debug-shared ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5debug.c)
+  target_include_directories (h5debug-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5debug-shared SHARED)
+  target_link_libraries (h5debug-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  set_target_properties (h5debug-shared PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5debug-shared")
 
-#-----------------------------------------------------------------------------
-# Generate the h5cc file containing settings needed to compile programs
-#-----------------------------------------------------------------------------
-#if (NOT WIN32)
-#  configure_file (${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5cc.in ${HDF5_BINARY_DIR}/h5cc @ONLY)
-#endif ()
+  add_executable (h5repart-shared ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5repart.c)
+  target_include_directories (h5repart-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5repart-shared SHARED)
+  target_link_libraries (h5repart-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  set_target_properties (h5repart-shared PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5repart-shared")
+
+  add_executable (h5mkgrp-shared ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5mkgrp.c)
+  target_include_directories (h5mkgrp-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5mkgrp-shared SHARED)
+  target_link_libraries (h5mkgrp-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  set_target_properties (h5mkgrp-shared PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5mkgrp-shared")
+
+  add_executable (h5clear-shared ${HDF5_TOOLS_SRC_MISC_SOURCE_DIR}/h5clear.c)
+  target_include_directories (h5clear-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  TARGET_C_PROPERTIES (h5clear-shared SHARED)
+  target_link_libraries (h5clear-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  set_target_properties (h5clear-shared PROPERTIES FOLDER tools)
+  set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5clear-shared")
+
+  set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES}
+      h5debug-shared
+      h5repart-shared
+      h5mkgrp-shared
+      h5clear-shared
+  )
+endif ()
 
 ##############################################################################
 ##############################################################################
diff --git a/tools/src/misc/Makefile.am b/tools/src/misc/Makefile.am
index 64c5ee5..f1d2aaf 100644
--- a/tools/src/misc/Makefile.am
+++ b/tools/src/misc/Makefile.am
@@ -23,7 +23,6 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 
 # These are our main targets, the tools
 bin_PROGRAMS=h5debug h5repart h5mkgrp h5clear
-bin_SCRIPTS=h5redeploy
 
 # Add h5debug, h5repart, and h5mkgrp specific linker flags here
 h5debug_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
@@ -31,30 +30,7 @@ h5repart_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
 h5mkgrp_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
 h5clear_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
 
-# Tell automake to clean h5redeploy script
-CLEANFILES=h5redeploy
-
-# These were generated by configure.  Remove them only when distclean.
-DISTCLEANFILES=h5cc
-
 # All programs rely on hdf5 library and h5tools library
 LDADD=$(LIBH5TOOLS) $(LIBHDF5)
 
-# h5cc needs custom install and uninstall rules, since it may be
-# named h5pcc if hdf5 is being built in parallel mode.
-if BUILD_PARALLEL_CONDITIONAL
-  H5CC_NAME=h5pcc
-else
-  H5CC_NAME=h5cc
-endif
-
-install-exec-local:
-	@$(INSTALL) h5cc $(DESTDIR)$(bindir)/$(H5CC_NAME)
-uninstall-local:
-	@$(RM) $(DESTDIR)$(bindir)/$(H5CC_NAME)
-
-# How to build h5redeploy script
-h5redeploy: h5redeploy.in
-	@cp $(srcdir)/$@.in $@
-
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/src/misc/h5cc.in b/tools/src/misc/h5cc.in
deleted file mode 100644
index 9c4e3ca..0000000
--- a/tools/src/misc/h5cc.in
+++ /dev/null
@@ -1,399 +0,0 @@
-#! /bin/sh
-##
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
-# If you do not have access to either file, you may request a copy from
-# help@hdfgroup.org.
-##
-
-# This tool is adapted from the mpicc command of the MPICH Software.
-
-############################################################################
-##                                                                        ##
-## Things You May Have to Modify:                                         ##
-##                                                                        ##
-## If the following paths don't point to the place were HDF5 is installed ##
-## on your system (i.e., you received a binary distribution or moved the  ##
-## files from the originally installed directory to another directory)    ##
-## then modify them accordingly to represent the new paths.               ##
-##                                                                        ##
-############################################################################
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-libdir="@libdir@"
-includedir="@includedir@"
-HL="@HL@"
-
-############################################################################
-##                                                                        ##
-## Things You Can Modify to Override HDF5 Library Build Components:       ##
-##                                                                        ##
-## (Advanced usage - know what you're doing - you're on your own here.)   ##
-## The four variables below can be used to insert paths and flags in      ##
-## CPPFLAGS, CFLAGS, LDFLAGS, or LIBS in the h5cc compile line:           ##
-##    $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS   ##
-##    $LIBS $clibpath $link_objs $link_args $shared_link                  ##
-##                                                                        ##
-## These settings can be overriden by setting HDF5_CFLAGS,                ##
-## HDF5_CPPFLAGS, HDF5_LDFLAGS, or HDF5_LIBS in the environment.          ##
-##                                                                        ##
-############################################################################
-CFLAGSBASE=""
-CPPFLAGSBASE=""
-LDFLAGSBASE=""
-LIBSBASE=""
-
-############################################################################
-##                                                                        ##
-## You shouldn't have to modify anything below this line.                 ##
-##                                                                        ##
-############################################################################
-
-# Constants definitions
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-host_os="@host_os@"
-
-prog_name="`basename $0`"
-
-allargs=""
-compile_args=""
-libraries=""
-link_args=""
-link_objs=""
-clibpath=""
-
-do_link="yes"
-do_compile="no"
-dash_o="no"
-dash_c="no"
-get_output_file="no"
-
-SHOW="eval"
-CCBASE="@CC@"
-CLINKERBASE="@CC@"
-
-# CFLAGS, CPPFLAGS and LDFLAGS are reserved for use by the script user.
-# FLAGS brought from the hdf5 build are put in H5BLD_*FLAGS.
-
-# User's CPPFLAGS and CFLAGS come after their H5BLD counterparts.  User's 
-# LDFLAGS come just before clibpath, user's LIBS come after $link_objs and 
-# before the hdf5 libraries in $link_args, followed by any external library 
-# paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in 
-# from the hdf5 build. The order of the flags is intended to give precedence
-# to the user's flags.
-H5BLD_CFLAGS="@AM_CFLAGS@ @CFLAGS@"
-H5BLD_CPPFLAGS="@AM_CPPFLAGS@ @CPPFLAGS@"
-H5BLD_LDFLAGS="@AM_LDFLAGS@ @LDFLAGS@"
-H5BLD_LIBS="@LIBS@"
-
-CC="${HDF5_CC:-$CCBASE}"
-CLINKER="${HDF5_CLINKER:-$CLINKERBASE}"
-CFLAGS="${HDF5_CFLAGS:-$CFLAGSBASE}"
-CPPFLAGS="${HDF5_CPPFLAGS:-$CPPFLAGSBASE}"
-LDFLAGS="${HDF5_LDFLAGS:-$LDFLAGSBASE}"
-LIBS="${HDF5_LIBS:-$LIBSBASE}"
-
-# If a static library is available, the default will be to use it.  If the only
-# available library is shared, it will be used by default.  The user can 
-# override either default, although choosing an unavailable library will result
-# in link errors.  
-STATIC_AVAILABLE="@enable_static@"
-if test "${STATIC_AVAILABLE}" = "yes"; then
-  USE_SHARED_LIB="${HDF5_USE_SHLIB:-no}"
-else
-  USE_SHARED_LIB="${HDF5_USE_SHLIB:-yes}"
-fi
-
-
-usage() {
-  # A wonderfully informative "usage" message.
-  echo "usage: $prog_name [OPTIONS] <compile line>"
-  echo "  OPTIONS:"
-  echo "    -help        This help message."
-  echo "    -echo        Show all the shell commands executed"
-  echo "    -prefix=DIR  Prefix directory to find HDF5 lib/ and include/"
-  echo "                   subdirectories [default: $prefix]"
-  # A wonderfully informative "usage" message.
-  echo "usage: $prog_name [OPTIONS] <compile line>"
-  echo "  OPTIONS:"
-  echo "    -help        This help message."
-  echo "    -echo        Show all the shell commands executed"
-  echo "    -prefix=DIR  Prefix directory to find HDF5 lib/ and include/"
-  echo "                   subdirectories [default: $prefix]"
-  echo "    -show        Show the commands without executing them"
-  echo "    -showconfig  Show the HDF5 library configuration summary"
-  echo "    -shlib       Compile with shared HDF5 libraries [default for hdf5 built"
-  echo "                                                     without static libraries]"
-  echo "    -noshlib     Compile with static HDF5 libraries [default for hdf5 built"
-  echo "                                                     with static libraries]"
-  echo " "
-  echo "  <compile line>  - the normal compile line options for your compiler."
-  echo "                    $prog_name uses the same compiler you used to compile"
-  echo "                    HDF5. Check with your compiler's man pages for more"
-  echo "                    information on which options are needed."
-  echo " "
-  echo " You can override the compiler, linker, and whether or not to use static"
-  echo " or shared libraries to compile your program by setting the following"
-  echo " environment variables accordingly:"
-  echo " "
-  echo "   HDF5_CC                  -  use a different C compiler"
-  echo "   HDF5_CLINKER             -  use a different linker"
-  echo "   HDF5_USE_SHLIB=[yes|no]  -  use shared or static version of the HDF5 library"
-  echo "                                 [default: no except when built with only" 
-  echo "                                           shared libraries]"
-  echo " "
-  echo " You can also add or change paths and flags to the compile line using"
-  echo " the following environment varibles or by assigning them to their counterparts"
-  echo " in the 'Things You Can Modify to Override...'" section of $prog_name
-  echo " "
-  echo "  Variable              Current value to be replaced"
-  echo "  HDF5_CPPFLAGS         \"$CPPFLAGSBASE\""
-  echo "  HDF5_CFLAGS           \"$CFLAGSBASE\""
-  echo "  HDF5_LDFLAGS          \"$LDFLAGSBASE\""
-  echo "  HDF5_LIBS             \"$LIBSBASE\""
-  echo " "
-  echo " Note that adding library paths to HDF5_LDFLAGS where another hdf5 version"
-  echo " is located may link your program with that other hdf5 library version."
-  echo " "
-  exit $EXIT_FAILURE
-}
-
-# Show the configuration summary of the library recorded in the
-# libhdf5.settings file reside in the lib directory.
-showconfigure()
-{
-  cat ${libdir}/libhdf5.settings
-  status=$?
-}
-
-# Main
-status=$EXIT_SUCCESS
-
-if test "$#" = "0"; then
-  # No parameters specified, issue usage statement and exit.
-  usage
-fi
-
-case "$CC" in
-  gcc)
-    kind="gcc"
-    ;;
-  mpicc|mpcc|mpicc_r)
-    # Is this gcc masquarading as an MPI compiler?
-    if test "`${CC} -v 2>&1 | sed -n 2p | cut -c1-3`" = "gcc"; then
-      kind="gcc"
-    else
-      # Nope
-      kind="$host_os"
-    fi
-    ;;
-  *)
-    kind="$host_os"
-    ;;
-esac
-
-for arg in $@ ; do
-  if test "x$get_output_file" = "xyes"; then
-    link_args="$link_args $arg"
-    output_file="$arg"
-    get_output_file="no"
-    continue
-  fi
-
-  case "$arg" in
-    -c)
-      allargs="$allargs $arg"
-      compile_args="$compile_args $arg"
-
-      if test "x$do_link" = "xyes" -a -n "$output_file"; then
-        compile_args="$compile_args -o $output_file"
-      fi
-
-      do_link="no"
-      dash_c="yes"
-      ;;
-    -o)
-      allargs="$allargs $arg"
-      dash_o="yes"
-
-      if test "x$dash_c" = "xyes"; then
-        compile_args="$compile_args $arg"
-      else
-        link_args="$link_args $arg"
-        do_link="yes"
-        get_output_file="yes"
-      fi
-      ;;
-    -E|-M|-MT)
-      allargs="$allargs $arg"
-      compile_args="$compile_args $arg"
-      dash_c="yes"
-      do_link="no"
-      ;;
-    -l*)
-      libraries=" $libraries $arg "
-      allargs="$allargs $arg"
-      ;;
-    -prefix=*)
-      prefix="`expr "$arg" : '-prefix=\(.*\)'`"
-      ;;
-    -echo)
-      set -x
-      ;;
-    -show)
-      SHOW="echo"
-      ;;
-    -showconfig)
-      showconfigure
-      exit $status
-      ;;
-    -shlib)
-      USE_SHARED_LIB="yes"
-      ;;
-    -noshlib)
-      USE_SHARED_LIB="no"
-      ;;
-    -help)
-      usage
-      ;;
-    *\"*)
-      qarg="'"$arg"'"
-      allargs="$allargs $qarg"
-      ;;
-    *\'*)
-      qarg='\"'"$arg"'\"'
-      allargs="$allargs $qarg"
-      ;;
-    *)
-      allargs="$allargs $qarg"
-
-      if test -s "$arg"; then
-        ext=`expr "$arg" : '.*\(\..*\)'`
-
-        if test "x$ext" = "x.c"; then
-          do_compile="yes"
-          compile_args="$compile_args $arg"
-          fname=`basename $arg .c`
-          link_objs="$link_objs $fname.o"
-        elif test "x$ext" = "x.o"; then
-          if test "x$dash_c" = "xyes"; then
-            compile_args="$compile_args $arg"
-          else
-            do_link="yes"
-            link_objs="$link_objs $arg"
-          fi
-        elif test "x$ext" = "x.a"; then
-          # This is an archive that we're linking in
-          libraries=" $libraries $arg "
-        else
-          compile_args="$compile_args $arg"
-          link_args="$link_args $arg"
-        fi
-      else
-        compile_args="$compile_args $arg"
-        link_args="$link_args $arg"
-      fi
-      ;;
-  esac
-done
-
-if test "$dash_c" = "yes" -a "$do_compile" = no -a "$do_link" = no ; then
-    # -c was specified.  Force do_compile on.
-    do_compile=yes
-fi
-
-if test "x$do_compile" = "xyes"; then
-  if test "x$dash_c" != "xyes"; then
-    compile_args="-c $compile_args"
-  fi
-
-  $SHOW $CC -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $compile_args
-  status=$?
-
-  if test "$status" != "0"; then
-    exit $status
-  fi
-fi
-
-if test "x$do_link" = "xyes"; then
-  shared_link=""
-# conditionnaly link with the hl library  
-  if test "X$HL" = "Xhl"; then
-   libraries=" $libraries -lhdf5_hl -lhdf5 "
-  else
-   libraries=" $libraries  -lhdf5 "
-  fi
-  link_args="$link_args -L${libdir}"
-
-  case "$kind" in
-    gcc|linux*)
-      # MacOS X doesn't support the "-Wl,-rpath -Wl," style of linker flags.
-      # It appears to want none of them specified.
-      case "$host_os" in
-        darwin*)          flag="" ;;
-        *)                flag="-Wl,-rpath -Wl," ;;
-      esac
-      ;;
-    hpux*)                flag="-Wl,+b -Wl," ;;
-    freebsd*|solaris*)    flag="-R" ;;
-    rs6000*|aix*)         flag="-L" ;;
-    sgi)                  flag="-rpath " ;;
-    *)                    flag="" ;;
-  esac
-
-  if test -n "$flag"; then
-    shared_link="${flag}${libdir}"
-  fi
-
-  if test "x$USE_SHARED_LIB" != "xyes"; then
-    # The "-lhdf5" & "-lhdf5_hl" flags are in here already...This is a static
-    # compile though, so change it to the static version (.a) of the library.
-    new_libraries=""
-    for lib in $libraries; do
-      case "$lib" in
-        -lhdf5)
-          new_libraries="$new_libraries ${libdir}/libhdf5.a"
-          ;;
-        -lhdf5_hl)
-          new_libraries="$new_libraries ${libdir}/libhdf5_hl.a"
-          ;;
-        *)
-          new_libraries="$new_libraries $lib"
-          ;;
-      esac
-    done
-    libraries="$new_libraries"
-  fi
-
-  for lib in $libraries; do
-    if echo $link_args | grep " $lib " > /dev/null ||
-       echo $link_args | grep " $lib$" > /dev/null; then
-      :
-    else
-      link_args="$link_args $lib "
-    fi
-  done
-
-  # The LIBS are just a bunch of -l* libraries necessary for the HDF5
-  # module. It's okay if they're included twice in the compile line.
-  link_args="$link_args $H5BLD_LDFLAGS $H5BLD_LIBS"
-
-  # User's CPPFLAGS and CFLAGS come after their H5BLD counterparts.  User's 
-  # LDFLAGS come just before clibpath, user's LIBS come after $link_objs and 
-  # before the hdf5 libraries in $link_args, followed by any external library 
-  # paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in 
-  # from the hdf5 build. The order of the flags is intended to give precedence
-  # to the user's flags.
-  $SHOW $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link
-  status=$?
-fi
-
-exit $status
diff --git a/tools/src/misc/h5clear.c b/tools/src/misc/h5clear.c
index 5724e1b..ae57031 100644
--- a/tools/src/misc/h5clear.c
+++ b/tools/src/misc/h5clear.c
@@ -82,7 +82,7 @@ static struct long_options l_opts[] = {
 };
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    usage
  *
@@ -119,7 +119,7 @@ static void usage(const char *prog)
     HDfprintf(stdout, "  Set the EOA to the maximum of (EOA, EOF) + 512 for the file <file_name>.\n");
 } /* usage() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: parse_command_line
  *
@@ -170,9 +170,12 @@ parse_command_line(int argc, const char **argv)
 
             case 'i':
                 increment_eoa_eof = TRUE;
-                if(opt_arg != NULL && (increment = HDatoi(opt_arg)) < 0) {
-                    usage(h5tools_getprogname());
-                    goto done;
+                if(opt_arg != NULL) {
+                    if (HDatoi(opt_arg) < 0) {
+                        usage(h5tools_getprogname());
+                        goto done;
+                    }
+                    increment = HDatoi(opt_arg);
                 }
                 break;
 
@@ -217,7 +220,7 @@ leave(int ret)
 } /* leave() */
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -231,14 +234,14 @@ leave(int ret)
  *          so the file is opened with write access.
  *          The --filesize option just prints the EOA and EOF, so the file
  *          is opened with read access.
- *      
+ *
  *          The -s option will activate the private property:
- *              --H5F_ACS_CLEAR_STATUS_FLAGS_NAME         
+ *              --H5F_ACS_CLEAR_STATUS_FLAGS_NAME
  *          The --increment option will active these two private properties:
- *              --H5F_ACS_NULL_FSM_ADDR_NAME              
- *              --H5F_ACS_SKIP_EOF_CHECK_NAME            
+ *              --H5F_ACS_NULL_FSM_ADDR_NAME
+ *              --H5F_ACS_SKIP_EOF_CHECK_NAME
  *          The --filesize will activate the private property:
- *              --H5F_ACS_SKIP_EOF_CHECK_NAME            
+ *              --H5F_ACS_SKIP_EOF_CHECK_NAME
  *
  * Return:      Success: 0
  *              Failure: 1
@@ -280,7 +283,7 @@ main (int argc, const char *argv[])
     }
 
     /* Cannot combine the --filesize option with other options */
-    if(print_filesize && 
+    if(print_filesize &&
        (clear_status_flags || remove_cache_image || increment_eoa_eof)) {
         error_msg("Cannot combine --filesize with other options\n");
         h5tools_setstatus(EXIT_FAILURE);
@@ -298,7 +301,7 @@ main (int argc, const char *argv[])
      }
 
     /* -s option */
-    if(clear_status_flags) { 
+    if(clear_status_flags) {
         /* Set to clear the status_flags in the file's superblock */
         /* Activate this private property */
         if(H5Pset(fapl, H5F_ACS_CLEAR_STATUS_FLAGS_NAME, &clear_status_flags) < 0) {
@@ -309,7 +312,7 @@ main (int argc, const char *argv[])
     }
 
     /* --increment option */
-    if(increment_eoa_eof) { 
+    if(increment_eoa_eof) {
         /* Activate this private property */
         if(H5Pset(fapl, H5F_ACS_SKIP_EOF_CHECK_NAME, &increment_eoa_eof) < 0) {
             error_msg("H5Pset\n");
@@ -325,7 +328,7 @@ main (int argc, const char *argv[])
     }
 
     /* --filesize option; open the file read-only */
-    if(print_filesize) { 
+    if(print_filesize) {
         /* Activate this private property */
         if(H5Pset(fapl, H5F_ACS_SKIP_EOF_CHECK_NAME, &print_filesize) < 0) {
             error_msg("H5Pset\n");
@@ -333,7 +336,7 @@ main (int argc, const char *argv[])
             goto done;
         }
         flags = H5F_ACC_RDONLY;
-    } 
+    }
 
     /* Open the file */
     if((fid = h5tools_fopen(fname, flags, fapl, NULL, NULL, (size_t)0)) < 0) {
@@ -367,7 +370,7 @@ main (int argc, const char *argv[])
     }
 
     /* -m option */
-    if(remove_cache_image) { 
+    if(remove_cache_image) {
         if(H5Fget_mdc_image_info(fid, &image_addr, &image_len) < 0) {
             error_msg("H5Fget_mdc_image_info\n");
             h5tools_setstatus(EXIT_FAILURE);
@@ -375,7 +378,7 @@ main (int argc, const char *argv[])
         }
         if(image_addr == HADDR_UNDEF && image_len == 0)
             warn_msg("No cache image in the file\n");
-    } 
+    }
 
 
     h5tools_setstatus(EXIT_SUCCESS);
diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c
index 088e6e9..45aba78 100644
--- a/tools/src/misc/h5debug.c
+++ b/tools/src/misc/h5debug.c
@@ -21,19 +21,19 @@
  *
  *-------------------------------------------------------------------------
  */
-#define H5A_FRIEND		/*suppress error about including H5Apkg  */
-#define H5B2_FRIEND		/*suppress error about including H5B2pkg */
-#define H5B2_TESTING		/*suppress warning about H5B2 testing funcs*/
-#define H5D_FRIEND		/*suppress error about including H5Dpkg  */
-#define H5EA_FRIEND		/*suppress error about including H5EApkg */
-#define H5EA_TESTING		/*suppress warning about H5EA testing funcs*/
-#define H5FA_FRIEND		/*suppress error about including H5FApkg */
-#define H5FA_TESTING		/*suppress warning about H5FA testing funcs*/
-#define H5F_FRIEND		/*suppress error about including H5Fpkg  */
-#define H5G_FRIEND		/*suppress error about including H5Gpkg  */
-#define H5HF_FRIEND		/*suppress error about including H5HFpkg */
-#define H5O_FRIEND		/*suppress error about including H5Opkg  */
-#define H5SM_FRIEND		/*suppress error about including H5SMpkg */
+#define H5A_FRIEND        /*suppress error about including H5Apkg  */
+#define H5B2_FRIEND        /*suppress error about including H5B2pkg */
+#define H5B2_TESTING        /*suppress warning about H5B2 testing funcs*/
+#define H5D_FRIEND        /*suppress error about including H5Dpkg  */
+#define H5EA_FRIEND        /*suppress error about including H5EApkg */
+#define H5EA_TESTING        /*suppress warning about H5EA testing funcs*/
+#define H5FA_FRIEND        /*suppress error about including H5FApkg */
+#define H5FA_TESTING        /*suppress warning about H5FA testing funcs*/
+#define H5F_FRIEND        /*suppress error about including H5Fpkg  */
+#define H5G_FRIEND        /*suppress error about including H5Gpkg  */
+#define H5HF_FRIEND        /*suppress error about including H5HFpkg */
+#define H5O_FRIEND        /*suppress error about including H5Opkg  */
+#define H5SM_FRIEND        /*suppress error about including H5SMpkg */
 
 #include "H5private.h"  /* Generic Functions    */
 #include "H5Apkg.h"     /* Attributes           */
@@ -57,7 +57,7 @@
 
 #define VCOL    50
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    get_H5B2_class
  *
@@ -80,68 +80,68 @@ get_H5B2_class(const uint8_t *sig)
     const H5B2_class_t *cls;
 
     switch(subtype) {
-        case H5B2_TEST_ID:
-            cls = H5B2_TEST;
-            break;
+    case H5B2_TEST_ID:
+        cls = H5B2_TEST;
+        break;
 
-        case H5B2_FHEAP_HUGE_INDIR_ID:
-            cls = H5HF_HUGE_BT2_INDIR;
-            break;
+    case H5B2_FHEAP_HUGE_INDIR_ID:
+        cls = H5HF_HUGE_BT2_INDIR;
+        break;
 
-        case H5B2_FHEAP_HUGE_FILT_INDIR_ID:
-            cls = H5HF_HUGE_BT2_FILT_INDIR;
-            break;
+    case H5B2_FHEAP_HUGE_FILT_INDIR_ID:
+        cls = H5HF_HUGE_BT2_FILT_INDIR;
+        break;
 
-        case H5B2_FHEAP_HUGE_DIR_ID:
-            cls = H5HF_HUGE_BT2_DIR;
-            break;
+    case H5B2_FHEAP_HUGE_DIR_ID:
+        cls = H5HF_HUGE_BT2_DIR;
+        break;
 
-        case H5B2_FHEAP_HUGE_FILT_DIR_ID:
-            cls = H5HF_HUGE_BT2_FILT_DIR;
-            break;
+    case H5B2_FHEAP_HUGE_FILT_DIR_ID:
+        cls = H5HF_HUGE_BT2_FILT_DIR;
+        break;
 
-        case H5B2_GRP_DENSE_NAME_ID:
-            cls = H5G_BT2_NAME;
-            break;
+    case H5B2_GRP_DENSE_NAME_ID:
+        cls = H5G_BT2_NAME;
+        break;
 
-        case H5B2_GRP_DENSE_CORDER_ID:
-            cls = H5G_BT2_CORDER;
-            break;
+    case H5B2_GRP_DENSE_CORDER_ID:
+        cls = H5G_BT2_CORDER;
+        break;
 
-        case H5B2_SOHM_INDEX_ID:
-            cls = H5SM_INDEX;
-            break;
+    case H5B2_SOHM_INDEX_ID:
+        cls = H5SM_INDEX;
+        break;
 
-        case H5B2_ATTR_DENSE_NAME_ID:
-            cls = H5A_BT2_NAME;
-            break;
+    case H5B2_ATTR_DENSE_NAME_ID:
+        cls = H5A_BT2_NAME;
+        break;
 
-        case H5B2_ATTR_DENSE_CORDER_ID:
-            cls = H5A_BT2_CORDER;
-            break;
+    case H5B2_ATTR_DENSE_CORDER_ID:
+        cls = H5A_BT2_CORDER;
+        break;
 
-        case H5B2_CDSET_ID:
-            cls = H5D_BT2;
-            break;
+    case H5B2_CDSET_ID:
+        cls = H5D_BT2;
+        break;
 
-        case H5B2_CDSET_FILT_ID:
-            cls = H5D_BT2_FILT;
-            break;
+    case H5B2_CDSET_FILT_ID:
+        cls = H5D_BT2_FILT;
+        break;
 
-        case H5B2_TEST2_ID:
-            cls = H5B2_TEST2;
-            break;
+    case H5B2_TEST2_ID:
+        cls = H5B2_TEST2;
+        break;
 
-        case H5B2_NUM_BTREE_ID:
-        default:
-            HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));
-            HDexit(4);
+    case H5B2_NUM_BTREE_ID:
+    default:
+        HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));
+        HDexit(4);
     } /* end switch */
 
     return(cls);
 } /* end get_H5B2_class() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    get_H5EA_class
  *
@@ -164,28 +164,28 @@ get_H5EA_class(const uint8_t *sig)
     const H5EA_class_t *cls;
 
     switch(clsid) {
-        case H5EA_CLS_TEST_ID:
-            cls = H5EA_CLS_TEST;
-            break;
+    case H5EA_CLS_TEST_ID:
+        cls = H5EA_CLS_TEST;
+        break;
 
-        case H5EA_CLS_CHUNK_ID:
-            cls = H5EA_CLS_CHUNK;
-            break;
+    case H5EA_CLS_CHUNK_ID:
+        cls = H5EA_CLS_CHUNK;
+        break;
 
-        case H5EA_CLS_FILT_CHUNK_ID:
-            cls = H5EA_CLS_FILT_CHUNK;
-            break;
+    case H5EA_CLS_FILT_CHUNK_ID:
+        cls = H5EA_CLS_FILT_CHUNK;
+        break;
 
-        case H5EA_NUM_CLS_ID:
-        default:
-            HDfprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid));
-            HDexit(4);
+    case H5EA_NUM_CLS_ID:
+    default:
+        HDfprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid));
+        HDexit(4);
     } /* end switch */
 
     return(cls);
 } /* end get_H5EA_class() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    get_H5FA_class
  *
@@ -208,28 +208,28 @@ get_H5FA_class(const uint8_t *sig)
     const H5FA_class_t *cls;
 
     switch(clsid) {
-        case H5FA_CLS_TEST_ID:
-            cls = H5FA_CLS_TEST;
-            break;
+    case H5FA_CLS_TEST_ID:
+        cls = H5FA_CLS_TEST;
+        break;
 
-        case H5FA_CLS_CHUNK_ID:
-            cls = H5FA_CLS_CHUNK;
-            break;
+    case H5FA_CLS_CHUNK_ID:
+        cls = H5FA_CLS_CHUNK;
+        break;
 
-        case H5FA_CLS_FILT_CHUNK_ID:
-            cls = H5FA_CLS_FILT_CHUNK;
-            break;
+    case H5FA_CLS_FILT_CHUNK_ID:
+        cls = H5FA_CLS_FILT_CHUNK;
+        break;
 
-        case H5FA_NUM_CLS_ID: 
-        default:
-            HDfprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid));
-            HDexit(4);
+    case H5FA_NUM_CLS_ID:
+    default:
+        HDfprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid));
+        HDexit(4);
     } /* end switch */
 
     return(cls);
 } /* end get_H5FA_class() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -254,13 +254,13 @@ main(int argc, char *argv[])
     uint8_t     sig[H5F_SIGNATURE_LEN];
     size_t      u;
     H5E_auto2_t func;
-    void 	*edata;
+    void       *edata;
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
     herr_t      status = SUCCEED;
 
     if(argc == 1) {
-  	HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
-  	HDexit(1);
+        HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
+        HDexit(1);
     } /* end if */
 
     /* Initialize the library */
@@ -282,7 +282,7 @@ main(int argc, char *argv[])
     } /* end if */
     if(HDstrchr(argv[1], '%'))
         if(H5Pset_fapl_family (fapl, (hsize_t)0, H5P_DEFAULT) < 0) {
-            fprintf(stderr, "cannot set file access property list\n");
+            HDfprintf(stderr, "cannot set file access property list\n");
             HDexit(1);
         }
     if((fid = H5Fopen(argv[1], H5F_ACC_RDONLY, fapl)) < 0) {
@@ -297,7 +297,7 @@ main(int argc, char *argv[])
     }
     api_ctx_pushed = TRUE;
 
-    if(NULL == (f = (H5F_t *)H5I_object(fid))) {
+    if(NULL == (f = (H5F_t *)H5VL_object(fid))) {
         HDfprintf(stderr, "cannot obtain H5F_t pointer\n");
         HDexit(2);
     } /* end if */
@@ -342,13 +342,15 @@ main(int argc, char *argv[])
          */
         status = H5HL_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp (sig, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
-	/*
-	 * Debug a global heap collection.
-	 */
-	status = H5HG_debug(f, addr, stdout, 0, VCOL);
+    }
+    else if(!HDmemcmp (sig, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+        /*
+         * Debug a global heap collection.
+         */
+        status = H5HG_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp(sig, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug a symbol table node.
          */
@@ -362,7 +364,8 @@ main(int argc, char *argv[])
 
         status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra);
 
-    } else if(!HDmemcmp(sig, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug a B-tree.  B-trees are debugged through the B-tree
          * subclass.  The subclass identifier is the byte immediately
@@ -373,79 +376,81 @@ main(int argc, char *argv[])
         uint32_t    dim[H5O_LAYOUT_NDIMS];
 
         switch(subtype) {
-            case H5B_SNODE_ID:
-                /* Check for extra parameters */
-                if(extra == 0) {
-                    HDfprintf(stderr, "\nWarning: Providing the group's local heap address will give more information\n");
-                    HDfprintf(stderr, "B-tree symbol table node usage:\n");
-                    HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <address of local heap>\n\n");
-                    HDexit(4);
-                } /* end if */
+        case H5B_SNODE_ID:
+            /* Check for extra parameters */
+            if(extra == 0) {
+                HDfprintf(stderr, "\nWarning: Providing the group's local heap address will give more information\n");
+                HDfprintf(stderr, "B-tree symbol table node usage:\n");
+                HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <address of local heap>\n\n");
+                HDexit(4);
+            } /* end if */
 
-                status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra);
-                break;
+            status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra);
+            break;
 
-            case H5B_CHUNK_ID:
-                /* Check for extra parameters */
-                if(extra == 0) {
-                    HDfprintf(stderr, "ERROR: Need number of dimensions of chunk in order to dump chunk B-tree node\n");
+        case H5B_CHUNK_ID:
+            /* Check for extra parameters */
+            if(extra == 0) {
+                HDfprintf(stderr, "ERROR: Need number of dimensions of chunk in order to dump chunk B-tree node\n");
+                HDfprintf(stderr, "B-tree chunked storage node usage:\n");
+                HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
+                HDexit(4);
+            } /* end if */
+
+            /* Build array of chunk dimensions */
+            ndims = (unsigned)extra;
+            dim[0] = (uint32_t)extra2;
+            if(ndims > 1)
+                dim[1] = (uint32_t)extra3;
+            if(ndims > 2)
+                dim[2] = (uint32_t)extra4;
+
+            /* Check for dimension error */
+            if(ndims > 3) {
+                HDfprintf(stderr, "ERROR: Only 3 dimensions support currently (fix h5debug)\n");
+                HDfprintf(stderr, "B-tree chunked storage node usage:\n");
+                HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
+                HDexit(4);
+            } /* end for */
+            for(u = 0; u < ndims; u++)
+                if(0 == dim[u]) {
+                    HDfprintf(stderr, "ERROR: Chunk dimensions should be >0\n");
                     HDfprintf(stderr, "B-tree chunked storage node usage:\n");
                     HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
                     HDexit(4);
                 } /* end if */
 
-                /* Build array of chunk dimensions */
-                ndims = (unsigned)extra;
-                dim[0] = (uint32_t)extra2;
-                if(ndims > 1)
-                    dim[1] = (uint32_t)extra3;
-                if(ndims > 2)
-                    dim[2] = (uint32_t)extra4;
-
-                /* Check for dimension error */
-                if(ndims > 3) {
-                    HDfprintf(stderr, "ERROR: Only 3 dimensions support currently (fix h5debug)\n");
-                    HDfprintf(stderr, "B-tree chunked storage node usage:\n");
-                    HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
-                    HDexit(4);
-                } /* end for */
-                for(u = 0; u < ndims; u++)
-                    if(0 == dim[u]) {
-                        HDfprintf(stderr, "ERROR: Chunk dimensions should be >0\n");
-                        HDfprintf(stderr, "B-tree chunked storage node usage:\n");
-                        HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
-                        HDexit(4);
-                    } /* end if */
-
-                /* Set the last dimension (the element size) to zero */
-                dim[ndims] = 0;
-
-                status = H5D_btree_debug(f, addr, stdout, 0, VCOL, ndims, dim);
-                break;
-
-            case H5B_NUM_BTREE_ID:
-            default:
-                HDfprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype));
-                HDexit(4);
+            /* Set the last dimension (the element size) to zero */
+            dim[ndims] = 0;
+
+            status = H5D_btree_debug(f, addr, stdout, 0, VCOL, ndims, dim);
+            break;
+
+        case H5B_NUM_BTREE_ID:
+        default:
+            HDfprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype));
+            HDexit(4);
         }
 
-    } else if(!HDmemcmp(sig, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug a v2 B-tree header.
-         */
+          */
         const H5B2_class_t *cls = get_H5B2_class(sig);
         HDassert(cls);
 
-	    if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && extra == 0) {
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && extra == 0) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and object header address containing the layout message in order to dump header\n");
             HDfprintf(stderr, "v2 B-tree hdr usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <v2 B-tree header address> <object header address>\n");
             HDexit(4);
-	    } /* end if */
+        } /* end if */
 
         status = H5B2__hdr_debug(f, addr, stdout, 0, VCOL, cls, (haddr_t)extra);
 
-    } else if(!HDmemcmp(sig, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug a v2 B-tree internal node.
          */
@@ -453,16 +458,15 @@ main(int argc, char *argv[])
         HDassert(cls);
 
         /* Check for enough valid parameters */
-	if((cls == H5D_BT2 || cls == H5D_BT2_FILT) &&
-	   (extra == 0 || extra2 == 0 || extra3 == 0 || extra4 == 0)) {
-
-            fprintf(stderr, "ERROR: Need v2 B-tree header address, the node's number of records, depth, and object header address containing the layout message in order to dump internal node\n");
-            fprintf(stderr, "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
-            fprintf(stderr, "v2 B-tree internal node usage:\n");
-            fprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> <number of records> <depth> <object header address>\n");
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra == 0 || extra2 == 0 || extra3 == 0 || extra4 == 0)) {
+            HDfprintf(stderr, "ERROR: Need v2 B-tree header address, the node's number of records, depth, and object header address containing the layout message in order to dump internal node\n");
+            HDfprintf(stderr, "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
+            HDfprintf(stderr, "v2 B-tree internal node usage:\n");
+            HDfprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> <number of records> <depth> <object header address>\n");
             HDexit(4);
 
-        } else if(extra == 0 || extra2 == 0 || extra3 == 0) {
+        }
+        else if(extra == 0 || extra2 == 0 || extra3 == 0) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and the node's number of records and depth in order to dump internal node\n");
             HDfprintf(stderr, "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
             HDfprintf(stderr, "v2 B-tree internal node usage:\n");
@@ -472,7 +476,8 @@ main(int argc, char *argv[])
 
         status = H5B2__int_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, (unsigned)extra3, (haddr_t)extra4);
 
-    } else if(!HDmemcmp(sig, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug a v2 B-tree leaf node.
          */
@@ -480,15 +485,15 @@ main(int argc, char *argv[])
         HDassert(cls);
 
         /* Check for enough valid parameters */
-	if((cls == H5D_BT2 || cls == H5D_BT2_FILT) &&
-	   (extra == 0 || extra2 == 0 || extra3 == 0 )) {
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra == 0 || extra2 == 0 || extra3 == 0 )) {
 
-            fprintf(stderr, "ERROR: Need v2 B-tree header address, number of records, and object header address containing the layout message in order to dump leaf node\n");
-            fprintf(stderr, "v2 B-tree leaf node usage:\n");
-            fprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records> <object header address>\n");
+            HDfprintf(stderr, "ERROR: Need v2 B-tree header address, number of records, and object header address containing the layout message in order to dump leaf node\n");
+            HDfprintf(stderr, "v2 B-tree leaf node usage:\n");
+            HDfprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records> <object header address>\n");
             HDexit(4);
 
-        } else if(extra == 0 || extra2 == 0) {
+        }
+        else if(extra == 0 || extra2 == 0) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and number of records in order to dump leaf node\n");
             HDfprintf(stderr, "v2 B-tree leaf node usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records>\n");
@@ -497,13 +502,15 @@ main(int argc, char *argv[])
 
         status = H5B2__leaf_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, (haddr_t)extra3);
 
-    } else if(!HDmemcmp(sig, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug a fractal heap header.
          */
         status = H5HF_hdr_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp(sig, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug a fractal heap direct block.
          */
@@ -518,7 +525,8 @@ main(int argc, char *argv[])
 
         status = H5HF_dblock_debug(f, addr, stdout, 0, VCOL, extra, (size_t)extra2);
 
-    } else if(!HDmemcmp(sig, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug a fractal heap indirect block.
          */
@@ -533,14 +541,16 @@ main(int argc, char *argv[])
 
         status = H5HF_iblock_debug(f, addr, stdout, 0, VCOL, extra, (unsigned)extra2);
 
-    } else if(!HDmemcmp(sig, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug a free space header.
          */
 
         status = H5FS_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp(sig, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug free space serialized sections.
          */
@@ -555,14 +565,16 @@ main(int argc, char *argv[])
 
         status = H5FS_sects_debug(f, addr, stdout, 0, VCOL, extra, extra2);
 
-    } else if(!HDmemcmp(sig, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug shared message master table.
          */
 
         status = H5SM_table_debug(f, addr, stdout, 0, VCOL, (unsigned) UFAIL, (unsigned) UFAIL);
 
-    } else if(!HDmemcmp(sig, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug shared message list index.
          */
@@ -577,7 +589,8 @@ main(int argc, char *argv[])
 
         status = H5SM_list_debug(f, addr, stdout, 0, VCOL, (haddr_t)extra);
 
-    } else if(!HDmemcmp(sig, H5EA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug an extensible aray header.
          */
@@ -594,7 +607,8 @@ main(int argc, char *argv[])
 
         status = H5EA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra);
 
-    } else if(!HDmemcmp(sig, H5EA_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug an extensible aray index block.
          */
@@ -611,7 +625,8 @@ main(int argc, char *argv[])
 
         status = H5EA__iblock_debug(f, addr, stdout, 0, VCOL, cls, extra, extra2);
 
-    } else if(!HDmemcmp(sig, H5EA_SBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_SBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug an extensible aray super block.
          */
@@ -628,7 +643,8 @@ main(int argc, char *argv[])
 
         status = H5EA__sblock_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, extra3);
 
-    } else if(!HDmemcmp(sig, H5EA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug an extensible aray data block.
          */
@@ -645,7 +661,8 @@ main(int argc, char *argv[])
 
         status = H5EA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra, (size_t)extra2, extra3);
 
-    } else if(!HDmemcmp(sig, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug a fixed array header.
          */
@@ -662,7 +679,8 @@ main(int argc, char *argv[])
 
         status = H5FA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra);
 
-    } else if(!HDmemcmp(sig, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug a fixed array data block.
          */
@@ -679,33 +697,37 @@ main(int argc, char *argv[])
 
         status = H5FA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra, extra2);
 
-    } else if(!HDmemcmp(sig, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
          * Debug v2 object header (which have signatures).
          */
 
         status = H5O_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(sig[0] == H5O_VERSION_1) {
+    }
+    else if(sig[0] == H5O_VERSION_1) {
         /*
          * This could be a v1 object header.  Since they don't have a signature
          * it's a somewhat "ify" detection.
          */
         status = H5O_debug(f, addr, stdout, 0, VCOL);
 
-    } else {
+    }
+    else {
         /*
          * Got some other unrecognized signature.
          */
-        printf("%-*s ", VCOL, "Signature:");
+        HDprintf("%-*s ", VCOL, "Signature:");
         for (u = 0; u < sizeof(sig); u++) {
             if (sig[u] > ' ' && sig[u] <= '~' && '\\' != sig[u])
                 HDputchar(sig[u]);
             else if ('\\' == sig[u]) {
                 HDputchar('\\');
                 HDputchar('\\');
-            } else
-                printf("\\%03o", sig[u]);
+            }
+            else
+                HDprintf("\\%03o", sig[u]);
         }
         HDputchar('\n');
 
diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c
index b7ff73c..feb60d4 100644
--- a/tools/src/misc/h5mkgrp.c
+++ b/tools/src/misc/h5mkgrp.c
@@ -251,7 +251,7 @@ main(int argc, const char *argv[])
 
         /* Display some output if requested */
         if(params.verbose)
-            printf("%s: Creating groups with latest version of the format\n", h5tools_getprogname());
+            HDprintf("%s: Creating groups with latest version of the format\n", h5tools_getprogname());
     } /* end if */
 
     /* Attempt to open an existing HDF5 file first */
@@ -284,7 +284,7 @@ main(int argc, const char *argv[])
 
         /* Display some output if requested */
         if(params.verbose)
-            printf("%s: Creating parent groups\n", h5tools_getprogname());
+            HDprintf("%s: Creating parent groups\n", h5tools_getprogname());
     } /* end if */
 
     /* Loop over creating requested groups */
@@ -305,7 +305,7 @@ main(int argc, const char *argv[])
 
         /* Display some output if requested */
         if(params.verbose)
-            printf("%s: created group '%s'\n", h5tools_getprogname(), params.groups[curr_group]);
+            HDprintf("%s: created group '%s'\n", h5tools_getprogname(), params.groups[curr_group]);
     } /* end for */
 
     /* Close link creation property list */
diff --git a/tools/src/misc/h5redeploy.in b/tools/src/misc/h5redeploy.in
deleted file mode 100644
index 242459a..0000000
--- a/tools/src/misc/h5redeploy.in
+++ /dev/null
@@ -1,216 +0,0 @@
-#! /bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
-# If you do not have access to either file, you may request a copy from
-# help@hdfgroup.org.
-#
-
-## Update HDF5 compiler tools after the HDF5 software has been installed  ##
-## in a new location.							  ##
-## For help page, use "h5redeploy -help"				  ##
-##									  ##
-
-# Constants definitions
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-# Function definitions
-
-# show help page
-usage() {
-  # A wonderfully informative "usage" message.
-  echo "usage: $prog_name [OPTIONS]"
-  echo "  OPTIONS:"
-  echo "    -help|help        This help message"
-  echo "    -echo             Show all the shell commands executed"
-  echo "    -force            No prompt, just do it"
-  echo "    -prefix=DIR       New directory to find HDF5 lib/ and include/"
-  echo "                        subdirectories [default: current directory]"
-  echo "    -exec-prefix=DIR  New directory to find HDF5 lib/"
-  echo "                        subdirectory [default: <prefix>]"
-  echo "    -libdir=DIR       New directory for the HDF5 lib directory"
-  echo "                        [default: <exec-prefix>/lib]"
-  echo "    -includedir=DIR   New directory for the HDF5 header files"
-  echo "                        [default: <prefix>/include]"
-  echo "    -tool=TOOL        Tool to update. TOOL must be in the current"
-  echo "                        directory and writable. [default: $h5tools]"
-  echo "    -show             Show the commands without executing them"
-  echo " "
-  exit $EXIT_FAILURE
-}
-
-# display variable values
-dump_vars(){
-    echo "====Showing all variable values====="
-    echo prefix=$prefix
-    echo h5tools=$h5tools
-    echo "====End Showing====="
-}
-
-# show actions to be taken
-show_action()
-{
-    echo "Update the following tools because they are now installed at a new directory"
-    for t in $foundtools; do
-	echo "${t}:"
-	echo "   current setting=`sed -e '/^prefix=/s/prefix=//p' -e d $t`"
-	echo "   new     setting="\""$prefix"\"
-    done
-}
-
-
-# Report Error message
-ERROR()
-{
-    echo "***ERROR***"
-    echo "$1"
-}
-
-# Main
-#
-############################################################################
-## Installation directories:						  ##
-## prefix	architecture-independent files.				  ##
-## exec_prefix	architecture-dependent files, default is <prefix>.	  ##
-## libdir	libraries, default is <exec_prefix>/lib.		  ##
-## includedir	header files, default is <prefix/include>.		  ##
-## Not used here:							  ##
-## bindir	executables, <exec_prefix/bin>.				  ##
-############################################################################
-# Initialization
-h5tools="h5cc h5pcc h5fc h5pfc h5c++"	# possible hdf5 tools
-foundtools=		# tools found and will be modified
-fmode=			# force mode, default is off
-prefix=
-exec_prefix=
-libdir=
-includedir=
-
-# Parse options
-for arg in $@ ; do
-  case "$arg" in
-    -prefix=*)
-      prefix="`echo $arg | cut -f2 -d=`"
-      ;;
-    -exec-prefix=*)
-      exec_prefix="`echo $arg | cut -f2 -d=`"
-      ;;
-    -libdir=*)
-      libdir="`echo $arg | cut -f2 -d=`"
-      ;;
-    -includedir=*)
-      includedir="`echo $arg | cut -f2 -d=`"
-      ;;
-    -echo)
-      set -x
-      ;;
-    -show)
-      SHOW="echo"
-      ;;
-    -tool=*)
-      h5tools="`echo $arg | cut -f2 -d=`"
-      ;;
-    -help|help)
-      usage
-      ;;
-    -force)
-      fmode=yes
-      ;;
-    *)
-      ERROR "Unknown Option($arg)"
-      usage
-      exit $EXIT_FAILURE
-      ;;
-  esac
-done
-
-# Set to default value, one above where i am, if not given by user
-if [ -z "$prefix" ]; then
-    prefix=`(cd ..;pwd)`
-fi
-if [ -z "$exec_prefix" ]; then
-    exec_prefix='${prefix}'		# use single quotes to prevent expansion of $
-fi
-if [ -z "$libdir" ]; then
-    libdir='${exec_prefix}'/lib	# use single quotes to prevent expansion of $
-fi
-if [ -z "$includedir" ]; then
-    includedir='${prefix}'/include # use single quotes to prevent expansion of $
-fi
-
-for x in $h5tools; do
-    if [ -f $x ]; then
-	foundtools="$foundtools $x"
-	if [ ! -w $x ]; then
-	    ERROR "h5tool($x) is not writable"
-	    exit $EXIT_FAILURE
-	fi
-    fi
-done
-
-if [ -z "$foundtools" ]; then
-    ERROR "found no tools to modify"
-    exit $EXIT_FAILURE
-fi
-
-# Show actions to be taken and get consent
-show_action
-# Ask confirmation unless fmode is on
-if [ x-$fmode = x- ]; then
-    echo "Continue? (yes/no)"
-    read ansx
-    ans=`echo $ansx | tr "[A-Z]" "[a-z]"`
-    if [ x-$ans != x-yes ]; then
-	echo ABORT.  No tools changed.
-	exit $EXIT_FAILURE
-    fi
-fi
-
-
-# Create the update commands
-CMDFILE=/tmp/h5redeploy.$$
-touch $CMDFILE
-chmod 0600 $CMDFILE
-echo "/^prefix=/c"                    >> $CMDFILE
-echo prefix=\""$prefix"\"             >> $CMDFILE
-echo .                                >> $CMDFILE
-echo "/^exec_prefix=/c"               >> $CMDFILE
-echo exec_prefix=\""$exec_prefix"\"   >> $CMDFILE
-echo .                                >> $CMDFILE
-echo "/^libdir=/c"                    >> $CMDFILE
-echo libdir=\""$libdir"\"             >> $CMDFILE
-echo .                                >> $CMDFILE
-echo "/^includedir=/c"                >> $CMDFILE
-echo includedir=\""$includedir"\"     >> $CMDFILE
-echo .                                >> $CMDFILE
-(echo w; echo q)                      >> $CMDFILE
-
-
-# Update them
-if [ "$SHOW" = "echo" ]; then
-    echo "===Update commands are:===="
-    cat $CMDFILE
-    echo "===End Update commands====="
-fi
-
-for t in $foundtools; do
-    echo Update $t ...
-    COMMAND="ed - $t"
-    if [ "$SHOW" = "echo" ]; then
-	echo $COMMAND
-    else
-	$COMMAND < $CMDFILE
-    fi
-done
-
-
-# Cleanup
-rm -f $CMDFILE
-exit $EXIT_SUCCESS
diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c
index cdc554f..d516fa0 100644
--- a/tools/src/misc/h5repart.c
+++ b/tools/src/misc/h5repart.c
@@ -15,35 +15,36 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Wednesday, May 13, 1998
  *
- * Purpose:	Repartitions a file family.  This program can be used to
- *		split a single file into a family of files, join a family of
- *		files into a single file, or copy one family to another while
- *		changing the size of the family members.  It can also be used
- *		to copy a single file to a single file with holes.
+ * Purpose:    Repartitions a file family.  This program can be used to
+ *        split a single file into a family of files, join a family of
+ *        files into a single file, or copy one family to another while
+ *        changing the size of the family members.  It can also be used
+ *        to copy a single file to a single file with holes.
  */
 
 /* See H5private.h for how to include system headers */
 #include "hdf5.h"
 #include "H5private.h"
 
-#define NAMELEN	4096
-#define GB	*1024*1024*1024
+#define NAMELEN    4096
+#define GB    *1024*1024*1024
 
-/*Make these 2 private properties(defined in H5Fprivate.h) available to h5repart.
- *The first one updates the member file size in the superblock.  The second one
- *change file driver from family to sec2. */
+/* Make these 2 private properties(defined in H5Fprivate.h) available to h5repart.
+ * The first one updates the member file size in the superblock.  The second one
+ * change file driver from family to a single file driver.
+ */
 #define H5F_ACS_FAMILY_NEWSIZE_NAME            "family_newsize"
-#define H5F_ACS_FAMILY_TO_SEC2_NAME            "family_to_sec2"
+#define H5F_ACS_FAMILY_TO_SINGLE_NAME          "family_to_single"
+
 
-
 /*-------------------------------------------------------------------------
- * Function:	usage
+ * Function:    usage
  *
- * Purpose:	Prints a usage message.
+ * Purpose:    Prints a usage message.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, May 13, 1998
  *
  * Modifications:
@@ -53,97 +54,99 @@
 static void
 usage (const char *progname)
 {
-    fprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2] SRC DST\n",
-	    progname);
-    fprintf(stderr, "   -v     Produce verbose output\n");
-    fprintf(stderr, "   -V     Print a version number and exit\n");
-    fprintf(stderr, "   -b N   The I/O block size, defaults to 1kB\n");
-    fprintf(stderr, "   -m N   The destination member size or 1GB\n");
-    fprintf(stderr, "   -family_to_sec2   Change file driver from family to sec2\n");
-    fprintf(stderr, "   SRC    The name of the source file\n");
-    fprintf(stderr, "   DST	The name of the destination files\n");
-    fprintf(stderr, "Sizes may be suffixed with `g' for GB, `m' for MB or "
-	    "`k' for kB.\n");
-    fprintf(stderr, "File family names include an integer printf "
-	    "format such as `%%d'\n");
-    exit (EXIT_FAILURE);
+    HDfprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2|-family_to_single] SRC DST\n",
+        progname);
+    HDfprintf(stderr, "   -v     Produce verbose output\n");
+    HDfprintf(stderr, "   -V     Print a version number and exit\n");
+    HDfprintf(stderr, "   -b N   The I/O block size, defaults to 1kB\n");
+    HDfprintf(stderr, "   -m N   The destination member size or 1GB\n");
+    HDfprintf(stderr, "   -family_to_sec2   Deprecated version of -family_to_single (below)\n");
+    HDfprintf(stderr, "   -family_to_single   Change file driver from family to the default single-file VFD (windows or sec2)\n");
+    HDfprintf(stderr, "   SRC    The name of the source file\n");
+    HDfprintf(stderr, "   DST    The name of the destination files\n");
+    HDfprintf(stderr, "Sizes may be suffixed with `g' for GB, `m' for MB or "
+        "`k' for kB.\n");
+    HDfprintf(stderr, "File family names include an integer printf "
+        "format such as `%%d'\n");
+    HDexit (EXIT_FAILURE);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	get_size
+ * Function:    get_size
  *
- * Purpose:	Reads a size option of the form `-XNS' where `X' is any
- *		letter, `N' is a multi-character positive decimal number, and
- *		`S' is an optional suffix letter in the set [GgMmk].  The
- *		option may also be split among two arguments as: `-X NS'.
- *		The input value of ARGNO is the argument number for the
- *		switch in the ARGV vector and ARGC is the number of entries
- *		in that vector.
+ * Purpose:    Reads a size option of the form `-XNS' where `X' is any
+ *        letter, `N' is a multi-character positive decimal number, and
+ *        `S' is an optional suffix letter in the set [GgMmk].  The
+ *        option may also be split among two arguments as: `-X NS'.
+ *        The input value of ARGNO is the argument number for the
+ *        switch in the ARGV vector and ARGC is the number of entries
+ *        in that vector.
  *
- * Return:	Success:	The value N multiplied according to the
- *				suffix S.  On return ARGNO will be the number
- *				of the next argument to process.
+ * Return:    Success:    The value N multiplied according to the
+ *                suffix S.  On return ARGNO will be the number
+ *                of the next argument to process.
  *
- *		Failure:	Calls usage() which exits with a non-zero
- *				status.
+ *        Failure:    Calls usage() which exits with a non-zero
+ *                status.
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, May 13, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static off_t
 get_size (const char *progname, int *argno, int argc, char *argv[])
 {
-    off_t	retval=-1;
-    char	*suffix;
+    off_t    retval=-1;
+    char    *suffix;
 
     if (isdigit ((int)(argv[*argno][2]))) {
-	retval = strtol (argv[*argno]+2, &suffix, 10);
-	(*argno)++;
-    } else if (argv[*argno][2] || *argno+1>=argc) {
-	usage (progname);
-    } else {
-	retval = strtol (argv[*argno+1], &suffix, 0);
-	if (suffix==argv[*argno+1]) usage (progname);
-	*argno += 2;
+        retval = HDstrtol(argv[*argno]+2, &suffix, 10);
+        (*argno)++;
+    }
+    else if (argv[*argno][2] || *argno+1>=argc) {
+        usage (progname);
+    }
+    else {
+        retval = HDstrtol(argv[*argno+1], &suffix, 0);
+        if (suffix == argv[*argno+1])
+            usage (progname);
+        *argno += 2;
     }
     if (suffix && suffix[0] && !suffix[1]) {
-	switch (*suffix) {
-	case 'G':
-	case 'g':
-	    retval *= 1024 * 1024 * 1024;
-	    break;
-	case 'M':
-	case 'm':
-	    retval *= 1024 * 1024;
-	    break;
-	case 'k':
-	    retval *= 1024;
-	    break;
-	default:
-	    usage (progname);
-	}
-    } else if (suffix && suffix[0]) {
-	usage (progname);
+        switch (*suffix) {
+        case 'G':
+        case 'g':
+            retval *= 1024 * 1024 * 1024;
+            break;
+        case 'M':
+        case 'm':
+            retval *= 1024 * 1024;
+            break;
+        case 'k':
+            retval *= 1024;
+            break;
+        default:
+            usage(progname);
+        }
+    }
+    else if (suffix && suffix[0]) {
+        usage (progname);
     }
     return retval;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Split an hdf5 file
+ * Purpose:    Split an hdf5 file
  *
- * Return:	Success:
+ * Return:    Success:
  *
- *		Failure:
+ *        Failure:
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, May 13, 1998
  *
  * Modifications:
@@ -153,83 +156,88 @@ get_size (const char *progname, int *argno, int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-    const char	*prog_name;		/*program name			*/
-    size_t	blk_size=1024;		/*size of each I/O block	*/
-    char	*buf=NULL;		/*I/O block buffer		*/
-    size_t	n, i;			/*counters			*/
-    ssize_t	nio;			/*I/O return value		*/
-    int		argno=1;		/*program argument number	*/
-    int		src, dst=-1;		/*source & destination files	*/
-    int		need_seek=FALSE;	/*destination needs to seek?	*/
-    int		need_write;		/*data needs to be written?	*/
-    h5_stat_t sb;                       /*temporary file stat buffer	*/
-
-    int		verbose=FALSE;		/*display file names?		*/
-
-    const char	*src_gen_name;  /*general source name		*/
-    char	*src_name=NULL;	    /*source member name		*/
-
-    int		src_is_family;		/*is source name a family name?	*/
-    int		src_membno=0;		/*source member number		*/
-
-    const char	*dst_gen_name;	/*general destination name	*/
-    char	*dst_name=NULL;	    /*destination member name	*/
-    int		dst_is_family;		/*is dst name a family name?	*/
-    int		dst_membno=0;		/*destination member number	*/
-
-    off_t	left_overs=0;		/*amount of zeros left over	*/
-    off_t	src_offset=0;		/*offset in source member	*/
-    off_t	dst_offset=0;		/*offset in destination member	*/
-    off_t	src_size;           /*source logical member size	*/
-    off_t	src_act_size;		/*source actual member size	*/
-    off_t	dst_size=1 GB;		/*destination logical memb size	*/
+    const char    *prog_name;        /*program name            */
+    size_t    blk_size=1024;        /*size of each I/O block    */
+    char    *buf=NULL;        /*I/O block buffer        */
+    size_t    n, i;            /*counters            */
+    ssize_t    nio;            /*I/O return value        */
+    int        argno=1;        /*program argument number    */
+    int        src, dst=-1;        /*source & destination files    */
+    int        need_seek=FALSE;    /*destination needs to seek?    */
+    int        need_write;        /*data needs to be written?    */
+    h5_stat_t sb;                       /*temporary file stat buffer    */
+
+    int        verbose=FALSE;        /*display file names?        */
+
+    const char    *src_gen_name;  /*general source name        */
+    char    *src_name=NULL;        /*source member name        */
+
+    int        src_is_family;        /*is source name a family name?    */
+    int        src_membno=0;        /*source member number        */
+
+    const char    *dst_gen_name;    /*general destination name    */
+    char    *dst_name=NULL;        /*destination member name    */
+    int        dst_is_family;        /*is dst name a family name?    */
+    int        dst_membno=0;        /*destination member number    */
+
+    off_t    left_overs=0;        /*amount of zeros left over    */
+    off_t    src_offset=0;        /*offset in source member    */
+    off_t    dst_offset=0;        /*offset in destination member    */
+    off_t    src_size;           /*source logical member size    */
+    off_t    src_act_size;        /*source actual member size    */
+    off_t    dst_size=1 GB;        /*destination logical memb size    */
     hid_t       fapl;                   /*file access property list     */
     hid_t       file;
     hsize_t     hdsize;                 /*destination logical memb size */
-    hbool_t     family_to_sec2=FALSE;   /*change family to sec2 driver? */
+    hbool_t     family_to_single = FALSE;   /*change family to single file driver? */
 
     /*
      * Get the program name from argv[0]. Use only the last component.
      */
-    if ((prog_name=strrchr (argv[0], '/'))) prog_name++;
-    else prog_name = argv[0];
+    if ((prog_name = HDstrrchr (argv[0], '/')))
+        prog_name++;
+    else
+        prog_name = argv[0];
 
     /*
      * Parse switches.
      */
-    while (argno<argc && '-'==argv[argno][0]) {
-        if (!strcmp (argv[argno], "-v")) {
+    while (argno < argc && '-' == argv[argno][0]) {
+        if (!HDstrcmp(argv[argno], "-v")) {
             verbose = TRUE;
             argno++;
-        } else if (!strcmp(argv[argno], "-V")) {
-            printf("This is %s version %u.%u release %u\n",
-                prog_name, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);
-            exit(EXIT_SUCCESS);
-        } else if (!strcmp (argv[argno], "-family_to_sec2")) {
-            family_to_sec2 = TRUE;
+        } else if (!HDstrcmp(argv[argno], "-V")) {
+            HDprintf("This is %s version %u.%u release %u\n", prog_name, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);
+            HDexit(EXIT_SUCCESS);
+        } else if (!HDstrcmp(argv[argno], "-family_to_sec2")) {
+            family_to_single = TRUE;
             argno++;
-        } else if ('b'==argv[argno][1]) {
-            blk_size = (size_t)get_size (prog_name, &argno, argc, argv);
-        } else if ('m'==argv[argno][1]) {
-            dst_size = get_size (prog_name, &argno, argc, argv);
+        } else if (!HDstrcmp(argv[argno], "-family_to_single")) {
+            family_to_single = TRUE;
+            argno++;
+        } else if ('b' == argv[argno][1]) {
+            blk_size = (size_t) get_size(prog_name, &argno, argc, argv);
+        } else if ('m' == argv[argno][1]) {
+            dst_size = get_size(prog_name, &argno, argc, argv);
         } else {
-            usage (prog_name);
+            usage(prog_name);
         } /* end if */
     } /* end while */
 
     /* allocate names */
     if(NULL == (src_name = (char *)HDcalloc((size_t)NAMELEN, sizeof(char))))
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     if(NULL == (dst_name = (char *)HDcalloc((size_t)NAMELEN, sizeof(char))))
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
 
     /*
      * Get the name for the source file and open the first member.  The size
      * of the first member determines the logical size of all the members.
      */
-    if (argno>=argc) usage (prog_name);
+    if (argno >= argc)
+        usage(prog_name);
     src_gen_name = argv[argno++];
-    sprintf (src_name, src_gen_name, src_membno);
+    HDsprintf(src_name, src_gen_name, src_membno);
     src_is_family = strcmp (src_name, src_gen_name);
 
     if ((src = HDopen(src_name, O_RDONLY)) < 0) {
@@ -237,157 +245,170 @@ main (int argc, char *argv[])
         HDexit(EXIT_FAILURE);
     }
 
-    if (HDfstat(src, &sb)<0) {
-        perror ("fstat");
-        exit (EXIT_FAILURE);
+    if (HDfstat(src, &sb) < 0) {
+        HDperror("fstat");
+        HDexit(EXIT_FAILURE);
     }
     src_size = src_act_size = sb.st_size;
-    if (verbose) fprintf (stderr, "< %s\n", src_name);
+    if (verbose)
+        HDfprintf(stderr, "< %s\n", src_name);
 
     /*
      * Get the name for the destination file and open the first member.
      */
-    if (argno>=argc) usage (prog_name);
+    if (argno>=argc)
+        usage (prog_name);
     dst_gen_name = argv[argno++];
-    sprintf (dst_name, dst_gen_name, dst_membno);
-    dst_is_family = strcmp (dst_name, dst_gen_name);
+    HDsprintf(dst_name, dst_gen_name, dst_membno);
+    dst_is_family = HDstrcmp(dst_name, dst_gen_name);
 
     if ((dst = HDopen(dst_name, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
         HDperror(dst_name);
         HDexit(EXIT_FAILURE);
     }
-    if (verbose) fprintf (stderr, "> %s\n", dst_name);
+    if (verbose)
+        HDfprintf(stderr, "> %s\n", dst_name);
 
     /* No more arguments */
-    if (argno<argc) usage (prog_name);
+    if (argno < argc)
+        usage (prog_name);
 
     /* Now the real work, split the file */
     buf = (char *)HDmalloc(blk_size);
     while (src_offset<src_size) {
 
-	/* Read a block.  The amount to read is the minimum of:
-	 *    1. The I/O block size
-	 *    2. What's left to write in the destination member
-	 *    3. Left over zeros or what's left in the source member.
-	 */
-	n = blk_size;
-	if (dst_is_family) n = (size_t)MIN((off_t)n, dst_size-dst_offset);
-	if (left_overs) {
-	    n = (size_t)MIN ((off_t)n, left_overs);
-	    left_overs = left_overs - (off_t)n;
-	    need_write = FALSE;
-	} else if (src_offset<src_act_size) {
-	    n = (size_t)MIN ((off_t)n, src_act_size-src_offset);
-	    if ((nio=HDread (src, buf, n))<0) {
-		perror ("read");
-		exit (EXIT_FAILURE);
-	    } else if ((size_t)nio!=n) {
-		fprintf (stderr, "%s: short read\n", src_name);
-		exit (EXIT_FAILURE);
-	    }
-	    for (i=0; i<n; i++) {
-		if (buf[i]) break;
-	    }
-	    need_write = (i<n);
-	} else {
-	    n = 0;
-	    left_overs = src_size - src_act_size;
-	    need_write = FALSE;
-	}
-
-	/*
-	 * If the block contains non-zero data then write it to the
-	 * destination, otherwise just remember that we'll have to do a seek
-	 * later in the destination when we finally get non-zero data.
-	 */
-	if (need_write) {
-	    if (need_seek && HDlseek (dst, dst_offset, SEEK_SET)<0) {
-		perror ("HDlseek");
-		exit (EXIT_FAILURE);
-	    }
-	    if ((nio=HDwrite (dst, buf, n))<0) {
-		perror ("write");
-		exit (EXIT_FAILURE);
-	    } else if ((size_t)nio!=n) {
-		fprintf (stderr, "%s: short write\n", dst_name);
-		exit (EXIT_FAILURE);
-	    }
-	    need_seek = FALSE;
-	} else {
-	    need_seek = TRUE;
-	}
-
-	/*
-	 * Update the source offset and open the next source family member if
-	 * necessary.  The source stream ends at the first member which
-	 * cannot be opened because it doesn't exist.  At the end of the
-	 * source stream, update the destination offset and break out of the
-	 * loop.   The destination offset must be updated so we can fix
-	 * trailing holes.
-	 */
-	src_offset = src_offset + (off_t)n;
-	if (src_offset==src_act_size) {
-	    HDclose (src);
-	    if (!src_is_family) {
-                dst_offset = dst_offset + (off_t)n;
-		break;
-	    }
-	    sprintf (src_name, src_gen_name, ++src_membno);
-	    if ((src = HDopen(src_name, O_RDONLY)) < 0 && ENOENT == errno) {
-            dst_offset = dst_offset + (off_t)n;
-            break;
-	    } else if (src<0) {
-		perror (src_name);
-		exit (EXIT_FAILURE);
-	    }
-	    if (HDfstat (src, &sb)<0) {
-		perror ("fstat");
-		exit (EXIT_FAILURE);
-	    }
-	    src_act_size = sb.st_size;
-	    if (src_act_size>src_size) {
-		fprintf (stderr, "%s: member truncated to %lu bytes\n",
-			 src_name, (unsigned long)src_size);
-	    }
-	    src_offset = 0;
-	    if (verbose) fprintf (stderr, "< %s\n", src_name);
-	}
-
-	/*
-	 * Update the destination offset, opening a new member if one will be
-	 * needed. The first member is extended to the logical member size
-	 * but other members might be smaller if they end with a hole.
-	 */
-        dst_offset = dst_offset + (off_t)n;
-	if (dst_is_family && dst_offset==dst_size) {
-	    if (0==dst_membno) {
-		if (HDlseek (dst, dst_size-1, SEEK_SET)<0) {
-		    perror ("HDHDlseek");
-		    exit (EXIT_FAILURE);
-		}
-		if (HDread (dst, buf, 1)<0) {
-		    perror ("read");
-		    exit (EXIT_FAILURE);
-		}
-		if (HDlseek (dst, dst_size-1, SEEK_SET)<0) {
-		    perror ("HDlseek");
-		    exit (EXIT_FAILURE);
-		}
-		if (HDwrite (dst, buf, 1)<0) {
-		    perror ("write");
-		    exit (EXIT_FAILURE);
-		}
-	    }
-	    HDclose (dst);
-	    sprintf (dst_name, dst_gen_name, ++dst_membno);
-	    if ((dst = HDopen(dst_name, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
-            HDperror(dst_name);
-            HDexit(EXIT_FAILURE);
-	    }
-	    dst_offset = 0;
-	    need_seek = FALSE;
-	    if (verbose) fprintf (stderr, "> %s\n", dst_name);
-	}
+    /* Read a block.  The amount to read is the minimum of:
+    *    1. The I/O block size
+    *    2. What's left to write in the destination member
+    *    3. Left over zeros or what's left in the source member.
+    */
+        n = blk_size;
+        if (dst_is_family)
+            n = (size_t)MIN((off_t)n, dst_size-dst_offset);
+        if (left_overs) {
+            n = (size_t)MIN((off_t)n, left_overs);
+            left_overs = left_overs - (off_t) n;
+            need_write = FALSE;
+        }
+        else if (src_offset < src_act_size) {
+            n = (size_t)MIN((off_t)n, src_act_size-src_offset);
+            if ((nio = HDread(src, buf, n)) < 0) {
+                HDperror("read");
+                HDexit(EXIT_FAILURE);
+            }
+            else if ((size_t) nio != n) {
+                HDfprintf(stderr, "%s: short read\n", src_name);
+                HDexit(EXIT_FAILURE);
+            }
+            for (i = 0; i < n; i++) {
+                if (buf[i])
+                    break;
+            }
+            need_write = (i < n);
+        }
+        else {
+            n = 0;
+            left_overs = src_size - src_act_size;
+            need_write = FALSE;
+        }
+
+    /*
+    * If the block contains non-zero data then write it to the
+    * destination, otherwise just remember that we'll have to do a seek
+    * later in the destination when we finally get non-zero data.
+    */
+        if (need_write) {
+            if (need_seek && HDlseek (dst, dst_offset, SEEK_SET) < 0) {
+                HDperror("HDlseek");
+                HDexit(EXIT_FAILURE);
+            }
+            if ((nio = HDwrite(dst, buf, n)) < 0) {
+                HDperror("write");
+                HDexit(EXIT_FAILURE);
+            }
+            else if ((size_t) nio != n) {
+                HDfprintf(stderr, "%s: short write\n", dst_name);
+                HDexit(EXIT_FAILURE);
+            }
+            need_seek = FALSE;
+        }
+        else {
+            need_seek = TRUE;
+        }
+
+    /*
+    * Update the source offset and open the next source family member if
+    * necessary.  The source stream ends at the first member which
+    * cannot be opened because it doesn't exist.  At the end of the
+    * source stream, update the destination offset and break out of the
+    * loop.   The destination offset must be updated so we can fix
+    * trailing holes.
+    */
+        src_offset = src_offset + (off_t) n;
+        if (src_offset == src_act_size) {
+            HDclose(src);
+            if (!src_is_family) {
+                dst_offset = dst_offset + (off_t) n;
+                break;
+            }
+            HDsprintf(src_name, src_gen_name, ++src_membno);
+            if ((src = HDopen(src_name, O_RDONLY)) < 0 && ENOENT == errno) {
+                dst_offset = dst_offset + (off_t) n;
+                break;
+            }
+            else if (src < 0) {
+                HDperror(src_name);
+                HDexit(EXIT_FAILURE);
+            }
+            if (HDfstat (src, &sb) < 0) {
+                HDperror("fstat");
+                HDexit(EXIT_FAILURE);
+            }
+            src_act_size = sb.st_size;
+            if (src_act_size > src_size) {
+                HDfprintf(stderr, "%s: member truncated to %lu bytes\n", src_name, (unsigned long) src_size);
+            }
+            src_offset = 0;
+            if (verbose)
+                HDfprintf(stderr, "< %s\n", src_name);
+        }
+
+    /*
+    * Update the destination offset, opening a new member if one will be
+    * needed. The first member is extended to the logical member size
+    * but other members might be smaller if they end with a hole.
+    */
+        dst_offset = dst_offset + (off_t) n;
+        if (dst_is_family && dst_offset == dst_size) {
+            if (0 == dst_membno) {
+                if (HDlseek (dst, dst_size-1, SEEK_SET) < 0) {
+                    HDperror("HDHDlseek");
+                    HDexit(EXIT_FAILURE);
+                }
+                if (HDread (dst, buf, 1) < 0) {
+                    HDperror("read");
+                    HDexit(EXIT_FAILURE);
+                }
+                if (HDlseek (dst, dst_size-1, SEEK_SET) < 0) {
+                    HDperror("HDlseek");
+                    HDexit(EXIT_FAILURE);
+                }
+                if (HDwrite (dst, buf, 1) < 0) {
+                    HDperror("write");
+                    HDexit(EXIT_FAILURE);
+                }
+            }
+            HDclose(dst);
+            HDsprintf(dst_name, dst_gen_name, ++dst_membno);
+            if ((dst = HDopen(dst_name, O_RDWR | O_CREAT | O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
+                HDperror(dst_name);
+                HDexit(EXIT_FAILURE);
+            }
+            dst_offset = 0;
+            need_seek = FALSE;
+            if (verbose)
+                HDfprintf(stderr, "> %s\n", dst_name);
+        }
     }
 
     /*
@@ -396,78 +417,81 @@ main (int argc, char *argv[])
      * family has been truncated.
      */
     if (need_seek) {
-	if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
-	    perror ("HDlseek");
-	    exit (EXIT_FAILURE);
-	}
-	if (HDread (dst, buf, 1)<0) {
-	    perror ("read");
-	    exit (EXIT_FAILURE);
-	}
-	if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
-	    perror ("HDlseek");
-	    exit (EXIT_FAILURE);
-	}
-	if (HDwrite (dst, buf, 1)<0) {
-	    perror ("write");
-	    exit (EXIT_FAILURE);
-	}
+        if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
+            HDperror ("HDlseek");
+            HDexit (EXIT_FAILURE);
+        }
+        if (HDread (dst, buf, 1)<0) {
+            HDperror ("read");
+            HDexit (EXIT_FAILURE);
+        }
+        if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
+            HDperror ("HDlseek");
+            HDexit (EXIT_FAILURE);
+        }
+        if (HDwrite (dst, buf, 1)<0) {
+            HDperror ("write");
+            HDexit (EXIT_FAILURE);
+        }
     }
     HDclose (dst);
 
     /* Modify family driver information saved in superblock through private property.
      * These private properties are for this tool only. */
-    if ((fapl=H5Pcreate(H5P_FILE_ACCESS))<0) {
-        perror ("H5Pcreate");
-        exit (EXIT_FAILURE);
+    if ((fapl=H5Pcreate(H5P_FILE_ACCESS)) < 0) {
+        HDperror ("H5Pcreate");
+        HDexit (EXIT_FAILURE);
     }
 
-    if(family_to_sec2) {
-        /* The user wants to change file driver from family to sec2. Open the file
-         * with sec2 driver.  This property signals the library to ignore the family
-         * driver information saved in the superblock. */
-        if(H5Pset(fapl, H5F_ACS_FAMILY_TO_SEC2_NAME, &family_to_sec2) < 0) {
-            perror ("H5Pset");
-            exit (EXIT_FAILURE);
+    if(family_to_single) {
+        /* The user wants to change file driver from family to a single-file VFD.
+         * Open the file with the sec2, windows, etc. driver. This property signals
+         * the library to ignore the family driver information saved in the superblock.
+         */
+        if(H5Pset(fapl, H5F_ACS_FAMILY_TO_SINGLE_NAME, &family_to_single) < 0) {
+            HDperror ("H5Pset");
+            HDexit (EXIT_FAILURE);
         }
-    } else {
+    }
+    else {
         /* Modify family size saved in superblock through private property. It signals
          * library to save the new member size(specified in command line) in superblock.
          * This private property is for this tool only. */
         if(H5Pset_fapl_family(fapl, H5F_FAMILY_DEFAULT, H5P_DEFAULT) < 0) {
-            perror ("H5Pset_fapl_family");
-            exit (EXIT_FAILURE);
+            HDperror ("H5Pset_fapl_family");
+            HDexit (EXIT_FAILURE);
         }
 
         /* Set the property of the new member size as hsize_t */
         hdsize = (hsize_t)dst_size;
         if(H5Pset(fapl, H5F_ACS_FAMILY_NEWSIZE_NAME, &hdsize) < 0) {
-            perror ("H5Pset");
-            exit (EXIT_FAILURE);
+            HDperror ("H5Pset");
+            HDexit (EXIT_FAILURE);
         }
     }
 
     /* If the new file is a family file, try to open file for "read and write" to
      * flush metadata. Flushing metadata will update the superblock to the new
-     * member size.  If the original file is a family file and the new file is a sec2
-     * file, the property FAMILY_TO_SEC2 will signal the library to switch to sec2
-     * driver when the new file is opened.  If the original file is a sec2 file and the
-     * new file can only be a sec2 file, reopen the new file should fail.  There's
-     * nothing to do in this case. */
+     * member size.  If the original file is a family file and the new file is a single
+     * file, the property FAMILY_TO_SINGLE will signal the library to switch to default
+     * single-file driver when the new file is opened.  If the original file is a single
+     * file and the new file can only be a single file, reopen the new file should fail.
+     * There's nothing to do in this case.
+     */
     H5E_BEGIN_TRY {
-        file=H5Fopen(dst_gen_name, H5F_ACC_RDWR, fapl);
+        file = H5Fopen(dst_gen_name, H5F_ACC_RDWR, fapl);
     } H5E_END_TRY;
 
-    if(file>=0) {
-        if(H5Fclose(file)<0) {
-            perror ("H5Fclose");
-            exit (EXIT_FAILURE);
+    if(file >= 0) {
+        if(H5Fclose(file) < 0) {
+            HDperror("H5Fclose");
+            HDexit(EXIT_FAILURE);
         } /* end if */
     } /* end if */
 
-    if(H5Pclose(fapl)<0) {
-        perror ("H5Pclose");
-        exit (EXIT_FAILURE);
+    if(H5Pclose(fapl) < 0) {
+        HDperror("H5Pclose");
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Free resources and return */