summaryrefslogtreecommitdiffstats
path: root/src/H5Dint.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2018-10-29 18:15:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2018-10-29 18:15:56 (GMT)
commitca5ff0c0c2ad95916ed41640419d4c24e78cc83d (patch)
treed22ded8094e7aea4c7ed06bf662e97e6c1436dbf /src/H5Dint.c
parent8fd2e1d36e4f9df5d202499204a88cbbdd44461b (diff)
downloadhdf5-ca5ff0c0c2ad95916ed41640419d4c24e78cc83d.zip
hdf5-ca5ff0c0c2ad95916ed41640419d4c24e78cc83d.tar.gz
hdf5-ca5ff0c0c2ad95916ed41640419d4c24e78cc83d.tar.bz2
Convert dataset callbacks to standard form, for wrapping object IDs, etc.
Also, fix a few attribute issues that I missed.
Diffstat (limited to 'src/H5Dint.c')
-rw-r--r--src/H5Dint.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 44a9d88..67889e6 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -300,7 +300,7 @@ H5D__close_cb(H5VL_object_t *dset_vol_obj)
HDassert(dset_vol_obj);
/* Close the dataset */
- if(H5VL_dataset_close(dset_vol_obj->data, dset_vol_obj->plugin->cls, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
+ if(H5VL_dataset_close(dset_vol_obj, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to close dataset");
done:
@@ -2459,10 +2459,7 @@ H5D__vlen_get_buf_size(void H5_ATTR_UNUSED *elem, hid_t type_id,
HGOTO_ERROR(H5E_DATASET, H5E_CANTCREATE, FAIL, "can't select point")
/* Read in the point (with the custom VL memory allocator) */
- if(H5VL_dataset_read(vol_obj->data, vol_obj->plugin->cls,
- type_id, vlen_bufsize->mspace_id,
- vlen_bufsize->fspace_id, H5P_DATASET_XFER_DEFAULT,
- vlen_bufsize->fl_tbuf, H5_REQUEST_NULL) < 0)
+ if(H5VL_dataset_read(vol_obj, type_id, vlen_bufsize->mspace_id, vlen_bufsize->fspace_id, H5P_DATASET_XFER_DEFAULT, vlen_bufsize->fl_tbuf, H5_REQUEST_NULL) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read point")
done: