diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-06 22:01:24 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-06 22:01:24 (GMT) |
| commit | fa279bfcb7bb294e5e2611453e2b778f76752844 (patch) | |
| tree | 8d32ddf37c5d023fb69208cf86fd503239bdf856 /src/H5Ocopy.c | |
| parent | eeb841b26bdd371f2e3ae506af6390828205691a (diff) | |
| download | hdf5-fa279bfcb7bb294e5e2611453e2b778f76752844.zip hdf5-fa279bfcb7bb294e5e2611453e2b778f76752844.tar.gz hdf5-fa279bfcb7bb294e5e2611453e2b778f76752844.tar.bz2 | |
[svn-r18526] Description:
Bring r18525 from trunk to 1.8 branch:
Bring r18523 from metadata journaling "merging" branch to trunk:
Bring metadata journaling branch into closer correspondence with trunk:
extract data structure freeing routines from metadata cache client 'destroy'
callbacks.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Ocopy.c')
| -rw-r--r-- | src/H5Ocopy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index da91782..f9bf533 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -736,7 +736,7 @@ done: HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header") /* Release pointer to destination object header */ - if(ret_value < 0 && oh_dst && H5O_dest(oloc_dst->file, oh_dst) < 0) + if(ret_value < 0 && oh_dst && H5O_free(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 */ |