]> git.ipfire.org Git - thirdparty/gcc.git/commit
Always pass 0 or option number to gfc_warning*.
authorJoseph Myers <joseph@codesourcery.com>
Sun, 1 Feb 2015 00:29:54 +0000 (00:29 +0000)
committerJoseph Myers <jsm28@gcc.gnu.org>
Sun, 1 Feb 2015 00:29:54 +0000 (00:29 +0000)
commitdb30e21cbff7b9b2acd13ab83e25e3bf52f9696f
treefad3fc076df76ea6f97827a7d37d80fc03eb5bbe
parent35fa7aa7371d5415398c995b518b543ccc2d29c6
Always pass 0 or option number to gfc_warning*.

Similar to the issue with fatal_error that I fixed in
<https://gcc.gnu.org/ml/gcc-patches/2015-01/msg02690.html>, the
overloads of gfc_warning and gfc_warning_now (with and without a first
argument for an option number) also break gcc.pot regeneration because
xgettext expects the translated string argument to be in a fixed
position for a given function name.  This patch applies the
corresponding fix of always passing a first argument (option number or
0), just like the core diagnostic functions warning and warning_at,
and removing the problem overloads without it.

Bootstrapped with no regressions on x86_64-unknown-linux-gnu.

* error.c (gfc_warning (const char *, ...), gfc_warning_now (const
char *, ...)): Remove functions.
* gfortran.h (gfc_warning (const char *, ...), gfc_warning_now
(const char *, ...)): Remove declarations.
* arith.c, check.c, data.c, decl.c, frontend-passes.c,
interface.c, intrinsic.c, io.c, matchexp.c, module.c, openmp.c,
options.c, parse.c, primary.c, resolve.c, scanner.c, symbol.c,
trans-common.c, trans-const.c, trans-stmt.c: All callers of
gfc_warning and gfc_warning_now changed to pass 0 or option number
as first argument.

From-SVN: r220313
23 files changed:
gcc/fortran/ChangeLog
gcc/fortran/arith.c
gcc/fortran/check.c
gcc/fortran/data.c
gcc/fortran/decl.c
gcc/fortran/error.c
gcc/fortran/frontend-passes.c
gcc/fortran/gfortran.h
gcc/fortran/interface.c
gcc/fortran/intrinsic.c
gcc/fortran/io.c
gcc/fortran/matchexp.c
gcc/fortran/module.c
gcc/fortran/openmp.c
gcc/fortran/options.c
gcc/fortran/parse.c
gcc/fortran/primary.c
gcc/fortran/resolve.c
gcc/fortran/scanner.c
gcc/fortran/symbol.c
gcc/fortran/trans-common.c
gcc/fortran/trans-const.c
gcc/fortran/trans-stmt.c