[svn-r26479] Fix for: HDFFV-9162

h5pget_class_f should return hid_t for classtype

Also removed all left over C comment artifacts /* and */ in the Fortran comments.

Tested: h5committest

3 files changed, 17 insertions, 43 deletions

diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index fa4dc5b..e9082d6 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -160,41 +160,32 @@ done:
 
 /****if* H5Pf/h5pget_class_c
  * NAME
- *        h5pget_class_c
+ *  h5pget_class_c
  * PURPOSE
- *     Call H5Pget_class to determine property list class
+ *  Call H5Pget_class to determine property list class
  * INPUTS
- *      prp_id - identifier of the dataspace
+ *  prp_id    - identifier of the dataspace
  * OUTPUTS
- *     classtype - class type; possible values are:
- *              H5P_ROOT_F       -1
- *              H5P_FILE_CREATE_F     0
- *              H5P_FILE_ACCESS_F     1
- *              H5P_DATASET_CREATE_F  2
- *              H5P_DATASET_XFER_F    3
- *              H5P_FILE_MOUNT_F      4
+ *  classtype - class type
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * SOURCE
 */
 
 int_f
-nh5pget_class_c ( hid_t_f *prp_id , int_f *classtype)
+nh5pget_class_c ( hid_t_f *prp_id , hid_t_f *classtype)
 /******/
 {
     hid_t c_classtype;
     int_f ret_value = 0;
 
-    c_classtype = H5Pget_class((hid_t)*prp_id);
-    if(c_classtype == H5P_ROOT) {
-      *classtype = H5P_ROOT;
+    if( (c_classtype = H5Pget_class((hid_t)*prp_id)) < 0)
        HGOTO_DONE(FAIL)
-    }
 
-    *classtype = (int_f)c_classtype;
+    *classtype = (hid_t_f)c_classtype;
 
 done:
     return ret_value;
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index 2103415..3409f15 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -237,18 +237,10 @@ CONTAINS
 !  Returns the property list class for a property list.
 !
 ! INPUTS
-!  
 !  prp_id	- property list identifier
+!
 ! OUTPUTS
-!  
 !  classtype	- property list class
-!		  Possible values are:
-!		   H5P_ROOT_F
-!		   H5P_FILE_CREATE_F
-!		   H5P_FILE_ACCESS_F
-!		   H5P_DATASET_CREATE_F
-!		   H5P_DATASET_XFER_F
-!		   H5P_FILE_MOUNT_F
 !  hdferr:	- error code		
 !		   Success:  0
 !		   Failure: -1 
@@ -265,30 +257,21 @@ CONTAINS
 ! Fortran90 Interface:
   SUBROUTINE h5pget_class_f(prp_id, classtype, hdferr)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-    INTEGER, INTENT(OUT) :: classtype    ! The type of the property list 
-                                         ! to be created. Possible values are: 
-                                         !  H5P_ROOT_F
-                                         !  H5P_FILE_CREATE_F
-                                         !  H5P_FILE_ACCESS_F
-                                         !  H5P_DATASET_CREATE_F 
-                                         !  H5P_DATASET_XFER_F
-                                         !  H5P_FILE_MOUNT_F
+    INTEGER(HID_T), INTENT(IN) :: prp_id      ! Property list identifier 
+    INTEGER(HID_T), INTENT(OUT) :: classtype  ! The type of the property list 
+                                              ! to be created.
     INTEGER, INTENT(OUT) :: hdferr       ! Error code
                                          ! 0 on success and -1 on failure
 !*****
 
-!   INTEGER, EXTERNAL :: h5pget_class_c
-!  MS FORTRAN needs explicit interface for C functions called here.
-!
     INTERFACE
        INTEGER FUNCTION h5pget_class_c(prp_id, classtype)
          USE H5GLOBAL
          !DEC$IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ATTRIBUTES C,reference,decorate,alias:'H5PGET_CLASS_C'::h5pget_class_c
          !DEC$ENDIF
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-         INTEGER, INTENT(OUT) :: classtype 
+         INTEGER(HID_T), INTENT(IN)  :: prp_id
+         INTEGER(HID_T), INTENT(OUT) :: classtype 
        END FUNCTION h5pget_class_c
     END INTERFACE
 
@@ -3641,7 +3624,7 @@ CONTAINS
 !  size         - Actual length of the class name
 !                   NOTE: If provided buffer "name" is smaller,
 !                   than name will be truncated to fit into
-!                   provided user buffer
+!                   provided user buffer.
 !  hdferr:	- error code
 !  		   Success: 0
 !  		   Failure: -1   
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index b5e40a8..6bde877 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -995,7 +995,7 @@ H5_FCDLL int_f nh5pcreate_c ( hid_t_f *cls, hid_t_f *prp_id );
 H5_FCDLL int_f nh5pclose_c ( hid_t_f *prp_id );
 H5_FCDLL int_f nh5pcopy_c ( hid_t_f *prp_id , hid_t_f *new_prp_id);
 H5_FCDLL int_f nh5pequal_c ( hid_t_f *plist1_id , hid_t_f *plist2_id, int_f *c_flag);
-H5_FCDLL int_f nh5pget_class_c ( hid_t_f *prp_id , int_f *classtype);
+H5_FCDLL int_f nh5pget_class_c ( hid_t_f *prp_id , hid_t_f *classtype);
 H5_FCDLL int_f nh5pset_deflate_c ( hid_t_f *prp_id , int_f *level);
 H5_FCDLL int_f nh5pset_chunk_c ( hid_t_f *prp_id, int_f *rank, hsize_t_f *dims );
 H5_FCDLL int_f nh5pget_chunk_c ( hid_t_f *prp_id, int_f *max_rank, hsize_t_f *dims );