diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-10-11 20:11:39 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-10-11 20:11:39 (GMT) |
| commit | fbc86cfb3d503d7e7091c4cc58bd72aa9a97aac7 (patch) | |
| tree | 2e8d1075edc764fca8e22f509f97365d73b41880 /tools/lib/h5diff_attr.c | |
| parent | 005444208330c7c4ece3f60278b36802ad93dbba (diff) | |
| download | hdf5-fbc86cfb3d503d7e7091c4cc58bd72aa9a97aac7.zip hdf5-fbc86cfb3d503d7e7091c4cc58bd72aa9a97aac7.tar.gz hdf5-fbc86cfb3d503d7e7091c4cc58bd72aa9a97aac7.tar.bz2 | |
HDFFV-10297 merge from develop
Also cleaned up some other non-merged changes
Diffstat (limited to 'tools/lib/h5diff_attr.c')
| -rw-r--r-- | tools/lib/h5diff_attr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index 3018f18..aa33727 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -322,8 +322,8 @@ hsize_t diff_attr(hid_t loc1_id, hid_t space2_id=-1; /* space ID */ hid_t ftype1_id=-1; /* file data type ID */ hid_t ftype2_id=-1; /* file data type ID */ - int vstrtype1=0; /* ftype1 is a variable string */ - int vstrtype2=0; /* ftype2 is a variable string */ + int vstrtype1=0; /* ftype1 is a variable string */ + int vstrtype2=0; /* ftype2 is a variable string */ hid_t mtype1_id=-1; /* memory data type ID */ hid_t mtype2_id=-1; /* memory data type ID */ size_t msize1; /* memory size of memory type */ @@ -461,8 +461,8 @@ hsize_t diff_attr(hid_t loc1_id, for(j = 0; j < rank1; j++) nelmts1 *= dims1[j]; - buf1 = (void *)HDmalloc((size_t)(nelmts1 * msize1)); - buf2 = (void *)HDmalloc((size_t)(nelmts1 * msize2)); + buf1 = (void *)HDcalloc((size_t)(nelmts1), msize1); + buf2 = (void *)HDcalloc((size_t)(nelmts1), msize2); if(buf1 == NULL || buf2 == NULL) { parallel_print("cannot read into memory\n"); goto error; |