Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

3 files changed, 1130 insertions, 1000 deletions

diff --git a/tools/src/h5ls/CMakeLists.txt b/tools/src/h5ls/CMakeLists.txt
index f2470fb..80b9b0c 100644
--- a/tools/src/h5ls/CMakeLists.txt
+++ b/tools/src/h5ls/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.12)
 project (HDF5_TOOLS_SRC_H5LS C)
 
 #-----------------------------------------------------------------------------
@@ -6,7 +6,9 @@ project (HDF5_TOOLS_SRC_H5LS C)
 #-----------------------------------------------------------------------------
 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_include_directories (h5ls PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_compile_options(h5ls PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  #target_compile_definitions(h5ls PRIVATE H5_TOOLS_DEBUG)
   TARGET_C_PROPERTIES (h5ls STATIC)
   target_link_libraries (h5ls PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
   set_target_properties (h5ls PROPERTIES FOLDER tools)
@@ -17,7 +19,9 @@ 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_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
+  target_compile_options(h5ls-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}")
+  #target_compile_definitions(h5ls-shared PRIVATE H5_TOOLS_DEBUG)
   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)
@@ -26,6 +30,17 @@ if (BUILD_SHARED_LIBS)
   set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5ls-shared)
 endif ()
 
+#-----------------------------------------------------------------------------
+# Add Target to clang-format
+#-----------------------------------------------------------------------------
+if (HDF5_ENABLE_FORMATTERS)
+  if (NOT ONLY_SHARED_LIBS)
+    clang_format (HDF5_H5LS_SRC_FORMAT h5ls)
+  else ()
+    clang_format (HDF5_H5LS_SRC_FORMAT h5ls-shared)
+  endif ()
+endif ()
+
 ##############################################################################
 ##############################################################################
 ###           I N S T A L L A T I O N                                      ###
diff --git a/tools/src/h5ls/Makefile.am b/tools/src/h5ls/Makefile.am
index 07279c1..9a4466d 100644
--- a/tools/src/h5ls/Makefile.am
+++ b/tools/src/h5ls/Makefile.am
@@ -6,7 +6,7 @@
 # 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.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 ##
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 20a68e8..c30c08f 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -6,17 +6,16 @@
  * 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.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
+ * Programmer:  Robb Matzke
  *              Monday, March 23, 1998
  */
 
-
 /*
  * We include the private header file so we can get to the uniform
  * programming environment it declares.  Other than that, h5ls only calls
@@ -31,112 +30,112 @@
 /* Name of tool */
 #define PROGRAMNAME "h5ls"
 
-#define NAME_BUF_SIZE   2048
+#define NAME_BUF_SIZE 2048
 /*
- *  Alternative formating for data dumped by H5LS
+ *  Alternative formatting for data dumped by H5LS
  *
  *  This table only affects H5LS output.
  */
-static h5tool_format_t         ls_dataformat = {
-        0, /*raw */
-
-        "", /*fmt_raw */
-        "%d", /*fmt_int */
-        "%u", /*fmt_uint */
-        "%hhd", /*fmt_schar */
-        "%u", /*fmt_uchar */
-        "%d", /*fmt_short */
-        "%u", /*fmt_ushort */
-        "%ld", /*fmt_long */
-        "%lu", /*fmt_ulong */
-        NULL, /*fmt_llong */
-        NULL, /*fmt_ullong */
-        "%g", /*fmt_double */
-        "%g", /*fmt_float */
-
-        0, /*ascii */
-        0, /*str_locale */
-        0, /*str_repeat */
-
-        "[", /*arr_pre */
-        ",", /*arr_sep */
-        "]", /*arr_suf */
-        1, /*arr_linebreak */
-
-        "", /*cmpd_name */
-        ",", /*cmpd_sep */
-        "{", /*cmpd_pre */
-        "}", /*cmpd_suf */
-        "", /*cmpd_end */
-        NULL, /* cmpd_listv */
-
-        ",", /*vlen_sep */
-        "(", /*vlen_pre */
-        ")", /*vlen_suf */
-        "", /*vlen_end */
-
-        "%s", /*elmt_fmt */
-        ",", /*elmt_suf1 */
-        " ", /*elmt_suf2 */
-
-        HSIZE_T_FORMAT, /*idx_n_fmt */
-        ",", /*idx_sep */
-        "(%s)", /*idx_fmt */
-
-        65535, /*line_ncols *//*standard default columns */
-        0, /*line_per_line */
-        "", /*line_pre */
-        "%s", /*line_1st */
-        "%s", /*line_cont */
-        "", /*line_suf */
-        "", /*line_sep */
-        1, /*line_multi_new */
-        "", /*line_indent */
-
-        0, /*skip_first */
-
-        0, /*obj_hidefileno */
-        "-%lu:"H5_PRINTF_HADDR_FMT, /*obj_format */
-
-        0, /*dset_hidefileno */
-        "DSET-%s ", /*dset_format */
-        "%sBlk%lu: ", /*dset_blockformat_pre */
-        "%sPt%lu: ", /*dset_ptformat_pre */
-        "%s", /*dset_ptformat */
-        1, /*array indices */
-        1 /*escape non printable characters */
+static h5tool_format_t ls_dataformat = {
+    0, /*raw */
+
+    "",     /*fmt_raw */
+    "%d",   /*fmt_int */
+    "%u",   /*fmt_uint */
+    "%hhd", /*fmt_schar */
+    "%u",   /*fmt_uchar */
+    "%d",   /*fmt_short */
+    "%u",   /*fmt_ushort */
+    "%ld",  /*fmt_long */
+    "%lu",  /*fmt_ulong */
+    NULL,   /*fmt_llong */
+    NULL,   /*fmt_ullong */
+    "%g",   /*fmt_double */
+    "%g",   /*fmt_float */
+
+    0, /*ascii */
+    0, /*str_locale */
+    0, /*str_repeat */
+
+    "[", /*arr_pre */
+    ",", /*arr_sep */
+    "]", /*arr_suf */
+    1,   /*arr_linebreak */
+
+    "",   /*cmpd_name */
+    ",",  /*cmpd_sep */
+    "{",  /*cmpd_pre */
+    "}",  /*cmpd_suf */
+    "",   /*cmpd_end */
+    NULL, /* cmpd_listv */
+
+    ",", /*vlen_sep */
+    "(", /*vlen_pre */
+    ")", /*vlen_suf */
+    "",  /*vlen_end */
+
+    "%s", /*elmt_fmt */
+    ",",  /*elmt_suf1 */
+    " ",  /*elmt_suf2 */
+
+    "%" PRIuHSIZE, /*idx_n_fmt */
+    ",",           /*idx_sep */
+    "(%s)",        /*idx_fmt */
+
+    65535,
+    /*line_ncols */ /*standard default columns */
+    0,              /*line_per_line */
+    "",             /*line_pre */
+    "%s",           /*line_1st */
+    "%s",           /*line_cont */
+    "",             /*line_suf */
+    "",             /*line_sep */
+    1,              /*line_multi_new */
+    "   ",          /*line_indent */
+
+    0, /*skip_first */
+
+    0,                  /*obj_hidefileno */
+    "-%lu:%" PRIuHADDR, /*obj_format */
+
+    0,            /*dset_hidefileno */
+    "DSET-%s ",   /*dset_format */
+    "%sBlk%lu: ", /*dset_blockformat_pre */
+    "%sPt%lu: ",  /*dset_ptformat_pre */
+    "%s",         /*dset_ptformat */
+    1,            /*array indices */
+    1             /*escape non printable characters */
 };
 
 /* Struct to pass through to visitors */
 typedef struct {
-    const char *fname;                  /* Filename */
-    hid_t fid;                          /* File ID */
-    hid_t gid;                          /* Group ID */
-    hbool_t symlink_target;                 /* Whether this is the target of an symbolic link */
-    symlink_trav_t *symlink_list;       /* List of visited symbolic links */
-    size_t base_len;                    /* Length of base path name, if not root */
-    size_t name_start;                  /* # of leading characters to strip off path names on output */
-}iter_t;
+    const char *    fname;          /* Filename */
+    hid_t           fid;            /* File ID */
+    hid_t           gid;            /* Group ID */
+    hbool_t         symlink_target; /* Whether this is the target of an symbolic link */
+    symlink_trav_t *symlink_list;   /* List of visited symbolic links */
+    size_t          base_len;       /* Length of base path name, if not root */
+    size_t          name_start;     /* # of leading characters to strip off path names on output */
+} iter_t;
 
 /* Command-line switches */
-static int      verbose_g = 0;            /* lots of extra output */
-static int      width_g = 80;             /* output width in characters */
-static hbool_t  address_g = FALSE;        /* print raw data addresses */
-static hbool_t  data_g = FALSE;           /* display dataset values? */
-static hbool_t  label_g = FALSE;          /* label compound values? */
-static hbool_t  string_g = FALSE;         /* print 1-byte numbers as ASCII? */
-static hbool_t  fullname_g = FALSE;       /* print full path names */
-static hbool_t  recursive_g = FALSE;      /* recursive descent listing */
-static hbool_t  follow_symlink_g = FALSE; /* follow symbolic links */
-static hbool_t  no_dangling_link_g = FALSE; /* treat dangling link is error */
-static hbool_t  follow_elink_g = FALSE;   /* follow external links */
-static hbool_t  grp_literal_g = FALSE;    /* list group, not contents */
-static hbool_t  hexdump_g = FALSE;        /* show data as raw hexadecimal */
-static hbool_t  show_errors_g = FALSE;    /* print HDF5 error messages */
-static hbool_t  simple_output_g = FALSE;  /* make output more machine-readable */
-static hbool_t  show_file_name_g = FALSE; /* show file name for full names */
-static hbool_t  no_line_wrap_g = FALSE;   /* show data content without line wrap */
-static hbool_t  display_root_g = FALSE;   /* show root group in output? */
+static int     verbose_g          = 0;     /* lots of extra output */
+static int     width_g            = 80;    /* output width in characters */
+static hbool_t address_g          = FALSE; /* print raw data addresses */
+static hbool_t data_g             = FALSE; /* display dataset values? */
+static hbool_t label_g            = FALSE; /* label compound values? */
+static hbool_t string_g           = FALSE; /* print 1-byte numbers as ASCII? */
+static hbool_t fullname_g         = FALSE; /* print full path names */
+static hbool_t recursive_g        = FALSE; /* recursive descent listing */
+static hbool_t follow_symlink_g   = FALSE; /* follow symbolic links */
+static hbool_t no_dangling_link_g = FALSE; /* treat dangling link is error */
+static hbool_t follow_elink_g     = FALSE; /* follow external links */
+static hbool_t grp_literal_g      = FALSE; /* list group, not contents */
+static hbool_t hexdump_g          = FALSE; /* show data as raw hexadecimal */
+static hbool_t simple_output_g    = FALSE; /* make output more machine-readable */
+static hbool_t show_file_name_g   = FALSE; /* show file name for full names */
+static hbool_t no_line_wrap_g     = FALSE; /* show data content without line wrap */
+static hbool_t display_root_g     = FALSE; /* show root group in output? */
 
 /* Information about how to display each type of object */
 static struct dispatch_t {
@@ -147,17 +146,17 @@ static struct dispatch_t {
     herr_t (*list2)(hid_t obj, const char *name);
 } dispatch_g[H5O_TYPE_NTYPES];
 
-#define DISPATCH(TYPE, NAME, LIST1, LIST2) {         \
-    dispatch_g[TYPE].name = (NAME);             \
-    dispatch_g[TYPE].list1 = (LIST1);           \
-    dispatch_g[TYPE].list2 = (LIST2);           \
-}
+#define DISPATCH(TYPE, NAME, LIST1, LIST2)                                                                   \
+    {                                                                                                        \
+        dispatch_g[TYPE].name  = (NAME);                                                                     \
+        dispatch_g[TYPE].list1 = (LIST1);                                                                    \
+        dispatch_g[TYPE].list2 = (LIST2);                                                                    \
+    }
 
-static void print_type(h5tools_str_t *buffer, hid_t type, int ind);
+static void    print_type(h5tools_str_t *buffer, hid_t type, int ind);
 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);
-
+static herr_t  visit_obj(hid_t file, const char *oname, iter_t *iter);
 
 /*-------------------------------------------------------------------------
  * Function: usage
@@ -168,36 +167,46 @@ static herr_t visit_obj(hid_t file, const char *oname, iter_t *iter);
  *-------------------------------------------------------------------------
  */
 static void
