summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2018-10-17 09:06:28 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2018-10-17 09:06:28 (GMT)
commit2d6d5cad0cc426cd53b9d4fda15e53d8021e4c7b (patch)
tree40d72b402a0af13b09e431aeb031b1c22a2f02c5 /test
parent1e8ef703cdc057211b3587be776a6e9f62e8f76f (diff)
downloadhdf5-2d6d5cad0cc426cd53b9d4fda15e53d8021e4c7b.zip
hdf5-2d6d5cad0cc426cd53b9d4fda15e53d8021e4c7b.tar.gz
hdf5-2d6d5cad0cc426cd53b9d4fda15e53d8021e4c7b.tar.bz2
Updates to the VOL ID and object API calls.
This brings the H5VL code in line with the H5I code regarding naming, parameter order, etc. Several public API calls were affected by this change. These changed names to reflect their use with VOL drivers: H5VLregister() --> H5VLregister_driver() H5VLregister_by_name() --> H5VLregister_driver_by_name() H5VLunregister() --> H5VLunregister_driver() H5VLis_registered() --> H5VLis_driver_registered() This call was renamed to match H5Iregister(). The order of the first two parameters also reversed and the object pointer is now const. H5VLobject_register() --> H5VLregister()
Diffstat (limited to 'test')
-rw-r--r--test/h5test.c2
-rw-r--r--test/tmisc.c14
-rw-r--r--test/vol.c8
3 files changed, 12 insertions, 12 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 9eed5db..2a977bf 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -3487,9 +3487,9 @@ test_misc19(void)
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);
- CHECK(volid, FAIL, "H5VLregister");
+ /* Register a VOL driver */
+ volid = H5VLregister_driver(vol_cls);
+ CHECK(volid, FAIL, "H5VLregister_driver");
/* Check the reference count */
rc = H5Iget_ref(volid);
@@ -3500,8 +3500,8 @@ test_misc19(void)
VERIFY(rc, 2, "H5Iinc_ref");
/* Unregister the VOL driver normally */
- ret = H5VLunregister(volid);
- CHECK(ret, FAIL, "H5VLunregister");
+ ret = H5VLunregister_driver(volid);
+ CHECK(ret, FAIL, "H5VLunregister_driver");
/* Check the reference count */
rc = H5Iget_ref(volid);
@@ -3513,9 +3513,9 @@ test_misc19(void)
/* Try unregistering the VOL driver again (should fail) */
H5E_BEGIN_TRY {
- ret = H5VLunregister(volid);
+ ret = H5VLunregister_driver(volid);
} H5E_END_TRY;
- VERIFY(ret, FAIL, "H5VLunregister");
+ VERIFY(ret, FAIL, "H5VLunregister_driver");
HDfree(vol_cls);
diff --git a/test/vol.c b/test/vol.c
index 3152a93..ad65a62 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -135,17 +135,17 @@ test_vol_registration(void)
TESTING("VOL registration");
/* The test/fake VOL driver should not be registered at the start of the test */
- if ((is_registered = H5VLis_registered(FAKE_VOL_NAME)) < 0)
+ if ((is_registered = H5VLis_driver_registered(FAKE_VOL_NAME)) < 0)
FAIL_STACK_ERROR;
if (is_registered > 0)
FAIL_PUTS_ERROR("native VOL driver is inappropriately registered");
/* Load a VOL interface */
- if ((vol_id = H5VLregister(&fake_vol_g)) < 0)
+ if ((vol_id = H5VLregister_driver(&fake_vol_g)) < 0)
FAIL_STACK_ERROR;
/* The test/fake VOL driver should be registered now */
- if ((is_registered = H5VLis_registered(FAKE_VOL_NAME)) < 0)
+ if ((is_registered = H5VLis_driver_registered(FAKE_VOL_NAME)) < 0)
FAIL_STACK_ERROR;
if (0 == is_registered)
FAIL_PUTS_ERROR("native VOL driver is un-registered");
@@ -183,7 +183,7 @@ test_native_vol_init(void)
TESTING("Native VOL driver initialization");
/* The native VOL driver should always be registered */
- if ((is_registered = H5VLis_registered(H5VL_NATIVE_NAME)) < 0)
+ if ((is_registered = H5VLis_driver_registered(H5VL_NATIVE_NAME)) < 0)
FAIL_STACK_ERROR;
if (0 == is_registered)
FAIL_PUTS_ERROR("native VOL driver is un-registered");