diff options
Diffstat (limited to 'src/H5Ftest.c')
| -rw-r--r-- | src/H5Ftest.c | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/src/H5Ftest.c b/src/H5Ftest.c index 73b00a6..7c15757 100644 --- a/src/H5Ftest.c +++ b/src/H5Ftest.c @@ -45,7 +45,7 @@ #include "H5Gpkg.h" /* Groups */ #include "H5Iprivate.h" /* IDs */ #include "H5SMpkg.h" /* Shared object header messages */ - +#include "H5VLprivate.h" /* Virtual Object Layer */ /****************/ /* Local Macros */ @@ -96,14 +96,25 @@ *------------------------------------------------------------------------- */ herr_t -H5F_get_sohm_mesg_count_test(hid_t file_id, unsigned type_id, +H5F_get_sohm_mesg_count_test(hid_t uid, 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") @@ -134,13 +145,24 @@ done: *------------------------------------------------------------------------- */ herr_t -H5F_check_cached_stab_test(hid_t file_id) +H5F_check_cached_stab_test(hid_t uid) { 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") @@ -168,13 +190,24 @@ done: *------------------------------------------------------------------------- */ herr_t -H5F_get_maxaddr_test(hid_t file_id, haddr_t *maxaddr) +H5F_get_maxaddr_test(hid_t uid, 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") |