[svn-r16197] Maintenance: Merged trunk into the hdf5_1_8 branch

             (used svn merge -r 15741:16196 http://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran).

1 files changed, 131 insertions, 124 deletions

diff --git a/fortran/src/H5Eff.f90 b/fortran/src/H5Eff.f90
index 5489a07..c7870fe 100644
--- a/fortran/src/H5Eff.f90
+++ b/fortran/src/H5Eff.f90
@@ -1,4 +1,13 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!****h* fortran/src/H5Eff.f90
+!
+! NAME
+!   H5E
+!  
+! FUNCTION
+!   This file contains Fortran interfaces for H5E functions.
+!
+! COPYRIGHT
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,16 +20,27 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
-!
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
-! This file contains FORTRAN90 interfaces for H5E functions
+! NOTES
+!                          *** IMPORTANT ***
+!   If you add a new H5E function you must add the function name to the 
+!   Windows dll file 'hdf5_fortrandll.def' in the fortran/src directory.
+!   This is needed for Windows based operating systems.
 !
-      MODULE H5E
+!*****
 
-        USE H5GLOBAL
-      
-      CONTAINS
+MODULE H5E
+  
+  USE H5GLOBAL
+
+  !Turn on automatic printing of errors
+  INTEGER, PARAMETER :: PRINTON = 1
+  
+  !Turn off automatic printing of errors
+  INTEGER, PARAMETER :: PRINTOFF = 0
+  
+CONTAINS
 
 !----------------------------------------------------------------------
 ! Name:		h5eclear_f
@@ -47,23 +67,23 @@
 ! Comment:		
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5eclear_f(hdferr)
-            IMPLICIT NONE
-            INTEGER, INTENT(OUT) :: hdferr  ! Error code
+  SUBROUTINE h5eclear_f(hdferr)
+    IMPLICIT NONE
+    INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
 !            INTEGER, EXTERNAL :: h5eclear_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
-            INTERFACE
-              INTEGER FUNCTION h5eclear_c()
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ECLEAR_C'::h5eclear_c
-              !DEC$ ENDIF
-              END FUNCTION h5eclear_c
-            END INTERFACE
-            hdferr = h5eclear_c()
-          END SUBROUTINE h5eclear_f
+    INTERFACE
+       INTEGER FUNCTION h5eclear_c()
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ECLEAR_C'::h5eclear_c
+         !DEC$ ENDIF
+       END FUNCTION h5eclear_c
+    END INTERFACE
+    hdferr = h5eclear_c()
+  END SUBROUTINE h5eclear_f
 
 !----------------------------------------------------------------------
 ! Name:		h5h5eprint_f
@@ -89,42 +109,38 @@
 ! Comment:		
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5eprint_f(hdferr, name)
-            CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: name ! File name
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!            INTEGER, EXTERNAL :: h5eprint_c1, h5eprint_c2 
-            INTEGER :: namelen
+  SUBROUTINE h5eprint_f(hdferr, name)
+    CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: name ! File name
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
+    INTEGER :: namelen
 
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5eprint_c1(name, namelen)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5EPRINT_C1'::h5eprint_c1
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER :: namelen
-              CHARACTER(LEN=*),INTENT(IN) :: name
-              END FUNCTION h5eprint_c1
-            END INTERFACE
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5eprint_c2()
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5EPRINT_C2'::h5eprint_c2
-              !DEC$ ENDIF
-              END FUNCTION h5eprint_c2
-            END INTERFACE
-            namelen = LEN(NAME)
-            if (present(name)) then
-               hdferr = h5eprint_c1(name, namelen) 
-            else
-            hdferr = h5eprint_c2() 
-            endif
-          END SUBROUTINE h5eprint_f
+    INTERFACE
+       INTEGER FUNCTION h5eprint_c1(name, namelen)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5EPRINT_C1'::h5eprint_c1
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER :: namelen
+         CHARACTER(LEN=*),INTENT(IN) :: name
+       END FUNCTION h5eprint_c1
+    END INTERFACE
+
+    INTERFACE
+       INTEGER FUNCTION h5eprint_c2()
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5EPRINT_C2'::h5eprint_c2
+         !DEC$ ENDIF
+       END FUNCTION h5eprint_c2
+    END INTERFACE
+    namelen = LEN(NAME)
+    IF (PRESENT(name)) THEN
+       hdferr = h5eprint_c1(name, namelen) 
+    ELSE
+       hdferr = h5eprint_c2() 
+    ENDIF
+  END SUBROUTINE h5eprint_f
 
 !----------------------------------------------------------------------
 ! Name:		h5eget_major_f
@@ -152,31 +168,28 @@
 ! Comment:		
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5eget_major_f(error_no, name, namelen, hdferr)
-            INTEGER, INTENT(IN) :: error_no !Major error number
-            CHARACTER(LEN=*), INTENT(OUT) :: name ! Character string describing
-                                                  ! the error.
-            INTEGER(SIZE_T), INTENT(IN) :: namelen !Anticipated number of characters in name.
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
+  SUBROUTINE h5eget_major_f(error_no, name, namelen, hdferr)
+    INTEGER, INTENT(IN) :: error_no ! Major error number
+    CHARACTER(LEN=*), INTENT(OUT) :: name ! Character string describing
+                                          ! the error.
+    INTEGER(SIZE_T), INTENT(IN) :: namelen !Anticipated number of characters in name.
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
-!            INTEGER, EXTERNAL :: h5eget_major_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5eget_major_c(error_no, name, namelen)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5EGET_MAJOR_C'::h5eget_major_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER :: error_no
-              CHARACTER(LEN=*) :: name 
-              INTEGER(SIZE_T), INTENT(IN) :: namelen
-              END FUNCTION h5eget_major_c
-            END INTERFACE
-
-            hdferr = h5eget_major_c(error_no, name, namelen) 
-          END SUBROUTINE h5eget_major_f
+    INTERFACE
+       INTEGER FUNCTION h5eget_major_c(error_no, name, namelen)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5EGET_MAJOR_C'::h5eget_major_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER :: error_no
+         CHARACTER(LEN=*) :: name 
+         INTEGER(SIZE_T), INTENT(IN) :: namelen
+       END FUNCTION h5eget_major_c
+    END INTERFACE
+    
+    hdferr = h5eget_major_c(error_no, name, namelen) 
+  END SUBROUTINE h5eget_major_f
 
 !----------------------------------------------------------------------
 ! Name:		h5eget_minor_f
@@ -206,29 +219,26 @@
 ! Comment:		
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5eget_minor_f(error_no, name, hdferr)
-            INTEGER, INTENT(IN) :: error_no !Major error number
-            CHARACTER(LEN=*), INTENT(OUT) :: name ! Character string describing
-                                                  ! the error
-            INTEGER, INTENT(OUT) :: hdferr        ! Error code
+  SUBROUTINE h5eget_minor_f(error_no, name, hdferr)
+    INTEGER, INTENT(IN) :: error_no !Major error number
+    CHARACTER(LEN=*), INTENT(OUT) :: name ! Character string describing
+                                          ! the error
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
-!            INTEGER, EXTERNAL :: h5eget_minor_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5eget_minor_c(error_no, name)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5EGET_MINOR_C'::h5eget_minor_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name
-              INTEGER :: error_no
-               CHARACTER(LEN=*) :: name 
-              END FUNCTION h5eget_minor_c
-            END INTERFACE
+    INTERFACE
+       INTEGER FUNCTION h5eget_minor_c(error_no, name)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5EGET_MINOR_C'::h5eget_minor_c
+         !DEC$ ENDIF
+         !DEC$ATTRIBUTES reference :: name
+         INTEGER :: error_no
+         CHARACTER(LEN=*) :: name 
+       END FUNCTION h5eget_minor_c
+    END INTERFACE
 
-            hdferr = h5eget_minor_c(error_no, name) 
-          END SUBROUTINE h5eget_minor_f
+    hdferr = h5eget_minor_c(error_no, name) 
+  END SUBROUTINE h5eget_minor_f
 !----------------------------------------------------------------------
 ! Name:		h5eset_auto_f
 !
@@ -258,29 +268,26 @@
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5eset_auto_f(printflag, hdferr)
-            INTEGER, INTENT(IN) :: printflag  !flag to turn automatic error
-                                              !printing on or off
-                                              !possible values are:
-                                              !printon (1)
-                                              !printoff(0)
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code
-
-!            INTEGER, EXTERNAL :: h5eset_auto_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
-            INTERFACE
-              INTEGER FUNCTION h5eset_auto_c(printflag)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ESET_AUTO_C'::h5eset_auto_c
-              !DEC$ ENDIF
-              INTEGER :: printflag
-              END FUNCTION h5eset_auto_c
-            END INTERFACE
+  SUBROUTINE h5eset_auto_f(printflag, hdferr)
+    INTEGER, INTENT(IN) :: printflag  !flag to turn automatic error
+                                      !printing on or off
+                                      !possible values are:
+                                      !printon (1)
+                                      !printoff(0)
+    INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
-            hdferr = h5eset_auto_c(printflag) 
-          END SUBROUTINE h5eset_auto_f
+    INTERFACE
+       INTEGER FUNCTION h5eset_auto_c(printflag)
+         USE H5GLOBAL
+         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ESET_AUTO_C'::h5eset_auto_c
+         !DEC$ ENDIF
+         INTEGER :: printflag
+       END FUNCTION h5eset_auto_c
+    END INTERFACE
 
-      END MODULE H5E
+    hdferr = h5eset_auto_c(printflag) 
+  END SUBROUTINE h5eset_auto_f
+  
+END MODULE H5E