From 8c138d7844935a882c70f1db20c691c9a04b38af Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Thu, 26 Apr 2012 09:51:36 -0500 Subject: [svn-r22318] Use new function that combines two functions that check for vlen types. Based on code used in h5ls. Tested: local linux --- tools/h5dump/h5dump_xml.c | 4 +--- tools/lib/h5tools_dump.c | 12 +++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tools/h5dump/h5dump_xml.c b/tools/h5dump/h5dump_xml.c index e6f8043..0c48216 100644 --- a/tools/h5dump/h5dump_xml.c +++ b/tools/h5dump/h5dump_xml.c @@ -1883,9 +1883,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t UNUSED * sset, int UNU p_type = h5tools_get_native_type(type); /* Check if we have VL data in the dataset's datatype */ - if (h5tools_detect_vlen_str(p_type) == TRUE) - vl_data = TRUE; - if (H5Tdetect_class(p_type, H5T_VLEN) == TRUE) + if (h5tools_detect_vlen(p_type) == TRUE) vl_data = TRUE; H5Tclose(type); diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c index 75f3c7e..194e85e 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -1143,9 +1143,7 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c size_row_block = sset->block.data[row_dim]; /* Check if we have VL data in the dataset's datatype */ - if (h5tools_detect_vlen_str(p_type) == TRUE) - vl_data = TRUE; - if (H5Tdetect_class(p_type, H5T_VLEN) == TRUE) + if (h5tools_detect_vlen(p_type) == TRUE) vl_data = TRUE; /* display loop */ @@ -1553,9 +1551,7 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont } /* Check if we have VL data in the dataset's datatype */ - if (h5tools_detect_vlen_str(p_type) == TRUE) - vl_data = TRUE; - if (H5Tdetect_class(p_type, H5T_VLEN) == TRUE) + if (h5tools_detect_vlen(p_type) == TRUE) vl_data = TRUE; /* @@ -3806,9 +3802,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, ndims = H5Sget_simple_extent_dims(space, size, NULL); /* Check if we have VL data in the dataset's datatype */ - if (h5tools_detect_vlen_str(p_type) == TRUE) - vl_data = TRUE; - if (H5Tdetect_class(p_type, H5T_VLEN) == TRUE) + if (h5tools_detect_vlen(p_type) == TRUE) vl_data = TRUE; for (i = 0; i < ndims; i++) -- cgit v0.12