diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-04-23 18:25:16 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-04-23 18:25:16 (GMT) |
| commit | f098d20ab95c885414f82ee310b3692929e76227 (patch) | |
| tree | 8f9eaca942902a988ccc12e983144d6b3d0b04c4 /src/H5Zdeflate.c | |
| parent | b1f8b21130a4f95d2dcd4b9343ed05e93c33f35c (diff) | |
| download | hdf5-f098d20ab95c885414f82ee310b3692929e76227.zip hdf5-f098d20ab95c885414f82ee310b3692929e76227.tar.gz hdf5-f098d20ab95c885414f82ee310b3692929e76227.tar.bz2 | |
[svn-r16847] Description:
Bring r16846 from revise_chunks branch back to trunk:
Fix broken (for how long?) H5_ASSIGN_OVERFLOW macro to actually detect
overflows during assignments, along with several errors it [now] detected.
Cleaned up a fix minor warnings and/or pieces of code also.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committest not needed - multi-platform test performed on branch)
Diffstat (limited to 'src/H5Zdeflate.c')
| -rw-r--r-- | src/H5Zdeflate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c index 7cda2c8..c0bcd70 100644 --- a/src/H5Zdeflate.c +++ b/src/H5Zdeflate.c @@ -94,9 +94,9 @@ H5Z_filter_deflate (unsigned flags, size_t cd_nelmts, /* Set the uncompression parameters */ HDmemset(&z_strm, 0, sizeof(z_strm)); z_strm.next_in = *buf; - H5_ASSIGN_OVERFLOW(z_strm.avail_in,nbytes,size_t,uInt); + H5_ASSIGN_OVERFLOW(z_strm.avail_in,nbytes,size_t,unsigned); z_strm.next_out = outbuf; - H5_ASSIGN_OVERFLOW(z_strm.avail_out,nalloc,size_t,uInt); + H5_ASSIGN_OVERFLOW(z_strm.avail_out,nalloc,size_t,unsigned); /* Initialize the uncompression routines */ if (Z_OK!=inflateInit(&z_strm)) |