summaryrefslogtreecommitdiffstats
path: root/src/H5FDvfd_swmr.c
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2020-01-10 17:31:37 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-01-10 18:00:22 (GMT)
commit3fd9dc7b83fdff1ea0ecf5d7ef5a4ad2ddfeae51 (patch)
tree78585ea709077cea12b0d95bb10089752bebaf41 /src/H5FDvfd_swmr.c
parent3a911e2b39bb4bf5c06dd4d0a99a847ddd87ce5e (diff)
downloadhdf5-3fd9dc7b83fdff1ea0ecf5d7ef5a4ad2ddfeae51.zip
hdf5-3fd9dc7b83fdff1ea0ecf5d7ef5a4ad2ddfeae51.tar.gz
hdf5-3fd9dc7b83fdff1ea0ecf5d7ef5a4ad2ddfeae51.tar.bz2
Clean up the code a bit: remove some unnecessary casts and such. NFCI.
Diffstat (limited to 'src/H5FDvfd_swmr.c')
-rw-r--r--src/H5FDvfd_swmr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5FDvfd_swmr.c b/src/H5FDvfd_swmr.c
index 3fa172d..3c01d68 100644
--- a/src/H5FDvfd_swmr.c
+++ b/src/H5FDvfd_swmr.c
@@ -308,7 +308,7 @@ H5FD_vfd_swmr_open(const char *name, unsigned flags, hid_t fapl_id,
for (do_try = h5_retry_init(&retry, H5FD_VFD_SWMR_MD_FILE_RETRY_MAX,
H5_RETRY_DEFAULT_MINIVAL,
H5_RETRY_DEFAULT_MAXIVAL);
- do_try != 0;
+ do_try;
do_try = h5_retry_next(&retry)) {
if((file->md_fd = HDopen(file->md_file_path, O_RDONLY)) >= 0)
break;
@@ -1143,7 +1143,7 @@ H5FD__vfd_swmr_load_hdr_and_idx(H5FD_t *_file, hbool_t open)
FUNC_ENTER_STATIC
for (do_try = h5_retry_init(&retry, H5FD_VFD_SWMR_MD_LOAD_RETRY_MAX,
- 1, H5_RETRY_ONE_HOUR / 3600);
+ 1, H5_RETRY_ONE_SECOND);
do_try;
do_try = h5_retry_next(&retry)) {
HDmemset(&md_header, 0, sizeof(H5FD_vfd_swmr_md_header));
@@ -1376,7 +1376,7 @@ H5FD__vfd_swmr_header_deserialize(H5FD_t *_file,
UINT32DECODE(p, stored_chksum);
/* Sanity check */
- HDassert((size_t)(p - (const uint8_t *)&image[0]) <= H5FD_MD_HEADER_SIZE);
+ HDassert((size_t)(p - image) <= H5FD_MD_HEADER_SIZE);
#if 0 /* JRM */
HDfprintf(stderr,
@@ -1537,7 +1537,7 @@ H5FD__vfd_swmr_index_deserialize(H5FD_t *_file,
done:
if(image) {
- image = (uint8_t *)H5MM_xfree(image);
+ image = H5MM_xfree(image);
}
if(ret_value < 0) {