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

diff --git a/tools/h5repack/h5repack_parse.c b/tools/h5repack/h5repack_parse.c
index b5753e6..d3a7419 100644
--- a/tools/h5repack/h5repack_parse.c
+++ b/tools/h5repack/h5repack_parse.c
@@ -96,7 +96,7 @@ obj_list_t* parse_filter(const char *str,
     obj_list = (obj_list_t*) malloc(n*sizeof(obj_list_t));
     if (obj_list==NULL)
     {
-        error_msg(h5tools_getprogname(), "could not allocate object list\n");
+        error_msg("could not allocate object list\n");
         return NULL;
     }
     *n_objs=n;
@@ -119,7 +119,7 @@ obj_list_t* parse_filter(const char *str,
     if (end_obj+1==(int)len)
     {
         if (obj_list) free(obj_list);
-        error_msg(h5tools_getprogname(), "input Error: Invalid compression type in <%s>\n",str);
+        error_msg("input Error: Invalid compression type in <%s>\n",str);
         exit(EXIT_FAILURE);
     }
 
@@ -157,7 +157,7 @@ obj_list_t* parse_filter(const char *str,
                         c = str[u];
                         if (!isdigit(c) && l==-1){
                             if (obj_list) free(obj_list);
-                            error_msg(h5tools_getprogname(), "compression parameter not digit in <%s>\n",str);
+                            error_msg("compression parameter not digit in <%s>\n",str);
                             exit(EXIT_FAILURE);
                         }
                         if (l==-1)
@@ -177,7 +177,7 @@ obj_list_t* parse_filter(const char *str,
                                     filt->cd_values[j++]=H5_SZIP_EC_OPTION_MASK;
                                 else
                                 {
-                                    error_msg(h5tools_getprogname(), "szip mask must be 'NN' or 'EC' \n");
+                                    error_msg("szip mask must be 'NN' or 'EC' \n");
                                     exit(EXIT_FAILURE);
                                 }
 
@@ -217,7 +217,7 @@ obj_list_t* parse_filter(const char *str,
                         c = str[u];
                         if (!isdigit(c) && l==-1){
                             if (obj_list) free(obj_list);
-                            error_msg(h5tools_getprogname(), "compression parameter is not a digit in <%s>\n",str);
+                            error_msg("compression parameter is not a digit in <%s>\n",str);
                             exit(EXIT_FAILURE);
                         }
                         if (l==-1)
@@ -237,7 +237,7 @@ obj_list_t* parse_filter(const char *str,
                                     filt->cd_values[j++]=H5Z_SO_FLOAT_DSCALE;
                                 else
                                 {
-                                    error_msg(h5tools_getprogname(), "scale type must be 'IN' or 'DS' \n");
+                                    error_msg("scale type must be 'IN' or 'DS' \n");
                                     exit(EXIT_FAILURE);
                                 }
 
@@ -261,7 +261,7 @@ obj_list_t* parse_filter(const char *str,
                         c = str[u];
                         if (!isdigit(c)){
                             if (obj_list) free(obj_list);
-                            error_msg(h5tools_getprogname(), "compression parameter is not a digit in <%s>\n",str);
+                            error_msg("compression parameter is not a digit in <%s>\n",str);
                             exit(EXIT_FAILURE);
                         }
                         stype[m]=c;
@@ -307,7 +307,7 @@ obj_list_t* parse_filter(const char *str,
        if (no_param)
        { /*no more parameters, GZIP must have parameter */
            if (obj_list) free(obj_list);
-           error_msg(h5tools_getprogname(), "missing compression parameter in <%s>\n",str);
+           error_msg("missing compression parameter in <%s>\n",str);
            exit(EXIT_FAILURE);
        }
    }
@@ -323,7 +323,7 @@ obj_list_t* parse_filter(const char *str,
        if (no_param)
        { /*no more parameters, SZIP must have parameter */
            if (obj_list) free(obj_list);
-           error_msg(h5tools_getprogname(), "missing compression parameter in <%s>\n",str);
+           error_msg("missing compression parameter in <%s>\n",str);
            exit(EXIT_FAILURE);
        }
    }
@@ -339,7 +339,7 @@ obj_list_t* parse_filter(const char *str,
        if (m>0)
        { /*shuffle does not have parameter */
            if (obj_list) free(obj_list);
-           error_msg(h5tools_getprogname(), "extra parameter in SHUF <%s>\n",str);
+           error_msg("extra parameter in SHUF <%s>\n",str);
            exit(EXIT_FAILURE);
        }
    }
@@ -354,7 +354,7 @@ obj_list_t* parse_filter(const char *str,
        if (m>0)
        { /*shuffle does not have parameter */
            if (obj_list) free(obj_list);
-           error_msg(h5tools_getprogname(), "extra parameter in FLET <%s>\n",str);
+           error_msg("extra parameter in FLET <%s>\n",str);
            exit(EXIT_FAILURE);
        }
    }
@@ -369,7 +369,7 @@ obj_list_t* parse_filter(const char *str,
        if (m>0)
        { /*nbit does not have parameter */
            if (obj_list) free(obj_list);
-           error_msg(h5tools_getprogname(), "extra parameter in NBIT <%s>\n",str);
+           error_msg("extra parameter in NBIT <%s>\n",str);
            exit(EXIT_FAILURE);
        }
    }
@@ -384,13 +384,13 @@ obj_list_t* parse_filter(const char *str,
        if (no_param)
        { /*no more parameters, SOFF must have parameter */
            if (obj_list) free(obj_list);
-           error_msg(h5tools_getprogname(), "missing compression parameter in <%s>\n",str);
+           error_msg("missing compression parameter in <%s>\n",str);
            exit(EXIT_FAILURE);
        }
    }
    else {
        if (obj_list) free(obj_list);
-       error_msg(h5tools_getprogname(), "invalid filter type in <%s>\n",str);
+       error_msg("invalid filter type in <%s>\n",str);
        exit(EXIT_FAILURE);
    }
   }
@@ -413,7 +413,7 @@ obj_list_t* parse_filter(const char *str,
        if (filt->cd_values[0]>9 )
        {
            if (obj_list) free(obj_list);
-           error_msg(h5tools_getprogname(), "invalid compression parameter in <%s>\n",str);
+           error_msg("invalid compression parameter in <%s>\n",str);
            exit(EXIT_FAILURE);
        }
        break;
@@ -428,19 +428,19 @@ obj_list_t* parse_filter(const char *str,
        if ((pixels_per_block%2)==1)
        {
            if (obj_list) free(obj_list);
-           error_msg(h5tools_getprogname(), "pixels_per_block is not even in <%s>\n",str);
+           error_msg("pixels_per_block is not even in <%s>\n",str);
            exit(EXIT_FAILURE);
        }
        if (pixels_per_block>H5_SZIP_MAX_PIXELS_PER_BLOCK)
        {
            if (obj_list) free(obj_list);
-           error_msg(h5tools_getprogname(), "pixels_per_block is too large in <%s>\n",str);
+           error_msg("pixels_per_block is too large in <%s>\n",str);
            exit(EXIT_FAILURE);
        }
        if ( (strcmp(smask,"NN")!=0) && (strcmp(smask,"EC")!=0) )
        {
            if (obj_list) free(obj_list);
-           error_msg(h5tools_getprogname(), "szip mask must be 'NN' or 'EC' \n");
+           error_msg("szip mask must be 'NN' or 'EC' \n");
            exit(EXIT_FAILURE);
        }
        break;
@@ -517,7 +517,7 @@ obj_list_t* parse_layout(const char *str,
     obj_list = (obj_list_t*) malloc(n*sizeof(obj_list_t));
     if (obj_list==NULL)
     {
-        error_msg(h5tools_getprogname(), "could not allocate object list\n");
+        error_msg("could not allocate object list\n");
         return NULL;
     }
     *n_objs=n;
@@ -541,7 +541,7 @@ obj_list_t* parse_layout(const char *str,
     if (end_obj+1==(int)len)
     {
         if (obj_list) free(obj_list);
-        error_msg(h5tools_getprogname(), "in parse layout, no characters after : in <%s>\n",str);
+        error_msg("in parse layout, no characters after : in <%s>\n",str);
         exit(EXIT_FAILURE);
     }
 
@@ -558,7 +558,7 @@ obj_list_t* parse_layout(const char *str,
             else if (strcmp(slayout,"CHUNK")==0)
                 pack->layout=H5D_CHUNKED;
             else {
-                error_msg(h5tools_getprogname(), "in parse layout, not a valid layout in <%s>\n",str);
+                error_msg("in parse layout, not a valid layout in <%s>\n",str);
                 exit(EXIT_FAILURE);
             }
         }
@@ -582,7 +582,7 @@ obj_list_t* parse_layout(const char *str,
         if (j>(int)len)
         {
             if (obj_list) free(obj_list);
-            error_msg(h5tools_getprogname(), "in parse layout,  <%s> Chunk dimensions missing\n",str);
+            error_msg("in parse layout,  <%s> Chunk dimensions missing\n",str);
             exit(EXIT_FAILURE);
         }
 
@@ -596,7 +596,7 @@ obj_list_t* parse_layout(const char *str,
                 && c!='N' && c!='O' && c!='N' && c!='E'
                 ){
                 if (obj_list) free(obj_list);
-                error_msg(h5tools_getprogname(), "in parse layout, <%s> Not a valid character in <%s>\n",
+                error_msg("in parse layout, <%s> Not a valid character in <%s>\n",
                     sdim,str);
                 exit(EXIT_FAILURE);
             }
@@ -609,7 +609,7 @@ obj_list_t* parse_layout(const char *str,
                     pack->chunk.chunk_lengths[c_index]=atoi(sdim);
                     if (pack->chunk.chunk_lengths[c_index]==0) {
                         if (obj_list) free(obj_list);
-                        error_msg(h5tools_getprogname(), "in parse layout, <%s> conversion to number in <%s>\n",
+                        error_msg("in parse layout, <%s> conversion to number in <%s>\n",
                             sdim,str);
                         exit(EXIT_FAILURE);
                     }
@@ -627,7 +627,7 @@ obj_list_t* parse_layout(const char *str,
                         pack->chunk.chunk_lengths[c_index]=atoi(sdim);
                         if (pack->chunk.chunk_lengths[c_index]==0){
                             if (obj_list) free(obj_list);
-                            error_msg(h5tools_getprogname(), "in parse layout, <%s> conversion to number in <%s>\n",
+                            error_msg("in parse layout, <%s> conversion to number in <%s>\n",
                                 sdim,str);
                             exit(EXIT_FAILURE);
                         }