diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2021-04-06 09:43:53 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2021-04-06 09:43:53 (GMT) |
| commit | 245950c383324d09ee4161c2697371462a8b928d (patch) | |
| tree | 7bd88bc241f247d48b5488f8d00933b377737ace /src/H5FDros3.c | |
| parent | 847be78dbec1116c5b9be6207dba5253b75da323 (diff) | |
| download | hdf5-245950c383324d09ee4161c2697371462a8b928d.zip hdf5-245950c383324d09ee4161c2697371462a8b928d.tar.gz hdf5-245950c383324d09ee4161c2697371462a8b928d.tar.bz2 | |
Brings trace changes from develop
Diffstat (limited to 'src/H5FDros3.c')
| -rw-r--r-- | src/H5FDros3.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/H5FDros3.c b/src/H5FDros3.c index 52f5134..5153c34 100644 --- a/src/H5FDros3.c +++ b/src/H5FDros3.c @@ -398,7 +398,7 @@ H5Pset_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa) herr_t ret_value = FAIL; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*x", fapl_id, fa); + H5TRACE2("e", "i*#", fapl_id, fa); HDassert(fa != NULL); @@ -493,7 +493,7 @@ H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_out) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*x", fapl_id, fa_out); + H5TRACE2("e", "i*#", fapl_id, fa_out); #if ROS3_DEBUG HDfprintf(stdout, "H5Pget_fapl_ros3() called.\n"); @@ -1538,10 +1538,8 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5FD_ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, - haddr_t addr, /* start offset */ - size_t size, /* length of read */ - void * buf) /* out */ +H5FD_ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, + size_t size, void *buf) { H5FD_ros3_t *file = (H5FD_ros3_t *)_file; size_t filesize = 0; @@ -1564,7 +1562,8 @@ H5FD_ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS filesize = H5FD_s3comms_s3r_get_filesize(file->s3r_handle); - if ((addr > filesize) || ((addr + size) > filesize)) { + if ((addr > filesize) || ((addr + size) > filesize)) +{ HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "range exceeds file address") } |