diff options
| author | raylu-hdf <60487644+raylu-hdf@users.noreply.github.com> | 2022-04-07 21:03:05 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-07 21:03:05 (GMT) |
| commit | 43ab4e6db135f0d0bacda7d64257b9532381e24a (patch) | |
| tree | 46e512e46b1f03ffb7a25a0aabb7be1f10e6d182 /src/H5Ocopy.c | |
| parent | 715cf1a29b14abd81b4a03421fc742d6f4542fd0 (diff) | |
| parent | 33cfd642b55edd63f8c192b941e227b920149fdc (diff) | |
| download | hdf5-43ab4e6db135f0d0bacda7d64257b9532381e24a.zip hdf5-43ab4e6db135f0d0bacda7d64257b9532381e24a.tar.gz hdf5-43ab4e6db135f0d0bacda7d64257b9532381e24a.tar.bz2 | |
Merge pull request #1601 from HDFGroup/raylu_onion_vfd_4
Sync with the develop branch
Diffstat (limited to 'src/H5Ocopy.c')
| -rw-r--r-- | src/H5Ocopy.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index e31db41..0b0bb55 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -33,7 +33,6 @@ #include "H5Aprivate.h" /* Attributes */ #include "H5CXprivate.h" /* API Contexts */ #include "H5Eprivate.h" /* Error handling */ -#include "H5ESprivate.h" /* Event Sets */ #include "H5FLprivate.h" /* Free lists */ #include "H5Iprivate.h" /* IDs */ #include "H5HGprivate.h" /* Global Heaps */ @@ -772,7 +771,7 @@ done: /* Free destination object header on failure */ if (ret_value < 0) { if (oh_dst && !inserted) { - if (H5O__free(oh_dst) < 0) + if (H5O__free(oh_dst, TRUE) < 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") @@ -963,7 +962,7 @@ H5O__copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, hid_t if (H5P_get(ocpy_plist, H5O_CPY_OPTION_NAME, &cpy_option) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object copy flag") - /* Retrieve the marge committed datatype list */ + /* Retrieve the merge committed datatype list */ if (H5P_peek(ocpy_plist, H5O_CPY_MERGE_COMM_DT_LIST_NAME, &dt_list) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get merge committed datatype list") |