Squashed commit of the token_refactoring branch:

3 files changed, 61 insertions, 159 deletions

diff --git a/fortran/test/tH5G_1_8.F90 b/fortran/test/tH5G_1_8.F90
index d3be525..58431a1 100644
--- a/fortran/test/tH5G_1_8.F90
+++ b/fortran/test/tH5G_1_8.F90
@@ -665,11 +665,11 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
                           !  H5L_TYPE_SOFT_F      - Soft link
                           !  H5L_TYPE_EXTERNAL_F  - External link
                           !  H5L_TYPE_ERROR _F    - Error
-     INTEGER(HADDR_T) :: address  ! If the link is a hard link, address specifies the file address that the link points to
+     TYPE(H5O_TOKEN_T_F) :: token  ! If the link is a hard link, token specifies the object token that the link points to
      INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
 
 
-!     WRITE(*,*) "link creation (w/new group format)"
+     WRITE(*,*) "link creation (w/new group format)"
 
      !  Create a file 
      CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, file, error, H5P_DEFAULT_F, fapl)
@@ -698,7 +698,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
      CALL check("H5Lcreate_soft_f", error, total_error)
 
      CALL H5Lget_info_f(file, "grp1/soft", &
-          cset, corder, f_corder_valid, link_type, address, val_size, &
+          cset, corder, f_corder_valid, link_type, token, val_size, &
           error, H5P_DEFAULT_F)
      CALL check("H5Lget_info_f",error,total_error)
 
@@ -770,7 +770,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
                          !  H5L_TYPE_SOFT_F      - Soft link
                          !  H5L_TYPE_EXTERNAL_F  - External link
                          !  H5L_TYPE_ERROR _F    - Error
-    INTEGER(HADDR_T) :: address  ! If the link is a hard link, address specifies the file address that the link points to
+    TYPE(H5O_TOKEN_T_F) :: token  ! If the link is a hard link, token specifies the object token that the link points to
     INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
 
     INTEGER :: error
@@ -816,7 +816,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
 
     !  Get the group's link's information 
     CALL H5Lget_info_f(file_id, "group", &
-         cset, corder, f_corder_valid, link_type, address, val_size, &
+         cset, corder, f_corder_valid, link_type, token, val_size, &
          error, H5P_DEFAULT_F)
     CALL check("H5Lget_info_f",error,total_error)
 
@@ -1179,7 +1179,7 @@ SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
   INTEGER :: cset ! Indicates the character set used for the attribute’s name
   INTEGER(SIZE_T) :: val_size
   INTEGER :: link_type
-  INTEGER(HADDR_T) :: address
+  TYPE(H5O_TOKEN_T_F) :: token
 
   INTEGER :: u !  Local index variable 
   INTEGER :: Input1, i
@@ -1309,10 +1309,10 @@ SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
               ! HDmemset(&linfo, 0, sizeof(linfo));
 
               CALL H5Lget_info_by_idx_f(group_id, ".", idx_type, iorder, INT(0,HSIZE_T), &
-                   link_type, f_corder_valid, corder, cset, address, val_size, error)
+                   link_type, f_corder_valid, corder, cset, token, val_size, error)
 
-              CALL H5Oopen_by_addr_f(group_id, address, grp, error)
-              CALL check("H5Oopen_by_addr_f", error, total_error)
+              CALL H5Oopen_by_token_f(group_id, token, grp, error)
+              CALL check("H5Oopen_by_token_f", error, total_error)
 
               CALL H5Iget_type_f(grp, id_type, error)
               CALL check("H5Iget_type_f", error, total_error)
@@ -1357,11 +1357,11 @@ SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
 
            ! Close the group creation property list 
            CALL H5Pclose_f(gcpl_id, error)
-           CALL check("delete_by_idx.H5Gclose_f", error, total_error)
+           CALL check("delete_by_idx.H5Pclose_f", error, total_error)
 
            ! Close the file 
            CALL H5Fclose_f(file_id, error)
-           CALL check("delete_by_idx.H5Gclose_f", error, total_error)
+           CALL check("delete_by_idx.H5Fclose_f", error, total_error)
 
            IF(cleanup) CALL h5_cleanup_f("file0", H5P_DEFAULT_F, error)
            CALL check("h5_cleanup_f", error, total_error)
