Switch driver | plugin => connector.

1 files changed, 88 insertions, 88 deletions

diff --git a/src/H5VLint.c b/src/H5VLint.c
index e6e0dbe..4590885 100644
--- a/src/H5VLint.c
+++ b/src/H5VLint.c
@@ -51,8 +51,8 @@
 /* Object wrapping context info */
 typedef struct H5VL_wrap_ctx_t {
     unsigned rc;                /* Ref. count for the # of times the context was set / reset */
-    const H5VL_t *plugin;       /* VOL plugin for "outermost" class to start wrap */
-    void *obj_wrap_ctx;         /* "wrap context" for outermost plugin */
+    const H5VL_t *connector;    /* VOL connector for "outermost" class to start wrap */
+    void *obj_wrap_ctx;         /* "wrap context" for outermost connector */
 } H5VL_wrap_ctx_t;
 
 
@@ -67,7 +67,7 @@ typedef struct H5VL_wrap_ctx_t {
 static herr_t H5VL__free_cls(H5VL_class_t *cls);
 static void *H5VL__wrap_obj(void *obj);
 static H5VL_object_t *H5VL__new_vol_obj(H5I_type_t type, void *object,
-    H5VL_t *vol_plugin, hbool_t wrap_obj);
+    H5VL_t *vol_connector, hbool_t wrap_obj);
 static void *H5VL__object(hid_t id, H5I_type_t obj_type);
 
 
