diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2015-08-31 21:58:15 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-08-31 21:58:15 (GMT) |
commit | db8e289abe67b506d2a1096d1a39151aca0935e9 (patch) | |
tree | 2fb45f2f3c1f9f8717bc00a07a55831689aa382c /tools | |
parent | 2c91cbecc6460d1a319bfb2303e228ea6f6d6e4d (diff) | |
download | hdf5-db8e289abe67b506d2a1096d1a39151aca0935e9.zip hdf5-db8e289abe67b506d2a1096d1a39151aca0935e9.tar.gz hdf5-db8e289abe67b506d2a1096d1a39151aca0935e9.tar.bz2 |
[svn-r27632] Description:
Revert changes to pass file pointer to selection serialize/deserialize
routines. Also patch back in some changes that were merged out in the
previous merge w/trunk.
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial
(h5committest not required on this branch)
Diffstat (limited to 'tools')
-rw-r--r-- | tools/h5ls/h5ls.c | 1 | ||||
-rw-r--r-- | tools/lib/h5tools_dump.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index 592645d..f291958 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -1759,6 +1759,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name) size_t cd_nelmts; /* filter client number of values */ size_t cd_num; /* filter client data counter */ char f_name[256]; /* filter/file name */ + char dset_name[256]; /* filter/file name */ char s[64]; /* temporary string buffer */ off_t f_offset; /* offset in external file */ hsize_t f_size; /* bytes used in external file */ diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c index d9418a6..2afe3e4 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -2997,6 +2997,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, off_t offset; /* offset of external file */ char f_name[256]; /* filter name */ char name[256]; /* external or virtual file name */ + char dsetname[256]; /* virtual datset name */ hsize_t chsize[64]; /* chunk size in elements */ hsize_t size; /* size of external file */ hsize_t storage_size; |