[svn-r5667] Purpose:

    Code cleanup

Description:
    Turn on more warnings in the IRIX builds and clean them up.

Platforms tested:
    IRIX64 6.5 (modi4) w/parallel

5 files changed, 13 insertions, 13 deletions

diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 3e9d200..064341b 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -989,7 +989,9 @@ H5FD_mpio_close(H5FD_t *_file)
 static herr_t
 H5FD_mpio_query(const H5FD_t *_file, unsigned long *flags /* out */)
 {
+#ifndef NDEBUG
     const H5FD_mpio_t	*file = (const H5FD_mpio_t*)_file;
+#endif /* NDEBUG */
     herr_t ret_value=SUCCEED;
 
     FUNC_ENTER_NOAPI(H5FD_mpio_query, FAIL);
diff --git a/src/H5Farray.c b/src/H5Farray.c
index 859f7ae..7d046cd 100644
--- a/src/H5Farray.c
+++ b/src/H5Farray.c
@@ -265,8 +265,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
                  */
                 unsigned long max, min, temp;
 
-                temp = nelmts;
-                assert(temp==nelmts);	/* verify no overflow */
+                H5_ASSIGN_OVERFLOW(temp,nelmts,hsize_t,unsigned long);
                 MPI_Allreduce(&temp, &max, 1, MPI_UNSIGNED_LONG, MPI_MAX,
                       H5FD_mpio_communicator(f->shared->lf));
                 MPI_Allreduce(&temp, &min, 1, MPI_UNSIGNED_LONG, MPI_MIN,
@@ -516,8 +515,7 @@ H5F_arr_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
                  */
                 unsigned long max, min, temp;
 
-                temp = nelmts;
-                assert(temp==nelmts);	/* verify no overflow */
+                H5_ASSIGN_OVERFLOW(temp,nelmts,hsize_t,unsigned long);
                 MPI_Allreduce(&temp, &max, 1, MPI_UNSIGNED_LONG, MPI_MAX,
                       H5FD_mpio_communicator(f->shared->lf));
                 MPI_Allreduce(&temp, &min, 1, MPI_UNSIGNED_LONG, MPI_MIN,
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 6f034b6..10ed39b 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -196,12 +196,6 @@ __DLL__ herr_t H5F_istore_write(H5F_t *f, hid_t dxpl_id,
                                 const hsize_t size_m[], const hssize_t offset_m[],
                                 const hssize_t offset[], const hsize_t size[],
                                 const void *buf);
-#ifdef H5_HAVE_PARALLEL
-__DLL__ herr_t H5F_istore_allocate (H5F_t *f, hid_t dxpl_id,
-                                const struct H5O_layout_t *layout,
-                                const hsize_t *space_dim,
-                                struct H5P_genplist_t *dc_plist);
-#endif /* H5_HAVE_PARALLEL */
 
 /* Functions that operate on contiguous storage wrt boot block */
 __DLL__ herr_t H5F_contig_read(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr,
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 6c7e913..a4a2a3d 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -391,6 +391,12 @@ __DLL__ herr_t H5F_seq_writev(H5F_t *f, hid_t dxpl_id,
 
 
 /* Functions that operate on indexed storage */
+#ifdef H5_HAVE_PARALLEL
+__DLL__ herr_t H5F_istore_allocate (H5F_t *f, hid_t dxpl_id,
+                                const struct H5O_layout_t *layout,
+                                const hsize_t *space_dim,
+                                struct H5P_genplist_t *dc_plist);
+#endif /* H5_HAVE_PARALLEL */
 __DLL__ hsize_t H5F_istore_allocated(H5F_t *f, unsigned ndims, haddr_t addr);
 __DLL__ herr_t H5F_istore_dump_btree(H5F_t *f, FILE *stream, unsigned ndims,
         haddr_t addr);
diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c
index 3f43310..43ffbd5 100644
--- a/src/H5Zdeflate.c
+++ b/src/H5Zdeflate.c
@@ -11,7 +11,7 @@
 #include "H5Zprivate.h"
 
 #ifdef H5_HAVE_ZLIB_H
-#   include <zlib.h>
+#   include "zlib.h"
 #else
 /* Make sure compression is disabled too. */
 #undef H5_HAVE_COMPRESS2
@@ -78,9 +78,9 @@ H5Z_filter_deflate (unsigned UNUSED flags, size_t cd_nelmts,
 	}
 	HDmemset(&z_strm, 0, sizeof(z_strm));
 	z_strm.next_in = *buf;
-	z_strm.avail_in = (uInt)nbytes;
+        H5_ASSIGN_OVERFLOW(z_strm.avail_in,nbytes,size_t,uInt);
 	z_strm.next_out = outbuf;
-	z_strm.avail_out = (uInt)nalloc;
+        H5_ASSIGN_OVERFLOW(z_strm.avail_out,nalloc,size_t,uInt);
 	if (Z_OK!=inflateInit(&z_strm)) {
 	    HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, 0, "inflateInit() failed");
 	}