-usage (void)
+usage(void)
 {
     FLUSHSTREAM(rawoutstream);
     PRINTVALSTREAM(rawoutstream, "usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]\n");
     PRINTVALSTREAM(rawoutstream, "  OPTIONS\n");
     PRINTVALSTREAM(rawoutstream, "   -h, -?, --help  Print a usage message and exit\n");
-    PRINTVALSTREAM(rawoutstream, "   -a, --address   Print raw data address.  If dataset is contiguous, address\n");
-    PRINTVALSTREAM(rawoutstream, "                   is offset in file of beginning of raw data. If chunked,\n");
-    PRINTVALSTREAM(rawoutstream, "                   returned list of addresses indicates offset of each chunk.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   -a, --address   Print raw data address.  If dataset is contiguous, address\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "                   is offset in file of beginning of raw data. If chunked,\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "                   returned list of addresses indicates offset of each chunk.\n");
     PRINTVALSTREAM(rawoutstream, "                   Must be used with -v, --verbose option.\n");
     PRINTVALSTREAM(rawoutstream, "                   Provides no information for non-dataset objects.\n");
     PRINTVALSTREAM(rawoutstream, "   -d, --data      Print the values of datasets\n");
     PRINTVALSTREAM(rawoutstream, "   --enable-error-stack\n");
-    PRINTVALSTREAM(rawoutstream, "                   Prints messages from the HDF5 error stack as they occur.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "                   Prints messages from the HDF5 error stack as they occur.\n");
     PRINTVALSTREAM(rawoutstream, "   --follow-symlinks\n");
-    PRINTVALSTREAM(rawoutstream, "                   Follow symbolic links (soft links and external links)\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "                   Follow symbolic links (soft links and external links)\n");
     PRINTVALSTREAM(rawoutstream, "                   to display target object information.\n");
     PRINTVALSTREAM(rawoutstream, "                   Without this option, h5ls identifies a symbolic link\n");
     PRINTVALSTREAM(rawoutstream, "                   as a soft link or external link and prints the value\n");
-    PRINTVALSTREAM(rawoutstream, "                   assigned to the symbolic link; it does not provide any\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "                   assigned to the symbolic link; it does not provide any\n");
     PRINTVALSTREAM(rawoutstream, "                   information regarding the target object or determine\n");
     PRINTVALSTREAM(rawoutstream, "                   whether the link is a dangling link.\n");
     PRINTVALSTREAM(rawoutstream, "   --no-dangling-links\n");
     PRINTVALSTREAM(rawoutstream, "                   Must be used with --follow-symlinks option;\n");
-    PRINTVALSTREAM(rawoutstream, "                   otherwise, h5ls shows error message and returns an exit\n");
-    PRINTVALSTREAM(rawoutstream, "                   code of 1. \n");
-    PRINTVALSTREAM(rawoutstream, "                   Check for any symbolic links (soft links or external links)\n");
-    PRINTVALSTREAM(rawoutstream, "                   that do not resolve to an existing object (dataset, group,\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "                   otherwise, h5ls shows error message and returns an exit\n");
+    PRINTVALSTREAM(rawoutstream, "                   code of 1.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "                   Check for any symbolic links (soft links or external links)\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "                   that do not resolve to an existing object (dataset, group,\n");
     PRINTVALSTREAM(rawoutstream, "                   or named datatype).\n");
-    PRINTVALSTREAM(rawoutstream, "                   If any dangling link is found, this situation is treated\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "                   If any dangling link is found, this situation is treated\n");
     PRINTVALSTREAM(rawoutstream, "                   as an error and h5ls returns an exit code of 1.\n");
     PRINTVALSTREAM(rawoutstream, "   -f, --full      Print full path names instead of base names\n");
     PRINTVALSTREAM(rawoutstream, "   -g, --group     Show information about a group, not its contents\n");
@@ -210,15 +219,33 @@ 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,
+                   "   --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,
+                   "                   If absent or A == '(,,,,)', all default values are used.\n");
     PRINTVALSTREAM(rawoutstream, "                   Has no effect if vfd flag is not 'hdfs'.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vol-value     Value (ID) of the VOL connector to use for opening the\n");
+    PRINTVALSTREAM(rawoutstream, "                   HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream, "   --vol-name      Name of the VOL connector to use for opening the\n");
+    PRINTVALSTREAM(rawoutstream, "                   HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "   --vol-info      VOL-specific info to pass to the VOL connector used for\n");
+    PRINTVALSTREAM(rawoutstream, "                   opening the HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream, "   --vfd-value     Value (ID) of the VFL driver to use for opening the\n");
+    PRINTVALSTREAM(rawoutstream, "                   HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream, "   --vfd-name      Name of the VFL driver to use for opening the\n");
+    PRINTVALSTREAM(rawoutstream, "                   HDF5 file specified\n");
+    PRINTVALSTREAM(rawoutstream, "   --vfd-info      VFD-specific info to pass to the VFL driver used for\n");
+    PRINTVALSTREAM(rawoutstream, "                   opening the HDF5 file specified\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "  file/OBJECT\n");
     PRINTVALSTREAM(rawoutstream, "    Each object consists of an HDF5 file name optionally followed by a\n");
@@ -228,11 +255,9 @@ usage (void)
     PRINTVALSTREAM(rawoutstream, "    \"%%05d\" to open a file family.\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "  Deprecated Options\n");
-    PRINTVALSTREAM(rawoutstream, "    The following options have been deprecated in HDF5. While they remain\n");
-    PRINTVALSTREAM(rawoutstream, "    available, they have been superseded as indicated and may be removed\n");
-    PRINTVALSTREAM(rawoutstream, "    from HDF5 in the future. Use the indicated replacement option in all\n");
-    PRINTVALSTREAM(rawoutstream, "    new work; where possible, existing scripts, et cetera, should also be\n");
-    PRINTVALSTREAM(rawoutstream, "    updated to use the replacement option.\n");
+    PRINTVALSTREAM(rawoutstream,
+                   "    The following options have been removed in HDF5 1.12. Use the indicated\n");
+    PRINTVALSTREAM(rawoutstream, "    replacement option in all work.\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "   -E or --external   Follow external links.\n");
     PRINTVALSTREAM(rawoutstream, "                      Replaced by --follow-symlinks.\n");
@@ -240,20 +265,19 @@ usage (void)
     PRINTVALSTREAM(rawoutstream, "                      Replaced by --enable-error-stack.\n");
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: print_string
+ * 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.
+ * 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.
+ * Return:      Number of characters printed.
  *-------------------------------------------------------------------------
  */
 static int
 print_string(h5tools_str_t *buffer, const char *s, hbool_t escape_spaces)
 {
-    int  nprint=0;
+    int nprint = 0;
 
     for (/*void*/; s && *s; s++) {
         switch (*s) {
@@ -288,7 +312,8 @@ print_string(h5tools_str_t *buffer, const char *s, hbool_t escape_spaces)
                 nprint += 2;
                 break;
             case '\t':
-                if (buffer) h5tools_str_append(buffer, "\\t");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\t");
                 nprint += 2;
                 break;
             case ' ':
@@ -311,7 +336,7 @@ print_string(h5tools_str_t *buffer, const char *s, hbool_t escape_spaces)
                 }
                 else {
                     if (buffer)
-                        h5tools_str_append(buffer, "\\%03o", *((const unsigned char*)s));
+                        h5tools_str_append(buffer, "\\%03o", *((const unsigned char *)s));
                     nprint += 4;
                 }
                 break;
@@ -320,23 +345,21 @@ print_string(h5tools_str_t *buffer, const char *s, hbool_t escape_spaces)
     return nprint;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: print_obj_name
+ * Function:    print_obj_name
  *
- * Purpose: Print an object name and another string.
+ * Purpose:     Print an object name and another string.
  *
- * Return: Success: TRUE
- *         Failure: FALSE, nothing printed
+ * 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;
+    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)
         HDsnprintf(fullname, sizeof(fullname), "%s/%s", iter->fname, oname + iter->name_start);
@@ -347,7 +370,7 @@ print_obj_name(h5tools_str_t *buffer, const iter_t *iter, const char *oname,
     if (fullname_g)
         n = print_string(buffer, name, TRUE);
     else {
-        const char *last_sep;   /* The location of the last group separator */
+        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, '/')))
@@ -362,14 +385,13 @@ print_obj_name(h5tools_str_t *buffer, const iter_t *iter, const char *oname,
     return TRUE;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: print_native_type
+ * Function:    print_native_type
  *
- * Purpose: Prints the name of a native C data type.
+ * Purpose:     Prints the name of a native C data type.
  *
- * Return: Success: TRUE
- *         Failure: FALSE, nothing printed.
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed.
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -412,11 +434,6 @@ print_native_type(h5tools_str_t *buffer, hid_t type, int ind)
         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) {
-            h5tools_str_append(buffer, "native long double");
-        }
-#endif
         else if (H5Tequal(type, H5T_NATIVE_INT8) == TRUE) {
             h5tools_str_append(buffer, "native int8_t");
         }
@@ -516,20 +533,20 @@ print_native_type(h5tools_str_t *buffer, hid_t type, int ind)
         else {
             return print_int_type(buffer, type, ind);
         }
-    } else {
+    }
+    else {
         return print_int_type(buffer, type, ind);
     }
     return TRUE;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: print_ieee_type
+ * Function:    print_ieee_type
  *
- * Purpose: Print the name of an IEEE floating-point data type.
+ * Purpose:     Print the name of an IEEE floating-point data type.
  *
- * Return: Success: TRUE
- *         Failure: FALSE, nothing printed
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -553,36 +570,35 @@ print_ieee_type(h5tools_str_t *buffer, hid_t type, int ind)
     return TRUE;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: print_precision
+ * 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.
+ * Purpose:     Prints information on the next line about precision and
+ *              padding if the precision is less than the total data type
+ *              size.
  *
- * Return: void
+ * Return:      void
  *-------------------------------------------------------------------------
  */
 static void
 print_precision(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    size_t      prec;           /* precision */
-    H5T_pad_t   plsb, pmsb;     /* lsb and msb padding */
-    const char  *plsb_s=NULL;   /* lsb padding string */
-    const char  *pmsb_s=NULL;   /* msb padding string */
-    size_t      nbits;          /* number of bits */
+    size_t      prec;          /* precision */
+    H5T_pad_t   plsb, pmsb;    /* lsb and msb padding */
+    const char *plsb_s = NULL; /* lsb padding string */
+    const char *pmsb_s = NULL; /* msb padding string */
+    size_t      nbits;         /* number of bits */
 
     /* 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))) {
-        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));
+        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));
 
         H5Tget_pad(type, &plsb, &pmsb);
         if (H5Tget_offset(type) > 0) {
-            switch(plsb) {
+            switch (plsb) {
                 case H5T_PAD_ZERO:
                     plsb_s = "zero";
                     break;
@@ -601,7 +617,7 @@ print_precision(h5tools_str_t *buffer, hid_t type, int ind)
             }
         }
         if ((unsigned)H5Tget_offset(type) + prec < 8 * H5Tget_size(type)) {
-            switch(pmsb) {
+            switch (pmsb) {
                 case H5T_PAD_ZERO:
                     pmsb_s = "zero";
                     break;
@@ -623,39 +639,40 @@ 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 (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
+ * 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.
+ * 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
+ * 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;
@@ -698,34 +715,34 @@ 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
+ * Function:    print_float_type
  *
- * Purpose: Print info about a floating point data type.
+ * Purpose:     Print info about a floating point data type.
  *
- * Return: Success: TRUE
- *         Failure: FALSE, nothing printed
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_float_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 */
+    const char *order_s = NULL; /* byte order string */
     size_t      spos;           /* sign bit position */
     size_t      esize, epos;    /* exponent size and position */
     size_t      msize, mpos;    /* significand size and position */
     size_t      ebias;          /* exponent bias */
     H5T_norm_t  norm;           /* significand normalization */
-    const char  *norm_s=NULL;   /* normalization string */
+    const char *norm_s = NULL;  /* normalization string */
     H5T_pad_t   pad;            /* internal padding value */
-    const char  *pad_s=NULL;    /* internal padding string */
+    const char *pad_s = NULL;   /* internal padding string */
 
     if (H5T_FLOAT != H5Tget_class(type))
         return FALSE;
@@ -752,13 +769,13 @@ 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 */
-    H5Tget_fields (type, &spos, &epos, &esize, &mpos, &msize);
+    H5Tget_fields(type, &spos, &epos, &esize, &mpos, &msize);
     ebias = H5Tget_ebias(type);
-    norm = H5Tget_norm(type);
+    norm  = H5Tget_norm(type);
     switch (norm) {
         case H5T_NORM_IMPLIED:
             norm_s = ", msb implied";
@@ -772,14 +789,14 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
         case H5T_NORM_ERROR:
             norm_s = ", unknown normalization";
             break;
-        default:
-            ;
-        break;
+        default:;
+            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);
-    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);
+    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);
+    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);
     h5tools_str_append(buffer, "\n%*s(sign bit at %lu)", ind, "", (unsigned long)spos);
 
     /* Display internal padding */
@@ -799,75 +816,73 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
             case H5T_NPAD:
                 pad_s = "unknown";
                 break;
-            default:
-                ;
-            break;
+            default:;
+                break;
         }
         h5tools_str_append(buffer, "\n%*s(internal padding bits are %s)", ind, "", pad_s);
     }
     return TRUE;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: print_cmpd_type
+ * Function:    print_cmpd_type
  *
- * Purpose: Print info about a compound data type.
+ * Purpose:     Print info about a compound data type.
  *
- * Return: Success: TRUE
- *         Failure: FALSE, nothing printed
+ * 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 */
-    size_t      size;           /* total size of type in bytes */
-    hid_t       subtype;        /* member data type */
-    int         nmembs;         /* number of members */
-    int         n;              /* miscellaneous counters */
-    unsigned    i;              /* miscellaneous counters */
-
-    if(H5T_COMPOUND != H5Tget_class(type))
+    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 */
+    int      n;           /* miscellaneous counters */
+    unsigned i;           /* miscellaneous counters */
+
+    if (H5T_COMPOUND != H5Tget_class(type))
         return FALSE;
-    if((nmembs = H5Tget_nmembers(type)) < 0)
+    if ((nmembs = H5Tget_nmembers(type)) < 0)
         return FALSE;
 
     h5tools_str_append(buffer, "struct {");
     for (i = 0; i < (unsigned)nmembs; i++) {
         /* Name and offset */
         name = H5Tget_member_name(type, i);
-        h5tools_str_append(buffer, "\n%*s\"", ind+4, "");
+        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 */
         subtype = H5Tget_member_type(type, i);
-        print_type(buffer, subtype, ind+4);
+        print_type(buffer, subtype, ind + 4);
         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
+ * Function:    print_enum_type
  *
- * Purpose: Print info about an enumeration data type.
+ * Purpose:     Print info about an enumeration data type.
  *
- * Return: Success: TRUE
- *         Failure: FALSE, nothing printed
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    int         nmembs;         /* number of members */
-    hid_t       super;          /* enum base integer type */
+    int   nmembs; /* number of members */
+    hid_t super;  /* enum base integer type */
 
     if (H5T_ENUM != H5Tget_class(type))
         return FALSE;
@@ -880,11 +895,11 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
     h5tools_str_append(buffer, " {");
 
     if (nmembs > 0) {
-        char        **name;         /* member names */
-        unsigned char *value;       /* value array */
-        hid_t       native = -1;    /* native integer data type */
-        size_t      dst_size;       /* destination value type size */
-        unsigned    i;              /* miscellaneous counters */
+        char **        name;                     /* member names */
+        unsigned char *value;                    /* value array */
+        hid_t          native = H5I_INVALID_HID; /* native integer data type */
+        size_t         dst_size;                 /* destination value type size */
+        unsigned       i;                        /* miscellaneous counters */
 
         /* Determine what data type to use for the native values.  To simplify
          * things we entertain three possibilities:
@@ -902,7 +917,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
             dst_size = H5Tget_size(type);
 
         /* Get the names and raw values of all members */
-        name = (char **)HDcalloc((size_t)nmembs, sizeof(char *));
+        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++) {
             name[i] = H5Tget_member_name(type, i);
@@ -917,6 +932,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
                     H5free_memory(name[i]);
                 HDfree(name);
                 HDfree(value);
+                H5Tclose(super);
 
                 return FALSE;
             }
@@ -926,10 +942,9 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
 
         /* Print members */
         for (i = 0; i < (unsigned)nmembs; i++) {
-            unsigned char *copy;        /* a pointer to value array */
-            int         nchars;         /* number of output characters */
+            int nchars; /* number of output characters */
 
-            h5tools_str_append(buffer, "\n%*s", ind+4, "");
+            h5tools_str_append(buffer, "\n%*s", ind + 4, "");
             nchars = print_string(buffer, name[i], TRUE);
             h5tools_str_append(buffer, "%*s = ", MAX(0, 16 - nchars), "");
 
@@ -938,30 +953,30 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
 
                 h5tools_str_append(buffer, "0x");
                 for (j = 0; j < dst_size; j++)
-                    h5tools_str_append(buffer, "%02x", value[i*dst_size+j]);
+                    h5tools_str_append(buffer, "%02x", value[i * dst_size + j]);
             }
             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;
-                h5tools_str_append(buffer, HSIZE_T_FORMAT, *((unsigned long long*)((void*)copy)));
+                unsigned long long copy;
+
+                HDmemcpy(&copy, value + i * dst_size, sizeof(copy));
+                h5tools_str_append(buffer, "%llu", copy);
             }
             else {
-                /*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)));
+                long long copy;
+
+                HDmemcpy(&copy, value + i * dst_size, sizeof(copy));
+                h5tools_str_append(buffer, "%lld", copy);
             }
         }
 
         /* Release resources */
-        for(i = 0; i < (unsigned)nmembs; i++)
+        for (i = 0; i < (unsigned)nmembs; i++)
             H5free_memory(name[i]);
         HDfree(name);
         HDfree(value);
     }
     else
-        h5tools_str_append(buffer, "\n%*s <empty>", ind+4, "");
+        h5tools_str_append(buffer, "\n%*s <empty>", ind + 4, "");
 
     h5tools_str_append(buffer, "\n%*s}", ind, "");
 
@@ -970,23 +985,22 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
     return TRUE;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: print_string_type
+ * Function:    print_string_type
  *
- * Purpose: Print information about a string data type.
+ * Purpose:     Print information about a string data type.
  *
- * Return: Success: TRUE
- *         Failure: FALSE, nothing printed
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
 {
-    H5T_str_t  pad;
-    const char  *pad_s=NULL;
+    H5T_str_t   pad;
+    const char *pad_s = NULL;
     H5T_cset_t  cset;
-    const char  *cset_s=NULL;
+    const char *cset_s = NULL;
 
     if (H5T_STRING != H5Tget_class(type))
         return FALSE;
@@ -1019,9 +1033,8 @@ print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
         case H5T_STR_ERROR:
             pad_s = "unknown-format";
             break;
-        default:
-            ;
-        break;
+        default:;
+            break;
     }
 
     /* Character set */
@@ -1050,9 +1063,8 @@ print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
         case H5T_CSET_ERROR:
             cset_s = "unknown-character-set";
             break;
-        default:
-            ;
-        break;
+        default:;
+            break;
     }
 
     if (H5Tis_variable_str(type)) {
@@ -1065,14 +1077,13 @@ 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.
+ * Purpose:     Prints information about a reference data type.
  *
- * Return: Success: TRUE
- *         Failure: FALSE, nothing printed
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -1081,7 +1092,10 @@ print_reference_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
     if (H5T_REFERENCE != H5Tget_class(type))
         return FALSE;
 
-    if (H5Tequal(type, H5T_STD_REF_OBJ) == TRUE) {
+    if (H5Tequal(type, H5T_STD_REF) == TRUE) {
+        h5tools_str_append(buffer, "standard reference");
+    }
+    else if (H5Tequal(type, H5T_STD_REF_OBJ) == TRUE) {
         h5tools_str_append(buffer, "object reference");
     }
     else if (H5Tequal(type, H5T_STD_REF_DSETREG) == TRUE) {
@@ -1094,20 +1108,19 @@ print_reference_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
     return TRUE;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: print_opaque_type
+ * Function:    print_opaque_type
  *
- * Purpose: Prints information about an opaque data type.
+ * Purpose:     Prints information about an opaque data type.
  *
- * Return: Success: TRUE
- *         Failure: FALSE, nothing printed
+ * Return:      Success: TRUE
+ *              Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_opaque_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    char *tag;
+    char * tag;
     size_t size;
 
     if (H5T_OPAQUE != H5Tget_class(type))
@@ -1124,7 +1137,6 @@ print_opaque_type(h5tools_str_t *buffer, hid_t type, int ind)
     return TRUE;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:    print_vlen_type
  *
@@ -1137,7 +1149,7 @@ print_opaque_type(h5tools_str_t *buffer, hid_t type, int ind)
 static hbool_t
 print_vlen_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    hid_t       super;
+    hid_t super;
 
     if (H5T_VLEN != H5Tget_class(type))
         return FALSE;
@@ -1149,7 +1161,6 @@ print_vlen_type(h5tools_str_t *buffer, hid_t type, int ind)
     return TRUE;
 }
 
-
 /*---------------------------------------------------------------------------
  * Purpose:     Print information about an array type
  *
@@ -1160,9 +1171,9 @@ print_vlen_type(h5tools_str_t *buffer, hid_t type, int ind)
 static hbool_t
 print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    hid_t       super;
-    int         ndims, i;
-    hsize_t     *dims=NULL;
+    hid_t    super;
+    int      ndims, i;
+    hsize_t *dims = NULL;
 
     if (H5T_ARRAY != H5Tget_class(type))
         return FALSE;
@@ -1173,42 +1184,40 @@ print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
 
         /* Print dimensions */
         for (i = 0; i < ndims; i++)
-            h5tools_str_append(buffer, "%s" HSIZE_T_FORMAT , i?",":"[", dims[i]);
+            h5tools_str_append(buffer, "%s%" PRIuHSIZE, i ? "," : "[", dims[i]);
         h5tools_str_append(buffer, "]");
 
         HDfree(dims);
     }
     else
-        h5tools_str_append(buffer, " [SCALAR]\n", rawoutstream);
-
+        h5tools_str_append(buffer, " [SCALAR]\n");
 
     /* Print parent type */
     h5tools_str_append(buffer, " ");
     super = H5Tget_super(type);
-    print_type(buffer, super, ind+4);
+    print_type(buffer, super, ind + 4);
     H5Tclose(super);
     return TRUE;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: print_bitfield_type
+ * Function:    print_bitfield_type
  *
- * Purpose: Print information about a bitfield type.
+ * Purpose:     Print information about a bitfield type.
  *
- * Return: Success: TRUE
- *         Failure: FALSE, nothing printed
+ * 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 */
+    const char *order_s = NULL; /* byte order string */
 
     if (H5T_BITFIELD != H5Tget_class(type))
         return FALSE;
-    if (H5Tget_size(type)>1) {
+    if (H5Tget_size(type) > 1) {
         order = H5Tget_order(type);
         if (H5T_ORDER_LE == order) {
             order_s = " little-endian";
@@ -1227,98 +1236,107 @@ print_bitfield_type(h5tools_str_t *buffer, hid_t type, int ind)
         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).
- *  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
+ * Return:      void
  *-------------------------------------------------------------------------
  */
 static void
 print_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    H5T_class_t  data_class = H5Tget_class(type);
+    H5T_class_t data_class = H5Tget_class(type);
 
     /* Bad data type */
     if (type < 0) {
-        h5tools_str_append(buffer,"<ERROR>");
+        h5tools_str_append(buffer, "<ERROR>");
         return;
     }
 
     /* Shared? If so then print the type's OID */
     if (H5Tcommitted(type)) {
-        H5O_info_t  oi;
+        H5O_info2_t oi;
 
-        if (H5Oget_info2(type, &oi, H5O_INFO_BASIC) >= 0)
-            h5tools_str_append(buffer,"shared-%lu:"H5_PRINTF_HADDR_FMT" ", oi.fileno, oi.addr);
+        if (H5Oget_info3(type, &oi, H5O_INFO_BASIC) >= 0) {
+            char *type_string = NULL;
+
+            H5Otoken_to_str(type, &oi.token, &type_string);
+
+            h5tools_str_append(buffer, "shared-%lu:%s", oi.fileno, type_string);
+
+            H5free_memory(type_string);
+        } /* end if */
         else
-            h5tools_str_append(buffer,"shared ");
+            h5tools_str_append(buffer, "shared ");
     } /* end if */
 
     /* Print the type */
-    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) ||
-            print_string_type(buffer, type, ind) ||
-            print_reference_type(buffer, type, ind) ||
-            print_vlen_type(buffer, type, ind) ||
-            print_array_type(buffer, type, ind) ||
-            print_opaque_type(buffer, type, ind) ||
-            print_bitfield_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) ||
+        print_string_type(buffer, type, ind) || print_reference_type(buffer, type, ind) ||
+        print_vlen_type(buffer, type, ind) || print_array_type(buffer, type, ind) ||
+        print_opaque_type(buffer, type, ind) || print_bitfield_type(buffer, type, 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
+ * Function:    dump_dataset_values
  *
- * Purpose: Prints all values of a dataset.
+ * Purpose:     Prints all values of a dataset.
  *
- * Return: void
+ * Return:      void
  *-------------------------------------------------------------------------
  */
 static void
 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   */
-    h5tools_str_t       buffer;          /* string into which to render   */
-    h5tools_context_t   ctx;             /* print context  */
-    h5tool_format_t     outputformat;
-    h5tool_format_t    *info = &ls_dataformat;
-
-    hid_t  f_type = H5Dget_type(dset);
-    size_t  size = H5Tget_size(f_type);
+    hid_t             f_type = H5I_INVALID_HID;
+    hid_t             space  = H5I_INVALID_HID;
+    hsize_t           total_size[H5S_MAX_RANK];
+    int               ndims;
+    char              string_prefix[64];
+    static char       fmt_double[16];
+    static char       fmt_float[16];
+    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;
+    h5tool_format_t * info    = &ls_dataformat;
+    H5R_ref_t *       ref_buf = NULL;
+
+    H5TOOLS_START_DEBUG(" ");
+
+    f_type = H5Dget_type(dset);
+    space  = H5Dget_space(dset);
 
     HDmemset(&ctx, 0, sizeof(ctx));
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
 
-    outputformat = *info;
-    outputformat.line_1st  = NULL;
+    outputformat          = *info;
+    outputformat.line_1st = NULL;
+    outputformat.idx_fmt  = "";
     if (simple_output_g) {
-        outputformat.idx_fmt = "";
-        outputformat.line_per_line = 1;
+        outputformat.idx_fmt        = "";
+        outputformat.line_per_line  = 1;
         outputformat.line_multi_new = 0;
-        outputformat.line_pre  = "        ";
-        outputformat.line_cont = "         ";
+        outputformat.line_pre       = "        ";
+        outputformat.line_cont      = "         ";
 
         outputformat.arr_pre = "";
         outputformat.arr_suf = "";
@@ -1333,9 +1351,8 @@ dump_dataset_values(hid_t dset)
         if (label_g)
             outputformat.cmpd_name = "%s=";
 
-        outputformat.elmt_suf1 = " ";
+        outputformat.elmt_suf1  = " ";
         outputformat.str_locale = ESCAPE_HTML;
-
     }
     else {
         if (no_line_wrap_g) {
@@ -1344,9 +1361,10 @@ dump_dataset_values(hid_t dset)
         else {
             outputformat.line_ncols = (unsigned)width_g;
         }
-        if (label_g) outputformat.cmpd_name = "%s=";
-        outputformat.line_pre  = "        %s ";
-        outputformat.line_cont = "        %s  ";
+        if (label_g)
+            outputformat.cmpd_name = "%s=";
+        outputformat.line_pre   = "        %s ";
+        outputformat.line_cont  = "        %s ";
         outputformat.str_repeat = 8;
 
         outputformat.arr_pre = NULL;
@@ -1374,10 +1392,10 @@ 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 && H5Tget_size(f_type) == 1 && (H5Tget_class(f_type) == H5T_INTEGER)) {
         /* 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;
+        outputformat.ascii     = TRUE;
         outputformat.elmt_suf1 = "";
         outputformat.elmt_suf2 = "";
         HDsnprintf(string_prefix, sizeof(string_prefix), "%s\"", outputformat.line_pre);
@@ -1386,232 +1404,377 @@ dump_dataset_values(hid_t dset)
     }
     info = &outputformat;
 
-    ctx.indent_level = 2;
-    ctx.cur_column = (size_t)curr_pos;
+    ctx.indent_level = 1;
+    ctx.cur_column   = (size_t)curr_pos;
     /* Print all the values. */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "    Data:\n");
-    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
+
+    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0,
+                           (hsize_t)0);
+
     ctx.need_prefix = TRUE;
-    ctx.cur_column = (size_t)curr_pos;
-    if (h5tools_dump_dset(rawoutstream, info, &ctx, dset, NULL) < 0) {
-        h5tools_str_reset(&buffer);
-        h5tools_str_append(&buffer, "        Unable to print data.");
-        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
-    }
+    ctx.cur_column  = (size_t)curr_pos;
+    if (H5Tget_class(f_type) == H5T_REFERENCE) {
+        H5TOOLS_DEBUG("reference class type");
+        if (!H5Tequal(f_type, H5T_STD_REF) && !H5Tequal(f_type, H5T_STD_REF_DSETREG) &&
+            !H5Tequal(f_type, H5T_STD_REF_OBJ)) {
+            H5TOOLS_GOTO_DONE_NO_RET();
+        }
+
+        ndims = (int)H5Sget_simple_extent_npoints(space);
+        H5TOOLS_DEBUG("ndims=%d - ctx.ndims=%d", ndims, ctx.ndims);
+
+        /* Assume entire data space to be printed */
+        H5Sget_simple_extent_dims(space, total_size, NULL);
+        init_acc_pos(ctx.ndims, total_size, ctx.acc, ctx.pos, ctx.p_min_idx);
+
+        ctx.need_prefix = TRUE;
+
+        if (NULL !=
+            (ref_buf = (H5R_ref_t *)HDcalloc(MAX(sizeof(unsigned), sizeof(H5R_ref_t)), (size_t)ndims))) {
+            H5TOOLS_DEBUG("H5Dread reference read");
+            if (H5Dread(dset, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, ref_buf) < 0) {
+                HDfree(ref_buf);
+                H5TOOLS_INFO("H5Dread reference failed");
+                H5TOOLS_GOTO_DONE_NO_RET();
+            }
+            h5tools_dump_reference(rawoutstream, info, &ctx, dset, ref_buf, ndims);
 
+            PRINTVALSTREAM(rawoutstream, "\n");
+            HDfree(ref_buf);
+        }
+    }
+    else {
+        if (h5tools_dump_dset(rawoutstream, info, &ctx, dset) < 0) {
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "        Unable to print data.");
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                   (hsize_t)0, (hsize_t)0);
+        }
+    }
+done:
+    H5Sclose(space);
     H5Tclose(f_type);
 
     h5tools_str_close(&buffer);
 
     PRINTVALSTREAM(rawoutstream, "\n");
+
+    H5TOOLS_ENDDEBUG(" ");
 }
 
+/*-------------------------------------------------------------------------
+ * Function:    dump_attribute_values
+ *
+ * Purpose:     Prints all values of a attribute.
+ *
+ * Return:      void
+ *-------------------------------------------------------------------------
+ */
+static void
+dump_attribute_values(hid_t attr)
+{
+    hid_t             f_type = H5I_INVALID_HID;
+    hid_t             space  = H5I_INVALID_HID;
+    hsize_t           total_size[H5S_MAX_RANK];
+    int               ndims;
+    char              string_prefix[64];
+    static char       fmt_double[16];
+    static char       fmt_float[16];
+    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;
+    h5tool_format_t * info    = &ls_dataformat;
+    H5R_ref_t *       ref_buf = NULL;
+
+    H5TOOLS_START_DEBUG(" ");
+
+    f_type = H5Aget_type(attr);
+    space  = H5Aget_space(attr);
+
+    HDmemset(&ctx, 0, sizeof(ctx));
+    HDmemset(&buffer, 0, sizeof(h5tools_str_t));
+
+    outputformat          = *info;
+    outputformat.line_1st = NULL;
+    outputformat.idx_fmt  = "";
+    if (simple_output_g) {
+        outputformat.idx_fmt        = "";
+        outputformat.line_per_line  = 1;
+        outputformat.line_multi_new = 0;
+        outputformat.line_pre       = "        ";
+        outputformat.line_cont      = "        ";
+
+        outputformat.arr_pre = "";
+        outputformat.arr_suf = "";
+        outputformat.arr_sep = " ";
+
+        if (!label_g) {
+            outputformat.cmpd_pre = "";
+            outputformat.cmpd_suf = "";
+        }
+        outputformat.cmpd_sep = " ";
+
+        if (label_g)
+            outputformat.cmpd_name = "%s=";
+
+        outputformat.elmt_suf1  = " ";
+        outputformat.str_locale = ESCAPE_HTML;
+    }
+    else {
+        if (no_line_wrap_g) {
+            outputformat.line_per_line = 1;
+        }
+        else {
+            outputformat.line_ncols = (unsigned)width_g;
+        }
+        if (label_g)
+            outputformat.cmpd_name = "%s=";
+        outputformat.line_pre   = "        %s ";
+        outputformat.line_cont  = "        %s  ";
+        outputformat.str_repeat = 8;
+
+        outputformat.arr_pre = NULL;
+        outputformat.arr_suf = NULL;
+        outputformat.arr_sep = NULL;
+
+        outputformat.cmpd_pre = NULL;
+        outputformat.cmpd_suf = NULL;
+        outputformat.cmpd_sep = NULL;
+
+        outputformat.vlen_sep = NULL;
+        outputformat.vlen_pre = NULL;
+        outputformat.vlen_suf = NULL;
+        outputformat.vlen_end = NULL;
+    }
+    outputformat.arr_linebreak = 0;
+    /* Floating point types should display full precision */
+    HDsnprintf(fmt_float, sizeof(fmt_float), "%%1.%dg", FLT_DIG);
+    outputformat.fmt_float = fmt_float;
+    HDsnprintf(fmt_double, sizeof(fmt_double), "%%1.%dg", DBL_DIG);
+    outputformat.fmt_double = fmt_double;
+
+    if (hexdump_g) {
+        /* Print all data in hexadecimal format if the `-x' or `--hexdump'
+         * command line switch was given. */
+        outputformat.raw = TRUE;
+    }
+    else if (string_g && H5Tget_size(f_type) == 1 && (H5Tget_class(f_type) == H5T_INTEGER)) {
+        /* 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;
+        outputformat.elmt_suf1 = "";
+        outputformat.elmt_suf2 = "";
+        HDsnprintf(string_prefix, sizeof(string_prefix), "%s\"", outputformat.line_pre);
+        outputformat.line_pre = string_prefix;
+        outputformat.line_suf = "\"";
+    }
+    info = &outputformat;
+
+    ctx.indent_level = 2;
+    ctx.cur_column   = (size_t)curr_pos;
+
+    /* Print all the values. */
+    h5tools_str_reset(&buffer);
+    h5tools_str_append(&buffer, "        Data:\n");
+
+    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0,
+                           (hsize_t)0);
+
+    ctx.need_prefix = TRUE;
+    ctx.cur_column  = (size_t)curr_pos;
+    if (H5Tget_class(f_type) == H5T_REFERENCE) {
+        H5TOOLS_DEBUG("reference class type");
+        if (!H5Tequal(f_type, H5T_STD_REF) && !H5Tequal(f_type, H5T_STD_REF_DSETREG) &&
+            !H5Tequal(f_type, H5T_STD_REF_OBJ)) {
+            H5TOOLS_GOTO_DONE_NO_RET();
+        }
+
+        ndims = (int)H5Sget_simple_extent_npoints(space);
+        H5TOOLS_DEBUG("ndims=%d - ctx.ndims=%d", ndims, ctx.ndims);
+
+        /* Assume entire data space to be printed */
+        H5Sget_simple_extent_dims(space, total_size, NULL);
+        init_acc_pos(ctx.ndims, total_size, ctx.acc, ctx.pos, ctx.p_min_idx);
+
+        ctx.need_prefix = TRUE;
+
+        if (NULL !=
+            (ref_buf = (H5R_ref_t *)HDcalloc(MAX(sizeof(unsigned), sizeof(H5R_ref_t)), (size_t)ndims))) {
+            H5TOOLS_DEBUG("H5Aread reference read");
+            if (H5Aread(attr, H5T_STD_REF, ref_buf) < 0) {
+                HDfree(ref_buf);
+                H5TOOLS_INFO("H5Aread reference failed");
+                H5TOOLS_GOTO_DONE_NO_RET();
+            }
+            ctx.indent_level++;
+            h5tools_dump_reference(rawoutstream, info, &ctx, attr, ref_buf, ndims);
+
+            PRINTVALSTREAM(rawoutstream, "\n");
+            ctx.indent_level--;
+            HDfree(ref_buf);
+        }
+    }
+    else {
+        H5TOOLS_DEBUG("Attribute data read");
+        ctx.indent_level++;
+        if (h5tools_dump_mem(rawoutstream, info, &ctx, attr) < 0) {
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "        Unable to print data.");
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                   (hsize_t)0, (hsize_t)0);
+        }
+        ctx.indent_level--;
+        H5TOOLS_DEBUG("Attribute data read complete");
+    }
+done:
+    H5Sclose(space);
+    H5Tclose(f_type);
+
+    h5tools_str_close(&buffer);
+
+    PRINTVALSTREAM(rawoutstream, "\n");
+
+    H5TOOLS_ENDDEBUG(" ");
+}
 
 /*-------------------------------------------------------------------------
- * Function: list_attr
+ * Function:    list_attr
  *
- * Purpose: Prints information about attributes.
+ * Purpose:     Prints information about attributes.
  *
- * Return: Success: 0
- *         Failure: -1
+ * 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)
+          void H5_ATTR_UNUSED *op_data)
 {
-    hid_t               attr = -1;
-    hid_t               space = -1;
-    hid_t               type = -1;
-    hid_t               p_type = -1;
-    hsize_t             size[H5S_MAX_RANK];
-    hsize_t             nelmts = 1;
-    hsize_t             temp_need;
-    size_t              need;
-    int                 ndims;
-    int                 i;
-    void               *buf;
-    H5S_class_t         space_type;
-    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;
-    h5tool_format_t     outputformat;
+    hid_t             attr  = H5I_INVALID_HID;
+    hid_t             space = H5I_INVALID_HID;
+    hid_t             type  = H5I_INVALID_HID;
+    hsize_t           size[H5S_MAX_RANK];
+    hsize_t           nelmts = 1;
+    int               ndims;
+    int               i;
+    H5S_class_t       space_type;
+    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;
+
+    H5TOOLS_START_DEBUG(" ");
 
     HDmemset(&ctx, 0, sizeof(ctx));
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
 
+    ctx.indent_level = 2;
+    ctx.cur_column   = (size_t)curr_pos;
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "    Attribute: ");
 
     print_string(&buffer, attr_name, TRUE);
 
-    if ((attr = H5Aopen(obj, attr_name, H5P_DEFAULT))) {
+    H5TOOLS_DEBUG("Attribute name:%s", attr_name);
+    if ((attr = H5Aopen(obj, attr_name, H5P_DEFAULT)) >= 0) {
         space = H5Aget_space(attr);
-        type = H5Aget_type(attr);
+        type  = H5Aget_type(attr);
 
         /* Data space */
-        ndims = H5Sget_simple_extent_dims(space, size, NULL);
+        ndims      = H5Sget_simple_extent_dims(space, size, NULL);
         space_type = H5Sget_simple_extent_type(space);
-        switch(space_type) {
+        H5TOOLS_DEBUG("Attribute ndims:%d", ndims);
+        switch (space_type) {
             case H5S_SCALAR:
                 /* scalar dataspace */
                 h5tools_str_append(&buffer, " scalar\n");
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                       (hsize_t)0, (hsize_t)0);
                 break;
 
             case H5S_SIMPLE:
                 /* simple dataspace */
                 h5tools_str_append(&buffer, " {");
                 for (i = 0; i < ndims; i++) {
-                    h5tools_str_append(&buffer, "%s" HSIZE_T_FORMAT, i?", ":"", size[i]);
+                    h5tools_str_append(&buffer, "%s%" PRIuHSIZE, i ? ", " : "", size[i]);
                     nelmts *= size[i];
                 }
                 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);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                       (hsize_t)0, (hsize_t)0);
                 break;
 
             case H5S_NULL:
                 /* null dataspace */
                 h5tools_str_append(&buffer, " null\n");
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                       (hsize_t)0, (hsize_t)0);
                 break;
 
             case H5S_NO_CLASS:
             default:
                 /* Unknown dataspace type */
                 h5tools_str_append(&buffer, " unknown\n");
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                       (hsize_t)0, (hsize_t)0);
                 break;
         } /* end switch */
 
         /* Data type */
         h5tools_str_reset(&buffer);
