[svn-r29584] resolve some old merge conflicts.

1 files changed, 8 insertions, 18 deletions

diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90
index f342ad2..165fba0 100644
--- a/fortran/src/H5Fff.F90
+++ b/fortran/src/H5Fff.F90
@@ -4,7 +4,7 @@
 !  MODULE H5F
 !
 ! FILE
-!  H5Fff.f90
+!  H5Fff.F90
 !
 ! PURPOSE
 !  This file contains Fortran interfaces for H5F functions.
@@ -485,10 +485,10 @@ CONTAINS
 
   END SUBROUTINE h5fget_access_plist_f
 
-!****s* H5F/h5fis_accessible_f
+!****s* H5F/h5fis_hdf5_f
 !
 ! NAME
-!  h5fis_accessible_f
+!  h5fis_hdf5_f
 !
 ! PURPOSE
 !  Determines whether a file is in the HDF5 format.
@@ -498,8 +498,6 @@ CONTAINS
 ! OUTPUTS
 !  status 	 - indicates if file is and HDF5 file
 !  hdferr 	 - Returns 0 if successful and -1 if fails
-! OPTIONAL PARAMETERS
-!  access_prp  - file access property list identifier
 ! AUTHOR
 !  Elena Pourmal
 !  August 12, 1999
@@ -510,41 +508,33 @@ CONTAINS
 !  port).  February 28, 2001
 !
 ! SOURCE
-  SUBROUTINE h5fis_accessible_f(name, status, hdferr, access_prp)
+  SUBROUTINE h5fis_hdf5_f(name, status, hdferr)
     IMPLICIT NONE
     CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the file
     LOGICAL, INTENT(OUT) :: status         ! Indicates if file
                                            ! is an HDF5 file
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
-                                           ! File access property list
-                                           ! identifier
 !*****
     INTEGER :: namelen ! Length of the name character string
-    INTEGER(HID_T) :: access_prp_default
     INTEGER :: flag    ! "TRUE/FALSE" flag from C routine
                        ! to define status value.
 
     INTERFACE
-       INTEGER FUNCTION h5fis_accessible_c(name, namelen, access_prp_default, flag) BIND(C,NAME='h5fis_accessible_c')
+       INTEGER FUNCTION h5fis_hdf5_c(name, namelen, flag) BIND(C,NAME='h5fis_hdf5_c')
          IMPORT :: C_CHAR
-         IMPORT :: HID_T
          IMPLICIT NONE
          CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: name
          INTEGER :: namelen
-         INTEGER(HID_T), INTENT(IN) :: access_prp_default
          INTEGER :: flag
-       END FUNCTION h5fis_accessible_c
+       END FUNCTION h5fis_hdf5_c
     END INTERFACE
 
     namelen = LEN_TRIM(name)
-    access_prp_default = H5P_DEFAULT_F
-    IF (PRESENT(access_prp))   access_prp_default   = access_prp
-    hdferr = h5fis_accessible_c(name, namelen, access_prp_default, flag)
+    hdferr = h5fis_hdf5_c(name, namelen, flag)
     status = .TRUE.
     IF (flag .EQ. 0) status = .FALSE.
 
-  END SUBROUTINE h5fis_accessible_f
+  END SUBROUTINE h5fis_hdf5_f
 !****s* H5F/h5fclose_f
 !
 ! NAME