diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-19 19:55:48 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-19 19:55:48 (GMT) |
commit | 2f6e3cb5bee1abac0be573123439938cb5d3096e (patch) | |
tree | fac2c21a94dde6fc226321a0df5a775d31f04269 /tools/lib/h5tools.h | |
parent | e56b6f6c4019ad7dddf2325c91b134646fcb55e6 (diff) | |
download | hdf5-2f6e3cb5bee1abac0be573123439938cb5d3096e.zip hdf5-2f6e3cb5bee1abac0be573123439938cb5d3096e.tar.gz hdf5-2f6e3cb5bee1abac0be573123439938cb5d3096e.tar.bz2 |
[svn-r19252] Description:
Bring Coverity changes from branch to trunk:
r19161:
Fixed the part for matching the subset info with dataset
r19189:
BZ1646: h5dump does not check number of dimensions for subsetting parameters against the dataset
Changed subset_t structure from holding hsize_t pointers to holding new subset_d pointers, which hold the original hsize_t pointer + len. this len is then checked against dataset ndims in the handle_dataset function of h5dump.
Changed all references to use new data structure.
Added tests for each subset parameter.
r19190:
Added new h5dump ddl files
Tested on:
Mac OS X/32 10.6.4 (amazon) w/debug & production
(h5committested on branch)
Diffstat (limited to 'tools/lib/h5tools.h')
-rw-r--r-- | tools/lib/h5tools.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index ab72025..b3e3dd2 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -507,12 +507,17 @@ typedef struct h5tools_context_t { hsize_t sm_pos; /* current stripmine element position */ } h5tools_context_t; +typedef struct subset_d { + hsize_t *data; + unsigned int len; +} subset_d; + /* a structure to hold the subsetting particulars for a dataset */ struct subset_t { - hsize_t *start; - hsize_t *stride; - hsize_t *count; - hsize_t *block; + subset_d start; + subset_d stride; + subset_d count; + subset_d block; }; /* The following include, h5tools_str.h, must be after the |