diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2019-02-04 07:47:51 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2019-02-04 07:47:51 (GMT) |
commit | 12fc6bf95507244b2f18a56f8ff76cc0ea922fea (patch) | |
tree | 0c7ac702a931646e4e0cbdd01dc1f1e571c07f2a /src/H5Dio.c | |
parent | ae94128b328236cbb36c1da005e2211b5154d2b9 (diff) | |
download | hdf5-12fc6bf95507244b2f18a56f8ff76cc0ea922fea.zip hdf5-12fc6bf95507244b2f18a56f8ff76cc0ea922fea.tar.gz hdf5-12fc6bf95507244b2f18a56f8ff76cc0ea922fea.tar.bz2 |
Merge of changes from develop for 1.10.5.
Added RELEASE.txt entries for new features.
Diffstat (limited to 'src/H5Dio.c')
-rw-r--r-- | src/H5Dio.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/H5Dio.c b/src/H5Dio.c index 2ce47f9..8abcd81 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -1060,16 +1060,13 @@ H5D__typeinfo_init(const H5D_t *dset, hid_t mem_type_id, hbool_t do_write, if(type_info->request_nelmts == 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "temporary buffer max size is too small") - /* - * Get a temporary buffer for type conversion unless the app has already + /* Get a temporary buffer for type conversion unless the app has already * supplied one through the xfer properties. Instead of allocating a - * buffer which is the exact size, we allocate the target size. The - * malloc() is usually less resource-intensive if we allocate/free the - * same size over and over. + * buffer which is the exact size, we allocate the target size. */ if(NULL == (type_info->tconv_buf = (uint8_t *)tconv_buf)) { /* Allocate temporary buffer */ - if(NULL == (type_info->tconv_buf = H5FL_BLK_MALLOC(type_conv, target_size))) + if(NULL == (type_info->tconv_buf = H5FL_BLK_CALLOC(type_conv, target_size))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion") type_info->tconv_buf_allocated = TRUE; } /* end if */ |