[svn-r8384] Purpose:

    Code cleanup

Description:
    Clean up lots of warnings based on those reported from the SGI compilers
as well as gcc.

Platforms tested:
    SGI O3900, IRIX64 6.5 (Cheryl's SGI machine)
    FreeBSD 4.9 (sleipnir) w/ & w/o parallel
    h5committest

1 files changed, 4 insertions, 6 deletions

diff --git a/src/H5V.c b/src/H5V.c
index 88793e2..dfadee9 100644
--- a/src/H5V.c
+++ b/src/H5V.c
@@ -1027,7 +1027,7 @@ done:
  *-------------------------------------------------------------------------
  */
 hsize_t
-H5V_array_offset_pre(unsigned n, const hsize_t *total_size, const hsize_t *acc, const hssize_t *offset)
+H5V_array_offset_pre(unsigned n, const hsize_t *acc, const hssize_t *offset)
 {
     hsize_t	    skip;	/*starting point byte offset		*/
     int             i;		/*counter				*/
@@ -1036,7 +1036,6 @@ H5V_array_offset_pre(unsigned n, const hsize_t *total_size, const hsize_t *acc,
     FUNC_ENTER_NOAPI(H5V_array_offset_pre, (HDabort(), 0));
 
     assert(n <= H5V_HYPER_NDIMS);
-    assert(total_size);
     assert(acc);
     assert(offset);
 
@@ -1089,7 +1088,7 @@ H5V_array_offset(unsigned n, const hsize_t *total_size, const hssize_t *offset)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, UFAIL, "can't compute down sizes");
 
     /* Set return value */
-    ret_value=H5V_array_offset_pre(n,total_size,acc_arr,offset);
+    ret_value=H5V_array_offset_pre(n,acc_arr,offset);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -1194,7 +1193,7 @@ done:
  */
 herr_t
 H5V_chunk_index(unsigned ndims, const hssize_t *coord, const hsize_t *chunk,
-    const hsize_t *nchunks, const hsize_t *down_nchunks, hsize_t *chunk_idx)
+    const hsize_t *down_nchunks, hsize_t *chunk_idx)
 {
     hssize_t	scaled_coord[H5V_HYPER_NDIMS];	/* Scaled, coordinates, in terms of chunks */
     unsigned    u;                      /* Local index variable */
@@ -1206,7 +1205,6 @@ H5V_chunk_index(unsigned ndims, const hssize_t *coord, const hsize_t *chunk,
     assert(ndims <= H5V_HYPER_NDIMS);
     assert(coord);
     assert(chunk);
-    assert(nchunks);
     assert(chunk_idx);
 
     /* Compute the scaled coordinates for actual coordinates */
@@ -1214,7 +1212,7 @@ H5V_chunk_index(unsigned ndims, const hssize_t *coord, const hsize_t *chunk,
         scaled_coord[u]=coord[u]/chunk[u];
 
     /* Compute the chunk index */
-    *chunk_idx=H5V_array_offset_pre(ndims,nchunks,down_nchunks,scaled_coord);
+    *chunk_idx=H5V_array_offset_pre(ndims,down_nchunks,scaled_coord);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);