summaryrefslogtreecommitdiffstats
path: root/tools/h5ls
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-03-07 16:09:42 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-03-07 16:09:42 (GMT)
commit22eaae599991804716cfe226859c3679e4494213 (patch)
tree6b77b2793dd9ffde4464541fc0e6346269d5c2e4 /tools/h5ls
parent8f5530e3be3e3c53951a0fa64a13d89d674b22d1 (diff)
downloadhdf5-22eaae599991804716cfe226859c3679e4494213.zip
hdf5-22eaae599991804716cfe226859c3679e4494213.tar.gz
hdf5-22eaae599991804716cfe226859c3679e4494213.tar.bz2
[svn-r29309] HDFFV-9698, HDFFV-9241, HDFFV-9570: Merge fixes from trunk for subsetting index, default fill value display, and optional arg crash. Also some minor compiler warnings fixes.
Diffstat (limited to 'tools/h5ls')
-rw-r--r--tools/h5ls/h5ls.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 708e9de..4ab4f22 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -973,7 +973,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
/* Release resources */
for(i = 0; i < (unsigned)nmembs; i++)
- HDfree(name[i]);
+ H5free_memory(name[i]);
HDfree(name);
HDfree(value);
}
@@ -1848,6 +1848,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
} /* end if */
break;
default:
+ HDassert(0);
break;
}
/* Print total raw storage size */