summaryrefslogtreecommitdiffstats
path: root/tools/h5copy/h5copy.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-08-19 21:16:28 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-08-19 21:16:28 (GMT)
commit525caddd9e0460b2f39d043f04dabc7ab6a1bf3a (patch)
tree176f2be3724d8160e67de97df457988a27aa2257 /tools/h5copy/h5copy.c
parentd221d97f992d66540d39b0dfdca80b37849a7dd6 (diff)
downloadhdf5-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/h5copy/h5copy.c')
-rw-r--r--tools/h5copy/h5copy.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c
index 20b28e1..89cb5fb 100644
--- a/tools/h5copy/h5copy.c
+++ b/tools/h5copy/h5copy.c
@@ -176,7 +176,7 @@ static int parse_flag(const char* str_flag, unsigned *flag)
}
else
{
- error_msg(h5tools_getprogname(), "Error in input flag\n");
+ error_msg("Error in input flag\n");
return -1;
}
@@ -288,28 +288,28 @@ main (int argc, const char *argv[])
if (fname_src==NULL)
{
- error_msg(h5tools_getprogname(), "Input file name missing\n");
+ error_msg("Input file name missing\n");
usage();
leave(EXIT_FAILURE);
}
if (fname_dst==NULL)
{
- error_msg(h5tools_getprogname(), "Output file name missing\n");
+ error_msg("Output file name missing\n");
usage();
leave(EXIT_FAILURE);
}
if (oname_src==NULL)
{
- error_msg(h5tools_getprogname(), "Source object name missing\n");
+ error_msg("Source object name missing\n");
usage();
leave(EXIT_FAILURE);
}
if (oname_dst==NULL)
{
- error_msg(h5tools_getprogname(), "Destination object name missing\n");
+ error_msg("Destination object name missing\n");
usage();
leave(EXIT_FAILURE);
}
@@ -326,7 +326,7 @@ main (int argc, const char *argv[])
*-------------------------------------------------------------------------*/
if (fid_src==-1)
{
- error_msg(h5tools_getprogname(), "Could not open input file <%s>...Exiting\n", fname_src);
+ error_msg("Could not open input file <%s>...Exiting\n", fname_src);
if (fname_src)
free(fname_src);
leave(EXIT_FAILURE);
@@ -349,7 +349,7 @@ main (int argc, const char *argv[])
*-------------------------------------------------------------------------*/
if (fid_dst==-1)
{
- error_msg(h5tools_getprogname(), "Could not open output file <%s>...Exiting\n", fname_dst);
+ error_msg("Could not open output file <%s>...Exiting\n", fname_dst);
if (fname_src)
free(fname_src);
if (fname_dst)
@@ -390,7 +390,7 @@ main (int argc, const char *argv[])
/* Create link creation property list */
if((lcpl_id = H5Pcreate(H5P_LINK_CREATE)) < 0) {
- error_msg(h5tools_getprogname(), "Could not create link creation property list\n");
+ error_msg("Could not create link creation property list\n");
goto error;
} /* end if */
@@ -398,7 +398,7 @@ main (int argc, const char *argv[])
if(parents) {
/* Set the intermediate group creation property */
if(H5Pset_create_intermediate_group(lcpl_id, 1) < 0) {
- error_msg(h5tools_getprogname(), "Could not set property for creating parent groups\n");
+ error_msg("Could not set property for creating parent groups\n");
goto error;
} /* end if */