diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-11-06 20:08:19 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-11-06 20:08:19 (GMT) |
| commit | bb6cb6adb005b0447c1dbb5d61711e3a459ade1f (patch) | |
| tree | 07b24f1271e0a53b541aff9a680d557ee1671689 /src/H5Ocopy.c | |
| parent | 2b5efccc302ee577daa59639109921456f787813 (diff) | |
| download | hdf5-bb6cb6adb005b0447c1dbb5d61711e3a459ade1f.zip hdf5-bb6cb6adb005b0447c1dbb5d61711e3a459ade1f.tar.gz hdf5-bb6cb6adb005b0447c1dbb5d61711e3a459ade1f.tar.bz2 | |
Code style and warning cleanups, from revise_chunks branch.
Diffstat (limited to 'src/H5Ocopy.c')
| -rw-r--r-- | src/H5Ocopy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index 0ee8cfd..d056ae8 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -858,6 +858,10 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, oh_dst->nlink += (unsigned)addr_map->inc_ref_count; } /* end if */ + /* Retag all copied metadata to apply the destination object's tag */ + if(H5AC_retag_copied_metadata(oloc_dst->file, oloc_dst->addr) < 0) + HGOTO_ERROR(H5E_CACHE, H5E_CANTTAG, FAIL, "unable to re-tag metadata entries") + /* Set metadata tag for destination object's object header */ H5_BEGIN_TAG(dxpl_id, oloc_dst->addr, FAIL); @@ -870,10 +874,6 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, /* Reset metadat tag */ H5_END_TAG(FAIL); - /* Retag all copied metadata to apply the destination object's tag */ - if(H5AC_retag_copied_metadata(oloc_dst->file, oloc_dst->addr) < 0) - HGOTO_ERROR(H5E_CACHE, H5E_CANTTAG, FAIL, "unable to re-tag metadata entries") - /* Set obj_type and udata, if requested */ if(obj_type) { HDassert(udata); @@ -892,7 +892,7 @@ done: /* Free destination object header on failure */ if(ret_value < 0 && oh_dst && !inserted) { - if(H5O_free(oh_dst) < 0) + if(H5O__free(oh_dst) < 0) HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header data") if(H5O_loc_reset(oloc_dst) < 0) HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy object header data") |