diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2018-11-01 22:02:27 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2018-11-01 22:02:27 (GMT) |
| commit | 4806d29d9f2274e102c76b8672c47cc211dbf3d6 (patch) | |
| tree | c31b228b89c250412284fed9c5dc9f55c51e2f41 /src/H5Tdeprec.c | |
| parent | 1b00d04080aa057cc4eae1512dbed03e35fbc675 (diff) | |
| download | hdf5-4806d29d9f2274e102c76b8672c47cc211dbf3d6.zip hdf5-4806d29d9f2274e102c76b8672c47cc211dbf3d6.tar.gz hdf5-4806d29d9f2274e102c76b8672c47cc211dbf3d6.tar.bz2 | |
Refactor and standardize named datatype VOL callbacks.
Diffstat (limited to 'src/H5Tdeprec.c')
| -rw-r--r-- | src/H5Tdeprec.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c index 4cedbd3..69a52e1 100644 --- a/src/H5Tdeprec.c +++ b/src/H5Tdeprec.c @@ -137,10 +137,7 @@ H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid object identifier") /* Commit the datatype */ - if(NULL == (data = H5VL_datatype_commit(vol_obj->data, loc_params, vol_obj->plugin->cls, - name, type_id, H5P_LINK_CREATE_DEFAULT, - H5P_DATATYPE_CREATE_DEFAULT, H5P_DATATYPE_ACCESS_DEFAULT, - H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL))) + if(NULL == (data = H5VL_datatype_commit(vol_obj, loc_params, name, type_id, H5P_LINK_CREATE_DEFAULT, H5P_DATATYPE_CREATE_DEFAULT, H5P_DATATYPE_ACCESS_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL))) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype") /* Set up VOL object */ @@ -197,9 +194,7 @@ H5Topen1(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid location identifier") /* Open the datatype */ - if(NULL == (dt = H5VL_datatype_open(vol_obj->data, loc_params, vol_obj->plugin->cls, - name, H5P_DATATYPE_ACCESS_DEFAULT, - H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL))) + if(NULL == (dt = H5VL_datatype_open(vol_obj, loc_params, name, H5P_DATATYPE_ACCESS_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL))) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, H5I_INVALID_HID, "unable to open named datatype") /* Register the type and return the ID */ @@ -209,7 +204,7 @@ H5Topen1(hid_t loc_id, const char *name) done: /* Cleanup on error */ if(H5I_INVALID_HID == ret_value) - if(dt && H5VL_datatype_close(dt, vol_obj->plugin->cls, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0) + if(dt && H5VL_datatype_close(vol_obj, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0) HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, H5I_INVALID_HID, "unable to close datatype") FUNC_LEAVE_API(ret_value) |