diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-20 20:20:35 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-20 20:20:35 (GMT) |
commit | 8a27e4f4a6a624931ba0b86444e8f21e8d735888 (patch) | |
tree | 9d82d6116ce2eb20be8f9a45ce468fd717ea2215 /src/H5O.c | |
parent | 97f8b83e2d35fe3be71217977b339077cbbd46d8 (diff) | |
download | hdf5-8a27e4f4a6a624931ba0b86444e8f21e8d735888.zip hdf5-8a27e4f4a6a624931ba0b86444e8f21e8d735888.tar.gz hdf5-8a27e4f4a6a624931ba0b86444e8f21e8d735888.tar.bz2 |
[svn-r18601] Description:
Bring r18581:18600 from trunk to revise_chunks branch.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug
(h5committest not required on this branch)
Diffstat (limited to 'src/H5O.c')
-rw-r--r-- | src/H5O.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1792,7 +1792,7 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot) HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header chunk") /* Unprotect chunk, marking it dirty */ - if(H5O_chunk_unprotect(loc->file, dxpl_id, oh, chk_proxy, H5AC__DIRTIED_FLAG) < 0) + if(H5O_chunk_unprotect(loc->file, dxpl_id, chk_proxy, H5AC__DIRTIED_FLAG) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to unprotect object header chunk") } /* end if */ } /* end for */ @@ -1810,10 +1810,9 @@ H5O_assert(oh); ret_value = oh; done: - if(ret_value == NULL && oh) { + if(ret_value == NULL && oh) if(H5AC_unprotect(loc->file, dxpl_id, H5AC_OHDR, loc->addr, oh, H5AC__NO_FLAGS_SET) < 0) HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header") - } /* end if */ FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_protect() */ @@ -2026,7 +2025,7 @@ H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hbool_t force) done: /* Release chunk */ - if(chk_proxy && H5O_chunk_unprotect(f, dxpl_id, oh, chk_proxy, chk_flags) < 0) + if(chk_proxy && H5O_chunk_unprotect(f, dxpl_id, chk_proxy, chk_flags) < 0) HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk") FUNC_LEAVE_NOAPI(ret_value) |