[svn-r16825] Description:

	Bring revisions 16636:16821 from trunk to revise_chunks branch

Tested on:
	FreeBSD/32 6.3 (duty)
	Mac OS X/32 10.5.6 (amazon)
	(h5committest not needed on this branch)

1 files changed, 60 insertions, 18 deletions

diff --git a/fortran/src/H5Iff.f90 b/fortran/src/H5Iff.f90
index 07b6d29..83587ce 100644
--- a/fortran/src/H5Iff.f90
+++ b/fortran/src/H5Iff.f90
@@ -72,9 +72,9 @@
             INTERFACE
               INTEGER FUNCTION h5iget_type_c(obj_id, type)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IGET_TYPE_C':: h5iget_type_c
-              !DEC$ ENDIF
+              !DEC$IF DEFINED(HDF5F90_WINDOWS)
+              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IGET_TYPE_C':: h5iget_type_c
+              !DEC$ENDIF
               INTEGER(HID_T), INTENT(IN) :: obj_id 
               INTEGER, INTENT(OUT) :: type
               END FUNCTION h5iget_type_c
@@ -123,9 +123,9 @@
             INTERFACE
               INTEGER FUNCTION h5iget_name_c(obj_id, buf, buf_size, name_size)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IGET_NAME_C'::h5iget_name_c
-              !DEC$ ENDIF
+              !DEC$IF DEFINED(HDF5F90_WINDOWS)
+              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IGET_NAME_C'::h5iget_name_c
+              !DEC$ENDIF
               !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: obj_id
               CHARACTER(LEN=*), INTENT(OUT) :: buf
@@ -170,9 +170,9 @@
             INTERFACE
               INTEGER FUNCTION h5iinc_ref_c(obj_id, ref_count)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IINC_REF_C':: h5iinc_ref_c
-              !DEC$ ENDIF
+              !DEC$IF DEFINED(HDF5F90_WINDOWS)
+              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IINC_REF_C':: h5iinc_ref_c
+              !DEC$ENDIF
               INTEGER(HID_T), INTENT(IN) :: obj_id 
               INTEGER, INTENT(OUT) :: ref_count
               END FUNCTION h5iinc_ref_c
@@ -213,9 +213,9 @@
             INTERFACE
               INTEGER FUNCTION h5idec_ref_c(obj_id, ref_count)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IDEC_REF_C':: h5idec_ref_c
-              !DEC$ ENDIF
+              !DEC$IF DEFINED(HDF5F90_WINDOWS)
+              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IDEC_REF_C':: h5idec_ref_c
+              !DEC$ENDIF
               INTEGER(HID_T), INTENT(IN) :: obj_id 
               INTEGER, INTENT(OUT) :: ref_count
               END FUNCTION h5idec_ref_c
@@ -256,9 +256,9 @@
             INTERFACE
               INTEGER FUNCTION h5iget_ref_c(obj_id, ref_count)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IGET_REF_C':: h5iget_ref_c
-              !DEC$ ENDIF
+              !DEC$IF DEFINED(HDF5F90_WINDOWS)
+              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IGET_REF_C':: h5iget_ref_c
+              !DEC$ENDIF
               INTEGER(HID_T), INTENT(IN) :: obj_id 
               INTEGER, INTENT(OUT) :: ref_count
               END FUNCTION h5iget_ref_c
@@ -296,9 +296,9 @@
             INTERFACE
               INTEGER FUNCTION h5iget_file_id_c(obj_id, file_id)
               USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IGET_FILE_ID_C':: h5iget_file_id_c
-              !DEC$ ENDIF
+              !DEC$IF DEFINED(HDF5F90_WINDOWS)
+              !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IGET_FILE_ID_C':: h5iget_file_id_c
+              !DEC$ENDIF
               INTEGER(HID_T), INTENT(IN)  :: obj_id 
               INTEGER(HID_T), INTENT(OUT) :: file_id 
               END FUNCTION h5iget_file_id_c
@@ -306,5 +306,47 @@
             hdferr = h5iget_file_id_c(obj_id, file_id)
           END SUBROUTINE h5iget_file_id_f
 
+!----------------------------------------------------------------------
+! Name:		H5Iis_valid_f
+!
+! Purpose:	Check if an ID is valid without producing an error message
+!
+! Inputs: 	id		- identifier 
+! Outputs:       
+!		valid           - status of id as a valid identifier
+!		hdferr:		- error code		
+!				 	Success:  0
+!				 	Failure: -1
+! Programmer:	M. Scot Breitenfeld
+!		April 13, 2009
+!
+! Comment:		
+!----------------------------------------------------------------------
+          SUBROUTINE h5iis_valid_f(id, valid, hdferr)
+            IMPLICIT NONE
+            INTEGER(HID_T), INTENT(IN)  :: id   ! Identifier 
+            LOGICAL, INTENT(OUT) :: valid    ! Status of id as a valid identifier
+            INTEGER, INTENT(OUT) :: hdferr  ! Error code
+            INTEGER  :: c_valid ! 0 = .false, 1 = .true.
+
+            INTERFACE
+               INTEGER FUNCTION h5iis_valid_c(id, c_valid)
+                 USE H5GLOBAL
+                 !DEC$IF DEFINED(HDF5F90_WINDOWS)
+                 !DEC$ATTRIBUTES C,reference,decorate,alias:'H5IIS_VALID_C':: h5iis_valid_c
+                 !DEC$ENDIF
+                 INTEGER(HID_T), INTENT(IN)  :: id   ! Identifier 
+                 INTEGER  :: c_valid
+               END FUNCTION h5iis_valid_c
+            END INTERFACE
+
+            hdferr = h5iis_valid_c(id, c_valid)
+
+            valid = .FALSE. ! Default
+            IF(c_valid.EQ.1) valid = .TRUE.
+         
+          END SUBROUTINE h5iis_valid_f
+
+
       END MODULE H5I