mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-17 16:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r22318] Use new function that combines two functions that check for vlen types. Based on code used in h5ls.

Browse Source 
Tested: local linux
This commit is contained in:
Allen Byrne 2012-04-26 09:51:36 -05:00
parent 447d13e82b
commit 8c138d7844
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/h5dump/h5dump_xml.c
View File

@ -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);

12
tools/lib/h5tools_dump.c
View File

@ -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++)