diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-04-16 13:55:27 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-04-16 13:55:27 (GMT) |
commit | b5188673f70ab4f144a9b2927ce43ce407b0c8b8 (patch) | |
tree | 5fa8b99b61eeed099ad6a2a8d78b080cd0dc847f /src/H5Dcontig.c | |
parent | 6b8492bf99637a092886e7cb5d75ea4389da42d7 (diff) | |
download | hdf5-b5188673f70ab4f144a9b2927ce43ce407b0c8b8.zip hdf5-b5188673f70ab4f144a9b2927ce43ce407b0c8b8.tar.gz hdf5-b5188673f70ab4f144a9b2927ce43ce407b0c8b8.tar.bz2 |
[svn-r26824] merge 26771 and 26777 from trunk.
Fix internal H5AC dxpl usage in the library.
tested with h5committest.
Diffstat (limited to 'src/H5Dcontig.c')
-rw-r--r-- | src/H5Dcontig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index 8d4cd02..dc09768 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -675,7 +675,7 @@ H5D__contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len, } /* end if */ else { /* Allocate room for the data sieve buffer */ - if(NULL == (dset_contig->sieve_buf = H5FL_BLK_MALLOC(sieve_buf, dset_contig->sieve_buf_size))) + if(NULL == (dset_contig->sieve_buf = H5FL_BLK_CALLOC(sieve_buf, dset_contig->sieve_buf_size))) HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "memory allocation failed") /* Determine the new sieve buffer size & location */ @@ -946,7 +946,7 @@ H5D__contig_writevv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len, } /* end if */ else { /* Allocate room for the data sieve buffer */ - if(NULL == (dset_contig->sieve_buf = H5FL_BLK_MALLOC(sieve_buf, dset_contig->sieve_buf_size))) + if(NULL == (dset_contig->sieve_buf = H5FL_BLK_CALLOC(sieve_buf, dset_contig->sieve_buf_size))) HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "memory allocation failed") #ifdef H5_CLEAR_MEMORY |