summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2016-06-16 16:54:45 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2016-06-16 16:54:45 (GMT)
commita82edeb89b88e359cef1f2e0c1a8bd6812ca63b6 (patch)
tree8a303b30d0f2183491da98fe23c7fb07eaf6bdce
parent0c2964383b43ee81be6119fefd9fccb07b0de9b1 (diff)
downloadhdf5-a82edeb89b88e359cef1f2e0c1a8bd6812ca63b6.zip
hdf5-a82edeb89b88e359cef1f2e0c1a8bd6812ca63b6.tar.gz
hdf5-a82edeb89b88e359cef1f2e0c1a8bd6812ca63b6.tar.bz2
[svn-r30085] changed from CHARACTER to CHARACTER(LEN=*), and moved the LEN of an optional argument into the optional check loop.
-rw-r--r--fortran/src/H5Eff.F903
-rw-r--r--fortran/src/H5Pff.F904
2 files changed, 4 insertions, 3 deletions
diff --git a/fortran/src/H5Eff.F90 b/fortran/src/H5Eff.F90
index 7a0b15b..4198321 100644
--- a/fortran/src/H5Eff.F90
+++ b/fortran/src/H5Eff.F90
@@ -141,8 +141,9 @@ CONTAINS
INTEGER FUNCTION h5eprint_c2() BIND(C,NAME='h5eprint_c2')
END FUNCTION h5eprint_c2
END INTERFACE
- namelen = LEN(NAME)
+
IF (PRESENT(name)) THEN
+ namelen = LEN(NAME)
hdferr = h5eprint_c1(name, namelen)
ELSE
hdferr = h5eprint_c2()
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index e052ea0..a49de81 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -6260,7 +6260,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
! of fillvalue datatype
! (in memory)
- CHARACTER, INTENT(IN), TARGET :: fillvalue ! Fillvalue
+ CHARACTER(LEN=*), INTENT(IN), TARGET :: fillvalue ! Fillvalue
INTEGER, INTENT(OUT) :: hdferr ! Error code
TYPE(C_PTR) :: f_ptr ! C address
@@ -6275,7 +6275,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
! of fillvalue datatype
! (in memory)
- CHARACTER, INTENT(OUT) :: fillvalue ! Fillvalue
+ CHARACTER(LEN=*), INTENT(OUT) :: fillvalue ! Fillvalue
INTEGER, INTENT(OUT) :: hdferr ! Error code
INTEGER :: i