[svn-r4643] Purpose:

    Code cleanup
Description:
    Windows is generating hundreds of warnings from some of the practices in
    the library.  Mostly, they are because size_t is 32-bit and hsize_t is
    64-bit on Windows and we were carelessly casting the larger values down to
    the smaller ones without checking for overflow.

    Also, some other small code cleanups,etc.

Solution:
    Re-worked some algorithms to eliminate the casts and also added more
    overflow checking for assignments and function parameters which needed
    casts.

    Kent did most of the work, I just went over his changes and fit them into
    the the library code a bit better.

Platforms tested:
    FreeBSD 4.4 (hawkwind)

1 files changed, 2 insertions, 1 deletions

diff --git a/src/H5V.c b/src/H5V.c
index c41f285..d4ac850 100644
--- a/src/H5V.c
+++ b/src/H5V.c
@@ -751,6 +751,7 @@ H5V_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size,
         for (i=0; i<nelmts; i++) {
 
             /* Copy an element */
+            H5_CHECK_OVERFLOW(elmt_size,hsize_t,size_t);
             HDmemcpy(dst, src, (size_t)elmt_size);
 
             /* Decrement indices and advance pointers */
@@ -765,7 +766,7 @@ H5V_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size,
             }
         }
     } else {
-        assert(elmt_size==(hsize_t)((size_t)elmt_size)); /*check for overflow*/
+        H5_CHECK_OVERFLOW(elmt_size,hsize_t,size_t);
         HDmemcpy (dst, src, (size_t)elmt_size);
         HRETURN (SUCCEED);
     }