@@ -1407,7 +1407,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
   INTEGER :: cset ! Indicates the character set used for the attribute’s name
   INTEGER :: link_type
-  INTEGER(HADDR_T) :: address
+  TYPE(H5O_TOKEN_T_F) :: token
   INTEGER(SIZE_T) :: val_size   ! Indicates the size, in the number of characters, of the attribute
 
   CHARACTER(LEN=7) :: tmpname     ! Temporary link name 
@@ -1427,14 +1427,14 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   !  Verify the link information for first link, in increasing creation order 
   !  HDmemset(&linfo, 0, sizeof(linfo));
   CALL H5Lget_info_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(0,HSIZE_T), &
-       link_type, f_corder_valid, corder, cset, address, val_size, error)
+       link_type, f_corder_valid, corder, cset, token, val_size, error)
   CALL check("H5Lget_info_by_idx_f", error, total_error)
   CALL verify("H5Lget_info_by_idx_f", corder, 0, total_error)
 
   !  Verify the link information for new link, in increasing creation order 
   ! HDmemset(&linfo, 0, sizeof(linfo));
   CALL H5Lget_info_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, INT(n,HSIZE_T), &
-       link_type, f_corder_valid, corder, cset, address, val_size, error)
+       link_type, f_corder_valid, corder, cset, token, val_size, error)
   CALL check("H5Lget_info_by_idx_f", error, total_error)
   CALL verify("H5Lget_info_by_idx_f", corder, n, total_error)
 
@@ -1516,7 +1516,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
                        !  H5L_TYPE_SOFT_F      - Soft link
                        !  H5L_TYPE_EXTERNAL_F  - External link
                        !  H5L_TYPE_ERROR _F    - Error
-  INTEGER(HADDR_T) :: address  ! If the link is a hard link, address specifies the file address that the link points to
+  TYPE(H5O_TOKEN_T_F) :: token  ! If the link is a hard link, token specifies the object token that the link points to
   INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
 
   CHARACTER(LEN=1024) :: filename = 'tempfile.h5'
@@ -1555,7 +1555,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   !  Check that its character encoding is the default 
 
   CALL H5Lget_info_f(file_id, "group", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error, H5P_DEFAULT_F)
 
 ! File-wide default character encoding can not yet be set via the file
@@ -1575,7 +1575,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
   !  Check that its character encoding is the default 
   CALL H5Lget_info_f(file_id, "type", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error)
   CALL check("h5tclose_f", error, total_error)
 
@@ -1636,7 +1636,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
   !  Check that its character encoding is the default 
   CALL H5Lget_info_f(file_id, "dataset", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error)
   CALL check("H5Lget_info_f", error, total_error)
 
@@ -1661,7 +1661,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
   ! Check that its character encoding is UTF-8 
   CALL H5Lget_info_f(file_id, "group2", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error)
   CALL check("H5Lget_info_f", error, total_error)
   CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
@@ -1679,7 +1679,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
   ! Check that its character encoding is UTF-8 
   CALL H5Lget_info_f(file_id, "type2", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error)
   CALL check("H5Lget_info_f", error, total_error)
   CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
@@ -1697,7 +1697,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
   !  Check that its character encoding is UTF-8 
   CALL H5Lget_info_f(file_id, "dataset2", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error)
   CALL check("H5Lget_info_f", error, total_error)
   CALL verify("H5Lget_info_f2",cset, H5T_CSET_UTF8_F,total_error)
