diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-04-24 16:30:24 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-04-24 16:30:24 (GMT) |
| commit | 3bdb11694298551dd1124d36497ac3955c91ba98 (patch) | |
| tree | d1f568f3831311eb74f677fa6d39c8f473f398bf /src/H5Fio.c | |
| parent | cd973218bf779af5b3ccbc171d708c15edb69c19 (diff) | |
| download | hdf5-3bdb11694298551dd1124d36497ac3955c91ba98.zip hdf5-3bdb11694298551dd1124d36497ac3955c91ba98.tar.gz hdf5-3bdb11694298551dd1124d36497ac3955c91ba98.tar.bz2 | |
[svn-r25092] Description:
More migration to using H5F_io_info_t pointers and away from using
property list IDs internally. Also, clean up some compiler warnings in the
cache code.
Tested on:
Mac OSX/64 10.9.2 (amazon) w/C++, FORTRAN & parallel
(h5committest forthcoming)
Diffstat (limited to 'src/H5Fio.c')
| -rw-r--r-- | src/H5Fio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/H5Fio.c b/src/H5Fio.c index e9c5fb7..1d05cd0 100644 --- a/src/H5Fio.c +++ b/src/H5Fio.c @@ -143,6 +143,7 @@ herr_t H5F_block_write(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, hid_t dxpl_id, const void *buf) { + H5F_io_info_t fio_info; /* I/O info for operation */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -160,8 +161,13 @@ HDfprintf(stderr, "%s: write to addr = %a, size = %Zu\n", FUNC, addr, size); if(H5F_addr_le(f->shared->tmp_addr, (addr + size))) HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space") + /* Set up I/O info for operation */ + fio_info.f = f; + if(NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id))) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list") + /* Pass through metadata accumulator layer */ - if(H5F_accum_write(f, dxpl_id, type, addr, size, buf) < 0) + if(H5F__accum_write(&fio_info, type, addr, size, buf) < 0) HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "write through metadata accumulator failed") done: |