diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-20 20:21:24 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-20 20:21:24 (GMT) |
| commit | ef3d6fc8dda3ad44c493ed8e372ca9ede5a096df (patch) | |
| tree | 10bbf3058e630411def78a5cd653aa4d7e989fbf /src/H5Oattribute.c | |
| parent | 64af76ef7d19f9377c04c46a52f0175e8336dfb8 (diff) | |
| download | hdf5-ef3d6fc8dda3ad44c493ed8e372ca9ede5a096df.zip hdf5-ef3d6fc8dda3ad44c493ed8e372ca9ede5a096df.tar.gz hdf5-ef3d6fc8dda3ad44c493ed8e372ca9ede5a096df.tar.bz2 | |
[svn-r18602] Description:
Bring r18600 from trunk to 1.8 branch:
Increment reference count on object header when "fake" object header
chunk proxy is returned from H5O_chunk_protect(). Also, clean up the
interface to H5O_chunk_unprotect by removing the unnecessary 'oh' parameter.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug
(h5committested on trunk)
Diffstat (limited to 'src/H5Oattribute.c')
| -rw-r--r-- | src/H5Oattribute.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Oattribute.c b/src/H5Oattribute.c index d1ae64c..e568d00 100644 --- a/src/H5Oattribute.c +++ b/src/H5Oattribute.c @@ -865,7 +865,7 @@ H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, chk_flags |= H5AC__DIRTIED_FLAG; /* Release chunk */ - if(H5O_chunk_unprotect(udata->f, udata->dxpl_id, oh, chk_proxy, chk_flags) < 0) + if(H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_flags) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to unprotect object header chunk") chk_proxy = NULL; @@ -886,7 +886,7 @@ H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, done: /* Release chunk, if not already done */ - if(chk_proxy && H5O_chunk_unprotect(udata->f, udata->dxpl_id, oh, chk_proxy, chk_flags) < 0) + if(chk_proxy && H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_flags) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to unprotect object header chunk") FUNC_LEAVE_NOAPI(ret_value) @@ -1066,7 +1066,7 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, chk_flags |= H5AC__DIRTIED_FLAG; /* Release chunk */ - if(H5O_chunk_unprotect(udata->f, udata->dxpl_id, oh, chk_proxy, chk_flags) < 0) + if(H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_flags) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to unprotect object header chunk") chk_proxy = NULL; @@ -1130,7 +1130,7 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, done: /* Release chunk, if not already done */ - if(chk_proxy && H5O_chunk_unprotect(udata->f, udata->dxpl_id, oh, chk_proxy, chk_flags) < 0) + if(chk_proxy && H5O_chunk_unprotect(udata->f, udata->dxpl_id, chk_proxy, chk_flags) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to unprotect object header chunk") FUNC_LEAVE_NOAPI(ret_value) |