mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Corrects more Fortran warnings (#2059)

Browse Source 
* Moves -Wunused-dummy-arguments to the developer warnings since this
  generates a lot of spurious, unfixable noise due to things like
  callback wrappers
* Changes the return cast in h5fget_fileno_c, fixes a comment, and comment
  on potential badness
* Initializes a variable in tH5L_F03.F90 to quiet a 'maybe
  uninitialized' warning
This commit is contained in:
Dana Robinson 2022-08-23 08:48:14 -07:00 committed by GitHub
parent 21ec337855
commit f020d129b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/cmake/HDFFortranCompilerFlags.cmake
View File

@ -54,10 +54,6 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_Fortran_COMPILER_VERS
endif ()
endif ()
#-----------------------------------------------------------------------------
# CDash is configured to only allow 3000 warnings, so
# break into groups (from the config/gnu-flags file)
#-----------------------------------------------------------------------------
if (NOT MSVC AND NOT MINGW)
# General flags
if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
@ -65,6 +61,11 @@ if (NOT MSVC AND NOT MINGW)
list (APPEND HDF5_CMAKE_Fortran_FLAGS "-free")
elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-general")
if (HDF5_ENABLE_DEV_WARNINGS)
ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-developer-general")
else ()
ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-no-developer-general")
endif ()
list (APPEND HDF5_CMAKE_Fortran_FLAGS "-ffree-form" "-fimplicit-none")
if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8.0 AND NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 4.6)
list (APPEND HDF5_CMAKE_Fortran_FLAGS "-std=f2008ts")
@ -92,7 +93,7 @@ if (NOT MSVC AND NOT MINGW)
# Append more extra warning flags that only gcc 5.x+ knows about
if (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5.0)
if (HDF5_ENABLE_DEV_WARNINGS)
ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-gfort-5")
ADD_H5_FLAGS (HDF5_CMAKE_Fortran_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/gfort-developer-5")
endif ()
endif ()

5
config/gnu-fflags
View File

@ -150,6 +150,9 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
H5_FCFLAGS="$H5_FCFLAGS $(load_gnu_arguments gfort-general)"
NO_DEVELOPER_WARNING_FCFLAGS="$NO_DEVELOPER_WARNING_FCFLAGS $(load_gnu_arguments gfort-no-developer-general)"
DEVELOPER_WARNING_FCFLAGS="$DEVELOPER_WARNING_FCFLAGS $(load_gnu_arguments gfort-developer-general)"
#############################
# Version-specific warnings #
#############################
@ -163,7 +166,7 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
# gfortran >= 5
if test $f9x_vers_major -ge 5; then
DEVELOPER_WARNING_FCFLAGS="$DEVELOPER_WARNING_FCFLAGS $(load_gnu_arguments developer-gfort-5)"
DEVELOPER_WARNING_FCFLAGS="$DEVELOPER_WARNING_FCFLAGS $(load_gnu_arguments gfort-developer-5)"
fi
# gfortran >= 6

0
config/gnu-warnings/developer-gfort-5 → config/gnu-warnings/gfort-developer-5
View File

3
config/gnu-warnings/gfort-developer-general Normal file
View File

@ -0,0 +1,3 @@
# There is no easy way in Fortran to indicate parameters are intentionally
# unused and many callbacks will have these, generating a lot of noise.
-Wunused-dummy-argument

3
config/gnu-warnings/gfort-no-developer-general Normal file
View File

@ -0,0 +1,3 @@
# There is no easy way in Fortran to indicate parameters are intentionally
# unused and many callbacks will have these, generating a lot of noise.
-Wno-unused-dummy-argument

1
configure.ac
View File

@ -2336,6 +2336,7 @@ case "X-$DEV_WARNINGS" in
;;
X-no)
H5_CFLAGS="$H5_CFLAGS $NO_DEVELOPER_WARNING_CFLAGS"
H5_FCFLAGS="$H5_FCFLAGS $NO_DEVELOPER_WARNING_FCFLAGS"
AC_MSG_RESULT([no])
;;
*)

8
fortran/src/H5Ff.c
View File

@ -664,11 +664,15 @@ h5fget_fileno_c(hid_t_f *file_id, int_f *fileno)
herr_t ret_value = 0; /* Return value */
/*
* Call H5Fget_filesize function
* Call H5Fget_fileno function
*/
if ((ret_value = H5Fget_fileno((hid_t)*file_id, &fileno_c)) < 0)
HGOTO_DONE(FAIL);
*fileno = (hsize_t_f)fileno_c;
/* XXX: This will have problems if the library fileno value doesn't fit
* into an int_f.
*/
*fileno = (int_f)fileno_c;
done:
return ret_value;

3
fortran/test/tH5L_F03.F90
View File

@ -73,7 +73,8 @@ CONTAINS
INTEGER, SAVE :: count
INTEGER, SAVE :: count2
!!$
liter_cb = 0
!!$ iter_info *info = (iter_info *)op_data;
!!$ static int count = 0;
!!$ static int count2 = 0;