diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-06-12 15:55:55 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-06-12 15:55:55 (GMT) |
| commit | 3736cc2a1d41f96d740079cc8201f761961b582a (patch) | |
| tree | 7799e6d9108bcb60027bc91fe7571fb68ab1d968 /src/H5VLint.c | |
| parent | f31fac3a23da12287384db7f6aa2937e9461d3fe (diff) | |
| download | hdf5-3736cc2a1d41f96d740079cc8201f761961b582a.zip hdf5-3736cc2a1d41f96d740079cc8201f761961b582a.tar.gz hdf5-3736cc2a1d41f96d740079cc8201f761961b582a.tar.bz2 | |
[svn-r22456] change all usage of lookup/free VOL callback in H5G,O,A and use the loc_param struct instead.
update the native implementation
Diffstat (limited to 'src/H5VLint.c')
| -rw-r--r-- | src/H5VLint.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/H5VLint.c b/src/H5VLint.c index 6371ef3..94346b8 100644 --- a/src/H5VLint.c +++ b/src/H5VLint.c @@ -513,7 +513,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_attr_remove(hid_t id, void *location, const char *attr_name, hid_t req) +H5VL_attr_remove(hid_t id, H5VL_loc_params_t loc_params, const char *attr_name, hid_t req) { H5VL_class_t *vol_plugin; /* VOL structure attached to id */ herr_t ret_value = SUCCEED; @@ -523,7 +523,7 @@ H5VL_attr_remove(hid_t id, void *location, const char *attr_name, hid_t req) if (NULL == (vol_plugin = (H5VL_class_t *)H5I_get_aux (id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information") - if((ret_value = (vol_plugin->attr_cls.remove)(id, location, attr_name, req)) < 0) + if((ret_value = (vol_plugin->attr_cls.remove)(id, loc_params, attr_name, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTDELETE, FAIL, "remove failed") done: @@ -645,9 +645,10 @@ H5VL_datatype_open(hid_t id, const char *name, hid_t tapl_id, hid_t req) loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; loc_params.loc_data.loc_by_name.name = name; + loc_params.loc_data.loc_by_name.plist_id = tapl_id; /* Open the object class */ - if((ret_value = H5VL_object_open(id, loc_params, tapl_id, H5_REQUEST_NULL)) < 0) + if((ret_value = H5VL_object_open(id, loc_params, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") } else { @@ -774,9 +775,10 @@ H5VL_dataset_open(hid_t id, const char *name, hid_t dapl_id, hid_t req) loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; loc_params.loc_data.loc_by_name.name = name; + loc_params.loc_data.loc_by_name.plist_id = dapl_id; /* Open the object class */ - if((ret_value = H5VL_object_open(id, loc_params, dapl_id, H5_REQUEST_NULL)) < 0) + if((ret_value = H5VL_object_open(id, loc_params, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") } else { @@ -1357,9 +1359,10 @@ H5VL_group_open(hid_t id, const char *name, hid_t gapl_id, hid_t req) loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; loc_params.loc_data.loc_by_name.name = name; + loc_params.loc_data.loc_by_name.plist_id = gapl_id; /* Open the object class */ - if((ret_value = H5VL_object_open(id, loc_params, gapl_id, H5_REQUEST_NULL)) < 0) + if((ret_value = H5VL_object_open(id, loc_params, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object") } else { @@ -1687,7 +1690,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_object_open(hid_t id, H5VL_loc_params_t params, hid_t lapl_id, hid_t req) +H5VL_object_open(hid_t id, H5VL_loc_params_t params, hid_t req) { H5VL_class_t *vol_plugin; /* VOL structure attached to id */ hid_t ret_value; /* Return value */ @@ -1702,7 +1705,7 @@ H5VL_object_open(hid_t id, H5VL_loc_params_t params, hid_t lapl_id, hid_t req) HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `object open' method") /* call the corresponding VOL open callback */ - if((ret_value = (vol_plugin->object_cls.open)(id, params, lapl_id, req)) < 0) + if((ret_value = (vol_plugin->object_cls.open)(id, params, req)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "open failed") /* attach VOL information to the ID */ |