removed the use of h5pclose_c

HDFGroup · Nov 1, 2023 · 1a28fec · 1a28fec
1 parent 8b2e363
commit 1a28fec
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 31 deletions.
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
@@ -69,30 +69,6 @@ h5pcreate_c(hid_t_f *cls, hid_t_f *prp_id)
     return ret_value;
 }
 
-/****if* H5Pf/h5pclose_c
- * NAME
- *  h5pclose_c
- * PURPOSE
- *  Call H5Pclose to close property lis
- * INPUTS
- *  prp_id - identifier of the property list to be closed
- * RETURNS
- *  0 on success, -1 on failure
- * SOURCE
- */
-
-int_f
-h5pclose_c(hid_t_f *prp_id)
-/******/
-{
-    int_f ret_value = 0;
-
-    if (H5Pclose((hid_t)*prp_id) < 0)
-        ret_value = -1;
-
-    return ret_value;
-}
-
 /****if* H5Pf/h5pcopy_c
  * NAME
  *  h5pcopy_c

diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
@@ -400,15 +400,16 @@ SUBROUTINE h5pclose_f(prp_id, hdferr)
     INTEGER(HID_T), INTENT(IN) :: prp_id
     INTEGER, INTENT(OUT) :: hdferr
     INTERFACE
-       INTEGER FUNCTION h5pclose_c(prp_id) &
-            BIND(C,NAME='h5pclose_c')
+       INTEGER(C_INT) FUNCTION H5Pclose(prp_id) &
+            BIND(C,NAME='H5Pclose')
+         IMPORT :: C_INT
          IMPORT :: HID_T
          IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN) :: prp_id
-       END FUNCTION h5pclose_c
+         INTEGER(HID_T), VALUE :: prp_id
+       END FUNCTION H5Pclose
     END INTERFACE
 
-    hdferr = h5pclose_c(prp_id)
+    hdferr = INT(H5Pclose(prp_id))
   END SUBROUTINE h5pclose_f
 
 !>

diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
@@ -368,7 +368,6 @@ H5_FCDLL int_f h5otoken_cmp_c(hid_t_f *loc_id, H5O_token_t *token1, H5O_token_t
  * Functions from H5Pf.c
  */
 H5_FCDLL int_f h5pcreate_c(hid_t_f *cls, hid_t_f *prp_id);
-H5_FCDLL int_f h5pclose_c(hid_t_f *prp_id);
 H5_FCDLL int_f h5pcopy_c(hid_t_f *prp_id, hid_t_f *new_prp_id);
 H5_FCDLL int_f h5pequal_c(hid_t_f *plist1_id, hid_t_f *plist2_id, int_f *c_flag);
 H5_FCDLL int_f h5pget_class_c(hid_t_f *prp_id, hid_t_f *classtype);

diff --git a/fortran/src/hdf5_fortrandll.def.in b/fortran/src/hdf5_fortrandll.def.in
@@ -258,7 +258,6 @@ H5P_mp_H5PSET_PRESERVE_F
 H5P_mp_H5PGET_PRESERVE_F
 H5P_mp_H5PGET_CLASS_F
 H5P_mp_H5PCOPY_F
-H5P_mp_H5PCLOSE_F
 H5P_mp_H5PSET_CHUNK_F
 H5P_mp_H5PGET_CHUNK_F
 H5P_mp_H5PSET_DEFLATE_F