@@ -1719,7 +1719,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
   !  Check that its character encoding is ASCII 
   CALL H5Lget_info_f(file_id, "/dataset2_link", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error)
   CALL check("H5Lget_info_f", error, total_error)
   CALL verify("H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
@@ -1727,7 +1727,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   !  Check that the first link's encoding hasn't changed 
 
   CALL H5Lget_info_f(file_id, "/dataset2", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error)
   CALL check("H5Lget_info_f", error, total_error)
   CALL verify("H5Lget_info_f3",cset, H5T_CSET_UTF8_F,total_error)
@@ -1742,7 +1742,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   CALL check("H5Lcreate_soft_f", error, total_error)
 
   CALL H5Lget_info_f(file_id, "slink_to_dset2", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error)
   CALL check("H5Lget_info_f", error, total_error)
   CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
@@ -1756,7 +1756,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   CALL check("H5Lmove_f",error, total_error)
 
   CALL H5Lget_info_f(file_id, "moved_slink", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error)
   CALL check("H5Lget_info_f", error, total_error)
   CALL verify("H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
@@ -1770,7 +1770,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   CALL H5Lcopy_f(file_id, "moved_slink", file_id, "copied_slink", error, lcpl_id)
 
   CALL H5Lget_info_f(file_id, "copied_slink", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error)
   CALL check("H5Lget_info_f", error, total_error)
   CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
@@ -1782,7 +1782,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   CALL check("H5Lcreate_external_f", error, total_error)
 
   CALL H5Lget_info_f(file_id, "extlink", &
-       cset, corder, f_corder_valid, link_type, address, val_size, &
+       cset, corder, f_corder_valid, link_type, token, val_size, &
        error)
   CALL check("H5Lget_info_f", error, total_error)
   CALL verify("H5Lget_info_f",cset, H5T_CSET_UTF8_F,total_error)
diff --git a/fortran/test/tH5O_F03.F90 b/fortran/test/tH5O_F03.F90
index 5b446a4..c9ecccc 100644
--- a/fortran/test/tH5O_F03.F90
+++ b/fortran/test/tH5O_F03.F90
@@ -63,27 +63,33 @@ MODULE visit_cb
 
 CONTAINS
 
-! Compares the field values of a C h5O_info_t and a Fortran H5O_info_t. 
+! Compares the field values of a C H5O_info_t and a Fortran H5O_info_t.
+
+  INTEGER FUNCTION compare_h5o_info_t( loc_id, oinfo_f, oinfo_c, field, full_f_field ) RESULT(status)
 
-  INTEGER FUNCTION compare_h5o_info_t( oinfo_f, oinfo_c, field, full_f_field ) RESULT(status)
-    
     IMPLICIT NONE
+    INTEGER(HID_T)     :: loc_id
     TYPE(h5o_info_t)   :: oinfo_f
     TYPE(c_h5o_info_t) :: oinfo_c
+    TYPE(H5O_TOKEN_T_F) :: token_c
     INTEGER :: field
-    LOGICAL :: full_f_field ! All the fields of Fortran H5O_info_t where filled 
+    LOGICAL :: full_f_field ! All the fields of Fortran H5O_info_t where filled
 !   local
     INTEGER(C_INT), DIMENSION(1:8) :: atime, btime, ctime, mtime
+    INTEGER :: cmp_value
     INTEGER :: i
+    INTEGER :: ierr
 
     status = 0
-    
+
     IF( (field .EQ. H5O_INFO_BASIC_F).OR.(field .EQ. H5O_INFO_ALL_F) )THEN
        IF( (oinfo_f%fileno.LE.0) .OR. (oinfo_c%fileno .NE. oinfo_f%fileno) )THEN
           status = -1
           RETURN
        ENDIF
-       IF( (oinfo_f%addr.LE.0) .OR. (oinfo_c%addr .NE. oinfo_f%addr) )THEN
+       token_c%token = oinfo_c%token%token
+       CALL H5Otoken_cmp_f(loc_id, oinfo_f%token, token_c, cmp_value, ierr);
+       IF( (ierr .EQ. -1) .OR. (cmp_value .NE. 0) ) THEN
           status = -1
           RETURN
        ENDIF
@@ -131,26 +137,12 @@ CONTAINS
        ! check other field values are not filled (using only a small subset to check)
        status = 0
        IF( oinfo_c%fileno .NE. oinfo_f%fileno) status = status + 1
-       IF( oinfo_c%addr .NE. oinfo_f%addr) status = status + 1
-       IF( oinfo_c%type .NE. oinfo_f%type) status = status + 1
-       IF( oinfo_c%rc .NE. oinfo_f%rc) status = status + 1
-       IF(status.EQ.0) THEN ! There was no difference found, which is only possible if the field was filled.
-          status = -1
-          RETURN
-       ENDIF
-       status = 0 ! reset
-    ENDIF
-
-    IF((field .EQ. H5O_INFO_NUM_ATTRS_F).OR.(field .EQ. H5O_INFO_ALL_F))THEN
-       IF( (oinfo_f%num_attrs.LT.0) .OR. (oinfo_c%num_attrs .NE. oinfo_f%num_attrs) )THEN
+       token_c%token = oinfo_c%token%token
+       CALL H5Otoken_cmp_f(loc_id, oinfo_f%token, token_c, cmp_value, ierr);
+       IF( (ierr .EQ. -1) .OR. (cmp_value .NE. 0) ) THEN
           status = -1
           RETURN
        ENDIF
-    ELSE IF( field .EQ. H5O_INFO_ALL_F.AND.full_f_field)THEN
-       ! check other field values are not filled (using only a small subset to check)
-       status = 0
-       IF( oinfo_c%fileno .NE. oinfo_f%fileno) status = status + 1
-       IF( oinfo_c%addr .NE. oinfo_f%addr) status = status + 1
        IF( oinfo_c%type .NE. oinfo_f%type) status = status + 1
        IF( oinfo_c%rc .NE. oinfo_f%rc) status = status + 1
        IF(status.EQ.0) THEN ! There was no difference found, which is only possible if the field was filled.
@@ -158,85 +150,23 @@ CONTAINS
           RETURN
        ENDIF
        status = 0 ! reset
-       
     ENDIF
 
-    IF((field).EQ.H5O_INFO_HDR_F.OR.(field .EQ. H5O_INFO_ALL_F))THEN
-       IF( (oinfo_f%hdr%version.LT.0) .OR. (oinfo_c%hdr%version .NE. oinfo_f%hdr%version) )THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF( (oinfo_f%hdr%nmesgs.LT.0) .OR. (oinfo_c%hdr%nmesgs .NE. oinfo_f%hdr%nmesgs) )THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF( (oinfo_f%hdr%nchunks.LT.0) .OR. (oinfo_c%hdr%nchunks .NE. oinfo_f%hdr%nchunks) )THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF( (oinfo_f%hdr%flags.LT.0) .OR. (oinfo_c%hdr%flags .NE. oinfo_f%hdr%flags) )THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF( (oinfo_f%hdr%space%total.LT.0) .OR. (oinfo_c%hdr%space%total .NE. oinfo_f%hdr%space%total) )THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF( (oinfo_f%hdr%space%meta.LT.0) .OR. (oinfo_c%hdr%space%meta .NE. oinfo_f%hdr%space%meta) )THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF( (oinfo_f%hdr%space%mesg.LT.0) .OR. (oinfo_c%hdr%space%mesg .NE. oinfo_f%hdr%space%mesg) )THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF( (oinfo_f%hdr%space%free.LT.0) .OR. (oinfo_c%hdr%space%free .NE. oinfo_f%hdr%space%free) )THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF( (oinfo_f%hdr%mesg%present.LT.0) .OR. (oinfo_c%hdr%mesg%present .NE. oinfo_f%hdr%mesg%present) )THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF( (oinfo_f%hdr%mesg%shared.LT.0) .OR. (oinfo_c%hdr%mesg%shared .NE. oinfo_f%hdr%mesg%shared) )THEN
+    IF((field .EQ. H5O_INFO_NUM_ATTRS_F).OR.(field .EQ. H5O_INFO_ALL_F))THEN
+       IF( (oinfo_f%num_attrs.LT.0) .OR. (oinfo_c%num_attrs .NE. oinfo_f%num_attrs) )THEN
           status = -1
           RETURN
        ENDIF
-    ELSE IF( field .EQ. H5O_INFO_HDR_F.AND.full_f_field)THEN
+    ELSE IF( field .EQ. H5O_INFO_ALL_F.AND.full_f_field)THEN
        ! check other field values are not filled (using only a small subset to check)
        status = 0
        IF( oinfo_c%fileno .NE. oinfo_f%fileno) status = status + 1
-       IF( oinfo_c%addr .NE. oinfo_f%addr) status = status + 1
-       IF( oinfo_c%type .NE. oinfo_f%type) status = status + 1
-       IF( oinfo_c%rc .NE. oinfo_f%rc) status = status + 1
-       IF(status.EQ.0) THEN ! There was no difference found, which is only possible if the field was filled.
-          status = -1
-          RETURN
-       ENDIF
-       status = 0 ! reset
-    ENDIF
-    IF((field).EQ.H5O_INFO_META_SIZE_F.OR.(field .EQ. H5O_INFO_ALL_F))THEN
-       IF((oinfo_f%meta_size%obj%index_size.LT.0).OR.(oinfo_c%meta_size%obj%index_size.NE.oinfo_f%meta_size%obj%index_size))THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF((oinfo_f%meta_size%obj%heap_size.LT.0).OR.(oinfo_c%meta_size%obj%heap_size.NE.oinfo_f%meta_size%obj%heap_size))THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF((oinfo_f%meta_size%attr%index_size.LT.0).OR.(oinfo_c%meta_size%attr%index_size.NE.oinfo_f%meta_size%attr%index_size))THEN
-          status = -1
-          RETURN
-       ENDIF
-       IF((oinfo_f%meta_size%attr%heap_size.LT.0).OR.(oinfo_c%meta_size%attr%heap_size.NE.oinfo_f%meta_size%attr%heap_size))THEN
+       token_c%token = oinfo_c%token%token
+       CALL H5Otoken_cmp_f(loc_id, oinfo_f%token, token_c, cmp_value, ierr);
+       IF( (ierr .EQ. -1) .OR. (cmp_value .NE. 0) ) THEN
           status = -1
           RETURN
        ENDIF
-    ELSE IF( field .EQ. H5O_INFO_META_SIZE_F.AND.full_f_field)THEN
-       ! check other field values are not filled (using only a small subset to check)
-       status = 0
-       IF( oinfo_c%fileno .NE. oinfo_f%fileno) status = status + 1
-       IF( oinfo_c%addr .NE. oinfo_f%addr) status = status + 1
        IF( oinfo_c%type .NE. oinfo_f%type) status = status + 1
        IF( oinfo_c%rc .NE. oinfo_f%rc) status = status + 1
        IF(status.EQ.0) THEN ! There was no difference found, which is only possible if the field was filled.
@@ -295,13 +225,13 @@ CONTAINS
     IF(op_data%field .EQ. H5O_INFO_ALL_F)THEN
 
        idx = op_data%idx
-     
+
        DO i = 1, len
           IF(op_data%info(idx)%path(i)(1:1) .NE. name(i)(1:1))THEN
              visit_obj_cb = -1
              RETURN
           ENDIF
-          
+
           IF(op_data%info(idx)%type_obj .NE. oinfo_c%type)THEN
              visit_obj_cb = -1
              RETURN
@@ -310,14 +240,14 @@ CONTAINS
 
     ENDIF
 
-    ! Check H5Oget_info_by_name_f; if partial field values where filled correctly
+    ! Check H5Oget_info_by_name_f; if partial field values were filled correctly
     CALL H5Oget_info_by_name_f(group_id, name2, oinfo_f, ierr);
-    visit_obj_cb =  compare_h5o_info_t( oinfo_f, oinfo_c, op_data%field, .TRUE. )
+    visit_obj_cb =  compare_h5o_info_t( group_id, oinfo_f, oinfo_c, op_data%field, .TRUE. )
     IF(visit_obj_cb.EQ.-1) RETURN
 
     ! Check H5Oget_info_by_name_f, only check field values
     CALL H5Oget_info_by_name_f(group_id, name2, oinfo_f, ierr, fields = op_data%field);
-    visit_obj_cb =  compare_h5o_info_t( oinfo_f, oinfo_c, op_data%field, .FALSE. )
+    visit_obj_cb =  compare_h5o_info_t(group_id, oinfo_f, oinfo_c, op_data%field, .FALSE. )
     IF(visit_obj_cb.EQ.-1) RETURN
 
 
@@ -325,12 +255,12 @@ CONTAINS
 
        ! Check H5Oget_info_f, only check field values
        CALL H5Oget_info_f(group_id, oinfo_f, ierr, fields = op_data%field);
-       visit_obj_cb =  compare_h5o_info_t( oinfo_f, oinfo_c, op_data%field, .FALSE.  )
+       visit_obj_cb =  compare_h5o_info_t(group_id, oinfo_f, oinfo_c, op_data%field, .FALSE.  )
        IF(visit_obj_cb.EQ.-1) RETURN
 
        ! Check H5Oget_info_f; if partial field values where filled correctly
        CALL H5Oget_info_f(group_id, oinfo_f, ierr);
-       visit_obj_cb =  compare_h5o_info_t( oinfo_f, oinfo_c, op_data%field, .TRUE.  )
+       visit_obj_cb =  compare_h5o_info_t(group_id, oinfo_f, oinfo_c, op_data%field, .TRUE.  )
        IF(visit_obj_cb.EQ.-1) RETURN
 
     ENDIF
@@ -583,20 +513,6 @@ SUBROUTINE test_obj_visit(total_error)
   IF(ret_val.LT.0)THEN
      CALL check("h5ovisit_f", -1, total_error)
   ENDIF
-  udata%field = H5O_INFO_HDR_F
-  udata%idx = 1
-  CALL h5ovisit_f(fid, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
-  CALL check("h5ovisit_f", error, total_error)
-  IF(ret_val.LT.0)THEN
-     CALL check("h5ovisit_f", -1, total_error)
-  ENDIF
-  udata%field = H5O_INFO_META_SIZE_F
-  udata%idx = 1
-  CALL h5ovisit_f(fid, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
-  CALL check("h5ovisit_f", error, total_error)
-  IF(ret_val.LT.0)THEN
-     CALL check("h5ovisit_f", -1, total_error)
-  ENDIF
 
   ! Test h5ovisit_by_name_f
   object_name = "/"
@@ -630,21 +546,7 @@ SUBROUTINE test_obj_visit(total_error)
   IF(ret_val.LT.0)THEN
      CALL check("h5ovisit_by_name_f", -1, total_error)
   ENDIF
-  udata%idx = 1
-  udata%field = H5O_INFO_HDR_F
-  CALL h5ovisit_by_name_f(fid, object_name, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
-  CALL check("h5ovisit_by_name_f", error, total_error)
-  IF(ret_val.LT.0)THEN
-     CALL check("h5ovisit_by_name_f", -1, total_error)
-  ENDIF
-  udata%idx = 1
-  udata%field = H5O_INFO_META_SIZE_F
-  CALL h5ovisit_by_name_f(fid, object_name, H5_INDEX_NAME_F, H5_ITER_INC_F, fun_ptr, f_ptr, ret_val, error, fields=udata%field)
-  CALL check("h5ovisit_by_name_f", error, total_error)
-  IF(ret_val.LT.0)THEN
-     CALL check("h5ovisit_by_name_f", -1, total_error)
-  ENDIF
-  
+
   CALL h5fclose_f(fid, error)
   CALL check("h5fclose_f",error, total_error)
 
diff --git a/fortran/test/vol_connector.F90 b/fortran/test/vol_connector.F90
index aabb2b8..cd05cb1 100644
--- a/fortran/test/vol_connector.F90
+++ b/fortran/test/vol_connector.F90
@@ -74,8 +74,8 @@ CONTAINS
     CALL check("H5VLis_connector_registered_f",error,total_error)
     CALL VERIFY("H5VLis_connector_registered_f", is_registered, .TRUE., total_error)
 
-    CALL H5VLget_connector_id_f(NATIVE_VOL_CONNECTOR_NAME, vol_id_out, error)
-    CALL check("H5VLget_connector_id_f",error,total_error)
+    CALL H5VLget_connector_id_by_name_f(NATIVE_VOL_CONNECTOR_NAME, vol_id_out, error)
+    CALL check("H5VLget_connector_id_by_name_f",error,total_error)
 
     CALL H5Fcreate_f("voltest.h5",H5F_ACC_TRUNC_F, file_id, error)
     CALL check("H5F_create_f",error,total_error)
@@ -201,9 +201,9 @@ CONTAINS
        CALL VERIFY("H5Pget_vol_id_f", vol_id_out, vol_id, total_error)
     ENDIF
 
-    CALL H5VLget_connector_id_f(NATIVE_VOL_CONNECTOR_NAME, vol_id_out, error)
-    CALL check("H5VLget_connector_id_f",error,total_error)
-    CALL VERIFY("H5VLget_connector_id_f", vol_id_out, vol_id, total_error)
+    CALL H5VLget_connector_id_by_name_f(NATIVE_VOL_CONNECTOR_NAME, vol_id_out, error)
+    CALL check("H5VLget_connector_id_by_name_f",error,total_error)
+    CALL VERIFY("H5VLget_connector_id_by_name_f", vol_id_out, vol_id, total_error)
     CALL H5Fcreate_f("voltest.h5",H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl_id)
 
     CALL check("H5F_create_f",error,total_error)