[svn-r22395] remove the high level ID implementation that wraps the actual ID, and

store the VOL plugin in an auxilary structure in the ID pointer.

1 files changed, 0 insertions, 15 deletions

diff --git a/src/H5Gloc.c b/src/H5Gloc.c
index 1080add..e513d17 100644
--- a/src/H5Gloc.c
+++ b/src/H5Gloc.c
@@ -159,25 +159,10 @@ static herr_t H5G_loc_get_comment_cb(H5G_loc_t *grp_loc, const char *name,
 herr_t
 H5G_loc(hid_t loc_id, H5G_loc_t *loc)
 {
-    H5I_type_t  id_type;
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    id_type = H5I_get_type(loc_id);
-    /* get the actual ID from an upper ID level */
-    /* MSC - this is a workaround to allow the test suite to pass and
-     at some point needs to be removed once all high level operations
-     that needs to go through the VOL actually go through the VOL*/
-    if (H5I_FILE_PUBLIC == id_type || H5I_GROUP_PUBLIC == id_type ||
-        H5I_DATASET_PUBLIC == id_type || H5I_DATATYPE_PUBLIC == id_type ||
-        H5I_ATTR_PUBLIC == id_type) {
-        H5VL_id_wrapper_t       *id_wrapper;              /* user id structure */
-        if(NULL == (id_wrapper = (H5VL_id_wrapper_t *)H5I_object(loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid user identifier")
-        loc_id = id_wrapper->obj_id;
-    }
-
     switch(H5I_get_type(loc_id)) {
         case H5I_FILE:
             {