Merge CMake and tools changes from develop

4 files changed, 78 insertions, 235 deletions

diff --git a/tools/src/h5dump/CMakeLists.txt b/tools/src/h5dump/CMakeLists.txt
index 383b04e..104d9b0 100644
--- a/tools/src/h5dump/CMakeLists.txt
+++ b/tools/src/h5dump/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.12)
 project (HDF5_TOOLS_SRC_H5DUMP C)
 
 # --------------------------------------------------------------------
@@ -13,6 +13,7 @@ if (NOT ONLY_SHARED_LIBS)
   target_include_directories (h5dump PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h5dump STATIC)
   target_link_libraries (h5dump PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+  #target_compile_definitions(h5dump PRIVATE H5_TOOLS_DEBUG)
   set_target_properties (h5dump PROPERTIES FOLDER tools)
   set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump")
 
@@ -28,6 +29,7 @@ if (BUILD_SHARED_LIBS)
   target_include_directories (h5dump-shared PRIVATE "${HDF5_TOOLS_DIR}/lib;${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")
   TARGET_C_PROPERTIES (h5dump-shared SHARED)
   target_link_libraries (h5dump-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  #target_compile_definitions(h5dump-shared PRIVATE H5_TOOLS_DEBUG)
   set_target_properties (h5dump-shared PROPERTIES FOLDER tools)
   set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump-shared")
 
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index 19ed013..731fcd7 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -634,8 +634,7 @@ parse_hsize_list(const char *h_list, subset_d *d)
 /*-------------------------------------------------------------------------
  * Function:    parse_subset_params
  *
- * Purpose:     Parse the so-called "terse" syntax for specifying subsetting
- *              parameters.
+ * Purpose:     Parse the so-called "terse" syntax for specifying subsetting parameters.
  *
  * Return:      Success:    struct subset_t object
  *              Failure:    NULL
@@ -1394,8 +1393,8 @@ error:
 int
 main(int argc, const char *argv[])
 {
-    hid_t               fid = -1;
-    hid_t               gid = -1;
+    hid_t               fid = H5I_INVALID_HID;
+    hid_t               gid = H5I_INVALID_HID;
     hid_t               fapl_id = H5P_DEFAULT;
     H5E_auto2_t         func;
     H5E_auto2_t         tools_func;
@@ -1704,6 +1703,8 @@ main(int argc, const char *argv[])
 
     /* To Do:  clean up XML table */
 
+    H5Eset_auto2(H5E_DEFAULT, func, edata);
+
     leave(h5tools_getstatus());
 
 done:
diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c
index 4fb8398..64ccfe0 100644
--- a/tools/src/h5dump/h5dump_ddl.c
+++ b/tools/src/h5dump/h5dump_ddl.c
@@ -41,11 +41,6 @@ static int      dump_extlink(hid_t group, const char *linkname, const char *objn
  *              atomic datatype or committed/transient datatype.
  *
  * Return:      void
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -70,11 +65,6 @@ dump_datatype(hid_t type)
  *              array, or others.
  *
  * Return:      void
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -97,14 +87,7 @@ dump_dataspace(hid_t space)
  * Purpose:     attribute function callback called by H5Aiterate2, displays the attribute
  *
  * Return:      Success:        SUCCEED
- *
  *              Failure:        FAIL
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications: Pedro Vicente, October 4, 2007
- *  Added H5A_info_t parameter to conform with H5Aiterate2
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -120,6 +103,8 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
+    ctx.display_index = display_ai;
+    ctx.display_char = display_char;
 
     attr_id = H5Aopen(oid, attr_name, H5P_DEFAULT);
     oid_output = display_oid;
@@ -144,7 +129,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *
     outputformat = &string_dataformat;
 
     h5dump_type_table = type_table;
-    h5tools_dump_attribute(rawoutstream, outputformat, &ctx, attr_name, attr_id, display_ai, display_char);
+    h5tools_dump_attribute(rawoutstream, outputformat, &ctx, attr_name, attr_id);
     h5dump_type_table = NULL;
 
     if(attr_id < 0) {
@@ -163,18 +148,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *
  *                displays everything in the specified object
  *
  * Return:      Success:        SUCCEED
- *
  *              Failure:        FAIL
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *  RMcG, November 2000
- *   Added XML support. Also, optionally checks the op_data argument
- *
- * PVN, May 2008
- *   Dump external links
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -183,12 +157,12 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
     hid_t       obj;
     hid_t       dapl_id = H5P_DEFAULT;  /* dataset access property list ID */
     herr_t      ret = SUCCEED;
-    char       *obj_path = NULL;    /* Full path of object */
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    char       *obj_path = NULL;        /* Full path of object */
+    h5tools_str_t     buffer;           /* string into which to render   */
+    h5tools_context_t ctx;              /* print context  */
     h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
+    hsize_t           curr_pos = 0;     /* total data element position   */
 
     /* setup */
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -583,7 +557,6 @@ done:
  * Purpose:     Iterate and display attributes within the specified group
  *
  * Return:      void
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -613,7 +586,6 @@ attr_iteration(hid_t gid, unsigned attr_crt_order_flags)
  * Purpose:     Iterate and display links within the specified group
  *
  * Return:      void
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -634,15 +606,6 @@ link_iteration(hid_t gid, unsigned crt_order_flags)
  * Purpose:     Dump named datatype
  *
  * Return:      void
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *  Pedro Vicente, March 27, 2006
- *   added display of attributes
- *  Pedro Vicente, October 4, 2007, added parameters to H5Aiterate2() to allow for
- *   other iteration orders
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -650,10 +613,10 @@ dump_named_datatype(hid_t tid, const char *name)
 {
     H5O_info_t        oinfo;
     unsigned          attr_crt_order_flags;
-    hid_t             tcpl_id = -1;  /* datatype creation property list ID */
-    hsize_t           curr_pos = 0;        /* total data element position   */
+    hid_t             tcpl_id = H5I_INVALID_HID;    /* datatype creation property list ID */
+    hsize_t           curr_pos = 0;    /* total data element position   */
     h5tools_str_t     buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    h5tools_context_t ctx;             /* print context  */
     h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
 
@@ -770,16 +733,6 @@ done:
  * Purpose:     Dump everything within the specified group
  *
  * Return:      void
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *
- * Call to dump_all_cb -- add parameter to select everything.
- *
- * Pedro Vicente, October 1, 2007
- *  handle several iteration orders for attributes and groups
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -792,11 +745,11 @@ dump_group(hid_t gid, const char *name)
     unsigned    crt_order_flags;
     unsigned    attr_crt_order_flags;
     char        type_name[1024];
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    h5tools_str_t     buffer;          /* string into which to render   */
+    h5tools_context_t ctx;             /* print context  */
     h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
+    hsize_t           curr_pos = 0;    /* total data element position   */
 
     if ((gcpl_id = H5Gget_create_plist(gid)) < 0) {
         error_msg("error in getting group creation property list ID\n");
@@ -934,14 +887,6 @@ dump_group(hid_t gid, const char *name)
  * Purpose:     Dump the specified data set
  *
  * Return:      void
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *  Pedro Vicente, 2004, added dataset creation property list display
- *  Pedro Vicente, October 4, 2007, added parameters to H5Aiterate2() to allow for
- *   other  iteration orders
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -950,11 +895,11 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     h5tools_context_t ctx;            /* print context  */
     h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
-    hid_t       type, space;
-    unsigned    attr_crt_order_flags;
-    hid_t       dcpl_id;  /* dataset creation property list ID */
-    h5tools_str_t buffer;          /* string into which to render   */
-    hsize_t       curr_pos = 0;        /* total data element position   */
+    hid_t         type, space;
+    unsigned      attr_crt_order_flags;
+    hid_t         dcpl_id;           /* dataset creation property list ID */
+    h5tools_str_t buffer;            /* string into which to render   */
+    hsize_t       curr_pos = 0;      /* total data element position   */
 
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
@@ -1026,6 +971,9 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     }
     H5Pclose(dcpl_id);
 
+    ctx.sset = sset;
+    ctx.display_index = display_ai;
+    ctx.display_char = display_char;
     if(display_data) {
         unsigned  data_loop = 1;
         unsigned  u;
@@ -1069,7 +1017,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
             case H5T_VLEN:
             case H5T_ARRAY:
                 {
-                    h5tools_dump_data(rawoutstream, outputformat, &ctx, did, TRUE, sset, display_ai, display_char);
+                    h5tools_dump_data(rawoutstream, outputformat, &ctx, did, TRUE);
                 }
                 break;
 
@@ -1112,13 +1060,6 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
  * Purpose:     Dump attribute or dataset data
  *
  * Return:      void
- *
- * Programmer:  Ruey-Hsia Li
- *
- * Modifications: pvn, print the matrix indices
- *  Albert Cheng, 2004/11/18
- *  Add --string printing for attributes too.
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -1149,10 +1090,13 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
+    ctx.sset = sset;
+    ctx.display_index = display_index;
+    ctx.display_char = display_char;
 
     if(obj_data == DATASET_DATA)
         print_dataset = TRUE;
-    h5tools_dump_data(rawoutstream, outputformat, &ctx, obj_id, print_dataset, sset, display_index, display_char);
+    h5tools_dump_data(rawoutstream, outputformat, &ctx, obj_id, print_dataset);
 }
 
 
@@ -1162,11 +1106,6 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index)
  * Purpose:     prints file creation property list information
  *
  * Return:      void
- *
- * Programmer:  pvn
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -1177,9 +1116,9 @@ dump_fcpl(hid_t fid)
     size_t   off_size;  /* size of offsets in the file */
     size_t   len_size;  /* size of lengths in the file */
     H5F_fspace_strategy_t  fs_strategy;  /* file space strategy */
-    hbool_t fs_persist;     /* Persisting free-space or not */
-    hsize_t fs_threshold;       /* free-space section threshold */
-    hsize_t fsp_size;        /* file space page size */
+    hbool_t  fs_persist;    /* Persisting free-space or not */
+    hsize_t  fs_threshold;  /* free-space section threshold */
+    hsize_t  fsp_size;      /* file space page size */
     H5F_info2_t finfo;      /* file information */
 #ifdef SHOW_FILE_DRIVER
     hid_t    fapl;      /* file access property list ID */
@@ -1260,13 +1199,17 @@ dump_fcpl(hid_t fid)
     indentation(dump_indent + COL);
     if(fs_strategy == H5F_FSPACE_STRATEGY_FSM_AGGR) {
         PRINTSTREAM(rawoutstream, "%s %s\n", "FILE_SPACE_STRATEGY", "H5F_FSPACE_STRATEGY_FSM_AGGR");
-    } else if(fs_strategy == H5F_FSPACE_STRATEGY_PAGE) {
+    }
+    else if(fs_strategy == H5F_FSPACE_STRATEGY_PAGE) {
         PRINTSTREAM(rawoutstream, "%s %s\n", "FILE_SPACE_STRATEGY", "H5F_FSPACE_STRATEGY_PAGE");
-    } else if(fs_strategy == H5F_FSPACE_STRATEGY_AGGR) {
+    }
+    else if(fs_strategy == H5F_FSPACE_STRATEGY_AGGR) {
         PRINTSTREAM(rawoutstream, "%s %s\n", "FILE_SPACE_STRATEGY", "H5F_FSPACE_STRATEGY_AGGR");
-    } else if(fs_strategy == H5F_FSPACE_STRATEGY_NONE) {
+    }
+    else if(fs_strategy == H5F_FSPACE_STRATEGY_NONE) {
         PRINTSTREAM(rawoutstream, "%s %s\n", "FILE_SPACE_STRATEGY", "H5F_FSPACE_STRATEGY_NONE");
-    } else
+    }
+    else
         PRINTSTREAM(rawoutstream, "%s %s\n", "FILE_SPACE_STRATEGY", "Unknown strategy");
     indentation(dump_indent + COL);
     PRINTSTREAM(rawoutstream, "%s %s\n","FREE_SPACE_PERSIST", fs_persist ? "TRUE" : "FALSE");
@@ -1295,11 +1238,6 @@ dump_fcpl(hid_t fid)
  * Purpose:     prints all objects
  *
  * Return:      void
- *
- * Programmer:  pvn
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -1470,13 +1408,12 @@ lnk_search(const char *path, const H5L_info_t *li, void *_op_data)
  * Purpose:     Handle objects from the command.
  *
  * Return:      void
- *
  *-------------------------------------------------------------------------
  */
 void
 handle_paths(hid_t fid, const char *path_name, void H5_ATTR_UNUSED * data, int H5_ATTR_UNUSED pe, const char H5_ATTR_UNUSED *display_name)
 {
-    hid_t  gid = -1;
+    hid_t  gid = H5I_INVALID_HID;
 
     if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) {
         error_msg("unable to open root group\n");
@@ -1525,30 +1462,21 @@ handle_paths(hid_t fid, const char *path_name, void H5_ATTR_UNUSED * data, int H
  * Purpose:     Handle the attributes from the command.
  *
  * Return:      void
- *
- * Programmer:  Bill Wendling
- *              Tuesday, 9. January 2001
- *
- * Modifications:
- *
- * PVN, May 2008
- *   add an extra parameter PE, to allow printing/not printing of error messages
- *
  *-------------------------------------------------------------------------
  */
 void
-handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H5_ATTR_UNUSED pe, const char H5_ATTR_UNUSED *display_name)
+handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5_ATTR_UNUSED pe, const char H5_ATTR_UNUSED *display_name)
 {
-    hid_t  oid          = -1;
-    hid_t  attr_id      = -1;
+    hid_t  oid          = H5I_INVALID_HID;
+    hid_t  attr_id      = H5I_INVALID_HID;
     char *obj_name      = NULL;
     char *attr_name     = NULL;
     int j;
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    h5tools_str_t     buffer;          /* string into which to render   */
+    h5tools_context_t ctx;             /* print context  */
     h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
+    hsize_t           curr_pos = 0;    /* total data element position   */
 
     j = (int)HDstrlen(attr) - 1;
     obj_name = (char *)HDmalloc((size_t)j + 2);
@@ -1574,6 +1502,8 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
+    ctx.display_index = display_ai;
+    ctx.display_char = display_char;
 
     string_dataformat = *outputformat;
 
@@ -1633,7 +1563,7 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H
     attr_data_output = display_attr_data;
 
     h5dump_type_table = type_table;
-    h5tools_dump_attribute(rawoutstream, outputformat, &ctx, attr_name, attr_id, display_ai, display_char);
+    h5tools_dump_attribute(rawoutstream, outputformat, &ctx, attr_name, attr_id);
     h5dump_type_table = NULL;
 
     if(attr_id < 0) {
@@ -1671,19 +1601,6 @@ error:
  * Purpose:     Handle the datasets from the command.
  *
  * Return:      void
- *
- * Programmer:  Bill Wendling
- *              Tuesday, 9. January 2001
- *
- * Modifications:
- *  Pedro Vicente, Tuesday, January 15, 2008
- *  check for block overlap\
- *
- *  Pedro Vicente, May 8, 2008
- *   added a flag PE that prints/not prints error messages
- *   added for cases of external links not found, to avoid printing of
- *    objects not found, since external links are dumped on a trial error basis
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -1844,18 +1761,6 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis
  * Purpose:     Handle the groups from the command.
  *
  * Return:      void
- *
- * Programmer:  Bill Wendling
- *              Tuesday, 9. January 2001
- *
- * Modifications: Pedro Vicente, September 26, 2007
- *  handle creation order
- *
- * Pedro Vicente, May 8, 2008
- *   added a flag PE that prints/not prints error messages
- *   added for cases of external links not found, to avoid printing of
- *    objects not found, since external links are dumped on a trial error basis
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -1900,12 +1805,6 @@ handle_groups(hid_t fid, const char *group, void H5_ATTR_UNUSED *data, int pe, c
  * Purpose:     Handle soft or UD links from the command.
  *
  * Return:      void
- *
- * Programmer:  Bill Wendling
- *              Tuesday, 9. January 2001
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -1986,17 +1885,6 @@ handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_AT
  * Purpose:     Handle the datatypes from the command.
  *
  * Return:      void
- *
- * Programmer:  Bill Wendling
- *              Tuesday, 9. January 2001
- *
- * Modifications:
- *
- *  Pedro Vicente, May 8, 2008
- *   added a flag PE that prints/not prints error messages
- *   added for cases of external links not found, to avoid printing of
- *    objects not found, since external links are dumped on a trial error basis
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -2061,19 +1949,10 @@ handle_datatypes(hid_t fid, const char *type, void H5_ATTR_UNUSED * data, int pe
 /*-------------------------------------------------------------------------
  * Function:    dump_extlink
  *
- * made by: PVN
- *
  * Purpose:     Dump an external link
- *  Since external links are soft links, they are dumped on a trial error
- *   basis, attempting to dump as a dataset, as a group and as a named datatype
- *   Error messages are supressed
- *
- * Modifications:
- *      Neil Fortner
- *      13 October 2008
- *      Function basically rewritten.  No longer directly opens the target file,
- *      now initializes a new set of tables for the external file.  No longer
- *      dumps on a trial and error basis, but errors are still suppressed.
+ *      Function does not directly open the target file,
+ *      it initializes a new set of tables for the external file.
+ *      Errors are suppressed.
  *
  *-------------------------------------------------------------------------
  */
diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index fdbdd40..ae8b9c7 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -1777,22 +1777,15 @@ xml_dump_dataspace(hid_t space)
  *              the h5tools library.
  *
  * Return:      void
- *
- * Programmer:  REMcG
  *-------------------------------------------------------------------------
  */
 void
-xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset, int H5_ATTR_UNUSED pindex)
+xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset, int H5_ATTR_UNUSED pindex)
 {
-    hid_t               space = -1;
-    hid_t               type = -1;
-    hid_t               p_type = -1;
-    hsize_t             size[64];
-    hsize_t             nelmts = 1;
-    int                 ndims;
-    int                 i;
+    hid_t               space = H5I_INVALID_HID;
+    hid_t               type = H5I_INVALID_HID;
+    hid_t               p_type = H5I_INVALID_HID;
     int                 status = -1;
-    void               *buf = NULL;
     hsize_t             curr_pos = 0;        /* total data element position   */
     h5tools_str_t       buffer;              /* string into which to render   */
     h5tools_context_t   ctx;                 /* print context  */
@@ -1861,7 +1854,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
             datactx.need_prefix = TRUE;
             datactx.indent_level = ctx.indent_level;
             datactx.cur_column = ctx.cur_column;
-            status = h5tools_dump_dset(rawoutstream, outputformat, &datactx, obj_id, NULL);
+            status = h5tools_dump_dset(rawoutstream, outputformat, &datactx, obj_id);
         }
     }
     else {
@@ -1881,47 +1874,17 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
             status = xml_print_strs(obj_id, ATTRIBUTE_DATA);
         }
         else {  /* all other data */
-            /* VL data special information */
-            unsigned int vl_data = 0; /* contains VL datatypes */
-
-            p_type = H5Tget_native_type(type, H5T_DIR_DEFAULT);
-
-            /* Check if we have VL data in the dataset's datatype */
-            if (h5tools_detect_vlen(p_type) == TRUE)
-                vl_data = TRUE;
-
-            H5Tclose(type);
-
             space = H5Aget_space(obj_id);
             if(space == H5S_NULL || space == H5S_NO_CLASS) {
                 status = SUCCEED;
             }
             else {
-                ndims = H5Sget_simple_extent_dims(space, size, NULL);
-
-                for (i = 0; i < ndims; i++)
-                    nelmts *= size[i];
-
-                if((buf = HDmalloc((size_t)(nelmts * MAX(H5Tget_size(type), H5Tget_size(p_type))))) == NULL)  {
-                    error_msg("unable to allocate buffer\n");
-                    h5tools_setstatus(EXIT_FAILURE);
-                    status = FAIL;
-                }
-                else {
-                    if (H5Aread(obj_id, p_type, buf) >= 0) {
-                        h5tools_context_t datactx;
-                        HDmemset(&datactx, 0, sizeof(datactx));
-                        datactx.need_prefix = TRUE;
-                        datactx.indent_level = ctx.indent_level;
-                        datactx.cur_column = ctx.cur_column;
-                        status = h5tools_dump_mem(rawoutstream, outputformat, &datactx, obj_id, p_type, space, buf);
-                    }
-                    /* Reclaim any VL memory, if necessary */
-                    if (vl_data)
-                        H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
-
-                    HDfree(buf);
-                }
+                h5tools_context_t datactx;
+                HDmemset(&datactx, 0, sizeof(datactx));
+                datactx.need_prefix = TRUE;
+                datactx.indent_level = ctx.indent_level;
+                datactx.cur_column = ctx.cur_column;
+                status = h5tools_dump_mem(rawoutstream, outputformat, &datactx, obj_id);
             }
             H5Tclose(p_type);
             H5Sclose(space);
@@ -1981,9 +1944,9 @@ herr_t
 xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *info,
     void H5_ATTR_UNUSED * op_data)
 {
-    hid_t             attr_id = -1;
-    hid_t             type = -1;
-    hid_t             space = -1;
+    hid_t             attr_id = H5I_INVALID_HID;
+    hid_t             type = H5I_INVALID_HID;
+    hid_t             space = H5I_INVALID_HID;
     H5S_class_t       space_type;
     hsize_t           curr_pos = 0;        /* total data element position   */
     h5tools_str_t     buffer;              /* string into which to render   */
@@ -2818,8 +2781,8 @@ static int
 xml_print_refs(hid_t did, int source)
 {
     herr_t            e;
-    hid_t             type    = -1;
-    hid_t             space   = -1;
+    hid_t             type    = H5I_INVALID_HID;
+    hid_t             space   = H5I_INVALID_HID;
     hssize_t          ssiz    = -1;
     hsize_t           i;
     size_t            tsiz;
@@ -2967,8 +2930,8 @@ static int
 xml_print_strs(hid_t did, int source)
 {
     herr_t            e;
-    hid_t             type    = -1;
-    hid_t             space   = -1;
+    hid_t             type    = H5I_INVALID_HID;
+    hid_t             space   = H5I_INVALID_HID;
     hssize_t          ssiz    = -1;
     htri_t            is_vlstr = FALSE;
     size_t            tsiz    = 0;
@@ -3578,12 +3541,10 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
  * Purpose:     Dump a description of an HDF5 dataset in XML.
  *
  * Return:      void
- *
- * Programmer:  REMcG
  *-------------------------------------------------------------------------
  */
 void
-xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * sset)
+xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *sset)
 {
     hid_t               type;
     hid_t               space;
@@ -4154,7 +4115,7 @@ xml_print_enum(hid_t type)
     unsigned char      *value = NULL;   /*value array                    */
     unsigned            nmembs;         /*number of members              */
     hid_t               super;          /*enum base integer type         */
-    hid_t               native = -1;    /*native integer datatype        */
+    hid_t               native = H5I_INVALID_HID;    /*native integer datatype        */
     size_t              dst_size;       /*destination value type size    */
     unsigned            i;              /*miscellaneous counters         */
     size_t              j;