summaryrefslogtreecommitdiffstats
path: root/tools/h5dump
diff options
context:
space:
mode:
authorJonathan Kim <jkm@hdfgroup.org>2011-03-18 18:50:19 (GMT)
committerJonathan Kim <jkm@hdfgroup.org>2011-03-18 18:50:19 (GMT)
commitd697acbfb588b0406403109398105e12562e2d3e (patch)
tree8aa04d2c07a43ae2d75eea54938dc16318d444a0 /tools/h5dump
parente038bf6eb718711c76a86074848e96a8158a12bd (diff)
downloadhdf5-d697acbfb588b0406403109398105e12562e2d3e.zip
hdf5-d697acbfb588b0406403109398105e12562e2d3e.tar.gz
hdf5-d697acbfb588b0406403109398105e12562e2d3e.tar.bz2
[svn-r20270] Purpose:
Improve the previous fix for Bug 2216 - GMQS: h5diff - memory leak when compares vlen string in dataset or attributes Description: Improve the fix along with the previous checkin r20266. Add a new function to tool lib, h5tools_detect_vlen_data() which return TRUE if include any kind of vlen data all at once, either VLEN-data or VLEN-string and so on. Also updated h5ls and h5dump code accordingly. Tested: jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Cmake - jam
Diffstat (limited to 'tools/h5dump')
-rw-r--r--tools/h5dump/h5dump.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 817f1cf..80cce55 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -2559,9 +2559,7 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index)
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_data(p_type) == TRUE)
vl_data = TRUE;
for (i = 0; i < ndims; i++)
@@ -5527,9 +5525,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_data(p_type) == TRUE)
vl_data = TRUE;
H5Tclose(type);