@@ -185,7 +185,7 @@ H5VL_term_package(void)
             n++;
         } /* end if */
         else {
-            /* Destroy the VOL plugin ID group */
+            /* Destroy the VOL connector ID group */
             n += (H5I_dec_type_ref(H5I_VOL) > 0);
 
             /* Mark interface as closed */
@@ -220,9 +220,9 @@ H5VL__free_cls(H5VL_class_t *cls)
     /* Sanity check */
     HDassert(cls);
 
-    /* Shut down the VOL plugin */
+    /* Shut down the VOL connector */
     if(cls->terminate && cls->terminate() < 0)
-        HGOTO_ERROR(H5E_VOL, H5E_CANTCLOSEOBJ, FAIL, "VOL plugin did not terminate cleanly")
+        HGOTO_ERROR(H5E_VOL, H5E_CANTCLOSEOBJ, FAIL, "VOL connector did not terminate cleanly")
 
     /* Release the class */
     H5MM_xfree(cls->name);
@@ -236,8 +236,8 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5VL__wrap_obj
  *
- * Purpose:     Wraps a library object with possible VOL plugin wrappers, to
- *		match the VOL plugin stack for the file.
+ * Purpose:     Wraps a library object with possible VOL connector wrappers, to
+ *		match the VOL connector stack for the file.
  *
  * Return:      Success:        Wrapped object pointer
  *              Failure:        NULL
@@ -265,7 +265,7 @@ H5VL__wrap_obj(void *obj)
     /* If there is a VOL object wrapping context, wrap the object */
     if(vol_wrap_ctx) {
         /* Wrap object, using the VOL callback */
-        if(NULL == (ret_value = H5VL_wrap_object(vol_wrap_ctx->plugin->cls, vol_wrap_ctx->obj_wrap_ctx, obj)))
+        if(NULL == (ret_value = H5VL_wrap_object(vol_wrap_ctx->connector->cls, vol_wrap_ctx->obj_wrap_ctx, obj)))
             HGOTO_ERROR(H5E_VOL, H5E_CANTGET, NULL, "can't wrap object")
     } /* end if */
     else
@@ -290,7 +290,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5VL_object_t *
-H5VL__new_vol_obj(H5I_type_t type, void *object, H5VL_t *vol_plugin, hbool_t wrap_obj)
+H5VL__new_vol_obj(H5I_type_t type, void *object, H5VL_t *vol_connector, hbool_t wrap_obj)
 {
     H5VL_object_t  *new_vol_obj = NULL;     /* Pointer to new VOL object                    */
     H5VL_object_t  *ret_value = NULL;       /* Return value                                 */
@@ -299,7 +299,7 @@ H5VL__new_vol_obj(H5I_type_t type, void *object, H5VL_t *vol_plugin, hbool_t wra
 
     /* Check arguments */
     HDassert(object);
-    HDassert(vol_plugin);
+    HDassert(vol_connector);
 
     /* Make sure type number is valid */
     if(type != H5I_ATTR && type != H5I_DATASET && type != H5I_DATATYPE && type != H5I_FILE && type != H5I_GROUP)
@@ -308,7 +308,7 @@ H5VL__new_vol_obj(H5I_type_t type, void *object, H5VL_t *vol_plugin, hbool_t wra
     /* Create the new VOL object */
     if(NULL == (new_vol_obj = H5FL_CALLOC(H5VL_object_t)))
         HGOTO_ERROR(H5E_VOL, H5E_CANTALLOC, NULL, "can't allocate memory for VOL object")
-    new_vol_obj->plugin = vol_plugin;
+    new_vol_obj->connector = vol_connector;
     if(wrap_obj) {
         if(NULL == (new_vol_obj->data = H5VL__wrap_obj(object)))
             HGOTO_ERROR(H5E_VOL, H5E_CANTCREATE, NULL, "can't wrap library object")
@@ -316,8 +316,8 @@ H5VL__new_vol_obj(H5I_type_t type, void *object, H5VL_t *vol_plugin, hbool_t wra
     else
         new_vol_obj->data = object;
 
-    /* Bump the reference count on the VOL plugin */
-    vol_plugin->nrefs++;
+    /* Bump the reference count on the VOL connector */
+    vol_connector->nrefs++;
 
     /* If this is a datatype, we have to hide the VOL object under the H5T_t pointer */
     if(H5I_DATATYPE == type) {
@@ -345,7 +345,7 @@ done:
  *-------------------------------------------------------------------------
  */
 hid_t
-H5VL_register(H5I_type_t type, void *object, H5VL_t *vol_plugin, hbool_t app_ref)
+H5VL_register(H5I_type_t type, void *object, H5VL_t *vol_connector, hbool_t app_ref)
 {
     H5VL_object_t  *vol_obj     = NULL;         /* VOL object wrapper for library object */
     hid_t           ret_value   = H5I_INVALID_HID;      /* Return value */
@@ -354,11 +354,11 @@ H5VL_register(H5I_type_t type, void *object, H5VL_t *vol_plugin, hbool_t app_ref
 
     /* Check arguments */
     HDassert(object);
-    HDassert(vol_plugin);
+    HDassert(vol_connector);
 
     /* Set up VOL object for the passed-in data */
     /* (Does not wrap object, since it's from a VOL callback) */
-    if(NULL == (vol_obj = H5VL__new_vol_obj(type, object, vol_plugin, FALSE)))
+    if(NULL == (vol_obj = H5VL__new_vol_obj(type, object, vol_connector, FALSE)))
         HGOTO_ERROR(H5E_VOL, H5E_CANTCREATE, FAIL, "can't create VOL object")
     
     /* Register VOL object as _object_ type, for future object API calls */
@@ -389,7 +389,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL_register_using_existing_id(H5I_type_t type, void *object, H5VL_t *vol_plugin, hbool_t app_ref, hid_t existing_id)
+H5VL_register_using_existing_id(H5I_type_t type, void *object, H5VL_t *vol_connector, hbool_t app_ref, hid_t existing_id)
 {
     H5VL_object_t  *new_vol_obj = NULL;     /* Pointer to new VOL object                    */
     herr_t          ret_value = SUCCEED;    /* Return value                                 */
@@ -398,11 +398,11 @@ H5VL_register_using_existing_id(H5I_type_t type, void *object, H5VL_t *vol_plugi
 
     /* Check arguments */
     HDassert(object);
-    HDassert(vol_plugin);
+    HDassert(vol_connector);
 
     /* Set up VOL object for the passed-in data */
     /* (Wraps object, since it's a library object) */
-    if(NULL == (new_vol_obj = H5VL__new_vol_obj(type, object, vol_plugin, TRUE)))
+    if(NULL == (new_vol_obj = H5VL__new_vol_obj(type, object, vol_connector, TRUE)))
         HGOTO_ERROR(H5E_VOL, H5E_CANTCREATE, FAIL, "can't create VOL object")
 
     /* Call the underlying H5I function to complete the registration */
@@ -418,8 +418,8 @@ done:
  * Function:	H5VL_register_using_vol_id
  *
  * Purpose:     Utility function to create a user ID for an object created
- *              or opened through the VOL. Uses the VOL plugin's ID to
- *              get the plugin information instead of it being passed in.
+ *              or opened through the VOL. Uses the VOL connector's ID to
+ *              get the connector information instead of it being passed in.
  *
  * Return:      Success:    A valid HDF5 ID
  *              Failure:    H5I_INVALID_HID 
@@ -427,28 +427,28 @@ done:
  *-------------------------------------------------------------------------
  */
 hid_t
-H5VL_register_using_vol_id(H5I_type_t type, void *obj, hid_t plugin_id, hbool_t app_ref)
+H5VL_register_using_vol_id(H5I_type_t type, void *obj, hid_t connector_id, hbool_t app_ref)
 {
     H5VL_class_t    *cls = NULL;
-    H5VL_t          *plugin = NULL;       /* VOL plugin struct */
+    H5VL_t          *connector = NULL;       /* VOL connector struct */
     hid_t           ret_value = H5I_INVALID_HID;
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    /* Get the VOL class object from the plugin's ID */
-    if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(plugin_id, H5I_VOL)))
-        HGOTO_ERROR(H5E_VOL, H5E_BADTYPE, H5I_INVALID_HID, "not a VOL plugin ID")
+    /* Get the VOL class object from the connector's ID */
+    if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL)))
+        HGOTO_ERROR(H5E_VOL, H5E_BADTYPE, H5I_INVALID_HID, "not a VOL connector ID")
 
     /* Setup VOL info struct */
-    if (NULL == (plugin = H5FL_CALLOC(H5VL_t)))
+    if (NULL == (connector = H5FL_CALLOC(H5VL_t)))
         HGOTO_ERROR(H5E_VOL, H5E_CANTALLOC, H5I_INVALID_HID, "can't allocate VOL info struct")
-    plugin->cls = cls;
-    plugin->id = plugin_id;
-    if (H5I_inc_ref(plugin->id, FALSE) < 0)
-        HGOTO_ERROR(H5E_VOL, H5E_CANTINC, H5I_INVALID_HID, "unable to increment ref count on VOL plugin")
+    connector->cls = cls;
+    connector->id = connector_id;
+    if (H5I_inc_ref(connector->id, FALSE) < 0)
+        HGOTO_ERROR(H5E_VOL, H5E_CANTINC, H5I_INVALID_HID, "unable to increment ref count on VOL connector")
 
     /* Get an ID for the VOL object */
-    if ((ret_value = H5VL_register(type, obj, plugin, app_ref)) < 0)
+    if ((ret_value = H5VL_register(type, obj, connector, app_ref)) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register object handle")
 
 done:
@@ -460,7 +460,7 @@ done:
  * Function:    H5VL_free_object
  *
  * Purpose:     Wrapper to unregister an object ID with a VOL aux struct
- *              and decrement ref count on VOL plugin ID
+ *              and decrement ref count on VOL connector ID
  *
  * Return:      SUCCEED/FAIL
  *
@@ -476,12 +476,12 @@ H5VL_free_object(H5VL_object_t *vol_obj)
     /* Check arguments */
     HDassert(vol_obj);
 
-    vol_obj->plugin->nrefs --;
+    vol_obj->connector->nrefs --;
 
-    if(0 == vol_obj->plugin->nrefs) {
-        if(H5I_dec_ref(vol_obj->plugin->id) < 0)
-            HGOTO_ERROR(H5E_VOL, H5E_CANTDEC, FAIL, "unable to decrement ref count on VOL plugin")
-        vol_obj->plugin = H5FL_FREE(H5VL_t, vol_obj->plugin);
+    if(0 == vol_obj->connector->nrefs) {
+        if(H5I_dec_ref(vol_obj->connector->id) < 0)
+            HGOTO_ERROR(H5E_VOL, H5E_CANTDEC, FAIL, "unable to decrement ref count on VOL connector")
+        vol_obj->connector = H5FL_FREE(H5VL_t, vol_obj->connector);
     } /* end if */
 
     vol_obj = H5FL_FREE(H5VL_object_t, vol_obj);
@@ -492,20 +492,20 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5VL_register_plugin
+ * Function:    H5VL_register_connector
  *
- * Purpose:     Registers a new VOL plugin as a member of the virtual object
+ * Purpose:     Registers a new VOL connector as a member of the virtual object
  *              layer class.
  *
- * Return:      Success:    A VOL plugin ID which is good until the
- *                          library is closed or the plugin is unregistered.
+ * Return:      Success:    A VOL connector ID which is good until the
+ *                          library is closed or the connector is unregistered.
  *
  *              Failure:    H5I_INVALID_HID 
  *
  *-------------------------------------------------------------------------
  */
 hid_t
-H5VL_register_plugin(const void *_cls, hbool_t app_ref, hid_t vipl_id)
+H5VL_register_connector(const void *_cls, hbool_t app_ref, hid_t vipl_id)
 {
     const H5VL_class_t	*cls = (const H5VL_class_t *)_cls;
     H5VL_class_t	*saved = NULL;
@@ -518,18 +518,18 @@ H5VL_register_plugin(const void *_cls, hbool_t app_ref, hid_t vipl_id)
 
     /* Copy the class structure so the caller can reuse or free it */
     if (NULL == (saved = H5FL_CALLOC(H5VL_class_t)))
-        HGOTO_ERROR(H5E_VOL, H5E_CANTALLOC, H5I_INVALID_HID, "memory allocation failed for VOL plugin class struct")
+        HGOTO_ERROR(H5E_VOL, H5E_CANTALLOC, H5I_INVALID_HID, "memory allocation failed for VOL connector class struct")
     HDmemcpy(saved, cls, sizeof(H5VL_class_t));
     if(NULL == (saved->name = H5MM_strdup(cls->name)))
-        HGOTO_ERROR(H5E_VOL, H5E_CANTALLOC, H5I_INVALID_HID, "memory allocation failed for VOL plugin name")
+        HGOTO_ERROR(H5E_VOL, H5E_CANTALLOC, H5I_INVALID_HID, "memory allocation failed for VOL connector name")
 
-    /* Initialize the VOL plugin */
+    /* Initialize the VOL connector */
     if(cls->initialize && cls->initialize(vipl_id) < 0)
-        HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, H5I_INVALID_HID, "unable to init VOL plugin")
+        HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, H5I_INVALID_HID, "unable to init VOL connector")
 
     /* Create the new class ID */
     if ((ret_value = H5I_register(H5I_VOL, saved, app_ref)) < 0)
-        HGOTO_ERROR(H5E_VOL, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register VOL plugin ID")
+        HGOTO_ERROR(H5E_VOL, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register VOL connector ID")
 
 done:
     if (ret_value < 0)
@@ -537,21 +537,21 @@ done:
             H5FL_FREE(H5VL_class_t, saved);
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5VL_register_plugin() */
+} /* end H5VL_register_connector() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5VL_get_plugin_name
+ * Function:    H5VL_get_connector_name
  *
- * Purpose:     Private version of H5VLget_plugin_name
+ * Purpose:     Private version of H5VLget_connector_name
  *
- * Return:      Success:        The length of the plugin name
+ * Return:      Success:        The length of the connector name
  *              Failure:        Negative
  *
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5VL_get_plugin_name(hid_t id, char *name /*out*/, size_t size)
+H5VL_get_connector_name(hid_t id, char *name /*out*/, size_t size)
 {
     H5VL_object_t       *vol_obj;
     const H5VL_class_t  *cls;
@@ -564,7 +564,7 @@ H5VL_get_plugin_name(hid_t id, char *name /*out*/, size_t size)
     if (NULL == (vol_obj = H5VL_vol_object(id)))
         HGOTO_ERROR(H5E_VOL, H5E_BADTYPE, FAIL, "invalid VOL identifier")
 
-    cls = vol_obj->plugin->cls;
+    cls = vol_obj->connector->cls;
 
     len = HDstrlen(cls->name);
     if(name) {
@@ -578,7 +578,7 @@ H5VL_get_plugin_name(hid_t id, char *name /*out*/, size_t size)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5VL_get_plugin_name() */
+} /* end H5VL_get_connector_name() */
 
 
 /*-------------------------------------------------------------------------
@@ -629,7 +629,7 @@ done:
  * Function:    H5VL_object_data
  *
  * Purpose:     Correctly retrieve the 'data' field for a VOL object (H5VL_object),
- *              even for nested / stacked VOL plugins.
+ *              even for nested / stacked VOL connectors.
  *
  * Return:      Success:        object pointer
  *              Failure:        NULL
@@ -643,9 +643,9 @@ H5VL_object_data(const H5VL_object_t *vol_obj)
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    /* Check for 'get_object' callback in plugin */
-    if(vol_obj->plugin->cls->get_object)
-        ret_value = (vol_obj->plugin->cls->get_object)(vol_obj->data);
+    /* Check for 'get_object' callback in connector */
+    if(vol_obj->connector->cls->get_object)
+        ret_value = (vol_obj->connector->cls->get_object)(vol_obj->data);
     else
         ret_value = vol_obj->data;
 
@@ -780,9 +780,9 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5VL_cmp_plugin_cls
+ * Function:    H5VL_cmp_connector_cls
  *
- * Purpose:     Compare VOL class for a plugin
+ * Purpose:     Compare VOL class for a connector
  *
  * Return:      Positive if VALUE1 is greater than VALUE2, negative if
  *              VALUE2 is greater than VALUE1 and zero if VALUE1 and
@@ -791,7 +791,7 @@ done:
  *-------------------------------------------------------------------------
  */
 int
-H5VL_cmp_plugin_cls(const H5VL_class_t *cls1, const H5VL_class_t *cls2)
+H5VL_cmp_connector_cls(const H5VL_class_t *cls1, const H5VL_class_t *cls2)
 {
     int cmp_value;              /* Value from comparison */
     int ret_value = 0;          /* Return value */
@@ -802,14 +802,14 @@ H5VL_cmp_plugin_cls(const H5VL_class_t *cls1, const H5VL_class_t *cls2)
     HDassert(cls1);
     HDassert(cls1);
 
-    /* Compare plugin "values" */
+    /* Compare connector "values" */
     if(cls1->value < cls2->value)
         HGOTO_DONE(-1)
     if(cls1->value > cls2->value)
         HGOTO_DONE(1)
     HDassert(cls1->value == cls2->value);
 
-    /* Compare plugin names */
+    /* Compare connector names */
     if(cls1->name == NULL && cls2->name != NULL)
         HGOTO_DONE(-1);
     if(cls1->name != NULL && cls2->name == NULL)
@@ -817,14 +817,14 @@ H5VL_cmp_plugin_cls(const H5VL_class_t *cls1, const H5VL_class_t *cls2)
     if(0 != (cmp_value = HDstrcmp(cls1->name, cls2->name)))
         HGOTO_DONE(cmp_value);
 
-    /* Compare plugin VOL API versions */
+    /* Compare connector VOL API versions */
     if(cls1->version < cls2->version)
         HGOTO_DONE(-1)
     if(cls1->version > cls2->version)
         HGOTO_DONE(1)
     HDassert(cls1->version == cls2->version);
 
-    /* Compare plugin info */
+    /* Compare connector info */
     if(cls1->info_size < cls2->info_size)
         HGOTO_DONE(-1)
     if(cls1->info_size > cls2->info_size)
@@ -833,30 +833,30 @@ H5VL_cmp_plugin_cls(const H5VL_class_t *cls1, const H5VL_class_t *cls2)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5VL_cmp_plugin_cls() */
+} /* end H5VL_cmp_connector_cls() */
 
 
 /*-------------------------------------------------------------------------
  * Function:    H5VL_set_vol_wrapper
  *
- * Purpose:     Set up object wrapping context for current VOL plugin
+ * Purpose:     Set up object wrapping context for current VOL connector
  *
  * Return:      SUCCEED / FAIL
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL_set_vol_wrapper(void *obj, const H5VL_t *plugin)
+H5VL_set_vol_wrapper(void *obj, const H5VL_t *connector)
 {
     H5VL_wrap_ctx_t *vol_wrap_ctx = NULL;       /* Object wrapping context */
-    void *obj_wrap_ctx = NULL;          /* VOL plugin's wrapping context */
+    void *obj_wrap_ctx = NULL;          /* VOL connector's wrapping context */
     herr_t ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity checks */
     HDassert(obj);
-    HDassert(plugin);
+    HDassert(connector);
 
     /* Retrieve the VOL object wrap context */
     if(H5CX_get_vol_wrap_ctx((void **)&vol_wrap_ctx) < 0)
@@ -864,14 +864,14 @@ H5VL_set_vol_wrapper(void *obj, const H5VL_t *plugin)
 
     /* Check for existing wrapping context */
     if(NULL == vol_wrap_ctx) {
-        /* Check if the plugin can create a wrap context */
-        if(plugin->cls->get_wrap_ctx) {
+        /* Check if the connector can create a wrap context */
+        if(connector->cls->get_wrap_ctx) {
             /* Sanity check */
-            HDassert(plugin->cls->free_wrap_ctx);
+            HDassert(connector->cls->free_wrap_ctx);
 
-            /* Get the wrap context from the plugin */
-            if((plugin->cls->get_wrap_ctx)(obj, &obj_wrap_ctx) < 0)
-                HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't retrieve VOL plugin's object wrap context")
+            /* Get the wrap context from the connector */
+            if((connector->cls->get_wrap_ctx)(obj, &obj_wrap_ctx) < 0)
+                HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't retrieve VOL connector's object wrap context")
         } /* end if */
 
         /* Allocate VOL object wrapper context */
@@ -880,7 +880,7 @@ H5VL_set_vol_wrapper(void *obj, const H5VL_t *plugin)
 
         /* Set up VOL object wrapper context */
         vol_wrap_ctx->rc = 1;;
-        vol_wrap_ctx->plugin = plugin;
+        vol_wrap_ctx->connector = connector;
         vol_wrap_ctx->obj_wrap_ctx = obj_wrap_ctx;
     } /* end if */
     else
@@ -903,7 +903,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5VL_reset_vol_wrapper
  *
- * Purpose:     Reset object wrapping context for current VOL plugin
+ * Purpose:     Reset object wrapping context for current VOL connector
  *
  * Return:      SUCCEED / FAIL
  *
@@ -930,11 +930,11 @@ H5VL_reset_vol_wrapper(void)
 
     /* Release context if the ref count drops to zero */
     if(0 == vol_wrap_ctx->rc) {
-        /* If there is a VOL plugin object wrapping context, release it */
+        /* If there is a VOL connector object wrapping context, release it */
         if(vol_wrap_ctx->obj_wrap_ctx) {
-            /* Release the VOL plugin's object wrapping context */
-            if((*vol_wrap_ctx->plugin->cls->free_wrap_ctx)(vol_wrap_ctx->obj_wrap_ctx) < 0)
-                HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "unable to release plugin's object wrapping context")
+            /* Release the VOL connector's object wrapping context */
+            if((*vol_wrap_ctx->connector->cls->free_wrap_ctx)(vol_wrap_ctx->obj_wrap_ctx) < 0)
+                HGOTO_ERROR(H5E_VOL, H5E_CANTRELEASE, FAIL, "unable to release connector's object wrapping context")
         } /* end if */
 
         /* Release object wrapping context */
@@ -983,18 +983,18 @@ H5VL_wrap_register(H5I_type_t type, void *obj, hbool_t app_ref)
         if(TRUE == H5T_already_vol_managed((const H5T_t *)obj))
             HGOTO_ERROR(H5E_VOL, H5E_BADTYPE, H5I_INVALID_HID, "can't wrap an uncommitted datatype")
 
-    /* Wrap the object with VOL plugin info */
+    /* Wrap the object with VOL connector info */
     if(NULL == (new_obj = H5VL__wrap_obj(obj)))
         HGOTO_ERROR(H5E_VOL, H5E_CANTCREATE, H5I_INVALID_HID, "can't wrap library object")
 
     /* Retrieve the VOL object wrapping context */
     if(H5CX_get_vol_wrap_ctx((void **)&vol_wrap_ctx) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_CANTGET, H5I_INVALID_HID, "can't get VOL object wrap context")
-    if(NULL == vol_wrap_ctx || NULL == vol_wrap_ctx->plugin)
-        HGOTO_ERROR(H5E_VOL, H5E_BADVALUE, H5I_INVALID_HID, "VOL object wrap context or its plugin is NULL???")
+    if(NULL == vol_wrap_ctx || NULL == vol_wrap_ctx->connector)
+        HGOTO_ERROR(H5E_VOL, H5E_BADVALUE, H5I_INVALID_HID, "VOL object wrap context or its connector is NULL???")
 
     /* Get an ID for the object */
-    if((ret_value = H5VL_register_using_vol_id(type, new_obj, vol_wrap_ctx->plugin->id, app_ref)) < 0)
+    if((ret_value = H5VL_register_using_vol_id(type, new_obj, vol_wrap_ctx->connector->id, app_ref)) < 0)
         HGOTO_ERROR(H5E_VOL, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to get an ID for the object")
 
 done: