From ff91dd8c3b3d376f005790d5105daf0ee23a73a9 Mon Sep 17 00:00:00 2001 From: Mohamad Chaarawi Date: Tue, 12 Jun 2012 13:31:21 -0500 Subject: [svn-r22457] rename location types for objects at the VOL level --- src/H5A.c | 26 +++++++++++++------------- src/H5Adeprec.c | 4 ++-- src/H5G.c | 6 +++--- src/H5O.c | 12 ++++++------ src/H5Pacpl.c | 2 +- src/H5R.c | 2 +- src/H5Rdeprec.c | 2 +- src/H5VLint.c | 8 ++++---- src/H5VLnative.c | 56 +++++++++++++++++++++++++++---------------------------- src/H5VLprivate.h | 2 +- src/H5VLpublic.h | 23 ++++++++++++----------- 11 files changed, 72 insertions(+), 71 deletions(-) diff --git a/src/H5A.c b/src/H5A.c index 1f254eb..a945cdc 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -234,7 +234,7 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, if(H5P_DEFAULT == acpl_id) acpl_id = H5P_ATTRIBUTE_CREATE_DEFAULT; - loc_params.type = H5VL_OBJECT_LOOKUP_BY_ID; + loc_params.type = H5VL_OBJECT_BY_ID; loc_params.loc_data.loc_by_id.id = loc_id; /* Get the plist structure */ @@ -314,7 +314,7 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, if(H5P_DEFAULT == acpl_id) acpl_id = H5P_ATTRIBUTE_CREATE_DEFAULT; - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; loc_params.loc_data.loc_by_name.plist_id = lapl_id; @@ -542,7 +542,7 @@ H5Aopen(hid_t loc_id, const char *attr_name, hid_t aapl_id) if(!attr_name || !*attr_name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_ID; + loc_params.type = H5VL_OBJECT_BY_ID; loc_params.loc_data.loc_by_id.id = loc_id; /* Open the attribute through the VOL */ @@ -598,7 +598,7 @@ H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; loc_params.loc_data.loc_by_name.plist_id = lapl_id; @@ -1660,7 +1660,7 @@ H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; loc_params.loc_data.loc_by_name.plist_id = lapl_id; @@ -1822,7 +1822,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name) if(HDstrcmp(old_name, new_name)) { H5VL_loc_params_t loc_params; - loc_params.type = H5VL_OBJECT_LOOKUP_BY_ID; + loc_params.type = H5VL_OBJECT_BY_ID; loc_params.loc_data.loc_by_id.id = loc_id; /* rename the attribute info through the VOL */ @@ -1876,7 +1876,7 @@ H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name, if(HDstrcmp(old_attr_name, new_attr_name)) { H5VL_loc_params_t loc_params; - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; loc_params.loc_data.loc_by_name.plist_id = lapl_id; @@ -2043,7 +2043,7 @@ H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; loc_params.loc_data.loc_by_name.plist_id = lapl_id; @@ -2104,7 +2104,7 @@ H5Adelete(hid_t loc_id, const char *name) if(!name || !*name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_ID; + loc_params.type = H5VL_OBJECT_BY_ID; loc_params.loc_data.loc_by_id.id = loc_id; /* Open the attribute through the VOL */ @@ -2155,7 +2155,7 @@ H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; loc_params.loc_data.loc_by_name.plist_id = lapl_id; @@ -2217,7 +2217,7 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; loc_params.loc_data.loc_by_name.plist_id = lapl_id; @@ -2600,7 +2600,7 @@ H5Aexists(hid_t obj_id, const char *attr_name) if(!attr_name || !*attr_name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_ID; + loc_params.type = H5VL_OBJECT_BY_ID; loc_params.loc_data.loc_by_id.id = obj_id; /* get the attribute info through the VOL */ @@ -2648,7 +2648,7 @@ H5Aexists_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = obj_name; loc_params.loc_data.loc_by_name.plist_id = lapl_id; diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c index 6f6388c..1fbc1ae 100644 --- a/src/H5Adeprec.c +++ b/src/H5Adeprec.c @@ -156,7 +156,7 @@ H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, if(H5P_DEFAULT == plist_id) plist_id = H5P_ATTRIBUTE_CREATE_DEFAULT; - loc_params.type = H5VL_OBJECT_LOOKUP_BY_ID; + loc_params.type = H5VL_OBJECT_BY_ID; loc_params.loc_data.loc_by_id.id = loc_id; /* Get the plist structure */ @@ -217,7 +217,7 @@ H5Aopen_name(hid_t loc_id, const char *name) if(!name || !*name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_ID; + loc_params.type = H5VL_OBJECT_BY_ID; loc_params.loc_data.loc_by_id.id = loc_id; /* Open the attribute through the VOL */ diff --git a/src/H5G.c b/src/H5G.c index 5544e41..6c8ee53 100644 --- a/src/H5G.c +++ b/src/H5G.c @@ -483,7 +483,7 @@ H5Gget_info(hid_t loc_id, H5G_info_t *grp_info) if(!grp_info) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_ID; + loc_params.type = H5VL_OBJECT_BY_ID; loc_params.loc_data.loc_by_id.id = loc_id; /* Get the group info through the VOL using the location token */ @@ -529,7 +529,7 @@ H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *grp_info, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; loc_params.loc_data.loc_by_name.plist_id = lapl_id; @@ -583,7 +583,7 @@ H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_IDX; + loc_params.type = H5VL_OBJECT_BY_IDX; loc_params.loc_data.loc_by_idx.name = group_name; loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; diff --git a/src/H5O.c b/src/H5O.c index 305bb79..29af042 100644 --- a/src/H5O.c +++ b/src/H5O.c @@ -236,7 +236,7 @@ H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id) if(!name || !*name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; loc_params.loc_data.loc_by_name.plist_id = lapl_id; @@ -295,7 +295,7 @@ H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_IDX; + loc_params.type = H5VL_OBJECT_BY_IDX; loc_params.loc_data.loc_by_idx.name = group_name; loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; @@ -355,7 +355,7 @@ H5Oopen_by_addr(hid_t loc_id, haddr_t addr) FUNC_ENTER_API(FAIL) H5TRACE2("i", "ia", loc_id, addr); - loc_params.type = H5VL_OBJECT_LOOKUP_BY_ADDR; + loc_params.type = H5VL_OBJECT_BY_ADDR; loc_params.loc_data.loc_by_addr.addr = addr; /* Open the object through the VOL */ @@ -575,7 +575,7 @@ H5Oget_info(hid_t loc_id, H5O_info_t *oinfo) if(!oinfo) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_ID; + loc_params.type = H5VL_OBJECT_BY_ID; loc_params.loc_data.loc_by_id.id = loc_id; /* Get the group info through the VOL using the location token */ @@ -620,7 +620,7 @@ H5Oget_info_by_name(hid_t loc_id, const char *name, H5O_info_t *oinfo, hid_t lap if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; loc_params.loc_data.loc_by_name.plist_id = lapl_id; @@ -673,7 +673,7 @@ H5Oget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, if(TRUE != H5P_isa_class(lapl_id, H5P_LINK_ACCESS)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_IDX; + loc_params.type = H5VL_OBJECT_BY_IDX; loc_params.loc_data.loc_by_idx.name = group_name; loc_params.loc_data.loc_by_idx.idx_type = idx_type; loc_params.loc_data.loc_by_idx.order = order; diff --git a/src/H5Pacpl.c b/src/H5Pacpl.c index e73ef21..0786cb1 100644 --- a/src/H5Pacpl.c +++ b/src/H5Pacpl.c @@ -45,7 +45,7 @@ /* Definitions for UDATA */ #define H5A_CRT_LOCATION_SIZE sizeof(H5VL_loc_params_t) -#define H5A_CRT_LOCATION_DEF {H5VL_OBJECT_LOOKUP_BY_ID, {{FAIL}}} +#define H5A_CRT_LOCATION_DEF {H5VL_OBJECT_BY_ID, {{FAIL}}} /******************/ /* Local Typedefs */ diff --git a/src/H5R.c b/src/H5R.c index 87edbea..d30cf90 100644 --- a/src/H5R.c +++ b/src/H5R.c @@ -525,7 +525,7 @@ H5Rdereference2(hid_t obj_id, hid_t oapl_id, H5R_type_t ref_type, const void *_r if(_ref == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_REF; + loc_params.type = H5VL_OBJECT_BY_REF; loc_params.loc_data.loc_by_ref.ref_type = ref_type; loc_params.loc_data.loc_by_ref._ref = _ref; loc_params.loc_data.loc_by_ref.plist_id = oapl_id; diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c index 6a8febb..eb9e09f 100644 --- a/src/H5Rdeprec.c +++ b/src/H5Rdeprec.c @@ -194,7 +194,7 @@ H5Rdereference1(hid_t obj_id, H5R_type_t ref_type, const void *_ref) if(_ref == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer") - loc_params.type = H5VL_OBJECT_LOOKUP_BY_REF; + loc_params.type = H5VL_OBJECT_BY_REF; loc_params.loc_data.loc_by_ref.ref_type = ref_type; loc_params.loc_data.loc_by_ref._ref = _ref; loc_params.loc_data.loc_by_ref.plist_id = H5P_DATASET_ACCESS_DEFAULT; diff --git a/src/H5VLint.c b/src/H5VLint.c index 94346b8..3edb813 100644 --- a/src/H5VLint.c +++ b/src/H5VLint.c @@ -643,7 +643,7 @@ H5VL_datatype_open(hid_t id, const char *name, hid_t tapl_id, hid_t req) if(NULL == vol_plugin->datatype_cls.open) { H5VL_loc_params_t loc_params; - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; loc_params.loc_data.loc_by_name.plist_id = tapl_id; @@ -773,7 +773,7 @@ H5VL_dataset_open(hid_t id, const char *name, hid_t dapl_id, hid_t req) if(NULL == vol_plugin->dataset_cls.open) { H5VL_loc_params_t loc_params; - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; loc_params.loc_data.loc_by_name.plist_id = dapl_id; @@ -1357,7 +1357,7 @@ H5VL_group_open(hid_t id, const char *name, hid_t gapl_id, hid_t req) if(NULL == vol_plugin->group_cls.open) { H5VL_loc_params_t loc_params; - loc_params.type = H5VL_OBJECT_LOOKUP_BY_NAME; + loc_params.type = H5VL_OBJECT_BY_NAME; loc_params.loc_data.loc_by_name.name = name; loc_params.loc_data.loc_by_name.plist_id = gapl_id; @@ -1811,7 +1811,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_object_lookup(hid_t id, H5VL_object_lookup_t lookup_type, void **location, hid_t req, ...) +H5VL_object_lookup(hid_t id, H5VL_loc_type_t lookup_type, void **location, hid_t req, ...) { va_list arguments; /* argument list passed from the API call */ H5VL_class_t *vol_plugin; /* VOL structure attached to id */ diff --git a/src/H5VLnative.c b/src/H5VLnative.c index 05c2fb4..e96132b 100644 --- a/src/H5VLnative.c +++ b/src/H5VLnative.c @@ -115,7 +115,7 @@ static herr_t H5VL_native_object_copy(hid_t src_loc_id, const char *src_name, hi static herr_t H5VL_native_object_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate_t op, void *op_data, hid_t lapl_id); -static herr_t H5VL_native_object_lookup(hid_t loc_id, H5VL_object_lookup_t lookup_type, void **location, hid_t req, va_list arguments); +static herr_t H5VL_native_object_lookup(hid_t loc_id, H5VL_loc_type_t lookup_type, void **location, hid_t req, va_list arguments); static herr_t H5VL_native_object_free_loc(void *location, hid_t req); static herr_t H5VL_native_object_get(hid_t id, H5VL_object_get_t get_type, hid_t req, va_list arguments); static herr_t H5VL_native_object_misc(hid_t id, H5VL_object_misc_t misc_type, hid_t req, va_list arguments); @@ -340,12 +340,12 @@ H5VL_native_attr_create(hid_t loc_id, const char *attr_name, hid_t acpl_id, hid_ if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space") - if(loc_params.type == H5VL_OBJECT_LOOKUP_BY_ID) { /* H5Acreate */ + if(loc_params.type == H5VL_OBJECT_BY_ID) { /* H5Acreate */ /* Go do the real work for attaching the attribute to the dataset */ if((ret_value = H5A_create(&loc, attr_name, type, space, acpl_id, H5AC_dxpl_id)) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute") } - else if (loc_params.type == H5VL_OBJECT_LOOKUP_BY_NAME) { /* H5Acreate_by_name */ + else if (loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Acreate_by_name */ H5G_name_t obj_path; /* Opened object group hier. path */ H5O_loc_t obj_oloc; /* Opened object object location */ @@ -404,7 +404,7 @@ H5VL_native_attr_open(hid_t loc_id, H5VL_loc_params_t loc_params, const char *at if(H5G_loc(loc_id, &loc) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") - if(loc_params.type == H5VL_OBJECT_LOOKUP_BY_ID) { /* H5Aopen */ + if(loc_params.type == H5VL_OBJECT_BY_ID) { /* H5Aopen */ /* Read in attribute from object header */ if(NULL == (attr = H5O_attr_open_by_name(loc.oloc, attr_name, H5AC_ind_dxpl_id))) HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to load attribute info from object header for attribute: '%s'", attr_name) @@ -412,7 +412,7 @@ H5VL_native_attr_open(hid_t loc_id, H5VL_loc_params_t loc_params, const char *at if(H5A_open_common(&loc, attr) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to initialize attribute") } - else if(loc_params.type == H5VL_OBJECT_LOOKUP_BY_NAME) { /* H5Aopen_by_name */ + else if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Aopen_by_name */ /* Open the attribute on the object header */ if(NULL == (attr = H5A_open_by_name(&loc, loc_params.loc_data.loc_by_name.name, attr_name, loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id))) @@ -540,12 +540,12 @@ H5VL_native_attr_get(hid_t id, H5VL_attr_get_t get_type, hid_t UNUSED req, va_li if(H5G_loc(id, &loc) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") - if(loc_params.type == H5VL_OBJECT_LOOKUP_BY_ID) { /* H5Aexists */ + if(loc_params.type == H5VL_OBJECT_BY_ID) { /* H5Aexists */ /* Check if the attribute exists */ if((*ret = H5O_attr_exists(loc.oloc, name, H5AC_ind_dxpl_id)) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to determine if attribute exists") } - else if(loc_params.type == H5VL_OBJECT_LOOKUP_BY_NAME) { /* H5Aopen_by_name */ + else if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Aopen_by_name */ /* Check if the attribute exists */ if((*ret = H5A_exists_by_name(loc, loc_params.loc_data.loc_by_name.name, name, loc_params.loc_data.loc_by_name.plist_id)) < 0) @@ -675,12 +675,12 @@ H5VL_native_attr_remove(hid_t loc_id, H5VL_loc_params_t loc_params, const char * if(H5G_loc(loc_id, &loc) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") - if(loc_params.type == H5VL_OBJECT_LOOKUP_BY_ID) { /* H5Adelete */ + if(loc_params.type == H5VL_OBJECT_BY_ID) { /* H5Adelete */ /* Delete the attribute from the location */ if(H5O_attr_remove(loc.oloc, attr_name, H5AC_dxpl_id) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute") } - else if (loc_params.type == H5VL_OBJECT_LOOKUP_BY_NAME) { /* H5Adelete_by_name */ + else if (loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Adelete_by_name */ H5G_name_t obj_path; /* Opened object group hier. path */ H5O_loc_t obj_oloc; /* Opened object object location */ @@ -2203,12 +2203,12 @@ H5VL_native_group_get(hid_t obj_id, H5VL_group_get_t get_type, hid_t UNUSED req, if(H5G_loc(obj_id, &loc) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") - if(loc_params.type == H5VL_OBJECT_LOOKUP_BY_ID) { /* H5Gget_info */ + if(loc_params.type == H5VL_OBJECT_BY_ID) { /* H5Gget_info */ /* Retrieve the group's information */ if(H5G__obj_info(loc.oloc, grp_info, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve group info") } - else if (loc_params.type == H5VL_OBJECT_LOOKUP_BY_NAME) { /* H5Gget_info_by_name */ + else if (loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Gget_info_by_name */ H5G_loc_t grp_loc; /* Location used to open group */ H5G_name_t grp_path; /* Opened object group hier. path */ H5O_loc_t grp_oloc; /* Opened object object location */ @@ -2233,7 +2233,7 @@ H5VL_native_group_get(hid_t obj_id, H5VL_group_get_t get_type, hid_t UNUSED req, if(H5G_loc_free(&grp_loc) < 0) HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location") } - else if (loc_params.type == H5VL_OBJECT_LOOKUP_BY_IDX) { /* H5Gget_info_by_idx */ + else if (loc_params.type == H5VL_OBJECT_BY_IDX) { /* H5Gget_info_by_idx */ H5G_loc_t grp_loc; /* Location used to open group */ H5G_name_t grp_path; /* Opened object group hier. path */ H5O_loc_t grp_oloc; /* Opened object object location */ @@ -2707,7 +2707,7 @@ H5VL_native_object_open(hid_t loc_id, H5VL_loc_params_t params, hid_t UNUSED req HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") switch (params.type) { - case H5VL_OBJECT_LOOKUP_BY_NAME: + case H5VL_OBJECT_BY_NAME: { /* Open the object */ if((ret_value = H5O_open_name(&loc, params.loc_data.loc_by_name.name, @@ -2715,7 +2715,7 @@ H5VL_native_object_open(hid_t loc_id, H5VL_loc_params_t params, hid_t UNUSED req HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object") break; } - case H5VL_OBJECT_LOOKUP_BY_IDX: + case H5VL_OBJECT_BY_IDX: { /* Set up opened group location to fill in */ obj_loc.oloc = &obj_oloc; @@ -2737,7 +2737,7 @@ H5VL_native_object_open(hid_t loc_id, H5VL_loc_params_t params, hid_t UNUSED req HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object") break; } - case H5VL_OBJECT_LOOKUP_BY_ADDR: + case H5VL_OBJECT_BY_ADDR: { if(!H5F_addr_defined(params.loc_data.loc_by_addr.addr)) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no address supplied") @@ -2756,7 +2756,7 @@ H5VL_native_object_open(hid_t loc_id, H5VL_loc_params_t params, hid_t UNUSED req HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object") break; } - case H5VL_OBJECT_LOOKUP_BY_REF: + case H5VL_OBJECT_BY_REF: { H5F_t *file = NULL; @@ -2870,7 +2870,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_object_lookup(hid_t loc_id, H5VL_object_lookup_t lookup_type, void **loc_token, +H5VL_native_object_lookup(hid_t loc_id, H5VL_loc_type_t lookup_type, void **loc_token, hid_t UNUSED req, va_list arguments) { H5G_loc_t loc; @@ -2892,13 +2892,13 @@ H5VL_native_object_lookup(hid_t loc_id, H5VL_object_lookup_t lookup_type, void * H5G_loc_reset(obj_loc); switch (lookup_type) { - case H5VL_OBJECT_LOOKUP_BY_ID: + case H5VL_OBJECT_BY_ID: obj_loc->oloc->addr = loc.oloc->addr; obj_loc->oloc->file = loc.oloc->file; obj_loc->oloc->holding_file = loc.oloc->holding_file; obj_loc->path = loc.path; break; - case H5VL_OBJECT_LOOKUP_BY_NAME: + case H5VL_OBJECT_BY_NAME: { char *name = va_arg (arguments, char *); hid_t lapl_id = va_arg (arguments, hid_t); @@ -2910,7 +2910,7 @@ H5VL_native_object_lookup(hid_t loc_id, H5VL_object_lookup_t lookup_type, void * HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found") break; } - case H5VL_OBJECT_LOOKUP_BY_IDX: + case H5VL_OBJECT_BY_IDX: { char *group_name = va_arg (arguments, char *); H5_index_t idx_type = va_arg (arguments, H5_index_t); @@ -2924,7 +2924,7 @@ H5VL_native_object_lookup(hid_t loc_id, H5VL_object_lookup_t lookup_type, void * HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found") break; } - case H5VL_OBJECT_LOOKUP_BY_ADDR: + case H5VL_OBJECT_BY_ADDR: { obj_addr = va_arg (arguments, haddr_t); obj_loc->oloc->addr = obj_addr; @@ -2932,7 +2932,7 @@ H5VL_native_object_lookup(hid_t loc_id, H5VL_object_lookup_t lookup_type, void * obj_loc->oloc->holding_file = loc.oloc->holding_file; break; } - case H5VL_OBJECT_LOOKUP_BY_REF: + case H5VL_OBJECT_BY_REF: { H5R_type_t ref_type = va_arg (arguments, H5R_type_t); void *_ref = va_arg (arguments, void *); @@ -3064,7 +3064,7 @@ H5VL_native_object_misc(hid_t loc_id, H5VL_object_misc_t misc_type, hid_t UNUSED hsize_t n = va_arg (arguments, hsize_t); H5G_loc_t loc; /* Object location */ - HDassert(loc_params.type == H5VL_OBJECT_LOOKUP_BY_NAME); + HDassert(loc_params.type == H5VL_OBJECT_BY_NAME); if(H5G_loc(loc_id, &loc) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") @@ -3111,12 +3111,12 @@ H5VL_native_object_misc(hid_t loc_id, H5VL_object_misc_t misc_type, hid_t UNUSED if(H5G_loc(loc_id, &loc) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") - if(loc_params.type == H5VL_OBJECT_LOOKUP_BY_ID) { /* H5Arename */ + if(loc_params.type == H5VL_OBJECT_BY_ID) { /* H5Arename */ /* Call attribute rename routine */ if(H5O_attr_rename(loc.oloc, H5AC_dxpl_id, old_name, new_name) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTRENAME, FAIL, "can't rename attribute") } - else if(loc_params.type == H5VL_OBJECT_LOOKUP_BY_NAME) { /* H5Arename_by_name */ + else if(loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Arename_by_name */ /* Call attribute rename routine */ if(H5A_rename_by_name(loc, loc_params.loc_data.loc_by_name.name, old_name, new_name, loc_params.loc_data.loc_by_name.plist_id) < 0) @@ -3264,19 +3264,19 @@ H5VL_native_object_get(hid_t id, H5VL_object_get_t get_type, hid_t UNUSED req, v H5O_info_t *obj_info = va_arg (arguments, H5O_info_t *); H5VL_loc_params_t loc_params = va_arg (arguments, H5VL_loc_params_t); - if(loc_params.type == H5VL_OBJECT_LOOKUP_BY_ID) { /* H5Oget_info */ + if(loc_params.type == H5VL_OBJECT_BY_ID) { /* H5Oget_info */ /* Retrieve the object's information */ if(H5G_loc_info(&loc, ".", TRUE, obj_info, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found") } - else if (loc_params.type == H5VL_OBJECT_LOOKUP_BY_NAME) { /* H5Oget_info_by_name */ + else if (loc_params.type == H5VL_OBJECT_BY_NAME) { /* H5Oget_info_by_name */ /* Retrieve the object's information */ if(H5G_loc_info(&loc, loc_params.loc_data.loc_by_name.name, TRUE, obj_info, loc_params.loc_data.loc_by_name.plist_id, H5AC_ind_dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found") } - else if (loc_params.type == H5VL_OBJECT_LOOKUP_BY_IDX) { /* H5Oget_info_by_idx */ + else if (loc_params.type == H5VL_OBJECT_BY_IDX) { /* H5Oget_info_by_idx */ H5G_loc_t obj_loc; /* Location used to open group */ H5G_name_t obj_path; /* Opened object group hier. path */ H5O_loc_t obj_oloc; /* Opened object object location */ diff --git a/src/H5VLprivate.h b/src/H5VLprivate.h index f3d2f46..ecb464f 100644 --- a/src/H5VLprivate.h +++ b/src/H5VLprivate.h @@ -100,7 +100,7 @@ H5_DLL herr_t H5VL_object_visit(hid_t loc_id, const char *obj_name, H5_index_t i H5_DLL herr_t H5VL_object_get(hid_t uid, H5VL_object_get_t get_type, hid_t req, ...); H5_DLL herr_t H5VL_object_misc(hid_t id, H5VL_object_misc_t misc_type, hid_t req, ...); H5_DLL herr_t H5VL_object_optional(hid_t id, H5VL_object_misc_t optional_type, hid_t req, ...); -H5_DLL herr_t H5VL_object_lookup(hid_t uid, H5VL_object_lookup_t lookup_type, void **location, hid_t req, ...); +H5_DLL herr_t H5VL_object_lookup(hid_t uid, H5VL_loc_type_t lookup_type, void **location, hid_t req, ...); H5_DLL herr_t H5VL_object_free_loc(hid_t loc_id, void *location, hid_t req); H5_DLL herr_t H5VL_object_close(hid_t uid, hid_t req); diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h index 2746dfc..f1d3046 100644 --- a/src/H5VLpublic.h +++ b/src/H5VLpublic.h @@ -150,14 +150,14 @@ typedef enum H5VL_object_get_t { H5VL_REF_GET_NAME = 5 /*object name */ } H5VL_object_get_t; -/* types for all object lookup API routines */ -typedef enum H5VL_object_lookup_t { - H5VL_OBJECT_LOOKUP_BY_ID = 0, - H5VL_OBJECT_LOOKUP_BY_NAME = 1, - H5VL_OBJECT_LOOKUP_BY_IDX = 2, - H5VL_OBJECT_LOOKUP_BY_ADDR = 3, - H5VL_OBJECT_LOOKUP_BY_REF = 4 -} H5VL_object_lookup_t; +/* types for different ways that objects are located in an HDF5 container */ +typedef enum H5VL_loc_type_t { + H5VL_OBJECT_BY_ID = 0, + H5VL_OBJECT_BY_NAME = 1, + H5VL_OBJECT_BY_IDX = 2, + H5VL_OBJECT_BY_ADDR = 3, + H5VL_OBJECT_BY_REF = 4 +} H5VL_loc_type_t; struct H5VL_loc_by_id { hid_t id; @@ -186,9 +186,10 @@ struct H5VL_loc_by_ref { hid_t plist_id; }; -/* Structure to hold parameters for object location */ +/* Structure to hold parameters for object locations. + either: BY_ID, BY_NAME, BY_IDX, BY_ADDR, BY_REF */ typedef struct H5VL_loc_params_t { - H5VL_object_lookup_t type; + H5VL_loc_type_t type; union{ struct H5VL_loc_by_id loc_by_id; struct H5VL_loc_by_name loc_by_name; @@ -271,7 +272,7 @@ typedef struct H5VL_object_class_t { hid_t ocpypl_id, hid_t lcpl_id, hid_t req); herr_t (*visit) (hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate_t op, void *op_data, hid_t lapl_id); - herr_t (*lookup)(hid_t loc_id, H5VL_object_lookup_t lookup_type, void **location, hid_t req, va_list arguments); + herr_t (*lookup)(hid_t loc_id, H5VL_loc_type_t lookup_type, void **location, hid_t req, va_list arguments); herr_t (*free_loc)(void *location, hid_t req); herr_t (*get) (hid_t loc_id, H5VL_object_get_t get_type, hid_t req, va_list arguments); herr_t (*misc) (hid_t id, H5VL_object_misc_t misc_type, hid_t req, va_list arguments); -- cgit v0.12