mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r20247] Change name of new VLEN function from H5Tdetect_vlen_str to h5tools_detect_vlen_str to match other functions in tools lib.

Browse Source 
Added back test for H5Tdetect_class of H5T_VLEN after each instance of above function to catch all VLEN types in h5dump.

Tested: local linux
This commit is contained in:
Allen Byrne 2011-03-14 16:03:20 -05:00
parent 92f79b6734
commit 5ed4eda59e
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/h5dump/h5dump.c
View File

@ -2559,7 +2559,9 @@ 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 (H5Tdetect_vlen_str(p_type) == TRUE)
if (h5tools_detect_vlen_str(p_type) == TRUE)
vl_data = TRUE;
if (H5Tdetect_class(p_type, H5T_VLEN) == TRUE)
vl_data = TRUE;
for (i = 0; i < ndims; i++)
@ -5525,7 +5527,9 @@ 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 (H5Tdetect_vlen_str(p_type) == TRUE)
if (h5tools_detect_vlen_str(p_type) == TRUE)
vl_data = TRUE;
if (H5Tdetect_class(p_type, H5T_VLEN) == TRUE)
vl_data = TRUE;
H5Tclose(type);

4
tools/h5ls/h5ls.c
View File

@ -1457,8 +1457,10 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
unsigned int vl_data = 0; /* contains VL datatypes */
/* Check if we have VL data in the dataset's datatype */
if (H5Tdetect_vlen_str(p_type) == TRUE)
if (h5tools_detect_vlen_str(p_type) == TRUE)
vl_data = TRUE;
if (H5Tdetect_class(p_type, H5T_VLEN) == TRUE)
vl_data = TRUE;
temp_need= nelmts * MAX(H5Tget_size(type), H5Tget_size(p_type));
assert(temp_need == (hsize_t)((size_t)temp_need));

16
tools/lib/h5tools.c
View File

@ -622,7 +622,7 @@ h5tools_ncols(const char *s)
}
/*-------------------------------------------------------------------------
* Function: H5Tdetect_vlen_str
* Function: h5tools_detect_vlen_str
*
* Purpose: Recursive check for variable length string of a datatype.
*
@ -631,7 +631,7 @@ h5tools_ncols(const char *s)
*-------------------------------------------------------------------------
*/
htri_t
H5Tdetect_vlen_str(hid_t tid)
h5tools_detect_vlen_str(hid_t tid)
{
int i = 0;
int n = 0;
@ -644,7 +644,7 @@ H5Tdetect_vlen_str(hid_t tid)
tclass = H5Tget_class(tid);
if (tclass == H5T_ARRAY) {
hid_t btid = H5Tget_super(tid);
has_vlen_str = H5Tdetect_vlen_str(btid);
has_vlen_str = h5tools_detect_vlen_str(btid);
H5Tclose(btid);
return has_vlen_str;
}
@ -652,7 +652,7 @@ H5Tdetect_vlen_str(hid_t tid)
n = H5Tget_nmembers(tid);
for (i = 0; i < n; i++) {
hid_t mtid = H5Tget_member_type(tid, i);
has_vlen_str = H5Tdetect_vlen_str(mtid);
has_vlen_str = h5tools_detect_vlen_str(mtid);
if (has_vlen_str == TRUE) {
H5Tclose(mtid);
return TRUE;
@ -2030,7 +2030,9 @@ 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 (H5Tdetect_vlen_str(p_type) == TRUE)
if (h5tools_detect_vlen_str(p_type) == TRUE)
vl_data = TRUE;
if (H5Tdetect_class(p_type, H5T_VLEN) == TRUE)
vl_data = TRUE;
/* display loop */
@ -2468,7 +2470,9 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info,
}
/* Check if we have VL data in the dataset's datatype */
if (H5Tdetect_vlen_str(p_type) == TRUE)
if (h5tools_detect_vlen_str(p_type) == TRUE)
vl_data = TRUE;
if (H5Tdetect_class(p_type, H5T_VLEN) == TRUE)
vl_data = TRUE;
/*

2
tools/lib/h5tools.h
View File

@ -553,7 +553,7 @@ H5TOOLS_DLL hid_t h5tools_get_native_type(hid_t type);
H5TOOLS_DLL hid_t h5tools_get_little_endian_type(hid_t type);
H5TOOLS_DLL hid_t h5tools_get_big_endian_type(hid_t type);
H5TOOLS_DLL htri_t H5Tdetect_vlen_str(hid_t tid);
H5TOOLS_DLL htri_t h5tools_detect_vlen_str(hid_t tid);
H5TOOLS_DLL void h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t container,
h5tools_context_t *ctx/*in,out*/, unsigned flags,