summaryrefslogtreecommitdiffstats
path: root/src/H5Fsuper.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/H5Fsuper.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/H5Fsuper.c')
-rw-r--r--src/H5Fsuper.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 6db631e..166247a 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -279,7 +279,7 @@ H5F__super_read(H5F_t *f, hid_t dxpl_id)
/* Check for userblock present */
if(H5F_addr_gt(super_addr, 0)) {
/* Set the base address for the file in the VFD now */
- if(H5FD_set_base_addr(f->shared->lf, super_addr) < 0)
+ if(H5F__set_base_addr(f, super_addr) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "failed to set base address for file driver")
} /* end if */
@@ -418,13 +418,13 @@ H5F__super_init(H5F_t *f, hid_t dxpl_id)
sblock->status_flags = 0;
/* Reserve space for the userblock */
- if(H5FD_set_eoa(f->shared->lf, H5FD_MEM_SUPER, userblock_size) < 0)
+ if(H5F__set_eoa(f, H5FD_MEM_SUPER, userblock_size) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to set EOA value for userblock")
/* Set the base address for the file in the VFD now, after allocating
* space for userblock.
*/
- if(H5FD_set_base_addr(f->shared->lf, sblock->base_addr) < 0)
+ if(H5F__set_base_addr(f, sblock->base_addr) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "failed to set base address for file driver")
/* Save a local copy of the superblock version number */
@@ -455,7 +455,7 @@ H5F__super_init(H5F_t *f, hid_t dxpl_id)
superblock_size += driver_size;
/* Reserve space in the file for the superblock, instead of allocating it */
- if(H5FD_set_eoa(f->shared->lf, H5FD_MEM_SUPER, superblock_size) < 0)
+ if(H5F__set_eoa(f, H5FD_MEM_SUPER, superblock_size) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to set EOA value for superblock")
/* Insert superblock into cache, pinned */