summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@lbl.gov>2020-06-02 20:16:46 (GMT)
committerQuincey Koziol <koziol@lbl.gov>2020-06-02 20:16:46 (GMT)
commit0b9979f0752caf7283a0bc367d3bcd4d0b151480 (patch)
tree661686cb3b8b507de0479b1cf86427910132a48e
parent1c8b4e9fabf62e422dddec7c8265c16124fa0d44 (diff)
parentc6b836527f31a731e022083ebe1b9b18f8cdd29a (diff)
downloadhdf5-0b9979f0752caf7283a0bc367d3bcd4d0b151480.zip
hdf5-0b9979f0752caf7283a0bc367d3bcd4d0b151480.tar.gz
hdf5-0b9979f0752caf7283a0bc367d3bcd4d0b151480.tar.bz2
Merge pull request #2622 in HDFFV/hdf5 from fix_h5doappend to develop
* commit 'c6b836527f31a731e022083ebe1b9b18f8cdd29a': Eliminate unneccesary creation of DXPL
-rw-r--r--hl/src/H5DO.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/hl/src/H5DO.c b/hl/src/H5DO.c
index 0fbdab3..66997cb 100644
--- a/hl/src/H5DO.c
+++ b/hl/src/H5DO.c
@@ -106,7 +106,6 @@ herr_t
H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension,
hid_t memtype, const void *buf)
{
- hbool_t created_dxpl = FALSE; /* Whether we created a DXPL */
hsize_t size[H5S_MAX_RANK]; /* The new size (after extension */
hsize_t old_size = 0; /* The size of the dimension to be extended */
int sndims; /* Number of dimensions in dataspace (signed) */
@@ -135,14 +134,10 @@ H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension,
if(H5I_DATASET != H5Iget_type(dset_id))
goto done;
- /* If the user passed in a default DXPL, create one to pass to H5Dwrite() */
- if(H5P_DEFAULT == dxpl_id) {
- if((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
+ /* If the user passed in a default DXPL, sanity check it */
+ if(H5P_DEFAULT != dxpl_id)
+ if(TRUE != H5Pisa_class(dxpl_id, H5P_DATASET_XFER))
goto done;
- created_dxpl = TRUE;
- } /* end if */
- else if(TRUE != H5Pisa_class(dxpl_id, H5P_DATASET_XFER))
- goto done;
/* Get the dataspace of the dataset */
if(FAIL == (space_id = H5Dget_space(dset_id)))
@@ -240,12 +235,6 @@ H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension,
ret_value = SUCCEED;
done:
- /* Close dxpl if we created it vs. one was passed in */
- if(created_dxpl) {
- if(H5Pclose(dxpl_id) < 0)
- ret_value = FAIL;
- } /* end if */
-
/* Close old dataspace */
if(space_id != FAIL && H5Sclose(space_id) < 0)
ret_value = FAIL;