Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol

3 files changed, 30 insertions, 30 deletions

diff --git a/test/h5test.c b/test/h5test.c
index 888fded..c1cc55b 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -1915,7 +1915,7 @@ error:
  *              them (e.g.: for testing VOL driver ID handling).
  *
  *              This API call will return a pointer to a VOL class that
- *              can be used to construct a test VOL using H5VLregister().
+ *              can be used to construct a test VOL using H5VLregister_driver().
  *
  * Return:      Success:    A pointer to a VOL class struct
  *              Failure:    NULL
diff --git a/test/tmisc.c b/test/tmisc.c
index c7fb4a9..02521e4 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -3481,15 +3481,15 @@ test_misc19(void)
 
     HDfree(vfd_cls);
 
-/* Check H5I operations on virtual object drivers */
+/* Check H5I operations on virtual object plugins */
 
     /* Get a VOL class to register */
     vol_cls = h5_get_dummy_vol_class();
     CHECK(vol_cls, NULL, "h5_get_dummy_vol_class");
 
-    /* Register a virtual object driver */
-    volid = H5VLregister(vol_cls, H5P_DEFAULT);
-    CHECK(volid, FAIL, "H5VLregister");
+    /* Register a VOL plugin */
+    volid = H5VLregister_plugin(vol_cls, H5P_DEFAULT);
+    CHECK(volid, FAIL, "H5VLregister_plugin");
 
     /* Check the reference count */
     rc = H5Iget_ref(volid);
@@ -3499,23 +3499,23 @@ test_misc19(void)
     rc = H5Iinc_ref(volid);
     VERIFY(rc, 2, "H5Iinc_ref");
 
-    /* Unregister the VOL driver normally */
-    ret = H5VLunregister(volid);
-    CHECK(ret, FAIL, "H5VLunregister");
+    /* Unregister the VOL plugin normally */
+    ret = H5VLunregister_plugin(volid);
+    CHECK(ret, FAIL, "H5VLunregister_plugin");
 
     /* Check the reference count */
     rc = H5Iget_ref(volid);
     VERIFY(rc, 1, "H5Iget_ref");
 
-    /* Unregister the VOL driver by decrementing the reference count */
+    /* Unregister the VOL plugin by decrementing the reference count */
     rc = H5Idec_ref(volid);
     VERIFY(rc, 0, "H5Idec_ref");
 
-    /* Try unregistering the VOL driver again (should fail) */
+    /* Try unregistering the VOL plugin again (should fail) */
     H5E_BEGIN_TRY {
-        ret = H5VLunregister(volid);
+        ret = H5VLunregister_plugin(volid);
     } H5E_END_TRY;
-    VERIFY(ret, FAIL, "H5VLunregister");
+    VERIFY(ret, FAIL, "H5VLunregister_plugin");
 
     HDfree(vol_cls);
 
diff --git a/test/vol.c b/test/vol.c
index 0de7d88..553a9cf 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -19,7 +19,7 @@
  */
 
 #include "h5test.h"
-#include "H5VLnative.h"
+#include "H5VLnative_private.h"
 
 
 #define NATIVE_VOL_TEST_FILENAME        "native_vol_test"
@@ -141,17 +141,17 @@ test_vol_registration(void)
     TESTING("VOL registration");
 
     /* The test/fake VOL plugin should not be registered at the start of the test */
-    if ((is_registered = H5VLis_registered(FAKE_VOL_NAME)) < 0)
+    if ((is_registered = H5VLis_plugin_registered(FAKE_VOL_NAME)) < 0)
         FAIL_STACK_ERROR;
     if (is_registered > 0)
         FAIL_PUTS_ERROR("native VOL plugin is inappropriately registered");
 
-    /* Register a VOL plugin */
-    if ((vol_id = H5VLregister(&fake_vol_g, H5P_DEFAULT)) < 0)
+    /* Load a VOL interface */
+    if ((vol_id = H5VLregister_plugin(&fake_vol_g)) < 0)
         FAIL_STACK_ERROR;
 
     /* The test/fake VOL plugin should be registered now */
-    if ((is_registered = H5VLis_registered(FAKE_VOL_NAME)) < 0)
+    if ((is_registered = H5VLis_plugin_registered(FAKE_VOL_NAME)) < 0)
         FAIL_STACK_ERROR;
     if (0 == is_registered)
         FAIL_PUTS_ERROR("native VOL plugin is un-registered");
@@ -195,7 +195,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_native_vol_init()
  *
- * Purpose:     Tests if the native VOL driver gets initialized.
+ * Purpose:     Tests if the native VOL plugin gets initialized.
  *
  * Return:      SUCCEED/FAIL
  *
@@ -206,13 +206,13 @@ test_native_vol_init(void)
 {
     htri_t is_registered;
 
-    TESTING("Native VOL driver initialization");
+    TESTING("Native VOL plugin initialization");
 
-    /* The native VOL driver should always be registered */
-    if ((is_registered = H5VLis_registered(H5VL_NATIVE_NAME)) < 0)
+    /* The native VOL plugin should always be registered */
+    if ((is_registered = H5VLis_plugin_registered(H5VL_NATIVE_NAME)) < 0)
         FAIL_STACK_ERROR;
     if (0 == is_registered)
-        FAIL_PUTS_ERROR("native VOL driver is un-registered");
+        FAIL_PUTS_ERROR("native VOL plugin is un-registered");
 
     PASSED();
     return SUCCEED;
@@ -226,7 +226,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_basic_file_operation()
  *
- * Purpose:     Uses the native VOL driver to test basic VOL file operations
+ * Purpose:     Uses the native VOL plugin to test basic VOL file operations
  *
  * Return:      SUCCEED/FAIL
  *
@@ -347,7 +347,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_basic_group_operation()
  *
- * Purpose:     Uses the native VOL driver to test basic VOL group operations
+ * Purpose:     Uses the native VOL plugin to test basic VOL group operations
  *
  * Return:      SUCCEED/FAIL
  *
@@ -438,7 +438,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_basic_dataset_operation()
  *
- * Purpose:     Uses the native VOL driver to test basic VOL dataset operations
+ * Purpose:     Uses the native VOL plugin to test basic VOL dataset operations
  *
  * Return:      SUCCEED/FAIL
  *
@@ -607,7 +607,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_basic_attribute_operation()
  *
- * Purpose:     Uses the native VOL driver to test basic VOL attribute operations
+ * Purpose:     Uses the native VOL plugin to test basic VOL attribute operations
  *
  * Return:      SUCCEED/FAIL
  *
@@ -705,7 +705,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_basic_object_operation()
  *
- * Purpose:     Uses the native VOL driver to test basic VOL object operations
+ * Purpose:     Uses the native VOL plugin to test basic VOL object operations
  *
  * Return:      SUCCEED/FAIL
  *
@@ -769,7 +769,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_basic_link_operation()
  *
- * Purpose:     Uses the native VOL driver to test basic VOL link operations
+ * Purpose:     Uses the native VOL plugin to test basic VOL link operations
  *
  * Return:      SUCCEED/FAIL
  *
@@ -834,7 +834,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_basic_datatype_operation()
  *
- * Purpose:     Uses the native VOL driver to test basic VOL datatype operations
+ * Purpose:     Uses the native VOL plugin to test basic VOL datatype operations
  *
  * Return:      SUCCEED/FAIL
  *
@@ -916,7 +916,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_echo_vol_operation()
  *
- * Purpose:     Uses the echo VOL driver to test basic VOL operations
+ * Purpose:     Uses the echo VOL plugin to test basic VOL operations
  *              via the H5VL public API.
  *
  * Return:      SUCCEED/FAIL