-        h5tools_str_append(&buffer, "        Type:      ");
+        h5tools_str_append(&buffer, "        %-10s ", "Type:");
         print_type(&buffer, type, 15);
         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);
-
-        /* Data */
-        outputformat = *info;
-
-        if (nelmts < 5) {
-            outputformat.idx_fmt = "";
-            outputformat.line_1st  = "        Data:  ";
-            outputformat.line_pre  = "               ";
-            outputformat.line_cont = "                ";
-            outputformat.str_repeat = 8;
-
-        }
-        else {
-            h5tools_str_reset(&buffer);
-            h5tools_str_append(&buffer, "        Data:\n");
-            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
-            outputformat.line_1st  = NULL;
-            outputformat.line_pre  = "            %s ";
-            outputformat.line_cont = "            %s  ";
-            outputformat.str_repeat = 8;
-        }
-
-        outputformat.line_ncols = (unsigned)width_g;
-        if (label_g)
-            outputformat.cmpd_name = "%s=";
-        if (string_g && 1 == H5Tget_size(type) && H5T_INTEGER == H5Tget_class(type)) {
-            outputformat.ascii = TRUE;
-            outputformat.elmt_suf1 = "";
-            outputformat.elmt_suf2 = "";
-            outputformat.line_pre = "            %s \"";
-            outputformat.line_suf = "\"";
-        } /* end if */
-
-
-        outputformat.arr_pre = NULL;
-        outputformat.arr_suf = NULL;
-        outputformat.arr_sep = NULL;
-
-        outputformat.cmpd_pre = NULL;
-        outputformat.cmpd_suf = NULL;
-        outputformat.cmpd_sep = NULL;
-
-        outputformat.vlen_sep = NULL;
-        outputformat.vlen_pre = NULL;
-        outputformat.vlen_suf = NULL;
-        outputformat.vlen_end = NULL;
-
-        info = &outputformat;
-
-        if (space_type != H5S_NULL && space_type != H5S_NO_CLASS) {
-            if (hexdump_g)
-                p_type = H5Tcopy(type);
-            else
-                p_type = H5Tget_native_type(type, H5T_DIR_DEFAULT);
-
-            if (p_type >= 0) {
-                /* VL data special information */
-                unsigned int        vl_data = 0; /* contains VL datatypes */
-
-                /* Check if we have VL data in the dataset's datatype */
-                if (h5tools_detect_vlen(p_type) == TRUE)
-                    vl_data = TRUE;
-
-                temp_need = nelmts * MAX(H5Tget_size(type), H5Tget_size(p_type));
-                need = (size_t)temp_need;
-                if((buf = HDmalloc(need)) != NULL) {
-                    if(H5Aread(attr, p_type, buf) >= 0) {
-                        ctx.need_prefix = TRUE;
-                        ctx.indent_level = 2;
-                        ctx.cur_column = (size_t)curr_pos;
-                        h5tools_dump_mem(rawoutstream, info, &ctx, attr, p_type, space, buf);
-                    }
-
-                    /* Reclaim any VL memory, if necessary */
-                    if (vl_data)
-                        H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
-
-                    HDfree(buf);
-                }
-                H5Tclose(p_type);
-            } /* end if */
-        }
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                               (hsize_t)0, (hsize_t)0);
 
         H5Sclose(space);
         H5Tclose(type);
+
+        h5tools_str_close(&buffer);
+
+        if (data_g)
+            dump_attribute_values(attr);
         H5Aclose(attr);
     }
-    h5tools_str_close(&buffer);
-
-    PRINTVALSTREAM(rawoutstream, "\n");
+    else {
+        H5TOOLS_DEBUG("Attribute open failed");
+        h5tools_str_close(&buffer);
+    }
+    H5TOOLS_ENDDEBUG(" ");
 
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: dataset_list1
+ * 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.
+ * 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
+ * Return:      Success: 0
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 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  */
-    h5tool_format_t    *info = &ls_dataformat;
+    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  */
+    h5tool_format_t * info = &ls_dataformat;
 
     HDmemset(&ctx, 0, sizeof(ctx));
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -1620,17 +1783,17 @@ dataset_list1(hid_t dset)
 
     /* Information that goes on the same row as the name.  The name has
      * already been printed. */
-    space = H5Dget_space(dset);
+    space      = H5Dget_space(dset);
     space_type = H5Sget_simple_extent_type(space);
-    ndims = H5Sget_simple_extent_dims(space, cur_size, max_size);
+    ndims      = H5Sget_simple_extent_dims(space, cur_size, max_size);
     h5tools_str_append(&buffer, " {");
     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%" PRIuHSIZE, 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) {
