From 230570b5934ccd3572d6af82a27b22ad338bd7c3 Mon Sep 17 00:00:00 2001 From: vchoi Date: Mon, 6 Apr 2020 19:26:49 -0500 Subject: Fix an error in previous merge: should use NULL instead of FAIL. --- src/H5Dint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/H5Dint.c b/src/H5Dint.c index 954b619..2e37aa4 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -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 */ -- cgit v0.12 From db9155c2f34bbf77a1cda01904805fe5c993b6d5 Mon Sep 17 00:00:00 2001 From: vchoi Date: Tue, 7 Apr 2020 13:17:56 -0500 Subject: Fix according to PR feedback. --- src/H5Dint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/H5Dint.c b/src/H5Dint.c index 2e37aa4..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) -- cgit v0.12