diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-19 21:16:28 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-08-19 21:16:28 (GMT) |
commit | 525caddd9e0460b2f39d043f04dabc7ab6a1bf3a (patch) | |
tree | 176f2be3724d8160e67de97df457988a27aa2257 /tools/h5repack/h5repack_main.c | |
parent | d221d97f992d66540d39b0dfdca80b37849a7dd6 (diff) | |
download | hdf5-525caddd9e0460b2f39d043f04dabc7ab6a1bf3a.zip hdf5-525caddd9e0460b2f39d043f04dabc7ab6a1bf3a.tar.gz hdf5-525caddd9e0460b2f39d043f04dabc7ab6a1bf3a.tar.bz2 |
[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)
Diffstat (limited to 'tools/h5repack/h5repack_main.c')
-rw-r--r-- | tools/h5repack/h5repack_main.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c index aaabeac..3cc65d0 100644 --- a/tools/h5repack/h5repack_main.c +++ b/tools/h5repack/h5repack_main.c @@ -124,7 +124,7 @@ int main(int argc, const char **argv) if ( strcmp( infile, outfile ) == 0 ) { - error_msg(h5tools_getprogname(), "file names cannot be the same\n"); + error_msg("file names cannot be the same\n"); usage(h5tools_getprogname()); exit(EXIT_FAILURE); @@ -133,7 +133,7 @@ int main(int argc, const char **argv) else { - error_msg(h5tools_getprogname(), "file names missing\n"); + error_msg("file names missing\n"); usage(h5tools_getprogname()); exit(EXIT_FAILURE); } @@ -320,7 +320,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) /* parse the -f filter option */ if (h5repack_addfilter( opt_arg, options)<0) { - error_msg(h5tools_getprogname(), "in parsing filter\n"); + error_msg("in parsing filter\n"); exit(EXIT_FAILURE); } break; @@ -329,7 +329,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) /* parse the -l layout option */ if (h5repack_addlayout( opt_arg, options)<0) { - error_msg(h5tools_getprogname(), "in parsing layout\n"); + error_msg("in parsing layout\n"); exit(EXIT_FAILURE); } break; @@ -340,7 +340,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) options->min_comp = atoi( opt_arg ); if ((int)options->min_comp<=0) { - error_msg(h5tools_getprogname(), "invalid minimum compress size <%s>\n", opt_arg ); + error_msg("invalid minimum compress size <%s>\n", opt_arg ); exit(EXIT_FAILURE); } break; @@ -433,7 +433,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) options->alignment = atol( opt_arg ); if ( options->alignment < 1 ) { - error_msg(h5tools_getprogname(), "invalid alignment size\n", opt_arg ); + error_msg("invalid alignment size\n", opt_arg ); exit(EXIT_FAILURE); } break; @@ -448,7 +448,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) /* check for file names to be processed */ if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL) { - error_msg(h5tools_getprogname(), "missing file names\n"); + error_msg("missing file names\n"); usage(h5tools_getprogname()); exit(EXIT_FAILURE); } @@ -492,7 +492,7 @@ void read_info(const char *filename, if ((fp = fopen(data_file, "r")) == (FILE *)NULL) { - error_msg(h5tools_getprogname(), "cannot open options file %s\n", filename); + error_msg("cannot open options file %s\n", filename); exit(EXIT_FAILURE); } @@ -529,7 +529,7 @@ void read_info(const char *filename, comp_info[i-1]='\0'; /*cut the last " */ if (h5repack_addfilter(comp_info,options)==-1){ - error_msg(h5tools_getprogname(), "could not add compression option\n"); + error_msg("could not add compression option\n"); exit(EXIT_FAILURE); } } @@ -559,7 +559,7 @@ void read_info(const char *filename, comp_info[i-1]='\0'; /*cut the last " */ if (h5repack_addlayout(comp_info,options)==-1){ - error_msg(h5tools_getprogname(), "could not add chunck option\n"); + error_msg("could not add chunck option\n"); exit(EXIT_FAILURE); } } @@ -568,7 +568,7 @@ void read_info(const char *filename, *------------------------------------------------------------------------- */ else { - error_msg(h5tools_getprogname(), "bad file format for %s", filename); + error_msg("bad file format for %s", filename); exit(EXIT_FAILURE); } } |