diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-08-12 13:33:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-08-12 13:33:49 (GMT) |
| commit | 367f2125d956e1c38c99f59603df95f6f31b940e (patch) | |
| tree | 13d975fd64da87abc8944861d297585a3acdb5dc /src | |
| parent | f040f990a065db070a83e3217c209a83e204d6ca (diff) | |
| download | hdf5-367f2125d956e1c38c99f59603df95f6f31b940e.zip hdf5-367f2125d956e1c38c99f59603df95f6f31b940e.tar.gz hdf5-367f2125d956e1c38c99f59603df95f6f31b940e.tar.bz2 | |
[svn-r15463] Description:
Bring revision 15462 (compiler warnings) back from trunk.
Tested on:
Mac OS X/32 10.5.4 (amazon) w/FORTRAN & C++
(Too minor to require h5committest)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Dchunk.c | 3 | ||||
| -rw-r--r-- | src/H5Dscatgath.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 711b91b..d15715b 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -3266,7 +3266,8 @@ H5D_chunk_prune_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) /* The number of bytes accessed in the chunk */ /* (i.e. the bytes replaced with fill values) */ - bytes_accessed = sel_nelmts * layout->u.chunk.dim[rank]; + H5_CHECK_OVERFLOW(sel_nelmts, hssize_t, uint32_t); + bytes_accessed = (uint32_t)sel_nelmts * layout->u.chunk.dim[rank]; /* Release lock on chunk */ if(H5D_chunk_unlock(io_info, TRUE, idx_hint, chunk, bytes_accessed) < 0) diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c index 3ea4c69..9f98622 100644 --- a/src/H5Dscatgath.c +++ b/src/H5Dscatgath.c @@ -802,7 +802,8 @@ H5D_compound_opt_read(size_t nelmts, const H5S_t *space, /* Get the number of bytes and offset in sequence */ curr_len = len[curr_seq]; - curr_off = off[curr_seq]; + H5_CHECK_OVERFLOW(off[curr_seq], hsize_t, size_t); + curr_off = (size_t)off[curr_seq]; /* Decide the number of elements and position in the buffer. */ curr_nelmts = curr_len / dst_stride; |