diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 04:28:42 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 04:28:42 (GMT) |
| commit | de952f36472b1cb66c2021ed37fd8bdfe7e7ba4c (patch) | |
| tree | bfc3d70d04325c8574801e433c24182693096d11 /src/H5Ocopy.c | |
| parent | 77038a81755bd6c853323ba261c9c671800d7be7 (diff) | |
| download | hdf5-de952f36472b1cb66c2021ed37fd8bdfe7e7ba4c.zip hdf5-de952f36472b1cb66c2021ed37fd8bdfe7e7ba4c.tar.gz hdf5-de952f36472b1cb66c2021ed37fd8bdfe7e7ba4c.tar.bz2 | |
[svn-r18035] Description:
More "brush clearing" convergence between metadata_journaling branch
and the trunk.
Tested on:
Mac OS X/32 10.6.2 (amazon) debug & prod
(h5committest not required on this branch)
Diffstat (limited to 'src/H5Ocopy.c')
| -rw-r--r-- | src/H5Ocopy.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index 14280b3..8b31f9b 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -730,17 +730,12 @@ done: HDfree(deleted); /* Release pointer to source object header and its derived objects */ - if(oh_src != NULL) { - /* Unprotect the source object header */ - if(H5AC_unprotect(oloc_src->file, dxpl_id, H5AC_OHDR, oloc_src->addr, oh_src, H5AC__NO_FLAGS_SET) < 0) - HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header") - } /* end if */ + if(oh_src && H5AC_unprotect(oloc_src->file, dxpl_id, H5AC_OHDR, oloc_src->addr, oh_src, H5AC__NO_FLAGS_SET) < 0) + HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header") /* Release pointer to destination object header */ - if(ret_value < 0 && oh_dst) { - if(H5O_dest(oloc_dst->file, oh_dst) < 0) - HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header data") - } /* end if */ + if(ret_value < 0 && oh_dst && H5O_dest(oloc_dst->file, oh_dst) < 0) + HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header data") /* Release user data for particular type of object to copy */ if(udata) { |