diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-10 17:08:27 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-10 17:08:27 (GMT) |
| commit | 9d27b9765ad7d5ec04762895752bc77b8ac1ec3d (patch) | |
| tree | a0e442dbb7b27f963a9ba8240db1605ca6de6615 /tools/h5repack | |
| parent | 61c693615a1f4f90f7654f639170eed2f3c85262 (diff) | |
| download | hdf5-9d27b9765ad7d5ec04762895752bc77b8ac1ec3d.zip hdf5-9d27b9765ad7d5ec04762895752bc77b8ac1ec3d.tar.gz hdf5-9d27b9765ad7d5ec04762895752bc77b8ac1ec3d.tar.bz2 | |
[svn-r17313] Description:
Bring back various minor code cleanups from the file free space branch
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.8 (amazon) in debug mode
Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'tools/h5repack')
| -rw-r--r-- | tools/h5repack/h5repack_copy.c | 8 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_main.c | 5 | ||||
| -rw-r--r-- | tools/h5repack/h5repacktst.c | 3 |
3 files changed, 4 insertions, 12 deletions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index 73f57e3..0fb8fc8 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -930,16 +930,12 @@ int do_copy_objects(hid_t fidin, /* only print the compression ration if there was a filter request */ if (apply_s && apply_f && req_filter) { - hssize_t a, b; - /* get the storage size of the output dataset */ dsize_out=H5Dget_storage_size(dset_out); /* compression ratio = uncompressed size / compressed size */ - - a = dsize_in; b = dsize_out; - if (b!=0) - ratio = (double) a / (double) b; + if (dsize_out!=0) + ratio = (double) dsize_in / (double) dsize_out; print_dataset_info(dcpl_out,travt->objs[i].name,ratio,1); } diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c index f55bd2e..d9ec7ad 100644 --- a/tools/h5repack/h5repack_main.c +++ b/tools/h5repack/h5repack_main.c @@ -411,13 +411,12 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options) case 'b': - options->ublock_size = atol( opt_arg ); + options->ublock_size = (hsize_t)atol( opt_arg ); break; case 't': - options->threshold = atol( opt_arg ); - + options->threshold = (hsize_t)atol( opt_arg ); break; case 'a': diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c index b36afde..d28750c 100644 --- a/tools/h5repack/h5repacktst.c +++ b/tools/h5repack/h5repacktst.c @@ -1507,7 +1507,6 @@ int main (void) SKIPPED(); #endif - /*------------------------------------------------------------------------- * test file with userblock *------------------------------------------------------------------------- @@ -1529,8 +1528,6 @@ int main (void) PASSED(); - - /*------------------------------------------------------------------------- * clean temporary test files *------------------------------------------------------------------------- |