[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, 4 insertions, 3 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 82b67ca..efb0e42 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -4670,6 +4670,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t * UNUSED sset)
     hsize_t                *chsize;
     int                     ndims;
     int                     i;
+	hsize_t                 tempi;
     char                   *tmp;
     char                   *t_name, *t_tmp, *t_prefix;
 
@@ -4735,9 +4736,9 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t * UNUSED sset)
     indent += COL;
     H5Aiterate(did, NULL, dump_function_table->dump_attribute_function, NULL);
     indent -= COL;
-    i = H5Dget_storage_size(did);
-
-    if (display_data && (i > 0)) {
+	tempi = H5Dget_storage_size(did);
+    
+    if (display_data && (tempi > 0)) {
 	switch (H5Tget_class(type)) {
 	case H5T_INTEGER:
 	case H5T_FLOAT: