diff options
| author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-06-08 19:45:23 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-06-08 19:45:23 (GMT) |
| commit | fe325fb554eddceccfa1674d804d5c7aed846bde (patch) | |
| tree | c5f191e25f44bdac61cfd590414cface520e6058 | |
| parent | e6aa306354b3b0f2fb707fd49351b7c08c1f49a2 (diff) | |
| download | hdf5-fe325fb554eddceccfa1674d804d5c7aed846bde.zip hdf5-fe325fb554eddceccfa1674d804d5c7aed846bde.tar.gz hdf5-fe325fb554eddceccfa1674d804d5c7aed846bde.tar.bz2 | |
HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
misc. clean-up
| -rw-r--r-- | fortran/src/H5Fff.F90 | 4 | ||||
| -rw-r--r-- | fortran/src/H5_ff.F90 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90 index 45d9f38..358e421 100644 --- a/fortran/src/H5Fff.F90 +++ b/fortran/src/H5Fff.F90 @@ -43,7 +43,7 @@ MODULE H5F IMPLICIT NONE ! Number of objects opened in H5open_f - INTEGER(SIZE_T) :: H5OPEN_NUM_OPEN_OBJ + INTEGER(SIZE_T) :: H5OPEN_NUM_OBJ CONTAINS !****s* H5F/h5fcreate_f @@ -624,7 +624,7 @@ CONTAINS ! Don't include objects created by H5open in the H5F_OBJ_ALL_F count IF(file_id.EQ.INT(H5F_OBJ_ALL_F,HID_T))THEN - obj_count = obj_count - H5OPEN_NUM_OPEN_OBJ + obj_count = obj_count - H5OPEN_NUM_OBJ ENDIF END SUBROUTINE h5fget_obj_count_f diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90 index 15fe37a..f63e734 100644 --- a/fortran/src/H5_ff.F90 +++ b/fortran/src/H5_ff.F90 @@ -169,10 +169,10 @@ CONTAINS ! October 13, 2011 ! Fortran90 Interface: SUBROUTINE h5open_f(error) - USE H5F, ONLY : h5fget_obj_count_f, H5OPEN_NUM_OPEN_OBJ + USE H5F, ONLY : h5fget_obj_count_f, H5OPEN_NUM_OBJ IMPLICIT NONE INTEGER, INTENT(OUT) :: error - INTEGER(SIZE_T) :: H5OPEN_NUM_OPEN_OBJ_LOC = 0 + INTEGER(SIZE_T) :: H5OPEN_NUM_OBJ_LOC = 0 !***** INTERFACE @@ -614,9 +614,9 @@ CONTAINS H5_SZIP_EC_OM_F = H5LIB_flags(1) H5_SZIP_NN_OM_F = H5LIB_flags(2) - CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, H5OPEN_NUM_OPEN_OBJ_LOC, error) + CALL h5fget_obj_count_f(INT(H5F_OBJ_ALL_F,HID_T), H5F_OBJ_ALL_F, H5OPEN_NUM_OBJ_LOC, error) - H5OPEN_NUM_OPEN_OBJ = H5OPEN_NUM_OPEN_OBJ_LOC + H5OPEN_NUM_OBJ = H5OPEN_NUM_OBJ_LOC END SUBROUTINE h5open_f |