Squashed commit of the token_refactoring branch:

1 files changed, 9 insertions, 4 deletions

diff --git a/test/vol.c b/test/vol.c
index e7020e7..d26499e 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -141,6 +141,11 @@ static const H5VL_class_t fake_vol_g = {
         NULL,                                       /* specific     */
         NULL                                        /* optional     */
     },
+    {   /* token_cls */
+        NULL,                                       /* cmp              */
+        NULL,                                       /* to_str           */
+        NULL                                        /* from_str         */
+    },
     NULL                                            /* optional     */
 };
 
@@ -228,7 +233,7 @@ test_vol_registration(void)
         TEST_ERROR;
 
     /* Try to unregister the native VOL connector (should fail) */
-    if (H5I_INVALID_HID == (native_id = H5VLget_connector_id(H5VL_NATIVE_NAME)))
+    if (H5I_INVALID_HID == (native_id = H5VLget_connector_id_by_name(H5VL_NATIVE_NAME)))
         TEST_ERROR;
     H5E_BEGIN_TRY {
         ret = H5VLunregister_connector(native_id);
@@ -870,7 +875,7 @@ test_basic_object_operation(void)
     hid_t oid       = H5I_INVALID_HID;
 
     char filename[1024];
-    H5O_info_t object_info;
+    H5O_info2_t object_info;
 
     TESTING("Basic VOL object operations");
 
@@ -884,11 +889,11 @@ test_basic_object_operation(void)
         TEST_ERROR;
 
     /* H5Oget_info */
-    if (H5Oget_info2(fid, &object_info, H5O_INFO_ALL) < 0)
+    if (H5Oget_info3(fid, &object_info, H5O_INFO_ALL) < 0)
         TEST_ERROR;
 
     /* H5Oget_info_by_name */
-    if (H5Oget_info_by_name2(fid, NATIVE_VOL_TEST_GROUP_NAME, &object_info, H5O_INFO_ALL, H5P_DEFAULT) < 0)
+    if (H5Oget_info_by_name3(fid, NATIVE_VOL_TEST_GROUP_NAME, &object_info, H5O_INFO_ALL, H5P_DEFAULT) < 0)
         TEST_ERROR;
 
     /* H5Oexists_by_name */