summaryrefslogtreecommitdiffstats
path: root/src/H5Dcompact.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-07-30 02:34:54 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-07-30 02:34:54 (GMT)
commitccc0d85878139e0d00a9376af719ca0ee2bea585 (patch)
tree6c6edd2444b4312228460e6eb70066798da8b1d8 /src/H5Dcompact.c
parente99906f5175e1516a9f28b3acbcffd962637ca89 (diff)
downloadhdf5-ccc0d85878139e0d00a9376af719ca0ee2bea585.zip
hdf5-ccc0d85878139e0d00a9376af719ca0ee2bea585.tar.gz
hdf5-ccc0d85878139e0d00a9376af719ca0ee2bea585.tar.bz2
[svn-r17269] Description:
Refactor how serialized size of layout message is computed, slightly. Tested on: Mac OS X/32 10.5.7 (amazon) debug & production FreeBSD/32 6.3 (duty) debug Too minor to require h5committest
Diffstat (limited to 'src/H5Dcompact.c')
-rw-r--r--src/H5Dcompact.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c
index 7639c2e..17bf531 100644
--- a/src/H5Dcompact.c
+++ b/src/H5Dcompact.c
@@ -172,7 +172,7 @@ static herr_t
H5D_compact_construct(H5F_t *f, H5D_t *dset)
{
hssize_t tmp_size; /* Temporary holder for raw data size */
- hsize_t comp_data_size; /* Size of compact data */
+ hsize_t max_comp_data_size; /* Max. allowed size of compact data */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_compact_construct)
@@ -191,8 +191,8 @@ H5D_compact_construct(H5F_t *f, H5D_t *dset)
/* Verify data size is smaller than maximum header message size
* (64KB) minus other layout message fields.
*/
- comp_data_size = H5O_MESG_MAX_SIZE - H5O_layout_meta_size(f, &(dset->shared->layout));
- if(dset->shared->layout.store.u.compact.size > comp_data_size)
+ max_comp_data_size = H5O_MESG_MAX_SIZE - H5D_layout_meta_size(f, &(dset->shared->layout), FALSE);
+ if(dset->shared->layout.store.u.compact.size > max_comp_data_size)
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "compact dataset size is bigger than header message maximum size")
done: