- implemented -Wswitch-enum
[cparser] / warning.c
index c149d94..7329731 100644 (file)
--- a/warning.c
+++ b/warning.c
@@ -1,23 +1,55 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #include <stdio.h>
 #include <string.h>
 #include "warning.h"
 
 warning_t warning = {
+       .attribute                     = true,
        .char_subscripts               = true,
-       .check_format                  = true,
+       .declaration_after_statement   = false,
+       .deprecated_declarations       = true,
        .empty_statement               = false,
        .fatal_errors                  = false,
        .float_equal                   = false,
+       .format                        = true,
        .implicit_function_declaration = true,
        .implicit_int                  = true,
+       .long_long                     = false,
        .main                          = true,
        .missing_declarations          = false,
+       .missing_noreturn              = false,
        .missing_prototypes            = false,
+       .multichar                     = true,
+       .nested_externs                = false,
+       .nonnull                       = true,
        .redundant_decls               = true,
+       .return_type                   = true,
        .s_are_errors                  = false,
+       .shadow                        = false,
+       .sign_compare                  = false,
        .strict_prototypes             = true,
        .switch_default                = false,
+       .switch_enum                   = false,
        .unknown_pragmas               = true,
+       .unreachable_code              = false,
        .unused_function               = false,
        .unused_label                  = false,
        .unused_parameter              = false,
@@ -39,70 +71,88 @@ void set_warning_opt(const char *const opt)
 
        if (0) {}
 #define OPTX(x)   else if (strcmp(s, x) == 0)
-#define SET(y)    warning.y = state;
+#define SET(y)    (void)(warning.y = state)
 #define OPT(x, y) OPTX(x) SET(y)
        OPTX("all") {
-               SET(char_subscripts)
-               SET(check_format)
-               SET(empty_statement)
-               SET(implicit_function_declaration)
-               SET(implicit_int)
-               SET(main)
-               SET(redundant_decls)
-               SET(strict_prototypes)
-               SET(switch_default)
-               SET(unknown_pragmas)
-               SET(unused_function)
-               SET(unused_label)
-               SET(unused_parameter)
-               SET(unused_value)
-               SET(unused_variable)
+               /* Note: this switched on a lot of more warnings than gcc's -Wall */
+               SET(attribute);
+               SET(char_subscripts);
+               SET(empty_statement);
+               SET(format);
+               SET(implicit_function_declaration);
+               SET(implicit_int);
+               SET(main);
+               SET(nonnull);
+               SET(redundant_decls);
+               SET(return_type);
+               SET(shadow);
+               SET(sign_compare);
+               SET(strict_prototypes);
+               SET(unknown_pragmas);
+               SET(unreachable_code);
+               SET(unused_function);
+               SET(unused_label);
+               SET(unused_parameter);
+               SET(unused_value);
+               SET(unused_variable);
+               SET(switch_enum);
        }
-       OPT("char-subscripts",               char_subscripts)
-       OPT("empty-statement",               empty_statement)
-       OPT("error",                         s_are_errors)
+       OPT("attribute",                     attribute);
+       OPT("char-subscripts",               char_subscripts);
+       OPT("declaration-after-statement",   declaration_after_statement);
+       OPT("deprecated-declarations",       deprecated_declarations);
+       OPT("empty-statement",               empty_statement);
+       OPT("error",                         s_are_errors);
        OPTX("extra") {
                /* TODO */
-               // TODO SET(function_end_without_return)
-               SET(empty_statement)
-               // TODO SET(incomplete_aggregate_init)
-               // TODO SET(pointless_comparison)
-               // TODO SET(sign_compare)
-               SET(unused_parameter)
-               SET(unused_value)
+               // TODO SET(function_end_without_return);
+               SET(empty_statement);
+               // TODO SET(incomplete_aggregate_init);
+               // TODO SET(pointless_comparison);
+               SET(unused_parameter);
+               SET(unused_value);
+       }
+       OPT("fatal-errors",                  fatal_errors);
+       OPT("float-equal",                   float_equal);
+       OPTX("format") {
+               SET(format);
+               SET(nonnull);
        }
-       OPT("fatal-errors",                  fatal_errors)
-       OPT("float-equal",                   float_equal)
-       OPT("format",                        check_format)
        OPTX("implicit") {
-               SET(implicit_function_declaration)
-               SET(implicit_int)
+               SET(implicit_function_declaration);
+               SET(implicit_int);
        }
-       OPT("implicit-function-declaration", implicit_function_declaration)
-       OPT("implicit-int",                  implicit_int)
-       OPT("main",                          main)
-       OPT("missing-declarations",          missing_declarations)
-       OPT("missing-prototypes",            missing_prototypes)
-       OPT("redundant-decls",               redundant_decls)
-       OPT("strict-prototypes",             strict_prototypes)
-       OPT("switch-default",                switch_default)
-       OPT("unknown-pragmas",               unknown_pragmas)
-       OPT("unused-function",               unused_function)
-       OPT("unused-label",                  unused_label)
-       OPT("unused-parameter",              unused_parameter)
-       OPT("unused-variable",               unused_variable)
+       OPT("implicit-function-declaration", implicit_function_declaration);
+       OPT("implicit-int",                  implicit_int);
+       OPT("long-long",                     long_long);
+       OPT("main",                          main);
+       OPT("missing-declarations",          missing_declarations);
+       OPT("missing-noreturn",              missing_noreturn);
+       OPT("missing-prototypes",            missing_prototypes);
+       OPT("multichar",                     multichar);
+       OPT("nested-externs",                nested_externs);
+       OPT("nonnull",                       nonnull);
+       OPT("redundant-decls",               redundant_decls);
+       OPT("return-type",                   return_type);
+       OPT("shadow",                        shadow);
+       OPT("sign-compare",                  sign_compare);
+       OPT("strict-prototypes",             strict_prototypes);
+       OPT("switch-default",                switch_default);
+       OPT("switch-enum",                   switch_enum);
+       OPT("unknown-pragmas",               unknown_pragmas);
+       OPT("unreachable-code",              unreachable_code);
        OPTX("unused") {
-               SET(unused_function)
-               SET(unused_label)
-               SET(unused_parameter)
-               SET(unused_value)
-               SET(unused_variable)
+               SET(unused_function);
+               SET(unused_label);
+               SET(unused_parameter);
+               SET(unused_value);
+               SET(unused_variable);
        }
-       OPT("unused-function",               unused_function)
-       OPT("unused-label",                  unused_label)
-       OPT("unused-parameter",              unused_parameter)
-       OPT("unused-value",                  unused_value)
-       OPT("unused-variable",               unused_variable)
+       OPT("unused-function",               unused_function);
+       OPT("unused-label",                  unused_label);
+       OPT("unused-parameter",              unused_parameter);
+       OPT("unused-value",                  unused_value);
+       OPT("unused-variable",               unused_variable);
 #undef OPT
 #undef SET
 #undef OPT_X