summaryrefslogtreecommitdiffstats
path: root/src/H5EAcache.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-06-03 15:35:28 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-06-03 15:35:28 (GMT)
commit235b3b86c1eabefcf6c4de9594a5609b6f03060b (patch)
treead92ab59e8545694bd914be12f46dc501f1963a0 /src/H5EAcache.c
parente2fa1a7555ea0c548824c33f84a5e5c9efd1b938 (diff)
downloadhdf5-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/H5EAcache.c')
-rw-r--r--src/H5EAcache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index b9acc49..70686fb 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -227,7 +227,7 @@ H5EA__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 extensible array header on disk */
- size = H5EA_HEADER_SIZE(hdr);
+ size = H5EA_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)))
@@ -1789,7 +1789,7 @@ H5EA__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 extensible array data block page on disk */
- size = H5EA_DBLK_PAGE_SIZE(dblk_page);
+ size = H5EA_DBLK_PAGE_SIZE(udata->hdr);
/* Get a pointer to a buffer that's large enough for serialized info */
if(NULL == (buf = (uint8_t *)H5WB_actual(wb, size)))