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

diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index e1b2182..4a1f4d7 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -153,7 +153,7 @@ int h5repack_addfilter(const char* str,
 
         if(options->n_filter_g > H5_REPACK_MAX_NFILTERS)
         {
-            error_msg(h5tools_getprogname(), "maximum number of filters exceeded for <%s>\n", str);
+            error_msg("maximum number of filters exceeded for <%s>\n", str);
             free(obj_list);
             return -1;
         }
@@ -191,7 +191,7 @@ int h5repack_addlayout(const char* str,
     init_packobject(&pack);
 
     if (options->all_layout==1){
-        error_msg(h5tools_getprogname(), "invalid layout input: 'all' option \
+        error_msg("invalid layout input: 'all' option \
                             is present with other objects <%s>\n",str);
         return -1;
     }
@@ -507,7 +507,7 @@ int copy_attr(hid_t loc_in,
             buf = (void *)HDmalloc((size_t)(nelmts * msize));
             if(buf == NULL) 
             {
-                error_msg(h5tools_getprogname(), "cannot read into memory\n" );
+                error_msg("h5repack", "cannot read into memory\n" );
                 goto error;
             }
             if(H5Aread(attr_id, wtype_id, buf) < 0)
@@ -610,7 +610,7 @@ static int check_options(pack_opt_t *options)
                 break;
             case H5D_LAYOUT_ERROR:
             case H5D_NLAYOUTS:
-                error_msg(h5tools_getprogname(), "invalid layout\n");
+                error_msg("invalid layout\n");
                 return -1;
             default:
                 strcpy(slayout,"invalid layout\n");
@@ -651,7 +651,7 @@ static int check_options(pack_opt_t *options)
 
     if (options->all_layout==1 && has_ck)
     {
-        error_msg(h5tools_getprogname(), "invalid chunking input: 'all' option\
+        error_msg("invalid chunking input: 'all' option\
                             is present with other objects\n");
         return -1;
     }
@@ -713,7 +713,7 @@ static int check_options(pack_opt_t *options)
 
     if (options->all_filter==1 && has_cp)
     {
-        error_msg(h5tools_getprogname(), "invalid compression input: 'all' option\
+        error_msg("invalid compression input: 'all' option\
                             is present with other objects\n");
         return -1;
     }
@@ -725,24 +725,24 @@ static int check_options(pack_opt_t *options)
 
     if (options->grp_compact < 0)
     {
-        error_msg(h5tools_getprogname(), "invalid maximum number of links to store as header messages\n");
+        error_msg("invalid maximum number of links to store as header messages\n");
         return -1;
     }
     if (options->grp_indexed < 0)
     {
-        error_msg(h5tools_getprogname(), "invalid minimum number of links to store in the indexed format\n");
+        error_msg("invalid minimum number of links to store in the indexed format\n");
         return -1;
     }
     if (options->grp_indexed > options->grp_compact)
     {
-        error_msg(h5tools_getprogname(), "minimum indexed size is greater than the maximum compact size\n");
+        error_msg("minimum indexed size is greater than the maximum compact size\n");
         return -1;
     }
     for (i=0; i<8; i++)
     {
         if (options->msg_size[i]<0)
         {
-            error_msg(h5tools_getprogname(), "invalid shared message size\n");
+            error_msg("invalid shared message size\n");
             return -1;
         }
     }
@@ -764,7 +764,7 @@ static int check_options(pack_opt_t *options)
 
     if ( options->ublock_filename == NULL && options->ublock_size != 0 )
     {
-        error_msg(h5tools_getprogname(), "file name missing for user block\n",
+        error_msg("file name missing for user block\n",
             options->ublock_filename);
         return -1;
     }
@@ -777,7 +777,7 @@ static int check_options(pack_opt_t *options)
 
     if ( options->alignment == 0 && options->threshold != 0 )
     {
-        error_msg(h5tools_getprogname(), "alignment for H5Pset_alignment missing\n");
+        error_msg("alignment for H5Pset_alignment missing\n");
         return -1;
     }
 
@@ -849,7 +849,7 @@ static int check_objects(const char* fname,
         /* the input object names are present in the file and are valid */
         if(h5trav_getindext(name, travt) < 0)
         {
-            error_msg(h5tools_getprogname(), "%s Could not find <%s> in file <%s>. Exiting...\n",
+            error_msg("%s Could not find <%s> in file <%s>. Exiting...\n",
                 (options->verbose?"\n":""),name,fname);
             goto out;
         }
@@ -971,7 +971,7 @@ static const char* get_sfilter(H5Z_filter_t filtn)
     else if (filtn==H5Z_FILTER_SCALEOFFSET)
         return "SOFF";
     else {
-        error_msg(h5tools_getprogname(), "input error in filter type\n");
+        error_msg("input error in filter type\n");
         exit(EXIT_FAILURE);
     }
 }