diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-07 23:22:23 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-07 23:22:23 (GMT) |
commit | f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67 (patch) | |
tree | 75db636de976919b35280e21cc13f5cf9070359e /src/H5Fsuper_cache.c | |
parent | 419b3d66495271b1eff9037e63b2f4bca235316d (diff) | |
download | hdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.zip hdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.tar.gz hdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.tar.bz2 |
[svn-r18073] Description:
Bring r18072 from trunk to 1.8 branch:
Bring r18071 from metadata journaling merge branch:
Refactor local heap routines with changes from metadata journaling
branch, along with other misc. changes as the changes on the metadata journaling
branch are being converged with the current state of the trunk.
Tested on:
Mac OS X/32 10.6.2 (amazon) debug & prod
Linux/64 2.6 (amani) prod
FreeBSD/64 (liberty) prod
Diffstat (limited to 'src/H5Fsuper_cache.c')
-rw-r--r-- | src/H5Fsuper_cache.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c index 86cb8e1..d0a028b 100644 --- a/src/H5Fsuper_cache.c +++ b/src/H5Fsuper_cache.c @@ -154,7 +154,8 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, const void UNUSED /* Read fixed-size portion of the superblock */ p = sbuf; - if(H5FD_set_eoa(lf, H5FD_MEM_SUPER, fixed_size) < 0) + H5_CHECK_OVERFLOW(fixed_size, size_t, haddr_t); + if(H5FD_set_eoa(lf, H5FD_MEM_SUPER, (haddr_t)fixed_size) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "set end of space allocation request failed") if(H5FD_read(lf, dxpl_id, H5FD_MEM_SUPER, (haddr_t)0, fixed_size, p) < 0) HGOTO_ERROR(H5E_FILE, H5E_READERROR, NULL, "unable to read superblock") @@ -181,7 +182,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, const void UNUSED HDassert(fixed_size + variable_size <= sizeof(sbuf)); /* Read in variable-sized portion of superblock */ - if(H5FD_set_eoa(lf, H5FD_MEM_SUPER, fixed_size + variable_size) < 0) + if(H5FD_set_eoa(lf, H5FD_MEM_SUPER, (haddr_t)fixed_size + variable_size) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "set end of space allocation request failed") if(H5FD_read(lf, dxpl_id, H5FD_MEM_SUPER, (haddr_t)fixed_size, variable_size, p) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to read superblock") |