summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJacob Smith <jake.smith@hdfgroup.org>2019-09-24 21:38:36 (GMT)
committerJacob Smith <jake.smith@hdfgroup.org>2019-09-24 21:40:02 (GMT)
commit9a388325ebaec339f67ddd210ca31ddcc3ede973 (patch)
treec541bac166199e47985bf879663bbf256db9bbf1 /tools
parent4ecc50bc136e71329593bef9fc675b6044bcff86 (diff)
parent9c73ed788ad620af7b09aaa75a7582ce30fac6be (diff)
downloadhdf5-9a388325ebaec339f67ddd210ca31ddcc3ede973.zip
hdf5-9a388325ebaec339f67ddd210ca31ddcc3ede973.tar.gz
hdf5-9a388325ebaec339f67ddd210ca31ddcc3ede973.tar.bz2
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hdf5 into bugfix/repack_external_storage
Diffstat (limited to 'tools')
-rw-r--r--tools/src/h5stat/h5stat.c4
-rw-r--r--tools/test/h5repack/h5repackgentest.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index 9528d2c..3eea368 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -173,7 +173,7 @@ struct handler_t {
char **obj;
};
-static const char *s_opts ="Aa:Ddm:EFfhGgl:sSTO:Vw:";
+static const char *s_opts ="Aa:Ddm:EFfhGgl:sSTO:Vw:H:";
/* e.g. "filemetadata" has to precede "file"; "groupmetadata" has to precede "group" etc. */
static struct long_options l_opts[] = {
{"help", no_arg, 'h'},
@@ -2014,7 +2014,7 @@ done:
iter_free(&iter);
if (fapl_id != H5P_DEFAULT) {
- if (0 < H5Pclose(fapl_id)) {
+ if (H5Pclose(fapl_id) < 0) {
error_msg("unable to close fapl entry\n");
h5tools_setstatus(EXIT_FAILURE);
}
diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c
index 6e2c6bf..12883b7 100644
--- a/tools/test/h5repack/h5repackgentest.c
+++ b/tools/test/h5repack/h5repackgentest.c
@@ -26,6 +26,10 @@
*
* There is no restriction on the name, number, or structure of datasets and
* groups in HDF5 file.
+ *
+ * The inluded datatypes should be more than adequate to verify the correctness
+ * of the behavior -- if one type can be consolidated from external storage,
+ * then thay all can.
*/
#include "hdf5.h"