summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2016-08-13 09:23:53 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2016-08-13 09:23:53 (GMT)
commitf40381b0eab242182a02b0bb97aed88b37095086 (patch)
tree600c15466f4bbb9576ccc78f82287e5e6c78612b /hl
parentae0b7490126e45e312b63a27b499e5a25e402f40 (diff)
downloadhdf5-f40381b0eab242182a02b0bb97aed88b37095086.zip
hdf5-f40381b0eab242182a02b0bb97aed88b37095086.tar.gz
hdf5-f40381b0eab242182a02b0bb97aed88b37095086.tar.bz2
[svn-r30285] Description:
More warning cleanups, bringing the build down to 25 unique types of warnings, with 550 warnings in 122 files (down from 28, 770, and 134). Tested on: MacOSX/64 10.11.5 (amazon) w/serial & parallel (h5committest forthcoming)
Diffstat (limited to 'hl')
-rw-r--r--hl/src/H5LT.c4
-rw-r--r--hl/test/test_dset_append.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 107e238..b7e0b4a 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -894,8 +894,8 @@ hid_t H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flags)
/* set allocation increment to a percentage of the supplied buffer size, or
* a pre-defined minimum increment value, whichever is larger
*/
- if ((buf_prcnt * buf_size) > min_incr)
- alloc_incr = (size_t)(buf_prcnt * buf_size);
+ if ((size_t)(buf_prcnt * (double)buf_size) > min_incr)
+ alloc_incr = (size_t)(buf_prcnt * (double)buf_size);
else
alloc_incr = min_incr;
diff --git a/hl/test/test_dset_append.c b/hl/test/test_dset_append.c
index 62e86cb..a5c9abc 100644
--- a/hl/test/test_dset_append.c
+++ b/hl/test/test_dset_append.c
@@ -56,14 +56,12 @@ test_dataset_append_notset(hid_t fid)
hid_t did = -1; /* Dataset ID */
hid_t sid = -1; /* Dataspace ID */
hid_t dcpl = -1; /* A copy of dataset creation property */
- hid_t dapl = -1; /* A copy of dataset access property */
hid_t ffapl = -1; /* The file's file access property list */
hsize_t dims[2] = {0, 10}; /* Current dimension sizes */
hsize_t maxdims[2] = {H5S_UNLIMITED, 20}; /* Maximum dimension sizes */
hsize_t chunk_dims[2] = {2,5}; /* Chunk dimension sizes */
int lbuf[10]; /* The data buffers */
- hsize_t file_size; /* File size */
int i, j; /* Local index variables */
h5_stat_t sb1, sb2; /* File info */