diff options
| author | Graham Stott <grahams@redhat.com> | 2002-01-12 13:45:39 +0000 |
|---|---|---|
| committer | Graham Stott <grahams@gcc.gnu.org> | 2002-01-12 13:45:39 +0000 |
| commit | f9f6b7df9dbea592ddb6f9230992872fee866a03 (patch) | |
| tree | 43e7dd937fa3ea2a493d8688200b94582d288196 /gcc/diagnostic.c | |
| parent | 4a69261704c060c8a7ff364dc570571f6c80569e (diff) | |
| download | gcc-f9f6b7df9dbea592ddb6f9230992872fee866a03.zip gcc-f9f6b7df9dbea592ddb6f9230992872fee866a03.tar.gz gcc-f9f6b7df9dbea592ddb6f9230992872fee866a03.tar.bz2 | |
attribs.c (handle_deprecated_attribute): constify WHAT.
* attribs.c (handle_deprecated_attribute): constify WHAT.
* diagnostic.c (warn_deprecated_use): Add braces, fixes
dangling else warning and constify WHAT.
* except.h (struct function, struct inline_remap): Move
struct tag forward defs before all prototypes.
(duplicate_eh_regions): Whitespace.
From-SVN: r48799
Diffstat (limited to 'gcc/diagnostic.c')
| -rw-r--r-- | gcc/diagnostic.c | 66 |
1 files changed, 34 insertions, 32 deletions
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index ac3539b..7633523 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -1526,38 +1526,40 @@ warn_deprecated_use (node) tree node; { if (node && warn_deprecated_decl) - if (DECL_P (node)) - { - warning ("`%s' is deprecated (declared at %s:%d)", - IDENTIFIER_POINTER (DECL_NAME (node)), - DECL_SOURCE_FILE (node), DECL_SOURCE_LINE (node)); - } - else if (TYPE_P (node)) - { - char *what = NULL; - tree decl = TYPE_STUB_DECL (node); + { + if (DECL_P (node)) + { + warning ("`%s' is deprecated (declared at %s:%d)", + IDENTIFIER_POINTER (DECL_NAME (node)), + DECL_SOURCE_FILE (node), DECL_SOURCE_LINE (node)); + } + else if (TYPE_P (node)) + { + const char *what = NULL; + tree decl = TYPE_STUB_DECL (node); - if (TREE_CODE (TYPE_NAME (node)) == IDENTIFIER_NODE) - what = IDENTIFIER_POINTER (TYPE_NAME (node)); - else if (TREE_CODE (TYPE_NAME (node)) == TYPE_DECL - && DECL_NAME (TYPE_NAME (node))) - what = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (node))); + if (TREE_CODE (TYPE_NAME (node)) == IDENTIFIER_NODE) + what = IDENTIFIER_POINTER (TYPE_NAME (node)); + else if (TREE_CODE (TYPE_NAME (node)) == TYPE_DECL + && DECL_NAME (TYPE_NAME (node))) + what = IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (node))); - if (what) - { - if (decl) - warning ("`%s' is deprecated (declared at %s:%d)", what, - DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl)); - else - warning ("`%s' is deprecated", what); - } - else - { - if (decl) - warning ("type is deprecated (declared at %s:%d)", - DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl)); - else - warning ("type is deprecated"); - } - } + if (what) + { + if (decl) + warning ("`%s' is deprecated (declared at %s:%d)", what, + DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl)); + else + warning ("`%s' is deprecated", what); + } + else + { + if (decl) + warning ("type is deprecated (declared at %s:%d)", + DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl)); + else + warning ("type is deprecated"); + } + } + } } |