diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-06-03 15:35:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-06-03 15:35:28 (GMT) |
| commit | 235b3b86c1eabefcf6c4de9594a5609b6f03060b (patch) | |
| tree | ad92ab59e8545694bd914be12f46dc501f1963a0 /src/H5FAcache.c | |
| parent | e2fa1a7555ea0c548824c33f84a5e5c9efd1b938 (diff) | |
| download | hdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.zip hdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.tar.gz hdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.tar.bz2 | |
[svn-r27144] Description:
Normalize trunk against the metadata_cache_merge branch, in preparation
for merging the branch into the trunk.
Tested on:
MacOSX/64 10.10.3 (amazon) w/serial & parallel
Linux/64 2.6.x (koala) w/serial
Linux/32 2.6.x (jam) w/serial & parallel
Diffstat (limited to 'src/H5FAcache.c')
| -rw-r--r-- | src/H5FAcache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5FAcache.c b/src/H5FAcache.c index a26aee6..9a1fc57 100644 --- a/src/H5FAcache.c +++ b/src/H5FAcache.c @@ -189,7 +189,7 @@ H5FA__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)) H5E_THROW(H5E_CANTINIT, "can't wrap buffer") /* Compute the 'base' size of the fixed array header on disk */ - size = H5FA_HEADER_SIZE(hdr); + size = H5FA_HEADER_SIZE_HDR(hdr); /* Get a pointer to a buffer that's large enough for serialized header */ if(NULL == (buf = (uint8_t *)H5WB_actual(wb, size))) @@ -883,7 +883,7 @@ H5FA__cache_dblk_page_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)) H5E_THROW(H5E_CANTINIT, "can't wrap buffer") /* Compute the size of the fixed array data block page on disk */ - size = H5FA_DBLK_PAGE_SIZE(dblk_page, udata->nelmts); + size = H5FA_DBLK_PAGE_SIZE(udata->hdr, udata->nelmts); /* Get a pointer to a buffer that's large enough for serialized info */ if(NULL == (buf = (uint8_t *)H5WB_actual(wb, size))) |