summaryrefslogtreecommitdiffstats
path: root/src/H5Zdeflate.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-04-23 18:02:41 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-04-23 18:02:41 (GMT)
commit4c3073f955898ce857f940e3e9ca05c6a3cb201f (patch)
tree8ab78c9a40471e3a604ebb0d28b0b508db663831 /src/H5Zdeflate.c
parent5bb857476f99118cda0e54ea522f52933a582747 (diff)
downloadhdf5-4c3073f955898ce857f940e3e9ca05c6a3cb201f.zip
hdf5-4c3073f955898ce857f940e3e9ca05c6a3cb201f.tar.gz
hdf5-4c3073f955898ce857f940e3e9ca05c6a3cb201f.tar.bz2
[svn-r16846] Description:
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 FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode Mac OS X/32 10.5.6 (amazon) in debug mode Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode
Diffstat (limited to 'src/H5Zdeflate.c')
-rw-r--r--src/H5Zdeflate.c4
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))