summaryrefslogtreecommitdiffstats
path: root/tools/h5dump
diff options
context:
space:
mode:
authorVailin Choi <vchoi@hdfgroup.org>2013-10-21 16:12:33 (GMT)
committerVailin Choi <vchoi@hdfgroup.org>2013-10-21 16:12:33 (GMT)
commit2b18e934c6812fd1b487ebfebf9240b009c3e4ae (patch)
tree4c5f328cf76071650907986d781191af05a3374a /tools/h5dump
parent0a9249a4016f327a3382a103d1b3d10cc6451a5a (diff)
downloadhdf5-2b18e934c6812fd1b487ebfebf9240b009c3e4ae.zip
hdf5-2b18e934c6812fd1b487ebfebf9240b009c3e4ae.tar.gz
hdf5-2b18e934c6812fd1b487ebfebf9240b009c3e4ae.tar.bz2
[svn-r24336] Bring revisions #24118 - #24200 from trunk.
Diffstat (limited to 'tools/h5dump')
-rw-r--r--tools/h5dump/Makefile.in1
-rw-r--r--tools/h5dump/errfiles/filter_fail.err3
-rw-r--r--tools/h5dump/h5dump_ddl.c6
3 files changed, 7 insertions, 3 deletions
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 4741683..21a622d 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -268,6 +268,7 @@ LIPO = @LIPO@
LL_PATH = @LL_PATH@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@
LT_STATIC_EXEC = @LT_STATIC_EXEC@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
diff --git a/tools/h5dump/errfiles/filter_fail.err b/tools/h5dump/errfiles/filter_fail.err
index 8f0f990..db21044 100644
--- a/tools/h5dump/errfiles/filter_fail.err
+++ b/tools/h5dump/errfiles/filter_fail.err
@@ -14,6 +14,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
#004: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered
major: Data filters
minor: Read failed
+ #005: (file name) line (number) in H5PL_load(): required dynamically loaded plugin filter '312' is not available
+ major: Plugin for dynamically loaded library
+ minor: Unable to load metadata into cache
h5dump error: unable to print data
H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
#000: (file name) line (number) in h5tools_dump_simple_dset(): H5Dread failed
diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c
index 6aaa499..d714f39 100644
--- a/tools/h5dump/h5dump_ddl.c
+++ b/tools/h5dump/h5dump_ddl.c
@@ -1154,6 +1154,9 @@ dump_fcpl(hid_t fid)
hsize_t userblock; /* userblock size retrieved from FCPL */
size_t off_size; /* size of offsets in the file */
size_t len_size; /* size of lengths in the file */
+ H5F_file_space_type_t fs_strategy; /* file space strategy */
+ hsize_t fs_threshold; /* free-space section threshold */
+ H5F_info2_t finfo; /* file information */
#ifdef SHOW_FILE_DRIVER
hid_t fapl; /* file access property list ID */
hid_t fdriver; /* file driver */
@@ -1162,9 +1165,6 @@ dump_fcpl(hid_t fid)
unsigned sym_lk; /* symbol table B-tree leaf 'K' value */
unsigned sym_ik; /* symbol table B-tree internal 'K' value */
unsigned istore_ik; /* indexed storage B-tree internal 'K' value */
- H5F_file_space_type_t fs_strategy; /* file space strategy */
- hsize_t fs_threshold; /* free-space section threshold */
- H5F_info2_t finfo; /* file information */
fcpl=H5Fget_create_plist(fid);
H5Fget_info2(fid, &finfo);