diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-03-28 15:00:47 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-03-28 15:00:47 (GMT) |
| commit | ae5da182009bb5fc2faba40ef3a109870c9573e8 (patch) | |
| tree | 080e33dccdaa622befe607495de6065130bb97f5 /src/H5VLnative.c | |
| parent | 31623a4916da61e72417ccacf7d8cea6466a769e (diff) | |
| download | hdf5-ae5da182009bb5fc2faba40ef3a109870c9573e8.zip hdf5-ae5da182009bb5fc2faba40ef3a109870c9573e8.tar.gz hdf5-ae5da182009bb5fc2faba40ef3a109870c9573e8.tar.bz2 | |
[svn-r22165] reorder the callbacks in the VOL struct to have create, open, ..., close ordering
Diffstat (limited to 'src/H5VLnative.c')
| -rw-r--r-- | src/H5VLnative.c | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/src/H5VLnative.c b/src/H5VLnative.c index 7d59ded..6c804ef 100644 --- a/src/H5VLnative.c +++ b/src/H5VLnative.c @@ -104,37 +104,37 @@ static const H5VL_class_t H5VL_native_g = { NULL, /*fapl_copy */ NULL, /*fapl_free */ { /* attribute_cls */ - NULL, /* open */ - NULL, /* close */ NULL, /* create */ - NULL, /* delete */ + NULL, /* open */ NULL, /* read */ - NULL /* write */ + NULL, /* write */ + NULL, /* delete */ + NULL /* close */ }, { /* datatype_cls */ H5VL_native_datatype_commit, /* commit */ H5VL_native_datatype_open /* open */ }, { /* dataset_cls */ - H5VL_native_dataset_open, /* open */ - H5VL_native_dataset_close, /* close */ H5VL_native_dataset_create, /* create */ + H5VL_native_dataset_open, /* open */ H5VL_native_dataset_read, /* read */ H5VL_native_dataset_write, /* write */ - H5VL_native_dataset_get /* get */ + H5VL_native_dataset_get, /* get */ + H5VL_native_dataset_close /* close */ }, { /* group_cls */ H5VL_native_group_create, /* create */ H5VL_native_group_open, /* open */ - H5VL_native_group_close, /* close */ - H5VL_native_group_get /* get */ + H5VL_native_group_get, /* get */ + H5VL_native_group_close /* close */ }, { /* file_cls */ - H5VL_native_file_open, /* open */ - H5VL_native_file_close, /* close */ H5VL_native_file_create, /* create */ + H5VL_native_file_open, /* open */ H5VL_native_file_flush, /* flush */ - H5VL_native_file_get /* get */ + H5VL_native_file_get, /* get */ + H5VL_native_file_close /* close */ }, { /* link_cls */ NULL, /* create */ @@ -144,11 +144,11 @@ static const H5VL_class_t H5VL_native_g = { }, { /* object_cls */ H5VL_native_object_open, /* open */ - H5VL_native_object_close, /* close */ NULL, /* move */ NULL, /* copy */ H5VL_native_object_lookup, /* lookup */ - H5VL_native_object_get /* get */ + H5VL_native_object_get, /* get */ + H5VL_native_object_close /* close */ } }; @@ -296,12 +296,6 @@ H5VL_native_file_open(const char *name, unsigned flags, hid_t fcpl_id, /* Keep this ID in file object structure */ new_file->file_id = ret_value; -#if 0 - new_file->vol_id = plugin_id; - if(H5I_inc_ref(new_file->vol_id, FALSE) < 0) - HGOTO_ERROR(H5E_VOL, H5E_CANTINC, FAIL, "unable to increment ref count on VOL plugin") -#endif - done: if(ret_value < 0 && new_file && H5F_try_close(new_file) < 0) HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problems closing file") |