diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-03-04 00:27:40 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-03-04 00:27:40 (GMT) |
| commit | 5b294640c003dac45c2cc489793950207bf63c8f (patch) | |
| tree | ef451f922a5242888c2cd63552212fa278284162 /tools/perform/zip_perf.c | |
| parent | dc059968de3823ffa1b0008c14b7e7e46c1fb8d8 (diff) | |
| parent | 6ee9ea656fad6f408e81bd995eb465e0dd4ce0db (diff) | |
| download | hdf5-5b294640c003dac45c2cc489793950207bf63c8f.zip hdf5-5b294640c003dac45c2cc489793950207bf63c8f.tar.gz hdf5-5b294640c003dac45c2cc489793950207bf63c8f.tar.bz2 | |
[svn-r26350] Merge of r26273-26348 from the trunk.
Tested on: h5committest
Diffstat (limited to 'tools/perform/zip_perf.c')
| -rw-r--r-- | tools/perform/zip_perf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/perform/zip_perf.c b/tools/perform/zip_perf.c index edd5b0f..f73ba40 100644 --- a/tools/perform/zip_perf.c +++ b/tools/perform/zip_perf.c @@ -43,10 +43,10 @@ #define ONE_MB (ONE_KB * ONE_KB) #define ONE_GB (ONE_MB * ONE_KB) -#define MICROSECOND 1000000.0 +#define MICROSECOND 1000000.0F /* report 0.0 in case t is zero too */ -#define MB_PER_SEC(bytes,t) ((fabs(t)<0.0000000001) ? 0.0 : ((((double)bytes) / ONE_MB) / (t))) +#define MB_PER_SEC(bytes,t) ((fabs(t)<0.0000000001F) ? 0.0F : ((((double)bytes) / ONE_MB) / (t))) #ifndef TRUE #define TRUE 1 @@ -182,7 +182,7 @@ write_file(Bytef *source, uLongf sourceLen) /* destination buffer needs to be at least 0.1% larger than sourceLen * plus 12 bytes */ - destLen = (uLongf)((double)sourceLen + ((double)sourceLen * 0.1)) + 12; + destLen = (uLongf)((double)sourceLen + ((double)sourceLen * 0.1F)) + 12; dest = (Bytef *)HDmalloc(destLen); if (!dest) @@ -464,7 +464,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, error("out of memory"); } - compression_time = 0.0; + compression_time = 0.0F; if (random_test) fill_with_random_data(src, src_len); |