diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-05-23 16:59:53 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-05-23 16:59:53 (GMT) |
| commit | 7d289e8a697aba2f537a62d3b6352e357b3bd83b (patch) | |
| tree | f8ee2ad40254c1a19f0512cca1eabdb06801c17c /src/H5Ftest.c | |
| parent | 1440f1cd87522330ed5bff30d546cacc05adf18e (diff) | |
| download | hdf5-7d289e8a697aba2f537a62d3b6352e357b3bd83b.zip hdf5-7d289e8a697aba2f537a62d3b6352e357b3bd83b.tar.gz hdf5-7d289e8a697aba2f537a62d3b6352e357b3bd83b.tar.bz2 | |
[svn-r22395] remove the high level ID implementation that wraps the actual ID, and
store the VOL plugin in an auxilary structure in the ID pointer.
Diffstat (limited to 'src/H5Ftest.c')
| -rw-r--r-- | src/H5Ftest.c | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/src/H5Ftest.c b/src/H5Ftest.c index 7c15757..0073db7 100644 --- a/src/H5Ftest.c +++ b/src/H5Ftest.c @@ -96,25 +96,14 @@ *------------------------------------------------------------------------- */ herr_t -H5F_get_sohm_mesg_count_test(hid_t uid, unsigned type_id, +H5F_get_sohm_mesg_count_test(hid_t file_id, unsigned type_id, size_t *mesg_count) { H5F_t *file; /* File info */ - H5VL_id_wrapper_t *id_wrapper; - hid_t file_id; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT - if (H5I_FILE_PUBLIC == H5I_get_type(uid)) { - if(NULL == (id_wrapper = (H5VL_id_wrapper_t *)H5I_object(uid))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid user identifier") - file_id = id_wrapper->obj_id; - } - else { - file_id = uid; - } - /* Check arguments */ if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file") @@ -145,24 +134,13 @@ done: *------------------------------------------------------------------------- */ herr_t -H5F_check_cached_stab_test(hid_t uid) +H5F_check_cached_stab_test(hid_t file_id) { H5F_t *file; /* File info */ - H5VL_id_wrapper_t *id_wrapper; - hid_t file_id; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT - if (H5I_FILE_PUBLIC == H5I_get_type(uid)) { - if(NULL == (id_wrapper = (H5VL_id_wrapper_t *)H5I_object(uid))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid user identifier") - file_id = id_wrapper->obj_id; - } - else { - file_id = uid; - } - /* Check arguments */ if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file") @@ -190,24 +168,13 @@ done: *------------------------------------------------------------------------- */ herr_t -H5F_get_maxaddr_test(hid_t uid, haddr_t *maxaddr) +H5F_get_maxaddr_test(hid_t file_id, haddr_t *maxaddr) { H5F_t *file; /* File info */ - H5VL_id_wrapper_t *id_wrapper; - hid_t file_id; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT - if (H5I_FILE_PUBLIC == H5I_get_type(uid)) { - if(NULL == (id_wrapper = (H5VL_id_wrapper_t *)H5I_object(uid))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid user identifier") - file_id = id_wrapper->obj_id; - } - else { - file_id = uid; - } - /* Check arguments */ if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file") |