-            h5tools_str_append(&buffer, "/"HSIZE_T_FORMAT, max_size[i]);
+            h5tools_str_append(&buffer, "/%" PRIuHSIZE, max_size[i]);
         }
     }
     if (space_type == H5S_SCALAR)
@@ -1638,52 +1801,52 @@ dataset_list1(hid_t dset)
     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);
+    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0,
+                           (hsize_t)0);
+    H5Sclose(space);
 
     h5tools_str_close(&buffer);
 
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: dataset_list2
+ * Function:    dataset_list2
  *
- * Purpose: List information about a dataset which should appear after
- *  information which is general to all objects.
+ * Purpose:     List information about a dataset which should appear after
+ *              information which is general to all objects.
  *
- * Return: Success: 0
- *         Failure: -1
+ * Return:      Success: 0
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
 {
-    hid_t       dcpl;           /* dataset creation property list */
-    hid_t       type;           /* data type of dataset */
-    hid_t       space;          /* data space of dataset */
-    int         nf;             /* number of filters */
-    unsigned    filt_flags;     /* filter flags */
-    H5Z_filter_t filt_id;       /* filter identification number */
-    unsigned    cd_values[20];  /* filter client data values */
-    size_t      cd_nelmts;      /* filter client number of values */
-    size_t      cd_num;         /* filter client data counter */
-    char        f_name[256];    /* filter/file name */
-    char        s[64];          /* temporary string buffer */
-    off_t       f_offset;       /* offset in external file */
-    hsize_t     f_size;         /* bytes used in external file */
-    hsize_t     total, used;    /* total size or offset */
-    int         ndims;          /* dimensionality */
-    int         n, max_len;     /* max extern file name length */
-    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   */
-    h5tools_str_t       buffer;          /* string into which to render   */
-    h5tools_context_t   ctx;             /* print context  */
-    h5tool_format_t    *info = &ls_dataformat;
+    hid_t             dcpl;          /* dataset creation property list */
+    hid_t             type;          /* data type of dataset */
+    hid_t             space;         /* data space of dataset */
+    int               nf;            /* number of filters */
+    unsigned          filt_flags;    /* filter flags */
+    H5Z_filter_t      filt_id;       /* filter identification number */
+    unsigned          cd_values[20]; /* filter client data values */
+    size_t            cd_nelmts;     /* filter client number of values */
+    size_t            cd_num;        /* filter client data counter */
+    char              f_name[256];   /* filter/file name */
+    char              s[64];         /* temporary string buffer */
+    off_t             f_offset;      /* offset in external file */
+    hsize_t           f_size;        /* bytes used in external file */
+    hsize_t           total, used;   /* total size or offset */
+    int               ndims;         /* dimensionality */
+    int               n, max_len;    /* max extern file name length */
+    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   */
+    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));
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -1691,26 +1854,24 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
     h5tools_str_reset(&buffer);
 
     if (verbose_g > 0) {
-        dcpl = H5Dget_create_plist(dset);
+        dcpl  = H5Dget_create_plist(dset);
         space = H5Dget_space(dset);
-        type = H5Dget_type(dset);
+        type  = H5Dget_type(dset);
 
         stl = H5Pget_layout(dcpl);
         switch (stl) {
-            case H5D_CHUNKED:
-                {
-                    hsize_t     chsize[64];     /* chunk size in elements */
-
-                    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++) {
-                        h5tools_str_append(&buffer, "%s"HSIZE_T_FORMAT, i?", ":"", chsize[i]);
-                        total *= chsize[i];
-                    }
-                    h5tools_str_append(&buffer, "} "HSIZE_T_FORMAT" bytes\n", total);
+            case H5D_CHUNKED: {
+                hsize_t chsize[64]; /* chunk size in elements */
+
+                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++) {
+                    h5tools_str_append(&buffer, "%s%" PRIuHSIZE, i ? ", " : "", chsize[i]);
+                    total *= chsize[i];
                 }
-                break;
+                h5tools_str_append(&buffer, "} %" PRIuHSIZE " bytes\n", total);
+            } break;
             case H5D_COMPACT:
                 break;
             case H5D_CONTIGUOUS:
@@ -1719,64 +1880,70 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                     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);
+                        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 ", "----", "----------", "----------", "----------");
+                    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++) {
-                        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":"");
+                    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" PRIuHSIZE " %10s %10s ***ERROR*** %s\n", i,
+                                total, "", "", i + 1 < nf ? "Following addresses are incorrect" : "");
                         }
                         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");
