diff options
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/H5Pf.c | 10 | ||||
| -rw-r--r-- | fortran/src/H5Pff.f90 | 18 | ||||
| -rw-r--r-- | fortran/src/H5f90proto.h | 6 | ||||
| -rw-r--r-- | fortran/test/tH5Z.f90 | 8 |
4 files changed, 21 insertions, 21 deletions
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c index f9ad983..9503d81 100644 --- a/fortran/src/H5Pf.c +++ b/fortran/src/H5Pf.c @@ -3238,8 +3238,8 @@ DONE: } /*---------------------------------------------------------------------------- - * Name: h5pdelete_filter_c - * Purpose: Call H5Pdelete_filter to delete one or more filters + * Name: h5premove_filter_c + * Purpose: Call H5Premove_filter to delete one or more filters * Inputs: prp_id - property list identifier * filter - Filter to be deleted * Returns: 0 on success, -1 on failure @@ -3248,7 +3248,7 @@ DONE: * Modifications: *---------------------------------------------------------------------------*/ int_f -nh5pdelete_filter_c (hid_t_f *prp_id, int_f* filter) +nh5premove_filter_c (hid_t_f *prp_id, int_f* filter) { int ret_value = -1; hid_t c_prp_id; @@ -3259,9 +3259,9 @@ nh5pdelete_filter_c (hid_t_f *prp_id, int_f* filter) c_prp_id = (hid_t)*prp_id; /* - * Call H5Pdelety_filter function. + * Call H5Premove_filter function. */ - ret = H5Pdelete_filter(c_prp_id, c_filter); + ret = H5Premove_filter(c_prp_id, c_filter); if (ret < 0) goto DONE; ret_value = 0; diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90 index a49b602..11188a9 100644 --- a/fortran/src/H5Pff.f90 +++ b/fortran/src/H5Pff.f90 @@ -6333,7 +6333,7 @@ END SUBROUTINE h5pmodify_filter_f !---------------------------------------------------------------------- -! Name: h5pdelete_filter_f +! Name: h5premove_filter_f ! ! Purpose: Delete one or more filters from the filter pipeline. ! @@ -6356,11 +6356,11 @@ ! Comment: !---------------------------------------------------------------------- - SUBROUTINE h5pdelete_filter_f(prp_id, filter, hdferr) + SUBROUTINE h5premove_filter_f(prp_id, filter, hdferr) ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) -!DEC$attributes dllexport :: h5pdelete_filter_f +!DEC$attributes dllexport :: h5premove_filter_f !DEC$endif ! IMPLICIT NONE @@ -6369,21 +6369,21 @@ INTEGER, INTENT(OUT) :: hdferr ! Error code -! INTEGER, EXTERNAL :: h5pdelete_filter_c +! INTEGER, EXTERNAL :: h5premove_filter_c ! MS FORTRAN needs explicit interface for C functions called here. ! INTERFACE - INTEGER FUNCTION h5pdelete_filter_c(prp_id, filter) + INTEGER FUNCTION h5premove_filter_c(prp_id, filter) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) - !MS$ATTRIBUTES C,reference,alias:'_H5PMODIFY_FILTER_C'::h5pdelete_filter_c + !MS$ATTRIBUTES C,reference,alias:'_H5PMODIFY_FILTER_C'::h5premove_filter_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: prp_id INTEGER, INTENT(IN) :: filter - END FUNCTION h5pdelete_filter_c + END FUNCTION h5premove_filter_c END INTERFACE - hdferr = h5pdelete_filter_c(prp_id, filter) - END SUBROUTINE h5pdelete_filter_f + hdferr = h5premove_filter_c(prp_id, filter) + END SUBROUTINE h5premove_filter_f END MODULE H5P diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index e42b59a..fa12186 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -770,7 +770,7 @@ H5_DLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag ); # define nh5pset_layout_c FNAME(H5PSET_LAYOUT_C) # define nh5pget_layout_c FNAME(H5PGET_LAYOUT_C) # define nh5pset_filter_c FNAME(H5PSET_FILTER_C) -# define nh5pdelete_filter_c FNAME(H5PDELETE_FILTER_C) +# define nh5premove_filter_c FNAME(H5PREMOVE_FILTER_C) # define nh5pmodify_filter_c FNAME(H5PMODIFY_FILTER_C) # define nh5pget_nfilters_c FNAME(H5PGET_NFILTERS_C) # define nh5pget_filter_c FNAME(H5PGET_FILTER_C) @@ -877,7 +877,7 @@ H5_DLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag ); # define nh5pset_layout_c FNAME(h5pset_layout_c) # define nh5pget_layout_c FNAME(h5pget_layout_c) # define nh5pset_filter_c FNAME(h5pset_filter_c) -# define nh5pdelete_filter_c FNAME(h5pdelete_filter_c) +# define nh5premove_filter_c FNAME(h5premove_filter_c) # define nh5pmodify_filter_c FNAME(h5pmodify_filter_c) # define nh5pget_nfilters_c FNAME(h5pget_nfilters_c) # define nh5pget_filter_c FNAME(h5pget_filter_c) @@ -1036,7 +1036,7 @@ nh5pget_layout_c (hid_t_f *prp_id, int_f* layout); H5_DLL int_f nh5pset_filter_c (hid_t_f *prp_id, int_f* filter, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values ); H5_DLL int_f -nh5pdelete_filter_c (hid_t_f *prp_id, int_f* filter); +nh5premove_filter_c (hid_t_f *prp_id, int_f* filter); H5_DLL int_f nh5pmodify_filter_c (hid_t_f *prp_id, int_f* filter, int_f* flags, size_t_f* cd_nelmts, int_f* cd_values ); H5_DLL int_f diff --git a/fortran/test/tH5Z.f90 b/fortran/test/tH5Z.f90 index 6d84139..214d2ab 100644 --- a/fortran/test/tH5Z.f90 +++ b/fortran/test/tH5Z.f90 @@ -94,7 +94,7 @@ endif ! -! Verify h5pdelete_filter_f +! Verify h5premove_filter_f ! CALL h5zfilter_avail_f(H5Z_FILTER_FLETCHER32_F, status, error) CALL check("h5zfilter_avail_f", error, total_error) @@ -118,7 +118,7 @@ endif ! Delete a single filter - CALL h5pdelete_filter_f(crtpr_id, H5Z_FILTER_SHUFFLE_F, error) + CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_SHUFFLE_F, error) CALL check("h5pset_shuffle_f", error, total_error) ! Verify the correct number of filters now @@ -130,8 +130,8 @@ endif ! Delete all filters - CALL h5pdelete_filter_f(crtpr_id, H5Z_FILTER_NONE_F, error) - CALL check("h5pdelete_filter_f", error, total_error) + CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_NONE_F, error) + CALL check("h5premove_filter_f", error, total_error) ! Verify the correct number of filters now CALL h5pget_nfilters_f(crtpr_id, nfilters, error) |