diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-06 21:52:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-06 21:52:35 (GMT) |
| commit | 1857a6098296837362a0cabb427c96a5ab956dbc (patch) | |
| tree | 977ce9af56f699c35ec17e442295257941b482b8 /src/H5Ocopy.c | |
| parent | 9d9ce9fbd1c8e98225f2fb08db56e8ebc1e9ec56 (diff) | |
| download | hdf5-1857a6098296837362a0cabb427c96a5ab956dbc.zip hdf5-1857a6098296837362a0cabb427c96a5ab956dbc.tar.gz hdf5-1857a6098296837362a0cabb427c96a5ab956dbc.tar.bz2 | |
[svn-r18525] Description:
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
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
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 */ |