diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-20 12:43:30 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-20 12:43:30 (GMT) |
| commit | 83f50e5a722f7a58562a0885fef695f74bce7285 (patch) | |
| tree | 604f4dad662be4824a77eb85cffa3639cd35a9de /src/H5Ocache.c | |
| parent | 02a23331992c618bb3cacb35bc0ea52f36ba1482 (diff) | |
| download | hdf5-83f50e5a722f7a58562a0885fef695f74bce7285.zip hdf5-83f50e5a722f7a58562a0885fef695f74bce7285.tar.gz hdf5-83f50e5a722f7a58562a0885fef695f74bce7285.tar.bz2 | |
[svn-r18865] Description:
Bring r18864 from trunk to 1.8 branch:
General cleanups to align metadata journaling branch and trunk
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Ocache.c')
| -rw-r--r-- | src/H5Ocache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Ocache.c b/src/H5Ocache.c index 32b9560..7e7d738 100644 --- a/src/H5Ocache.c +++ b/src/H5Ocache.c @@ -663,11 +663,11 @@ H5O_cache_chk_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "can't wrap buffer") /* Get a pointer to a buffer that's large enough for serialized header */ - if(NULL == (buf = (uint8_t *)H5WB_actual(wb, udata->chunk_size))) + if(NULL == (buf = (uint8_t *)H5WB_actual(wb, udata->size))) HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, NULL, "can't get actual buffer") /* Read rest of the raw data */ - if(H5F_block_read(f, H5FD_MEM_OHDR, addr, udata->chunk_size, dxpl_id, buf) < 0) + if(H5F_block_read(f, H5FD_MEM_OHDR, addr, udata->size, dxpl_id, buf) < 0) HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to read object header continuation chunk") /* Check if we are still decoding the object header */ @@ -678,7 +678,7 @@ H5O_cache_chk_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) HDassert(udata->common.cont_msg_info); /* Parse the chunk */ - if(H5O_chunk_deserialize(udata->oh, udata->common.addr, udata->chunk_size, buf, &(udata->common), &chk_proxy->cache_info.is_dirty) < 0) + if(H5O_chunk_deserialize(udata->oh, udata->common.addr, udata->size, buf, &(udata->common), &chk_proxy->cache_info.is_dirty) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "can't deserialize object header chunk") /* Set the fields for the chunk proxy */ |