diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 05:45:56 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 05:45:56 (GMT) |
commit | cccd3d26d61348db189ec262548fab26f062a427 (patch) | |
tree | ae599a7ab23d0330d1d92e85551c058ec42ba0cd /src/H5HFdblock.c | |
parent | 856b2e2c259e94516c9b04e57368018fd44f58cf (diff) | |
download | hdf5-cccd3d26d61348db189ec262548fab26f062a427.zip hdf5-cccd3d26d61348db189ec262548fab26f062a427.tar.gz hdf5-cccd3d26d61348db189ec262548fab26f062a427.tar.bz2 |
[svn-r18038] Description:
Bring r18037 from trunk to 1.8 branch:
Bring r18035 from merge_metadata_journaling branch to trunk:
More "brush clearing" convergence between metadata_journaling branch
and the trunk.
Tested on:
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
(h5committested on trunk)
Diffstat (limited to 'src/H5HFdblock.c')
-rw-r--r-- | src/H5HFdblock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c index 3968c76..8c4c5c8 100644 --- a/src/H5HFdblock.c +++ b/src/H5HFdblock.c @@ -435,9 +435,9 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr, size_t dblock_size, H5HF_indirect_t *par_iblock, unsigned par_entry, H5AC_protect_t rw) { - H5HF_parent_t par_info; /* Parent info for loading block */ - H5HF_direct_t *dblock; /* Direct block from cache */ - H5HF_direct_t *ret_value; /* Return value */ + H5HF_parent_t par_info; /* Parent info for loading block */ + H5HF_direct_t *dblock; /* Direct block from cache */ + H5HF_direct_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_protect) |