diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-06-27 19:07:24 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-06-27 19:07:24 (GMT) |
| commit | b5f6b587130537186fa47ea1487cd8e487de31d2 (patch) | |
| tree | c616de466ffecdaf00b528b3a3c99e5b21fc12ac /src/H5F.c | |
| parent | 5d7f70d45d3d45a6541d36636896042487a2a702 (diff) | |
| parent | 0fe43fbf2cd56f142ec322daca2a669fac8243ed (diff) | |
| download | hdf5-b5f6b587130537186fa47ea1487cd8e487de31d2.zip hdf5-b5f6b587130537186fa47ea1487cd8e487de31d2.tar.gz hdf5-b5f6b587130537186fa47ea1487cd8e487de31d2.tar.bz2 | |
[svn-r23837] merge from VOL branch and add new callbacks
Diffstat (limited to 'src/H5F.c')
| -rw-r--r-- | src/H5F.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -926,15 +926,13 @@ done: * david.pitt@bigpond.com * Apr 27, 2004 * - * Modifications: - * *------------------------------------------------------------------------- */ herr_t H5Fget_filesize(hid_t file_id, hsize_t *size) { H5VL_t *vol_plugin; - void *obj; + void *file; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) @@ -945,10 +943,11 @@ H5Fget_filesize(hid_t file_id, hsize_t *size) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information") /* get the file object */ - if(NULL == (obj = (void *)H5I_object(file_id))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier") + if(NULL == (file = (void *)H5I_object_verify(file_id, H5I_FILE))) + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID") - if((ret_value = H5VL_file_optional(obj, vol_plugin, H5VL_FILE_GET_SIZE, H5AC_dxpl_id, H5_EVENT_QUEUE_NULL, size)) < 0) + if((ret_value = H5VL_file_optional(file, vol_plugin, H5VL_FILE_GET_SIZE, + H5AC_dxpl_id, H5_EVENT_QUEUE_NULL, size)) < 0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get file size") done: |