From bb93b973c9644462184e62c4b098dbbd6885a1da Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Sat, 12 Jan 2002 14:05:32 +0000 Subject: diagnostic.c (warn_deprecated_use): Rework to lower indentation. * diagnostic.c (warn_deprecated_use): Rework to lower indentation. * expr.c (emit_move_insn_1): Remove warning, use HOST_WIDE_INT for offsets, and change line folding. * optabs.c (expand_binop): Remove warnings. * sdbout.c (sdbout_record_type_name): Constify NAME to avoid warning. From-SVN: r48801 --- gcc/diagnostic.c | 61 ++++++++++++++++++++++++++------------------------------ 1 file changed, 28 insertions(+), 33 deletions(-) (limited to 'gcc/diagnostic.c') diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index 7633523..2803049 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -1525,41 +1525,36 @@ void warn_deprecated_use (node) tree node; { - if (node && warn_deprecated_decl) + if (node == 0 || !warn_deprecated_decl) + return; + + 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)) { - 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))); + 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 (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); - } + if (what) + { + if (decl) + warning ("`%s' is deprecated (declared at %s:%d)", what, + DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl)); else - { - if (decl) - warning ("type is deprecated (declared at %s:%d)", - DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl)); - else - warning ("type is deprecated"); - } - } + 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"); } } -- cgit v1.1