+                            h5tools_str_append(&buffer,
+                                               "        #%03d %10" PRIuHSIZE " %10" PRIuHSIZE " %10s ", i,
+                                               total, (hsize_t)f_offset, "INF");
                             print_string(&buffer, f_name, TRUE);
                         }
                         else {
-                            h5tools_str_append(&buffer, "        #%03d %10"H5_PRINTF_LL_WIDTH"u %10"H5_PRINTF_LL_WIDTH"u %10"H5_PRINTF_LL_WIDTH"u ",
-                                    i, total, (hsize_t)f_offset, f_size);
+                            h5tools_str_append(
+                                &buffer, "        #%03d %10" PRIuHSIZE " %10" PRIuHSIZE " %10" PRIuHSIZE " ",
+                                i, total, (hsize_t)f_offset, f_size);
                             print_string(&buffer, f_name, TRUE);
                         }
                         h5tools_str_append(&buffer, "\n");
                         total += f_size;
                     }
-                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s ", "----", "----------", "----------", "----------");
+                    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 */
                 break;
 
-            case H5D_VIRTUAL:
-                {
-                    char dset_name[256];        /* Dataset name */
-                    size_t vmaps;
+            case H5D_VIRTUAL: {
+                char   dset_name[256]; /* Dataset name */
+                size_t vmaps;
 
-                    H5Pget_virtual_count(dcpl, &vmaps);
+                H5Pget_virtual_count(dcpl, &vmaps);
 
-                    if (vmaps) {
-                        size_t next;
+                if (vmaps) {
+                    size_t next;
 
-                        h5tools_str_append(&buffer, "    %-10s {%ld} Source {\n", "Maps:", vmaps);
-                        for (next = 0; next < (unsigned) vmaps; next++) {
-                            H5Pget_virtual_filename(dcpl, next, f_name, sizeof(f_name));
-                            H5Pget_virtual_dsetname(dcpl, next, dset_name, sizeof(dset_name));
-                            h5tools_str_append(&buffer, "    %-10s        ", " ");
-                            print_string(&buffer, f_name, TRUE);
-                            h5tools_str_append(&buffer, "   ");
-                            print_string(&buffer, dset_name, TRUE);
-                            h5tools_str_append(&buffer, "\n");
-                        }
-                        h5tools_str_append(&buffer, "     %-10s}\n", " ");
+                    h5tools_str_append(&buffer, "    %-10s {%ld} Source {\n", "Maps:", vmaps);
+                    for (next = 0; next < (unsigned)vmaps; next++) {
+                        H5Pget_virtual_filename(dcpl, next, f_name, sizeof(f_name));
+                        H5Pget_virtual_dsetname(dcpl, next, dset_name, sizeof(dset_name));
+                        h5tools_str_append(&buffer, "    %-10s        ", " ");
+                        print_string(&buffer, f_name, TRUE);
+                        h5tools_str_append(&buffer, "   ");
+                        print_string(&buffer, dset_name, TRUE);
+                        h5tools_str_append(&buffer, "\n");
                     }
+                    h5tools_str_append(&buffer, "     %-10s}\n", " ");
                 }
-                break;
+            } break;
 
             case H5D_LAYOUT_ERROR:
             case H5D_NLAYOUTS:
@@ -1785,38 +1952,42 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                 break;
         }
         /* Print total raw storage size */
-        total = (hsize_t)H5Sget_simple_extent_npoints(space) * H5Tget_size(type);
-        used = H5Dget_storage_size(dset);
+        total  = (hsize_t)H5Sget_simple_extent_npoints(space) * H5Tget_size(type);
+        used   = H5Dget_storage_size(dset);
         tclass = H5Tget_class(type);
         h5tools_str_append(&buffer, "    %-10s ", "Storage:");
         switch (tclass) {
-        case H5T_VLEN:
-            h5tools_str_append(&buffer, "information not available");
-            break;
-
-        case H5T_REFERENCE:
-            if (H5Tequal(type, H5T_STD_REF_DSETREG)) {
+            case H5T_VLEN:
                 h5tools_str_append(&buffer, "information not available");
-            }
-            break;
+                break;
 
-        case H5T_NO_CLASS:
-        case H5T_INTEGER:
-        case H5T_FLOAT:
-        case H5T_TIME:
-        case H5T_STRING:
-        case H5T_BITFIELD:
-        case H5T_OPAQUE:
-        case H5T_COMPOUND:
-        case H5T_ENUM:
-        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) {
-                utilization = ((double)total * (double)100.0f) / (double)used;
-                h5tools_str_append(&buffer, ", %1.2f%% utilization", utilization);
-            }
+            case H5T_REFERENCE:
+                if (H5Tequal(dset, H5T_STD_REF)) {
+                    h5tools_str_append(&buffer, "reference information not available");
+                }
+                else if (H5Tequal(dset, H5T_STD_REF_DSETREG)) {
+                    h5tools_str_append(&buffer, "information not available");
+                }
+                break;
+
+            case H5T_NO_CLASS:
+            case H5T_INTEGER:
+            case H5T_FLOAT:
+            case H5T_TIME:
+            case H5T_STRING:
+            case H5T_BITFIELD:
+            case H5T_OPAQUE:
+            case H5T_COMPOUND:
+            case H5T_ENUM:
+            case H5T_ARRAY:
+            case H5T_NCLASSES:
+            default:
+                h5tools_str_append(&buffer, "%" PRIuHSIZE " logical byte%s, %" PRIuHSIZE " allocated byte%s",
+                                   total, 1 == total ? "" : "s", used, 1 == used ? "" : "s");
+                if (used > 0) {
+                    utilization = ((double)total * 100.0) / (double)used;
+                    h5tools_str_append(&buffer, ", %1.2f%% utilization", utilization);
+                }
         }
 
         h5tools_str_append(&buffer, "\n");
@@ -1825,21 +1996,27 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
         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" : ""));
+                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 */
-        } /* end if */
+        }     /* end if */
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                               (hsize_t)0, (hsize_t)0);
 
         /* Print data type */
+        h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "    %-10s ", "Type:");
         print_type(&buffer, type, 15);
         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);
+        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)
@@ -1859,25 +2036,24 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
     return 0;
 } /* end dataset_list2() */
 
-
 /*-------------------------------------------------------------------------
- * Function: datatype_list2
+ * Function:    datatype_list2
  *
- * Purpose: List information about a datatype which should appear after
- *  information which is general to all objects.
+ * Purpose:     List information about a datatype which should appear after
+ *              information which is general to all objects.
  *
- * Return: Success: 0
- *         Failure: -1
+ * 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   */
-        h5tools_str_t       buffer;          /* string into which to render   */
-        h5tools_context_t   ctx;             /* print context  */
-        h5tool_format_t    *info = &ls_dataformat;
+        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));
         HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -1887,38 +2063,41 @@ datatype_list2(hid_t type, const char H5_ATTR_UNUSED *name)
         h5tools_str_append(&buffer, "    %-10s ", "Type:");
         print_type(&buffer, type, 15);
         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);
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                               (hsize_t)0, (hsize_t)0);
 
         h5tools_str_close(&buffer);
     }
     return 0;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: list_obj
+ * Function:    list_obj
  *
- * Purpose: Prints information about an object
+ * Purpose:     Prints information about an object
  *
- * Return: Success: 0
- *         Failure: -1
+ * Return:      Success: 0
+ *              Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
-list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void *_iter)
+list_obj(const char *name, const H5O_info2_t *oinfo, const char *first_seen, void *_iter)
 {
-    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   */
-    h5tools_str_t       buffer;          /* string into which to render   */
-    h5tools_context_t   ctx;             /* print context  */
-    h5tool_format_t    *info = &ls_dataformat;
+    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   */
+    h5tools_str_t     buffer;       /* string into which to render   */
+    h5tools_context_t ctx;          /* print context  */
+    h5tool_format_t * info = &ls_dataformat;
+
+    H5TOOLS_START_DEBUG(" ");
 
     HDmemset(&ctx, 0, sizeof(ctx));
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
 
     h5tools_str_reset(&buffer);
 
+    H5TOOLS_DEBUG("Object name:%s", name);
     /* Print the link's name, either full name or base name */
     if (!iter->symlink_target)
         print_obj_name(&buffer, iter, name, "");
@@ -1932,7 +2111,8 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         h5tools_str_append(&buffer, "{");
     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);
+    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) {
@@ -1942,53 +2122,66 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         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);
+        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_id = 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) {
+        H5TOOLS_DEBUG("Open object name=%s", name);
+        if (obj_type >= 0 && (obj_id = 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);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                   (hsize_t)0, (hsize_t)0);
             goto done;
         } /* end if */
 
         /* List the first line of information for the object. */
+        H5TOOLS_DEBUG("Object type:%d", obj_type);
         if (obj_type >= 0 && dispatch_g[obj_type].list1)
-            (dispatch_g[obj_type].list1)(obj);
+            (dispatch_g[obj_type].list1)(obj_id);
         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);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                   (hsize_t)0, (hsize_t)0);
         }
 
         /* Show detailed information about the object, beginning with information
          * which is common to all objects. */
         if (verbose_g > 0) {
-            size_t buf_size = 0;
-            char* comment = NULL;
-            ssize_t cmt_bufsize = -1;
+            size_t   buf_size    = 0;
+            char *   comment     = NULL;
+            char *   obj_tok_str = NULL;
+            ssize_t  cmt_bufsize = -1;
+            uint64_t supported   = 0;
 
             /* Display attributes */
+            H5TOOLS_DEBUG("Display attributes");
             if (obj_type >= 0)
-                H5Aiterate2(obj, H5_INDEX_NAME, H5_ITER_INC, NULL, list_attr, NULL);
+                H5Aiterate2(obj_id, H5_INDEX_NAME, H5_ITER_INC, NULL, list_attr, NULL);
 
             /* Object location & reference count */
+            H5Otoken_to_str(obj_id, &oinfo->token, &obj_tok_str);
+
             h5tools_str_reset(&buffer);
-            h5tools_str_append(&buffer, "    %-10s %lu:"H5_PRINTF_HADDR_FMT"\n", "Location:", oinfo->fileno, oinfo->addr);
+            h5tools_str_append(&buffer, "    %-10s %lu:%s\n", "Location:", oinfo->fileno, obj_tok_str);
             h5tools_str_append(&buffer, "    %-10s %u\n", "Links:", (unsigned)oinfo->rc);
-            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                   (hsize_t)0, (hsize_t)0);
+
+            H5free_memory(obj_tok_str);
 
             /* Modification time */
             if (oinfo->mtime > 0) {
-                char buf[256];
+                char       buf[256];
                 struct tm *tm;
 
-                if(simple_output_g)
+                if (simple_output_g)
                     tm = HDgmtime(&(oinfo->mtime));
                 else
                     tm = HDlocaltime(&(oinfo->mtime));
@@ -1996,55 +2189,66 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
                     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);
-                    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
+                    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos,
+                                           (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                 } /* end if */
-            } /* end if */
-
-            /* Object comment */
-            cmt_bufsize = H5Oget_comment(obj, comment, buf_size);
-
-            /* if the actual length of the comment is longer than cmt_bufsize, then call
-             * H5Oget_comment again with the correct value.
-             * 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) {
-                    cmt_bufsize = H5Oget_comment(obj, comment, (size_t)cmt_bufsize);
-                    if (cmt_bufsize > 0) {
-                        comment[cmt_bufsize] = 0;
-                        h5tools_str_reset(&buffer);
-                        h5tools_str_append(&buffer, "    %-10s \"", "Comment:");
-                        print_string(&buffer, comment, FALSE);
-                        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 */
-                    HDfree(comment);
+            }     /* end if */
+
+            /* Only emit comments if the VOL connector supports that */
+            H5VLquery_optional(obj_id, H5VL_SUBCLS_OBJECT, H5VL_NATIVE_OBJECT_GET_COMMENT, &supported);
+
+            if (supported & H5VL_OPT_QUERY_SUPPORTED) {
+
+                /* Object comment */
+                cmt_bufsize = H5Oget_comment(obj_id, comment, buf_size);
+
+                /* if the actual length of the comment is longer than cmt_bufsize, then call
+                 * H5Oget_comment again with the correct value.
+                 */
+                if (cmt_bufsize > 0) {
+                    comment =
+                        (char *)HDmalloc((size_t)cmt_bufsize + 1); /* new_size including null terminator */
+                    if (comment) {
+                        cmt_bufsize = H5Oget_comment(obj_id, comment, (size_t)cmt_bufsize);
+                        if (cmt_bufsize > 0) {
+                            comment[cmt_bufsize] = 0;
+                            h5tools_str_reset(&buffer);
+                            h5tools_str_append(&buffer, "    %-10s \"", "Comment:");
+                            print_string(&buffer, comment, FALSE);
+                            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 */
+                        HDfree(comment);
+                    }
                 }
             }
         } /* end if */
 
         /* Detailed list for object */
         if (obj_type >= 0 && dispatch_g[obj_type].list2)
