[svn-r8782] Purpose:

    Code cleanup

Description:
    Clean up almost all warnings from Windows builds.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel
    Too minor to require h5committest

2 files changed, 5 insertions, 4 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index ed41369..cfc4955 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -3712,7 +3712,7 @@ print_enum(hid_t type)
 
     /* Convert values to native data type */
     if (native > 0)
-        H5Tconvert(super, native, (hsize_t)nmembs, value, NULL, H5P_DEFAULT);
+        H5Tconvert(super, native, nmembs, value, NULL, H5P_DEFAULT);
 
     /*
      * Sort members by increasing value
@@ -6156,7 +6156,7 @@ xml_print_enum(hid_t type)
 
     /* Convert values to native data type */
     if (native > 0)
-	H5Tconvert(super, native, (hsize_t)nmembs, value, NULL, H5P_DEFAULT);
+	H5Tconvert(super, native, nmembs, value, NULL, H5P_DEFAULT);
 
     /* Sort members by increasing value */
     /*not implemented yet */
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index ed73af4..7107162 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -801,7 +801,7 @@ display_enum_type(hid_t type, int ind)
     }
 
     /* Convert values to native data type */
-    if (native>0) H5Tconvert(super, native, (hsize_t)nmembs, value, NULL, H5P_DEFAULT);
+    if (native>0) H5Tconvert(super, native, nmembs, value, NULL, H5P_DEFAULT);
 
     /* Sort members by increasing value */
     /*not implemented yet*/
@@ -2216,7 +2216,7 @@ main (int argc, const char *argv[])
      * doesn't exist). */
     show_file_name_g = (argc-argno > 1); /*show file names if more than one*/
     while (argno<argc) {
-        fname = argv[argno++];
+        fname = HDstrdup(argv[argno++]);
         oname = NULL;
         file = -1;
 
@@ -2266,6 +2266,7 @@ main (int argc, const char *argv[])
             if (H5Gclose(root)<0) leave(1);
         }
         H5Fclose(file);
+        free(fname);
     }
     leave(0);
 }