From c566935876dc1bcba6ee4fcf2571c410ffb16312 Mon Sep 17 00:00:00 2001 From: vchoi Date: Mon, 6 Apr 2020 21:32:28 -0500 Subject: Fix error in previous merge: should use NULL instead of FAIL. --- src/H5Dint.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/H5Dint.c b/src/H5Dint.c index 173ae3f..977940d 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -1418,18 +1418,16 @@ done: HDONE_ERROR(H5E_DATASET, H5E_CANTRESET, NULL, "unable to reset external file list info") if(new_dset->shared->space && H5S_close(new_dset->shared->space) < 0) HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, NULL, "unable to release dataspace") - 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 */ - if(H5F_addr_defined(new_dset->oloc.addr)) { if(H5O_dec_rc_by_loc(&(new_dset->oloc)) < 0) HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, NULL, "unable to decrement refcount on newly created object") -- cgit v0.12 From 365f08e555e7e92f04b095ccfb3dae09b27fd0ad Mon Sep 17 00:00:00 2001 From: vchoi Date: Tue, 7 Apr 2020 14:52:11 -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 977940d..73dc526 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -1399,7 +1399,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