-            (dispatch_g[obj_type].list2)(obj, name);
+            (dispatch_g[obj_type].list2)(obj_id, name);
 
         /* Close the object. */
         if (obj_type >= 0)
-            H5Oclose(obj);
+            H5Oclose(obj_id);
     } /* end else */
 
 done:
     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);
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                               (hsize_t)0, (hsize_t)0);
         iter->symlink_target = FALSE;
     }
     h5tools_str_close(&buffer);
 
+    H5TOOLS_ENDDEBUG(" ");
+
     return 0;
 } /* end list_obj() */
 
-
 /*-------------------------------------------------------------------------
  * Function: list_lnk
  *
@@ -2055,16 +2259,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
+list_lnk(const char *name, const H5L_info2_t *linfo, void *_iter)
 {
-    char *buf=NULL;
-    iter_t *iter = (iter_t*)_iter;
-    int ret;
-    hsize_t             curr_pos = 0;        /* total data element position   */
+    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;
-    h5tools_str_t       buffer;          /* string into which to render   */
-    h5tools_context_t   ctx;             /* print context  */
-    h5tool_format_t    *info = &ls_dataformat;
+    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));
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -2076,17 +2280,17 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
 
     /* if verbose, make H5tools_get_symlink_info() display more */
     if (verbose_g)
-        lnk_info.opt.msg_mode=1;
+        lnk_info.opt.msg_mode = 1;
 
     /* Print the link's name, either full name or base name */
     print_obj_name(&buffer, iter, name, "");
 
-    switch(linfo->type) {
+    switch (linfo->type) {
         case H5L_TYPE_SOFT:
             ret = H5tools_get_symlink_info(iter->fid, name, &lnk_info, follow_symlink_g);
             /* lnk_info.trg_path is malloced in H5tools_get_symlink_info()
              * so it will be freed via buf later */
-            buf = (char*)lnk_info.trg_path;
+            buf = (char *)lnk_info.trg_path;
             /* error */
             if (ret < 0)
                 goto done;
@@ -2095,9 +2299,10 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 iter->symlink_list->dangle_link = TRUE;
 
             h5tools_str_append(&buffer, "Soft Link {");
-            h5tools_str_append(&buffer, buf);
+            h5tools_str_append(&buffer, "%s", 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);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                   (hsize_t)0, (hsize_t)0);
             if (follow_symlink_g) {
                 hbool_t orig_grp_literal = grp_literal_g;
                 h5tools_str_reset(&buffer);
@@ -2106,10 +2311,12 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 /* Check if we have already seen this softlink */
                 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);
+                    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos,
+                                           (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                     goto done;
                 }
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
+                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)
@@ -2134,21 +2341,21 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
             else {
                 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);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                       (hsize_t)0, (hsize_t)0);
             }
 
             break;
 
-        case H5L_TYPE_EXTERNAL:
-            {
+        case H5L_TYPE_EXTERNAL: {
             const char *filename;
             const char *path;
-            hbool_t follow_link = follow_symlink_g || follow_elink_g;
+            hbool_t     follow_link = follow_symlink_g || follow_elink_g;
 
             ret = H5tools_get_symlink_info(iter->fid, name, &lnk_info, follow_link);
             /* lnk_info.trg_path is malloced in H5tools_get_symlink_info()
              * so it will be freed via buf later */
-            buf = (char*)lnk_info.trg_path;
+            buf = (char *)lnk_info.trg_path;
             /* error */
             if (ret < 0)
                 goto done;
@@ -2160,13 +2367,14 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 goto done;
 
             h5tools_str_append(&buffer, "External Link {");
-            h5tools_str_append(&buffer, filename);
+            h5tools_str_append(&buffer, "%s", filename);
             h5tools_str_append(&buffer, "/");
-            if(*path != '/')
+            if (*path != '/')
                 h5tools_str_append(&buffer, "/");
-            h5tools_str_append(&buffer, path);
+            h5tools_str_append(&buffer, "%s", 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);
+            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 */
@@ -2178,10 +2386,12 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 /* Check if we have already seen this elink */
                 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);
+                    h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos,
+                                           (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                     goto done;
                 }
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
+                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) {
@@ -2207,15 +2417,15 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
             }
             else
                 PRINTVALSTREAM(rawoutstream, "\n");
-            }
-            break;
+        } break;
 
         case H5L_TYPE_ERROR:
         case H5L_TYPE_HARD:
         case H5L_TYPE_MAX:
         default:
             h5tools_str_append(&buffer, "UD Link {cannot follow UD links}\n");
-            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
+            h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                   (hsize_t)0, (hsize_t)0);
             break;
     } /* end switch */
 
@@ -2227,26 +2437,24 @@ done:
     return 0;
 } /* end list_lnk() */
 
-
 /*-------------------------------------------------------------------------
- * Function: visit_obj
+ * Function:    visit_obj
  *
- * Purpose: Begins iteration on an object
+ * Purpose:     Begins iteration on an object
  *
- * Return:
- *  Success: 0
- *  Failure: -1
+ * 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   */
-    h5tools_str_t       buffer;          /* string into which to render   */
-    h5tools_context_t   ctx;             /* print context  */
-    h5tool_format_t    *info = &ls_dataformat;
+    int               retval = 0;
+    H5O_info2_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;
 
     HDmemset(&ctx, 0, sizeof(ctx));
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -2254,14 +2462,15 @@ 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 (H5Oget_info_by_name3(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;
         }
         else
             print_obj_name(&buffer, iter, oname, "**NOT FOUND**");
-        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
+        h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                               (hsize_t)0, (hsize_t)0);
         retval = -1;
         goto done;
     } /* end if */
@@ -2271,18 +2480,20 @@ visit_obj(hid_t file, const char *oname, iter_t *iter)
         /* Get ID for group */
         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().
-                         * We don't "continue" here in order to close the file
-                         * and free the file name properly. */
-        } /* end if */
+            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().
+                        * We don't "continue" here in order to close the file
+                        * and free the file name properly. */
+        }              /* end if */
 
         /* Delay specifying the name start point so the original object name is
          * displayed if it is a link or non-group object */
         iter->name_start = iter->base_len;
 
         /* Specified name is a group. List the complete contents of the group. */
-        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);
+        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)
@@ -2302,23 +2513,22 @@ done:
     return retval;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: get_width
+ * 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).
+ * 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.
+ * Return:      Success: Number of columns.
+ *              Failure: Some default number of columns.
  *-------------------------------------------------------------------------
  */
 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
@@ -2358,14 +2568,14 @@ get_width(void)
     {
         /* Unix with ioctl(TIOCGWINSZ) */
         struct winsize w;
-        if (ioctl(2, (int)TIOCGWINSZ, &w)>=0 && w.ws_col>0)
+        if (ioctl(2, (int)TIOCGWINSZ, &w) >= 0 && w.ws_col > 0)
             width = w.ws_col;
     }
 #elif defined(H5_HAVE_TIOCGETD) && defined(H5_HAVE_IOCTL)
     {
         /* Unix with ioctl(TIOCGETD) */
         struct uwdata w;
-        if (ioctl(2, WIOCGETD, &w)>=0 && w.uw_width>0)
+        if (ioctl(2, WIOCGETD, &w) >= 0 && w.uw_width > 0)
             width = w.uw_width / w.uw_hs;
     }
 #endif
@@ -2377,13 +2587,12 @@ get_width(void)
 }
 
 /*-------------------------------------------------------------------------
- * Function: is_valid_args
+ * Function:    is_valid_args
  *
- * Purpose: check if command line arguments are valid
+ * Purpose:     check if command line arguments are valid
  *
- * Return:
- *  Success: TRUE (1)
- *  Failure: FALSE (0)
+ * Return:      Success: TRUE (1)
+ *              Failure: FALSE (0)
  *-------------------------------------------------------------------------*/
 static hbool_t
 is_valid_args(void)
@@ -2397,7 +2606,8 @@ is_valid_args(void)
     }
 
     if (no_dangling_link_g && !follow_symlink_g) {
-        HDfprintf(rawerrorstream, "Error: --no-dangling-links must be used along with --follow-symlinks option!\n\n");
+        HDfprintf(rawerrorstream,
+                  "Error: --no-dangling-links must be used along with --follow-symlinks option!\n\n");
         ret = FALSE;
         goto out;
     }
@@ -2406,13 +2616,12 @@ out:
     return ret;
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: leave
+ * Function:    leave
  *
- * Purpose: Close HDF5 and MPI and call exit()
+ * Purpose:     Close HDF5 and MPI and call exit()
  *
- * Return: Does not return
+ * Return:      Does not return
  *-------------------------------------------------------------------------
  */
 static void
@@ -2423,50 +2632,52 @@ leave(int ret)
     HDexit(ret);
 }
 
-
 /*-------------------------------------------------------------------------
- * Function: main
+ * Function:    main
  *
- * Purpose: Opens a file and lists the specified group
+ * Purpose:     Opens a file and lists the specified group
  *
- * Return: Success: 0
- *         Failure: 1
+ * Return:      Success: 0
+ *              Failure: 1
  *-------------------------------------------------------------------------
  */
 int
-main(int argc, const char *argv[])
+main(int argc, char *argv[])
 {
-    hid_t       file = -1;
-    char       *fname = NULL, *oname = NULL, *x;
-    const char *s = NULL;
-    char       *rest;
-    int         argno;
-    static char root_name[] = "/";
-    char        drivername[50];
-    const char *preferred_driver = NULL;
-    int         err_exit = 0;
-    hid_t       fapl_id = H5P_DEFAULT;
+    hid_t              file_id = H5I_INVALID_HID;
+    char *             fname = NULL, *oname = NULL, *x = NULL;
+    const char *       s = NULL;
+    char *             rest;
+    int                argno;
+    static char        root_name[] = "/";
+    char               drivername[50];
+    int                err_exit        = 0;
+    hid_t              fapl_id         = H5P_DEFAULT;
+    hbool_t            custom_vol_fapl = FALSE;
+    hbool_t            custom_vfd_fapl = FALSE;
+    h5tools_vol_info_t vol_info;
+    h5tools_vfd_info_t vfd_info;
 
 #ifdef H5_HAVE_ROS3_VFD
-    /* default "anonymous" s3 configuration */
+    /* Default "anonymous" S3 configuration */
     H5FD_ros3_fapl_t ros3_fa = {
-        1,     /* fapl version      */
-        false, /* authenticate      */
-        "",    /* aws region        */
-        "",    /* access key id     */
-        "",    /* secret access key */
+        1,     /* Structure Version */
+        FALSE, /* Authenticate?     */
+        "",    /* AWS Region        */
+        "",    /* Access Key ID     */
+        "",    /* Secret Access Key */
     };
-#endif /* H5_HVAE_ROS3_VFD */
+#endif /* H5_HAVE_ROS3_VFD */
 
 #ifdef H5_HAVE_LIBHDFS
-    /* "default" HDFS configuration */
+    /* "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    */
+        1,           /* Structure Version     */
+        "localhost", /* Namenode Name         */
+        0,           /* Namenode Port         */
+        "",          /* Kerberos ticket cache */
+        "",          /* User name             */
+        2048,        /* Stream buffer size    */
     };
 #endif /* H5_HAVE_LIBHDFS */
 
@@ -2476,6 +2687,10 @@ main(int argc, const char *argv[])
     /* Initialize h5tools lib */
     h5tools_init();
 
+    /* Initialize fapl info structs */
+    HDmemset(&vol_info, 0, sizeof(h5tools_vol_info_t));
+    HDmemset(&vfd_info, 0, sizeof(h5tools_vfd_info_t));
+
     /* Build object display table */
     DISPATCH(H5O_TYPE_GROUP, "Group", NULL, NULL);
     DISPATCH(H5O_TYPE_DATASET, "Dataset", dataset_list1, dataset_list2);
