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/decl.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/decl.c')
| -rw-r--r-- | gcc/fortran/decl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index c26ffeb..40d851c 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -2299,7 +2299,7 @@ kind_expr: if (ts->f90_type != BT_UNKNOWN && ts->f90_type != ts->type && !((ts->f90_type == BT_REAL && ts->type == BT_COMPLEX) || (ts->f90_type == BT_COMPLEX && ts->type == BT_REAL))) - gfc_warning_now ("C kind type parameter is for type %s but type at %L " + gfc_warning_now (0, "C kind type parameter is for type %s but type at %L " "is %s", gfc_basic_typename (ts->f90_type), &where, gfc_basic_typename (ts->type)); @@ -3318,7 +3318,7 @@ gfc_match_import (void) if (gfc_find_symtree (gfc_current_ns->sym_root, name)) { - gfc_warning ("%qs is already IMPORTed from host scoping unit " + gfc_warning (0, "%qs is already IMPORTed from host scoping unit " "at %C", name); goto next_item; } @@ -4156,7 +4156,7 @@ verify_bind_c_sym (gfc_symbol *tmp_sym, gfc_typespec *ts, && tmp_sym->binding_label) /* Use gfc_warning_now because we won't say that the symbol fails just because of this. */ - gfc_warning_now ("Symbol %qs at %L is marked PRIVATE but has been " + gfc_warning_now (0, "Symbol %qs at %L is marked PRIVATE but has been " "given the binding label %qs", tmp_sym->name, &(tmp_sym->declared_at), tmp_sym->binding_label); @@ -6625,7 +6625,7 @@ cray_pointer_decl (void) return MATCH_ERROR; } else if (cptr->ts.kind < gfc_index_integer_kind) - gfc_warning ("Cray pointer at %C has %d bytes of precision;" + gfc_warning (0, "Cray pointer at %C has %d bytes of precision;" " memory addresses require %d bytes", cptr->ts.kind, gfc_index_integer_kind); |