diff options
author | Neil Fortner <nfortne2@hdfgroup.org> | 2019-10-29 19:38:50 (GMT) |
---|---|---|
committer | David Young <dyoung@hdfgroup.org> | 2020-05-20 14:17:26 (GMT) |
commit | 31fd2e60c791b908fd652ced8587e2f07f88349f (patch) | |
tree | 857fa2f163bc82402c805ed742c619dabdc16c61 /src/H5Tcommit.c | |
parent | 1e7387a5f86cb7ff4db1d1e168b9befe1db8d7da (diff) | |
download | hdf5-31fd2e60c791b908fd652ced8587e2f07f88349f.zip hdf5-31fd2e60c791b908fd652ced8587e2f07f88349f.tar.gz hdf5-31fd2e60c791b908fd652ced8587e2f07f88349f.tar.bz2 |
Implement H5VLget_file_type() to return a copy of a datatype with the
location set to be in a file. Only meant to be used by VOL connectors.
Implement H5VLpeek_connector_id() to support connectors querying their
own IDs. Fix app_ref with connector IDs in a couple places (external
VOLs registered as default through ENV should be visible to the
application). Modify vlen and reference interfaces to work with
arbitrary VOL connectors. Implement file "post open" specific
callback, to enable connectors to update their file structs after a
wrap context has been set.
Diffstat (limited to 'src/H5Tcommit.c')
-rw-r--r-- | src/H5Tcommit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index c6b85a5..e582995 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -229,7 +229,7 @@ done: HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't remove dataset from list of open objects") /* Close the datatype object */ - if(H5O_close(&(dt->oloc), NULL) < 0) + if(H5O_close(&(dt->oloc), NULL) < 0) HDONE_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to release object header") /* Remove the datatype's object header from the file */ @@ -237,7 +237,7 @@ done: HDONE_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "unable to delete object header") /* Mark datatype as being back in memory */ - if(H5T_set_loc(dt, dt->sh_loc.file, H5T_LOC_MEMORY)) + if(H5T_set_loc(dt, NULL, H5T_LOC_MEMORY)) HDONE_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "unable to return datatype to memory") dt->sh_loc.type = H5O_SHARE_TYPE_UNSHARED; dt->shared->state = old_state; @@ -414,7 +414,7 @@ H5T__commit(H5F_t *file, H5T_t *type, hid_t tcpl_id) /* Mark datatype as being on disk now. This step changes the size of * datatype as stored on disk. */ - if(H5T_set_loc(type, file, H5T_LOC_DISK) < 0) + if(H5T_set_loc(type, H5F_VOL_OBJ(file), H5T_LOC_DISK) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "cannot mark datatype on disk") /* Reset datatype location and path */ |