diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2020-04-08 23:33:00 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2020-04-08 23:33:00 (GMT) |
| commit | fcd3bce9610d0f746f2d6a550e800cab8abdec69 (patch) | |
| tree | 1b3d8b664c27ab9aa5dcadda1e6c64aafdd76a22 /src | |
| parent | 9c0b57114928df01b4a45e69e786de8fc76783d2 (diff) | |
| parent | db9155c2f34bbf77a1cda01904805fe5c993b6d5 (diff) | |
| download | hdf5-fcd3bce9610d0f746f2d6a550e800cab8abdec69.zip hdf5-fcd3bce9610d0f746f2d6a550e800cab8abdec69.tar.gz hdf5-fcd3bce9610d0f746f2d6a550e800cab8abdec69.tar.bz2 | |
Merge pull request #2496 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/dtype_close_on_error to develop
* commit 'db9155c2f34bbf77a1cda01904805fe5c993b6d5':
Fix according to PR feedback.
Fix an error in previous merge: should use NULL instead of FAIL.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Dint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index 954b619..4c6814d 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -1402,7 +1402,7 @@ H5D__create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id, ret_value = new_dset; done: - if(!ret_value && new_dset && new_dset->shared) { + if(!ret_value && new_dset) { if(new_dset->shared) { if(layout_init) if(new_dset->shared->layout.ops->dest && (new_dset->shared->layout.ops->dest)(new_dset) < 0) @@ -1425,11 +1425,11 @@ done: if(new_dset->shared->type) { if(new_dset->shared->type_id > 0) { if(H5I_dec_ref(new_dset->shared->type_id) < 0) - HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release datatype") + HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release datatype") } /* end if */ else { if(H5T_close_real(new_dset->shared->type) < 0) - HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release datatype") + HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release datatype") } /* end else */ } /* end if */ |