[svn-r3252] Purpose:

    Code cleanup.
Description:
    Fixed _lots_ (I mean _tons_) of warnings spit out by the gcc with the
    extra warnings.  Including a few show-stoppers for compression on IRIX
    machines.
Solution:
    Changed lots of variables' types to more sensible and consistent types,
    more range-checking, more variable typecasts, etc.
Platforms tested:
    FreeBSD 4.2 (hawkwind), IRIX64-64 (modi4)

1 files changed, 12 insertions, 12 deletions

diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h
index c471b6a..7dcd45a 100644
--- a/src/H5Vprivate.h
+++ b/src/H5Vprivate.h
@@ -24,7 +24,7 @@
 
 /* Other functions */
 #define H5V_vector_cpy(N,DST,SRC) {                                           \
-    assert (sizeof(*(DST))==sizeof(*(SRC)));				      \
+    assert (sizeof(*(DST))==sizeof(*(SRC)));				                  \
     if (SRC) HDmemcpy (DST, SRC, (N)*sizeof(*(DST)));                         \
     else HDmemset (DST, 0, (N)*sizeof(*(DST)));                               \
 }
@@ -34,30 +34,30 @@
 /* A null pointer is equivalent to a zero vector */
 #define H5V_ZERO        NULL
 
-__DLL__ hsize_t H5V_hyper_stride(intn n, const hsize_t *size,
+__DLL__ hsize_t H5V_hyper_stride(uintn n, const hsize_t *size,
 				 const hsize_t *total_size,
 				 const hssize_t *offset,
 				 hssize_t *stride);
-__DLL__ htri_t H5V_hyper_disjointp(intn n, const hssize_t *offset1,
+__DLL__ htri_t H5V_hyper_disjointp(uintn n, const hssize_t *offset1,
 				   const hsize_t *size1,
 				   const hssize_t *offset2,
 				   const hsize_t *size2);
 __DLL__ htri_t H5V_hyper_eq(intn n, const hssize_t *offset1,
 			    const hsize_t *size1, const hssize_t *offset2,
 			    const hsize_t *size2);
-__DLL__ herr_t H5V_hyper_fill(intn n, const hsize_t *_size,
+__DLL__ herr_t H5V_hyper_fill(uintn n, const hsize_t *_size,
 			      const hsize_t *total_size,
 			      const hssize_t *offset, void *_dst,
 			      uintn fill_value);
-__DLL__ herr_t H5V_hyper_copy(intn n, const hsize_t *size,
+__DLL__ herr_t H5V_hyper_copy(uintn n, const hsize_t *size,
 			      const hsize_t *dst_total_size,
 			      const hssize_t *dst_offset, void *_dst,
 			      const hsize_t *src_total_size,
 			      const hssize_t *src_offset, const void *_src);
-__DLL__ herr_t H5V_stride_fill(intn n, hsize_t elmt_size, const hsize_t *size,
+__DLL__ herr_t H5V_stride_fill(uintn n, hsize_t elmt_size, const hsize_t *size,
 			       const hssize_t *stride, void *_dst,
 			       uintn fill_value);
-__DLL__ herr_t H5V_stride_copy(intn n, hsize_t elmt_size, const hsize_t *_size,
+__DLL__ herr_t H5V_stride_copy(uintn n, hsize_t elmt_size, const hsize_t *_size,
 			       const hssize_t *dst_stride, void *_dst,
 			       const hssize_t *src_stride, const void *_src);
 __DLL__ herr_t H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, intn dst_n,
@@ -65,14 +65,14 @@ __DLL__ herr_t H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, intn dst_n,
 				const hssize_t *dst_stride, void *_dst,
 				intn src_n, const hsize_t *src_size,
 				const hssize_t *src_stride, const void *_src);
-__DLL__ herr_t H5V_stride_optimize1(intn *np, hsize_t *elmt_size,
+__DLL__ herr_t H5V_stride_optimize1(uintn *np, hsize_t *elmt_size,
 				    hsize_t *size, hssize_t *stride1);
-__DLL__ herr_t H5V_stride_optimize2(intn *np, hsize_t *elmt_size,
+__DLL__ herr_t H5V_stride_optimize2(uintn *np, hsize_t *elmt_size,
 				    hsize_t *size, hssize_t *stride1,
 				    hssize_t *stride2);
 __DLL__ herr_t H5V_array_fill(void *_dst, const void *src, size_t size,
 			      size_t count);
-__DLL__ hsize_t H5V_array_offset(intn n, const hsize_t *total_size,
+__DLL__ hsize_t H5V_array_offset(uintn n, const hsize_t *total_size,
 				 const hssize_t *offset);
 
 
@@ -96,7 +96,7 @@ __DLL__ hsize_t H5V_array_offset(intn n, const hsize_t *total_size,
  *-------------------------------------------------------------------------
  */
 static inline hsize_t UNUSED
-H5V_vector_reduce_product(intn n, const hsize_t *v)
+H5V_vector_reduce_product(uintn n, const hsize_t *v)
 {
     size_t                  ans = 1;
 
@@ -212,7 +212,7 @@ H5V_vector_cmp_u (intn n, const hsize_t *v1, const hsize_t *v2)
  *-------------------------------------------------------------------------
  */
 static inline intn UNUSED
-H5V_vector_cmp_s (intn n, const hssize_t *v1, const hssize_t *v2)
+H5V_vector_cmp_s (uintn n, const hssize_t *v1, const hssize_t *v2)
 {
     if (v1 == v2) return 0;
     while (n--) {