diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 18:33:36 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 18:33:36 (GMT) |
| commit | e4ee157c86ea837ba8297c50cefdc296e8401094 (patch) | |
| tree | 834205bf56ec642aab0f022382fab69bb7c64c46 /src/H5Dcompact.c | |
| parent | 53d5ccb17e75f4ce182f3d98f2b60891de07e716 (diff) | |
| download | hdf5-e4ee157c86ea837ba8297c50cefdc296e8401094.zip hdf5-e4ee157c86ea837ba8297c50cefdc296e8401094.tar.gz hdf5-e4ee157c86ea837ba8297c50cefdc296e8401094.tar.bz2 | |
[svn-r18635] Description:
Bring r18634 from trunk to 1.8 branch:
Clean up compiler warnings.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Dcompact.c')
| -rw-r--r-- | src/H5Dcompact.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c index 2c61a6d..128b07e 100644 --- a/src/H5Dcompact.c +++ b/src/H5Dcompact.c @@ -172,7 +172,8 @@ done: static herr_t H5D_compact_construct(H5F_t *f, H5D_t *dset) { - hssize_t tmp_size; /* Temporary holder for raw data size */ + hssize_t stmp_size; /* Temporary holder for raw data size */ + hsize_t tmp_size; /* Temporary holder for raw data size */ hsize_t max_comp_data_size; /* Max. allowed size of compact data */ herr_t ret_value = SUCCEED; /* Return value */ @@ -186,7 +187,11 @@ H5D_compact_construct(H5F_t *f, H5D_t *dset) * Compact dataset is stored in dataset object header message of * layout. */ - tmp_size = H5S_GET_EXTENT_NPOINTS(dset->shared->space) * H5T_get_size(dset->shared->type); + stmp_size = H5S_GET_EXTENT_NPOINTS(dset->shared->space); + HDassert(stmp_size >= 0); + tmp_size = H5T_get_size(dset->shared->type); + HDassert(tmp_size > 0); + tmp_size = tmp_size * (hsize_t)stmp_size; H5_ASSIGN_OVERFLOW(dset->shared->layout.storage.u.compact.size, tmp_size, hssize_t, size_t); /* Verify data size is smaller than maximum header message size |