diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-02-01 00:29:54 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2015-02-01 00:29:54 +0000 |
| commit | db30e21cbff7b9b2acd13ab83e25e3bf52f9696f (patch) | |
| tree | fad3fc076df76ea6f97827a7d37d80fc03eb5bbe /gcc/fortran/arith.c | |
| parent | 35fa7aa7371d5415398c995b518b543ccc2d29c6 (diff) | |
| download | gcc-db30e21cbff7b9b2acd13ab83e25e3bf52f9696f.zip gcc-db30e21cbff7b9b2acd13ab83e25e3bf52f9696f.tar.gz gcc-db30e21cbff7b9b2acd13ab83e25e3bf52f9696f.tar.bz2 | |
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
Diffstat (limited to 'gcc/fortran/arith.c')
| -rw-r--r-- | gcc/fortran/arith.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c index 5bcd9d0..b9c25c1 100644 --- a/gcc/fortran/arith.c +++ b/gcc/fortran/arith.c @@ -551,7 +551,7 @@ check_result (arith rc, gfc_expr *x, gfc_expr *r, gfc_expr **rp) if (val == ARITH_ASYMMETRIC) { - gfc_warning (gfc_arith_error (val), &x->where); + gfc_warning (0, gfc_arith_error (val), &x->where); val = ARITH_OK; } @@ -1966,7 +1966,7 @@ gfc_int2int (gfc_expr *src, int kind) { if (rc == ARITH_ASYMMETRIC) { - gfc_warning (gfc_arith_error (rc), &src->where); + gfc_warning (0, gfc_arith_error (rc), &src->where); } else { @@ -2280,7 +2280,8 @@ hollerith2representation (gfc_expr *result, gfc_expr *src) if (src_len > result_len) { - gfc_warning ("The Hollerith constant at %L is too long to convert to %qs", + gfc_warning (0, + "The Hollerith constant at %L is too long to convert to %qs", &src->where, gfc_typename(&result->ts)); } |