diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-04-12 23:11:16 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-04-12 23:11:16 (GMT) |
| commit | 12e8b52917ad7ecb027506b5f6231c2f4e8a164e (patch) | |
| tree | 74ec6e0071c145de3d0c0edcc3093a09e1c8c1d1 /src/H5VLint.c | |
| parent | 18bee91d73cc4dbc1024f8c92172a417e1669bc6 (diff) | |
| download | hdf5-12e8b52917ad7ecb027506b5f6231c2f4e8a164e.zip hdf5-12e8b52917ad7ecb027506b5f6231c2f4e8a164e.tar.gz hdf5-12e8b52917ad7ecb027506b5f6231c2f4e8a164e.tar.bz2 | |
[svn-r23583] update the encoding/decoding part of the IOD plugin
- complete overhaul to use FS proc macros
- remove dead code
Rename FS routines to HG and update configure magic and makefiles
Many bug fixes
Diffstat (limited to 'src/H5VLint.c')
| -rw-r--r-- | src/H5VLint.c | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/src/H5VLint.c b/src/H5VLint.c index 2dff9cd..fb0465b 100644 --- a/src/H5VLint.c +++ b/src/H5VLint.c @@ -1210,7 +1210,7 @@ H5VL_dataset_close(void *dset, H5VL_t *vol_plugin, hid_t dxpl_id, hid_t eq_id) void **req = NULL; /* pointer to plugin generate requests (Stays NULL if plugin does not support async */ herr_t ret_value = SUCCEED; - FUNC_ENTER_NOAPI(FAIL) + FUNC_ENTER_NOAPI_NOINIT if(eq_id != H5_EVENT_QUEUE_NULL) { /* create the private request */ @@ -1221,20 +1221,8 @@ H5VL_dataset_close(void *dset, H5VL_t *vol_plugin, hid_t dxpl_id, hid_t eq_id) request->next = NULL; request->vol_plugin = vol_plugin; } - - /* if the VOL class does not implement a specific dataset close - callback, try the object close */ - if(NULL == vol_plugin->cls->dataset_cls.close){ - ; -#if 0 - if(H5VL_object_close(id, dxpl_id, dxpl_id, event_q) < 0) - HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close object") -#endif - } - else { - if((ret_value = (vol_plugin->cls->dataset_cls.close)(dset, dxpl_id, req)) < 0) - HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "close failed") - } + if((ret_value = (vol_plugin->cls->dataset_cls.close)(dset, dxpl_id, req)) < 0) + HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "close failed") if(request && *req) { if(H5EQinsert(eq_id, request) < 0) @@ -1597,7 +1585,7 @@ H5VL_file_close(void *file, H5VL_t *vol_plugin, hid_t dxpl_id, hid_t eq_id) void **req = NULL; /* pointer to plugin generate requests (Stays NULL if plugin does not support async */ herr_t ret_value = SUCCEED; - FUNC_ENTER_NOAPI(FAIL) + FUNC_ENTER_NOAPI_NOINIT if(eq_id != H5_EVENT_QUEUE_NULL) { /* create the private request */ @@ -1800,7 +1788,7 @@ H5VL_group_close(void *grp, H5VL_t *vol_plugin, hid_t dxpl_id, hid_t eq_id) void **req = NULL; /* pointer to plugin generate requests (Stays NULL if plugin does not support async */ herr_t ret_value = SUCCEED; - FUNC_ENTER_NOAPI(FAIL) + FUNC_ENTER_NOAPI_NOINIT if(eq_id != H5_EVENT_QUEUE_NULL) { /* create the private request */ @@ -1812,19 +1800,8 @@ H5VL_group_close(void *grp, H5VL_t *vol_plugin, hid_t dxpl_id, hid_t eq_id) request->vol_plugin = vol_plugin; } - /* if the VOL class does not implement a specific group close - callback, try the object close */ - if(NULL == vol_plugin->cls->group_cls.close) { - ; -#if 0 - if(H5VL_object_close(id, dxpl_id, event_q) < 0) - HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close object") -#endif - } - else { - if((ret_value = (vol_plugin->cls->group_cls.close)(grp, dxpl_id, req)) < 0) - HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "close failed") - } + if((ret_value = (vol_plugin->cls->group_cls.close)(grp, dxpl_id, req)) < 0) + HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "close failed") if(request && *req) { if(H5EQinsert(eq_id, request) < 0) |