diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2001-08-12 03:56:45 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2001-08-12 03:56:45 (GMT) |
| commit | 9cb6f1ae5dae4c6d261e7ed20f70ca02f26da7e6 (patch) | |
| tree | 89ff1d9af297b61b2dd6b6c9f698d8bc1d1e26f4 /src/H5D.c | |
| parent | 80c02cc6f1ba4e4c564a862c24029c1230a5835d (diff) | |
| download | hdf5-9cb6f1ae5dae4c6d261e7ed20f70ca02f26da7e6.zip hdf5-9cb6f1ae5dae4c6d261e7ed20f70ca02f26da7e6.tar.gz hdf5-9cb6f1ae5dae4c6d261e7ed20f70ca02f26da7e6.tar.bz2 | |
[svn-r4329] Purpose:
Bug Fix
Description:
The datatype conversion buffer size was only halfway converted from hsize_t
to size_t and was causing problems. Also, the H5P_peek_<foo> routines have
a bunch of identical code.
Solution:
Finished converting the datatype conversion buffer size to size_t and
cleaned up the implementation of the H5P_peek_<foo> routines to call a
common routine instead of reimplementing a bunch of code.
Platforms tested:
Solaris 2.7 (arabica)
Diffstat (limited to 'src/H5D.c')
| -rw-r--r-- | src/H5D.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -140,7 +140,7 @@ static herr_t H5D_init_interface(void) { H5P_genclass_t *pclass; /* Property list class to modify */ - hsize_t def_max_temp_buf=H5D_XFER_MAX_TEMP_BUF_DEF; /* Default value for maximum temp buffer size */ + size_t def_max_temp_buf=H5D_XFER_MAX_TEMP_BUF_DEF; /* Default value for maximum temp buffer size */ void *def_tconv_buf=H5D_XFER_TCONV_BUF_DEF; /* Default value for type conversion buffer */ void *def_bkgr_buf=H5D_XFER_BKGR_BUF_DEF; /* Default value for background buffer */ H5T_bkg_t def_bkgr_buf_type=H5D_XFER_BKGR_BUF_TYPE_DEF; /* Default value for background buffer type */ @@ -1956,7 +1956,7 @@ printf("%s: check 1.2, \n",FUNC); src_type_size = H5T_get_size(dataset->type); dst_type_size = H5T_get_size(mem_type); - target_size = H5P_peek_hsize_t(dxpl_id,H5D_XFER_MAX_TEMP_BUF_NAME); + target_size = H5P_peek_size_t(dxpl_id,H5D_XFER_MAX_TEMP_BUF_NAME); #ifdef QAK printf("%s: check 2.0, src_type_size=%d, dst_type_size=%d, target_size=%d\n",FUNC,(int)src_type_size,(int)dst_type_size,(int)target_size); #endif /* QAK */ @@ -2432,7 +2432,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, src_type_size = H5T_get_size(mem_type); dst_type_size = H5T_get_size(dataset->type); - target_size = H5P_peek_hsize_t(dxpl_id,H5D_XFER_MAX_TEMP_BUF_NAME); + target_size = H5P_peek_size_t(dxpl_id,H5D_XFER_MAX_TEMP_BUF_NAME); #ifdef QAK printf("%s: check 2.0, src_type_size=%d, dst_type_size=%d, target_size=%d\n",FUNC,(int)src_type_size,(int)dst_type_size,(int)target_size); #endif /* QAK */ |