diff options
| author | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2019-11-26 01:07:44 (GMT) |
|---|---|---|
| committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2019-11-27 20:17:08 (GMT) |
| commit | f46494ffd8449fc610798c8af312362608029d3d (patch) | |
| tree | bb461430b391552fd4305e4ad2b35ab3f3232555 /src/H5I.c | |
| parent | b8a56718e40efaf6954a760984b9d513dbff8f7d (diff) | |
| download | hdf5-f46494ffd8449fc610798c8af312362608029d3d.zip hdf5-f46494ffd8449fc610798c8af312362608029d3d.tar.gz hdf5-f46494ffd8449fc610798c8af312362608029d3d.tar.bz2 | |
Remove H5VL_NATIVE_FILE_GET_FILE_ID and add H5VL_OBJECT_GET_FILE
Remove H5F__get_file_id() and use only private routine instead
Diffstat (limited to 'src/H5I.c')
| -rw-r--r-- | src/H5I.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -2270,7 +2270,14 @@ H5Iget_file_id(hid_t obj_id) /* Call internal function */ if (H5I_FILE == type || H5I_DATATYPE == type || H5I_GROUP == type || H5I_DATASET == type || H5I_ATTR == type) { - if ((ret_value = H5F_get_file_id(obj_id, type, TRUE)) < 0) + H5VL_object_t *vol_obj = NULL; /* Object token of obj_id */ + + /* Get the VOL object */ + if(NULL == (vol_obj = H5VL_vol_object(obj_id))) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid location identifier") + + /* Get the file ID */ + if ((ret_value = H5F_get_file_id(vol_obj, type, TRUE)) < 0) HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, H5I_INVALID_HID, "can't retrieve file ID") } /* end if */ else |