diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-04-01 21:52:57 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-04-01 21:52:57 (GMT) |
| commit | 7022c013acb0ffac172d0ef99aa7d0205ab842c8 (patch) | |
| tree | 61004bc2b74e3c274d1ccda743e5a77211da340b /tools/h5repack/h5repack_copy.c | |
| parent | d2232db790ebad0dbff649336b647e17ab83c71f (diff) | |
| download | hdf5-7022c013acb0ffac172d0ef99aa7d0205ab842c8.zip hdf5-7022c013acb0ffac172d0ef99aa7d0205ab842c8.tar.gz hdf5-7022c013acb0ffac172d0ef99aa7d0205ab842c8.tar.bz2 | |
[svn-r22225] Description:
Bring r22220, r22221 & r22224 from trunk to 1.8 branch: improved h5repack metadata block size testing, and some code cleanups.
Tested on:
FreeBSD/32 8.2 (loyalty) w/gcc4.6, w/C++ & FORTRAN, in debug mode
FreeBSD/64 8.2 (freedom) w/gcc4.6, w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (koala) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Diffstat (limited to 'tools/h5repack/h5repack_copy.c')
| -rw-r--r-- | tools/h5repack/h5repack_copy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index e8fbbfa..03a0043 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -42,7 +42,7 @@ int _err_num = 0; \ char _msg[80]; \ H5Ewalk2(H5E_DEFAULT, H5E_WALK_DOWNWARD, walk_error_callback, &_err_num); \ - H5Eget_msg(_err_num, NULL, _msg, 80); \ + H5Eget_msg(_err_num, NULL, _msg, (size_t)80); \ error_msg("%s %s -- %s\n", #_fun, "failed", _msg); \ goto error; \ } \ @@ -293,7 +293,7 @@ int copy_objects(const char* fnamein, * set metadata block size option *------------------------------------------------------------------------- */ - if ( options->meta_block_size > 0 ) + if ( options->meta_block_size > 0 ) { /* either use the FAPL already created or create a new one */ if (fapl == H5P_DEFAULT) |