@@ -2498,15 +2713,15 @@ main(int argc, const char *argv[])
         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")) {
-            show_errors_g = TRUE;
-        /* deprecated --errors */
+            enable_error_stack = 1;
         }
         else if (!HDstrcmp(argv[argno], "--errors")) {
-            show_errors_g = TRUE;
+            /* deprecated --errors */
+            enable_error_stack = 1;
         }
         else if (!HDstrcmp(argv[argno], "--follow-symlinks")) {
             follow_symlink_g = TRUE;
@@ -2528,7 +2743,7 @@ main(int argc, const char *argv[])
         }
         else if (!HDstrcmp(argv[argno], "--recursive")) {
             recursive_g = TRUE;
-            fullname_g = TRUE;
+            fullname_g  = TRUE;
         }
         else if (!HDstrcmp(argv[argno], "--simple")) {
             simple_output_g = TRUE;
@@ -2536,11 +2751,40 @@ main(int argc, const char *argv[])
         else if (!HDstrcmp(argv[argno], "--string")) {
             string_g = TRUE;
         }
+        else if (!HDstrncmp(argv[argno], "--vol-value=", (size_t)12)) {
+            vol_info.type    = VOL_BY_VALUE;
+            vol_info.u.value = (H5VL_class_value_t)HDatoi(argv[argno] + 12);
+            custom_vol_fapl  = TRUE;
+        }
+        else if (!HDstrncmp(argv[argno], "--vol-name=", (size_t)11)) {
+            vol_info.type   = VOL_BY_NAME;
+            vol_info.u.name = argv[argno] + 11;
+            custom_vol_fapl = TRUE;
+        }
+        else if (!HDstrncmp(argv[argno], "--vol-info=", (size_t)11)) {
+            vol_info.info_string = argv[argno] + 11;
+        }
         else if (!HDstrncmp(argv[argno], "--vfd=", (size_t)6)) {
-            preferred_driver = argv[argno]+6;
+            vfd_info.type   = VFD_BY_NAME;
+            vfd_info.u.name = argv[argno] + 6;
+            vfd_info.info   = NULL;
+            custom_vfd_fapl = TRUE;
+        }
+        else if (!HDstrncmp(argv[argno], "--vfd-value=", (size_t)12)) {
+            vfd_info.type    = VFD_BY_VALUE;
+            vfd_info.u.value = (H5FD_class_value_t)HDatoi(argv[argno] + 12);
+            custom_vfd_fapl  = TRUE;
+        }
+        else if (!HDstrncmp(argv[argno], "--vfd-name=", (size_t)11)) {
+            vfd_info.type   = VFD_BY_NAME;
+            vfd_info.u.name = argv[argno] + 11;
+            custom_vfd_fapl = TRUE;
+        }
+        else if (!HDstrncmp(argv[argno], "--vfd-info=", (size_t)11)) {
+            vfd_info.info = (const void *)(argv[argno] + 11);
         }
         else if (!HDstrncmp(argv[argno], "--width=", (size_t)8)) {
-            width_g = (int)HDstrtol(argv[argno]+8, &rest, 0);
+            width_g = (int)HDstrtol(argv[argno] + 8, &rest, 0);
 
             if (0 == width_g)
                 no_line_wrap_g = TRUE;
@@ -2586,27 +2830,18 @@ main(int argc, const char *argv[])
             }
             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) {
+            else if (width_g < 0 || *rest) {
                 usage();
                 leave(EXIT_FAILURE);
             }
+        }
+        else if (!HDstrncmp(argv[argno], "--s3-cred=", (size_t)10)) {
+#ifdef H5_HAVE_ROS3_VFD
+            char const *start = NULL;
 
-        } 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,
@@ -2616,130 +2851,43 @@ main(int argc, const char *argv[])
                 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");
+
+            if (h5tools_parse_ros3_fapl_tuple(start, ',', &ros3_fa) < 0) {
+                HDfprintf(rawerrorstream, "Error: failed to parse S3 VFD credential info\n\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
-            HDfree(s3cred);
-            HDfree(s3cred_src);
-#endif /* H5_HAVE_ROS3_VFD */
-
+#else
+            HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n");
+            usage();
+            leave(EXIT_FAILURE);
+#endif
         }
         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");
+#ifdef H5_HAVE_LIBHDFS
+            char const *start = NULL;
+
+            start = argv[argno] + 13; /* should never segfault: worst case of */
+            if (*start != '(') {      /* null-termintor after '='.            */
                 usage();
                 leave(EXIT_FAILURE);
             }
 
-            /* sanity-check tuple count
-             */
-            if (nelems != 5) {
-                HDfprintf(stderr, "    expected 5-ple, got `%d`\n", nelems);
+            if (h5tools_parse_hdfs_fapl_tuple(start, ',', &hdfs_fa) < 0) {
+                HDfprintf(rawerrorstream, "Error: failed to parse HDFS VFD configuration info\n\n");
                 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
+            HDfprintf(rawerrorstream, "Error: The HDFS VFD is not enabled\n\n");
+            usage();
+            leave(EXIT_FAILURE);
+#endif
         }
-        else if('-'!=argv[argno][1]) {
+        else if ('-' != argv[argno][1]) {
             /* Single-letter switches */
-            for(s = argv[argno] + 1; *s; s++) {
-                switch(*s) {
+            for (s = argv[argno] + 1; *s; s++) {
+                switch (*s) {
                     case '?':
                     case 'h': /* --help */
                         usage();
@@ -2756,7 +2904,7 @@ main(int argc, const char *argv[])
 
                     /* deprecated -e */
                     case 'e': /* --errors */
-                        show_errors_g = TRUE;
+                        enable_error_stack = 1;
                         break;
 
                     case 'E': /* --external */
@@ -2777,7 +2925,7 @@ main(int argc, const char *argv[])
 
                     case 'r': /* --recursive */
                         recursive_g = TRUE;
-                        fullname_g = TRUE;
+                        fullname_g  = TRUE;
                         break;
 
                     case 'S': /* --simple */
@@ -2805,7 +2953,7 @@ main(int argc, const char *argv[])
                         usage();
                         leave(EXIT_FAILURE);
                 } /* end switch */
-            } /* end for */
+            }     /* end for */
         }
         else {
             HDfprintf(stderr, "Unknown argument: %s\n", argv[argno]);
@@ -2814,6 +2962,9 @@ main(int argc, const char *argv[])
         }
     } /* end for */
 
+    /* enable error reporting if command line option */
+    h5tools_error_report();
+
     /* If no arguments remain then print a usage message (instead of doing
      * absolutely nothing ;-) */
     if (argno >= argc) {
@@ -2827,47 +2978,14 @@ main(int argc, const char *argv[])
         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();
+    /* Setup a custom fapl for file accesses */
+    if (custom_vol_fapl || custom_vfd_fapl) {
+        if ((fapl_id = h5tools_get_fapl(H5P_DEFAULT, custom_vol_fapl ? &vol_info : NULL,
+                                        custom_vfd_fapl ? &vfd_info : NULL)) < 0) {
+            error_msg("failed to setup file access property list (fapl) for file\n");
             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);
-
+    }
 
     /* Each remaining argument is an hdf5 file followed by an optional slash
      * and object name.
@@ -2881,33 +2999,29 @@ main(int argc, const char *argv[])
      * chops off the last component. If we reach the beginning of the name
      * then there must have been something wrong with the file (perhaps it
      * doesn't exist). */
-    show_file_name_g = (argc-argno > 1); /*show file names if more than one*/
-    while(argno < argc) {
-        H5L_info_t li;
-        iter_t iter;
+    show_file_name_g = (argc - argno > 1); /*show file names if more than one*/
+    while (argno < argc) {
+        H5L_info2_t    li;
+        iter_t         iter;
         symlink_trav_t symlink_list;
-        size_t u;
+        size_t         u;
 
-        fname = HDstrdup(argv[argno++]);
-        oname = NULL;
-        file = -1;
+        fname   = HDstrdup(argv[argno++]);
+        oname   = NULL;
+        file_id = H5I_INVALID_HID;
 
         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);
-            }
+            file_id = h5tools_fopen(fname, H5F_ACC_RDONLY, fapl_id, (fapl_id != H5P_DEFAULT), drivername,
+                                    sizeof drivername);
 
-            if (file >= 0) {
+            if (file_id >= 0) {
                 if (verbose_g)
                     PRINTSTREAM(rawoutstream, "Opened \"%s\" with %s driver.\n", fname, drivername);
                 break; /*success*/
-            } /* end if */
+            }          /* end if */
 
             /* Shorten the file name; lengthen the object name */
-            x = oname;
+            x     = oname;
             oname = HDstrrchr(fname, '/');
             if (x)
                 *x = '/';
@@ -2916,8 +3030,8 @@ main(int argc, const char *argv[])
             *oname = '\0';
         } /* end while */
 
-        if (file < 0) {
-            HDfprintf(rawerrorstream, "%s: unable to open file\n", argv[argno-1]);
+        if (file_id < 0) {
+            HDfprintf(rawerrorstream, "%s: unable to open file\n", argv[argno - 1]);
             HDfree(fname);
             err_exit = 1;
             continue;
@@ -2925,9 +3039,9 @@ main(int argc, const char *argv[])
         if (oname) {
             /* Always use absolute paths to avoid confusion, keep track of where
              * to begin path name output */
-            *oname = '/';
+            *oname        = '/';
             iter.base_len = HDstrlen(oname);
-            iter.base_len -= oname[iter.base_len-1] == '/';
+            iter.base_len -= oname[iter.base_len - 1] == '/';
             x = oname;
             if (NULL == (oname = HDstrdup(oname))) {
                 HDfprintf(rawerrorstream, "memory allocation failed\n");
@@ -2942,57 +3056,59 @@ main(int argc, const char *argv[])
             oname = root_name;
             if (recursive_g)
                 display_root_g = TRUE;
-            iter.base_len = 0;
+            iter.base_len   = 0;
             iter.name_start = 0;
             /* Use x to remember if we have allocated space in oname */
             x = NULL;
         } /* end if */
 
         /* Remember the file information for later */
-        iter.fname = fname;
-        iter.fid = file;
-        iter.gid = -1;
-        iter.symlink_target = FALSE;
-        iter.symlink_list = &symlink_list;
+        iter.fname                     = fname;
+        iter.fid                       = file_id;
+        iter.gid                       = H5I_INVALID_HID;
+        iter.symlink_target            = FALSE;
+        iter.symlink_list              = &symlink_list;
         iter.symlink_list->dangle_link = FALSE;
 
         /* Initialize list of visited symbolic links */
         symlink_list.nused = symlink_list.nalloc = 0;
-        symlink_list.objs = NULL;
+        symlink_list.objs                        = NULL;
 
         /* Check for root group as object name */
-        if (HDstrcmp(oname, root_name)) {
+        if (HDstrcmp(oname, root_name) != 0) {
             /* Check the type of link given */
-            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  */
-                h5tool_format_t    *info = &ls_dataformat;
+            if (H5Lget_info2(file_id, 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  */
+                h5tool_format_t * info = &ls_dataformat;
 
                 HDmemset(&ctx, 0, sizeof(ctx));
                 HDmemset(&buffer, 0, sizeof(h5tools_str_t));
 
                 h5tools_str_reset(&buffer);
                 print_obj_name(&buffer, &iter, oname, "**NOT FOUND**");
-                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
+                h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
+                                       (hsize_t)0, (hsize_t)0);
                 leave(EXIT_FAILURE);
             } /* end if */
-        } /* end if */
+        }     /* end if */
         else
             li.type = H5L_TYPE_HARD;
 
         /* Open the object and display it's information */
         if (li.type == H5L_TYPE_HARD) {
-            if (visit_obj(file, oname, &iter) < 0)
+            if (visit_obj(file_id, oname, &iter) < 0) {
                 leave(EXIT_FAILURE);
+            }
         } /* end if(li.type == H5L_TYPE_HARD) */
         else {
             /* Specified name is not for object -- list that link */
-            /* Use file ID for root group ID */
-            iter.gid = file;
+            /* Use file_id ID for root group ID */
+            iter.gid = file_id;
             list_lnk(oname, &li, &iter);
         }
-        H5Fclose(file);
+        H5Fclose(file_id);
         HDfree(fname);
         if (x)
             HDfree(oname);
@@ -3022,4 +3138,3 @@ main(int argc, const char *argv[])
     else
         leave(EXIT_SUCCESS);
 } /* end main() */
-