[svn-r19254] Description:

   Bring r19252 & 19253 from trunk to 1.8 branch:

   Bring Coverity changes from branch to trunk:


r19161:
Fixed the part for matching the subset info with dataset

r19189:
BZ1646: h5dump does not check number of dimensions for subsetting parameters against the dataset

Changed subset_t structure from holding hsize_t pointers to holding new subset_d pointers, which hold the original hsize_t pointer + len. this len is then checked against dataset ndims in the handle_dataset function of h5dump.

Changed all references to use new data structure.

Added tests for each subset parameter.

r19190:
Added new h5dump ddl files

Tested on:
    Mac OS X/32 10.6.4 (amazon) w/debug & production
    (h5committested on Coverity branch)

1 files changed, 9 insertions, 9 deletions

diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index 0176fd5..57b1ce0 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -790,7 +790,7 @@ parse_command_line(int argc, const char *argv[])
 
     /* check for file name to be processed */
     if (argc <= opt_ind) {
-        error_msg(h5tools_getprogname(), "missing file name\n");
+        error_msg("missing file name\n");
         usage(h5tools_getprogname());
         leave(EXIT_FAILURE);
     } /* end if */
@@ -1340,7 +1340,7 @@ main(int argc, const char *argv[])
     h5tools_init();
     hand = parse_command_line (argc, argv);
     if(!hand) {
-        error_msg(h5tools_getprogname(), "unable to parse command line arguments \n");
+        error_msg("unable to parse command line arguments \n");
         leave(EXIT_FAILURE);
     } /* end if */
 
@@ -1350,7 +1350,7 @@ main(int argc, const char *argv[])
 
     fid = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
     if(fid < 0) {
-        error_msg(h5tools_getprogname(), "unable to open file \"%s\"\n", fname);
+        error_msg("unable to open file \"%s\"\n", fname);
         leave(EXIT_FAILURE);
     } /* end if */
 
@@ -1359,7 +1359,7 @@ main(int argc, const char *argv[])
 
     /* Get storge info for SOHM's btree/list/heap and superblock extension */
     if(H5Fget_info(fid, &finfo) < 0)
-	warn_msg(h5tools_getprogname(), "Unable to retrieve SOHM info\n");
+	warn_msg("Unable to retrieve SOHM info\n");
     else {
 	iter.super_ext_size = finfo.super_ext_size;
 	iter.SM_hdr_storage_size = finfo.sohm.hdr_size;
@@ -1368,10 +1368,10 @@ main(int argc, const char *argv[])
     } /* end else */
 
     if((fcpl = H5Fget_create_plist(fid)) < 0)
-        warn_msg(h5tools_getprogname(), "Unable to retrieve file creation property\n");
+        warn_msg("Unable to retrieve file creation property\n");
 
     if(H5Pget_userblock(fcpl, &iter.ublk_size) < 0)
-        warn_msg(h5tools_getprogname(), "Unable to retrieve userblock size\n");
+        warn_msg("Unable to retrieve userblock size\n");
 
     /* Walk the objects or all file */
     if(display_object) {
@@ -1380,7 +1380,7 @@ main(int argc, const char *argv[])
         u = 0;
         while(hand[u].obj) {
             if (h5trav_visit(fid, hand[u].obj, TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0)
-		warn_msg(h5tools_getprogname(), "Unable to traverse object \"%s\"\n", hand[u].obj);
+		warn_msg("Unable to traverse object \"%s\"\n", hand[u].obj);
 	    else
 		print_statistics(hand[u].obj, &iter);
             u++;
@@ -1388,7 +1388,7 @@ main(int argc, const char *argv[])
     } /* end if */
     else {
         if (h5trav_visit(fid, "/", TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0)
-	    warn_msg(h5tools_getprogname(), "Unable to traverse objects/links in file \"%s\"\n", fname);
+	    warn_msg("Unable to traverse objects/links in file \"%s\"\n", fname);
 	else
 	    print_statistics("/", &iter);
     } /* end else */
@@ -1396,7 +1396,7 @@ main(int argc, const char *argv[])
     if (hand) free(hand);
 
     if(H5Fclose(fid) < 0) {
-        error_msg(h5tools_getprogname(), "unable to close file \"%s\"\n", fname);
+        error_msg("unable to close file \"%s\"\n", fname);
         leave(EXIT_FAILURE);
     }