Do no include -Wswitch-default in -Wall.

[cparser] / warning.c

diff --git a/warning.c b/warning.c
index f39e16c..7d9c434 100644 (file)
--- a/warning.c
+++ b/warning.c
@@ -2,12 +2,38 @@
 #include <string.h>
 #include "warning.h"
 
+warning_t warning = {
+       .char_subscripts               = true,
+       .check_format                  = true,
+       .empty_statement               = false,
+       .fatal_errors                  = false,
+       .float_equal                   = false,
+       .implicit_function_declaration = true,
+       .implicit_int                  = true,
+       .main                          = true,
+       .missing_declarations          = false,
+       .missing_prototypes            = false,
+       .redundant_decls               = true,
+       .s_are_errors                  = false,
+       .shadow                        = false,
+       .sign_compare                  = false,
+       .strict_prototypes             = true,
+       .switch_default                = false,
+       .unknown_pragmas               = true,
+       .unused_function               = false,
+       .unused_label                  = false,
+       .unused_parameter              = false,
+       .unused_value                  = true,
+       .unused_variable               = false
+};
+
 void set_warning_opt(const char *const opt)
 {
        const char* s = opt;
 
        bool state = true;
-       /* no- modifier */
+
+       /* "no-" prefix */
        if (s[0] == 'n' && s[1] == 'o' && s[2] == '-') {
                s += 3;
                state = false;
@@ -17,9 +43,38 @@ void set_warning_opt(const char *const opt)
 #define OPTX(x)   else if (strcmp(s, x) == 0)
 #define SET(y)    warning.y = state;
 #define OPT(x, y) OPTX(x) SET(y)
+       OPTX("all") {
+               /* Note: this switched on a lot of more warnings than gcc's -Wall */
+               SET(char_subscripts)
+               SET(check_format)
+               SET(empty_statement)
+               SET(implicit_function_declaration)
+               SET(implicit_int)
+               SET(main)
+               SET(redundant_decls)
+               SET(shadow)
+               SET(sign_compare)
+               SET(strict_prototypes)
+               SET(unknown_pragmas)
+               SET(unused_function)
+               SET(unused_label)
+               SET(unused_parameter)
+               SET(unused_value)
+               SET(unused_variable)
+       }
        OPT("char-subscripts",               char_subscripts)
        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)
+       }
        OPT("fatal-errors",                  fatal_errors)
        OPT("float-equal",                   float_equal)
        OPT("format",                        check_format)
@@ -33,19 +88,23 @@ void set_warning_opt(const char *const opt)
        OPT("missing-declarations",          missing_declarations)
        OPT("missing-prototypes",            missing_prototypes)
        OPT("redundant-decls",               redundant_decls)
+       OPT("shadow",                        shadow)
+       OPT("sign-compare",                  sign_compare)
        OPT("strict-prototypes",             strict_prototypes)
        OPT("switch-default",                switch_default)
        OPT("unknown-pragmas",               unknown_pragmas)
-#if 0
        OPTX("unused") {
                SET(unused_function)
                SET(unused_label)
                SET(unused_parameter)
-               SET(unused_variable)
                SET(unused_value)
+               SET(unused_variable)
        }
-#endif
+       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
@@ -53,22 +112,3 @@ void set_warning_opt(const char *const opt)
                fprintf(stderr, "warning: ignoring unknown option -W%s\n", opt);
        }
 }
-
-warning_t warning = {
-       .char_subscripts               = true,
-       .check_format                  = true,
-       .empty_statement               = false,
-       .fatal_errors                  = false,
-       .float_equal                   = true,
-       .implicit_function_declaration = true,
-       .implicit_int                  = true,
-       .main                          = true,
-       .missing_declarations          = true,
-       .missing_prototypes            = true,
-       .redundant_decls               = true,
-       .s_are_errors                  = false,
-       .strict_prototypes             = true,
-       .switch_default                = false,
-       .unknown_pragmas               = true,
-       .unused_value                  = true
-};