diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-04-26 14:51:36 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-04-26 14:51:36 (GMT) |
| commit | 8c138d7844935a882c70f1db20c691c9a04b38af (patch) | |
| tree | 946cb3c26d1c8a7f233116052ecd55fe386eceb5 | |
| parent | 447d13e82bd4901b42cabf1580c889b29d5f906b (diff) | |
| download | hdf5-8c138d7844935a882c70f1db20c691c9a04b38af.zip hdf5-8c138d7844935a882c70f1db20c691c9a04b38af.tar.gz hdf5-8c138d7844935a882c70f1db20c691c9a04b38af.tar.bz2 | |
[svn-r22318] Use new function that combines two functions that check for vlen types. Based on code used in h5ls.
Tested: local linux
| -rw-r--r-- | tools/h5dump/h5dump_xml.c | 4 | ||||
| -rw-r--r-- | 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++) |