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_copy.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_copy.c')
-rw-r--r-- | tools/h5repack/h5repack_copy.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index ece870f..6853297 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -89,7 +89,7 @@ int copy_objects(const char* fnamein, */ if((fidin = h5tools_fopen(fnamein, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) { - error_msg(h5tools_getprogname(), "<%s>: %s\n", fnamein, H5FOPENERROR ); + error_msg("<%s>: %s\n", fnamein, H5FOPENERROR ); goto out; } @@ -99,19 +99,19 @@ int copy_objects(const char* fnamein, if((fcpl_in = H5Fget_create_plist(fidin)) < 0) { - error_msg(h5tools_getprogname(), "failed to retrieve file creation property list\n"); + error_msg("failed to retrieve file creation property list\n"); goto out; } if(H5Pget_userblock(fcpl_in, &ub_size) < 0) { - error_msg(h5tools_getprogname(), "failed to retrieve userblock size\n"); + error_msg("failed to retrieve userblock size\n"); goto out; } if(H5Pclose(fcpl_in) < 0) { - error_msg(h5tools_getprogname(), "failed to close property list\n"); + error_msg("failed to close property list\n"); goto out; } } @@ -122,7 +122,7 @@ int copy_objects(const char* fnamein, /* Create file creation property list */ if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) { - error_msg(h5tools_getprogname(), "fail to create a file creation property list\n"); + error_msg("fail to create a file creation property list\n"); goto out; } @@ -130,7 +130,7 @@ int copy_objects(const char* fnamein, { if(H5Pset_userblock(fcpl, ub_size) < 0) { - error_msg(h5tools_getprogname(), "failed to set non-default userblock size\n"); + error_msg("failed to set non-default userblock size\n"); goto out; } } @@ -143,7 +143,7 @@ int copy_objects(const char* fnamein, /* (So that it is created in "dense storage" form) */ if(H5Pset_link_phase_change(fcpl, (unsigned)options->grp_compact, (unsigned)options->grp_indexed) < 0) { - error_msg(h5tools_getprogname(), "fail to adjust group creation parameters for root group\n"); + error_msg("fail to adjust group creation parameters for root group\n"); goto out; } @@ -185,7 +185,7 @@ int copy_objects(const char* fnamein, { if(H5Pset_shared_mesg_nindexes(fcpl, nindex) < 0) { - error_msg(h5tools_getprogname(), "fail to set the number of shared object header message indexes\n"); + error_msg("fail to set the number of shared object header message indexes\n"); goto out; } @@ -193,7 +193,7 @@ int copy_objects(const char* fnamein, for(i = 0; i < (nindex - 1); i++) { if(H5Pset_shared_mesg_index(fcpl, i, mesg_type_flags[i], min_mesg_sizes[i]) < 0) { - error_msg(h5tools_getprogname(), "fail to configure the specified shared object header message index\n"); + error_msg("fail to configure the specified shared object header message index\n"); goto out; } /* end if */ } /* end for */ @@ -202,13 +202,13 @@ int copy_objects(const char* fnamein, /* Create file access property list */ if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) { - error_msg(h5tools_getprogname(), "Could not create file access property list\n"); + error_msg("Could not create file access property list\n"); goto out; } /* end if */ if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { - error_msg(h5tools_getprogname(), "Could not set property for using latest version of the format\n"); + error_msg("Could not set property for using latest version of the format\n"); goto out; } /* end if */ } /* end if */ @@ -235,7 +235,7 @@ int copy_objects(const char* fnamein, /* set user block size */ if(H5Pset_userblock(fcpl, options->ublock_size) < 0) { - error_msg(h5tools_getprogname(), "failed to set userblock size\n"); + error_msg("failed to set userblock size\n"); goto out; } @@ -247,14 +247,14 @@ int copy_objects(const char* fnamein, /* create a file creation property list */ if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) { - error_msg(h5tools_getprogname(), "fail to create a file creation property list\n"); + error_msg("fail to create a file creation property list\n"); goto out; } /* set user block size */ if(H5Pset_userblock(fcpl, options->ublock_size) < 0) { - error_msg(h5tools_getprogname(), "failed to set userblock size\n"); + error_msg("failed to set userblock size\n"); goto out; } @@ -279,7 +279,7 @@ int copy_objects(const char* fnamein, if (H5Pset_alignment(fapl, options->threshold, options->alignment) < 0) { - error_msg(h5tools_getprogname(), "failed to set alignment\n"); + error_msg("failed to set alignment\n"); goto out; } @@ -291,13 +291,13 @@ int copy_objects(const char* fnamein, /* create a file access property list */ if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) { - error_msg(h5tools_getprogname(), "Could not create file access property list\n"); + error_msg("Could not create file access property list\n"); goto out; } if (H5Pset_alignment(fapl, options->threshold, options->alignment) < 0) { - error_msg(h5tools_getprogname(), "failed to set alignment\n"); + error_msg("failed to set alignment\n"); goto out; } @@ -318,7 +318,7 @@ int copy_objects(const char* fnamein, if((fidout = H5Fcreate(fnameout,H5F_ACC_TRUNC, fcpl, fapl)) < 0) { - error_msg(h5tools_getprogname(), "<%s>: Could not create file\n", fnameout ); + error_msg("<%s>: Could not create file\n", fnameout ); goto out; } @@ -331,7 +331,7 @@ int copy_objects(const char* fnamein, { if ( copy_user_block( options->ublock_filename, fnameout, options->ublock_size) < 0 ) { - error_msg(h5tools_getprogname(), "Could not copy user block. Exiting...\n"); + error_msg("Could not copy user block. Exiting...\n"); goto out; } @@ -355,7 +355,7 @@ int copy_objects(const char* fnamein, */ if(do_copy_objects(fidin, fidout, travt, options) < 0) { - error_msg(h5tools_getprogname(), "<%s>: Could not copy data to: %s\n", fnamein, fnameout); + error_msg("<%s>: Could not copy data to: %s\n", fnamein, fnameout); goto out; } /* end if */ @@ -397,7 +397,7 @@ int copy_objects(const char* fnamein, { if ( copy_user_block(fnamein, fnameout, ub_size) < 0 ) { - error_msg(h5tools_getprogname(), "Could not copy user block. Exiting...\n"); + error_msg("Could not copy user block. Exiting...\n"); goto out; } @@ -1357,19 +1357,19 @@ void print_user_block(const char *filename, hid_t fid) /* get user block size */ if(( fcpl = H5Fget_create_plist(fid)) < 0) { - error_msg(h5tools_getprogname(), "failed to retrieve file creation property list\n"); + error_msg("failed to retrieve file creation property list\n"); goto done; } if(H5Pget_userblock(fcpl, &ub_size) < 0) { - error_msg(h5tools_getprogname(), "failed to retrieve userblock size\n"); + error_msg("failed to retrieve userblock size\n"); goto done; } if(H5Pclose(fcpl) < 0) { - error_msg(h5tools_getprogname(), "failed to close property list\n"); + error_msg("failed to close property list\n"); goto done; } |